addHolding

algorand · joe-p · Jun 5, 2024 · Jun 6, 2024 · Jun 6, 2024 · Jun 6, 2024
commit d9e77effd5c9168a50d3b273fdf2a860c647e2cb
diff --git a/ledger/simulation/resources.go b/ledger/simulation/resources.go
@@ -606,8 +606,8 @@
 	return p.tracker.addBox(app, name, readSize, *p.initialBoxSurplusReadBudget, p.ep.Proto.BytesPerBoxReference)
 }

 type TxnResources struct {
 	// The static fields are resource arrays that were given in the transaciton group and thus cannot be removed
 	// The assumption is that these are prefilled because of one of the following reaons:
 	//   - This transaction has already been signed
 	//   - One of the foreign arrays is accessed on-chain
@@ -671,7 +671,22 @@
 	_, hasStatic := r.StaticAccounts[addr]
 	_, hasRef := r.Accounts[addr]
 	_, hasField := r.AccountsFromFields[addr]
-	// TODO: Check app addresses
+
+	if r.AppFromField.Address() == addr {
+		return true
+	}
+
+	for app := range r.Apps {
+		if app.Address() == addr {
+			return true
+		}
+	}
+
+	for app := range r.StaticApps {
+		if app.Address() == addr {
+			return true
+		}
+	}
 
 	return hasField || hasStatic || hasRef
 }
@@ -692,7 +707,7 @@
 	r.Boxes[logic.BoxRef{App: app, Name: name}] = struct{}{}
 }

 type PopulatedArrays struct {
 	Accounts []basics.Address
 	Assets   []basics.AssetIndex
 	Apps     []basics.AppIndex
@@ -728,7 +743,7 @@
 	}
 }

 type ResourcePopulator struct {
 	TxnResources []TxnResources
 }

@@ -818,7 +833,7 @@
 
 func (p *ResourcePopulator) addAsset(asset basics.AssetIndex) error {
 	for i := range p.TxnResources {
-		if p.TxnResources[i].hasRoomForCrossRef() {
+		if p.TxnResources[i].hasRoom() {
 			p.TxnResources[i].addAsset(asset)
 			return nil
 		}
@@ -828,7 +843,7 @@
 
 func (p *ResourcePopulator) addApp(app basics.AppIndex) error {
 	for i := range p.TxnResources {
-		if p.TxnResources[i].hasRoomForCrossRef() {
+		if p.TxnResources[i].hasRoom() {
 			p.TxnResources[i].addApp(app)
 			return nil
 		}
@@ -859,6 +874,38 @@
 	return fmt.Errorf("no room for box")
 }
 
+func (p *ResourcePopulator) addHolding(addr basics.Address, aid basics.AssetIndex) error {
+	// First try to find txn with account already available
+	for i := range p.TxnResources {
+		if p.TxnResources[i].hasAccount(addr) {
+			if p.TxnResources[i].hasRoom() {
+				p.TxnResources[i].addAsset(aid)
+				return nil
+			}
+		}
+	}
+
+	// Then try to find txn with asset already available
+	for i := range p.TxnResources {
+		if p.TxnResources[i].hasAsset(aid) {
+			if p.TxnResources[i].hasRoomForAccount() {
+				p.TxnResources[i].addAccount(addr)
+				return nil
+			}
+		}
+	}
+
+	// Finally try to find txn with room for both account and holding
+	for i := range p.TxnResources {
+		if p.TxnResources[i].hasRoomForCrossRef() {
+			p.TxnResources[i].addAccount(addr)
+			p.TxnResources[i].addAsset(aid)
+			return nil
+		}
+	}
+	return fmt.Errorf("no room for holding")
+}
+
 func (p *ResourcePopulator) populateResources(groupResourceTracker groupResourceTracker) error {
 	for i, tracker := range groupResourceTracker.localTxnResources {
 		for asset := range tracker.Assets {
@@ -874,15 +921,15 @@
 		}
 	}
 
-	for asset := range groupResourceTracker.globalResources.Assets {
-		err := p.addAsset(asset)
+	for holding := range groupResourceTracker.globalResources.AssetHoldings {
+		err := p.addHolding(holding.Address, holding.Asset)
 		if err != nil {
 			return err
 		}
 	}
 
-	for app := range groupResourceTracker.globalResources.Apps {
-		err := p.addApp(app)
+	for box := range groupResourceTracker.globalResources.Boxes {
+		err := p.addBox(box.App, box.Name)
 		if err != nil {
 			return err
 		}
@@ -895,8 +942,15 @@
 		}
 	}
 
-	for box := range groupResourceTracker.globalResources.Boxes {
-		err := p.addBox(box.App, box.Name)
+	for app := range groupResourceTracker.globalResources.Apps {
+		err := p.addApp(app)
+		if err != nil {
+			return err
+		}
+	}
+
+	for asset := range groupResourceTracker.globalResources.Assets {
+		err := p.addAsset(asset)
 		if err != nil {
 			return err
 		}
@@ -905,7 +959,7 @@
 	return nil
 }

 func MakeResourcePopulator(txnGroup []transactions.SignedTxnWithAD) ResourcePopulator {
 	populator := ResourcePopulator{
 		TxnResources: make([]TxnResources, len(txnGroup)),
 	}

diff --git a/ledger/simulation/resources_test.go b/ledger/simulation/resources_test.go
@@ -23,6 +23,7 @@ import (
 	"github.com/algorand/go-algorand/data/basics"
 	"github.com/algorand/go-algorand/data/transactions"
 	"github.com/algorand/go-algorand/data/transactions/logic"
+	"github.com/algorand/go-algorand/ledger/ledgercore"
 	"github.com/algorand/go-algorand/protocol"
 	"github.com/algorand/go-algorand/test/partitiontest"
 	"github.com/stretchr/testify/require"
@@ -351,22 +352,34 @@ func TestPopulatorWithGlobalResources(t *testing.T) {
 	proto := config.Consensus[protocol.ConsensusFuture]
 	groupTracker := makeGroupResourceTracker(txns, &proto)
 
+	// Resources that will go in the first transaction
 	addr := basics.Address{1, 1, 1}
 	app := basics.AppIndex(12345)
 	asset := basics.AssetIndex(12345)
-	box1 := logic.BoxRef{App: basics.AppIndex(1), Name: "box"}
 	box100 := logic.BoxRef{App: basics.AppIndex(100), Name: "box"}
+	addr100 := basics.Address{100}
+	asa100 := basics.AssetIndex(100)
+
+	// Resources that will go in the second transaction
+	box1 := logic.BoxRef{App: basics.AppIndex(1), Name: "box"}
+	app1Addr := basics.AppIndex(1).Address()
+	asa1 := basics.AssetIndex(1)
+	addr1 := basics.Address{1}
 
 	groupTracker.globalResources.Accounts = make(map[basics.Address]struct{})
 	groupTracker.globalResources.Assets = make(map[basics.AssetIndex]struct{})
 	groupTracker.globalResources.Apps = make(map[basics.AppIndex]struct{})
 	groupTracker.globalResources.Boxes = make(map[logic.BoxRef]uint64)
+	groupTracker.globalResources.AssetHoldings = make(map[ledgercore.AccountAsset]struct{})
 
 	groupTracker.globalResources.Accounts[addr] = struct{}{}
 	groupTracker.globalResources.Assets[asset] = struct{}{}
 	groupTracker.globalResources.Apps[app] = struct{}{}
 	groupTracker.globalResources.Boxes[box1] = 1
 	groupTracker.globalResources.Boxes[box100] = 1
+	groupTracker.globalResources.AssetHoldings[ledgercore.AccountAsset{Address: addr100, Asset: asa100}] = struct{}{}
+	groupTracker.globalResources.AssetHoldings[ledgercore.AccountAsset{Address: app1Addr, Asset: asa1}] = struct{}{}
+	groupTracker.globalResources.AssetHoldings[ledgercore.AccountAsset{Address: addr1, Asset: asa1}] = struct{}{}
 
 	err := populator.populateResources(groupTracker)
 	require.NoError(t, err)
@@ -376,12 +389,12 @@ func TestPopulatorWithGlobalResources(t *testing.T) {
 
 	require.ElementsMatch(t, pop0.Apps, []basics.AppIndex{app, box100.App})
 	require.ElementsMatch(t, pop0.Boxes, []logic.BoxRef{box100})
-	require.ElementsMatch(t, pop0.Accounts, []basics.Address{addr})
-	require.ElementsMatch(t, pop0.Assets, []basics.AssetIndex{asset})
+	require.ElementsMatch(t, pop0.Accounts, []basics.Address{addr, addr100})
+	require.ElementsMatch(t, pop0.Assets, []basics.AssetIndex{asset, asa100})
 
 	// Txn 1 has all the resources that had partial requirements already in tnx 1
 	require.ElementsMatch(t, pop1.Apps, []basics.AppIndex{})
 	require.ElementsMatch(t, pop1.Boxes, []logic.BoxRef{box1})
-	require.ElementsMatch(t, pop1.Accounts, []basics.Address{})
-	require.ElementsMatch(t, pop1.Assets, []basics.AssetIndex{})
+	require.ElementsMatch(t, pop1.Accounts, []basics.Address{addr1})
+	require.ElementsMatch(t, pop1.Assets, []basics.AssetIndex{asa1})
 }