Merge pull request #5 from algorandskiy/pavel/cce/newacctdeltas-resou…

…rces

ledger/apply/application.go

@@ -78,6 +78,17 @@ func createApplication(ac *transactions.ApplicationCallTxnFields, balances Balan
 
 	// Allocate the new app params (+ 1 to match Assets Idx namespace)
 	appIdx = basics.AppIndex(txnCounter + 1)
+
+	// Sanity check that there isn't an app with this counter value.
+	_, present, err := balances.GetAppParams(creator, appIdx)
+	if err != nil {
+		return
+	}
+	if present {
+		err = fmt.Errorf("already found app with index %d", appIdx)
+		return
+	}
+
 	params := basics.AppParams{
 		ApprovalProgram:   ac.ApprovalProgram,
 		ClearStateProgram: ac.ClearStateProgram,

ledger/internal/appcow_test.go

@@ -970,6 +970,9 @@ func TestApplyStorageDelta(t *testing.T) {
 			TotalAppLocalStates: 1,
 		}},
 	)
+	baseCow := makeRoundCowBase(nil, 0, 0, 0, config.ConsensusParams{})
+	baseCow.updateAppResourceCache(ledgercore.AccountApp{Address: addr, App: 1}, ledgercore.AccountResource{})
+	cow.lookupParent = baseCow
 
 	err := applyStorageDelta(cow, addr, storagePtr{1, true}, &sd)
 	a.NoError(err)

ledger/internal/eval.go

@@ -216,7 +216,10 @@ func (x *roundCowBase) updateAppResourceCache(aa ledgercore.AccountApp, r ledger
 func (x *roundCowBase) lookupAppParams(addr basics.Address, aidx basics.AppIndex, fromCache bool) (ledgercore.AppParamsDelta, bool, error) {
 	aa := ledgercore.AccountApp{Address: addr, App: aidx}
 	if result, ok := x.appParams[aa]; ok {
-		return ledgercore.AppParamsDelta{Params: &result.value}, result.exists, nil
+		if !result.exists {
+			return ledgercore.AppParamsDelta{}, false, nil
+		}
+		return ledgercore.AppParamsDelta{Params: &result.value}, true, nil
 	}
 
 	if fromCache { // hasn't been found yet; we were asked not to query DB
@@ -239,7 +242,10 @@ func (x *roundCowBase) lookupAppParams(addr basics.Address, aidx basics.AppIndex
 func (x *roundCowBase) lookupAssetParams(addr basics.Address, aidx basics.AssetIndex, fromCache bool) (ledgercore.AssetParamsDelta, bool, error) {
 	aa := ledgercore.AccountAsset{Address: addr, Asset: aidx}
 	if result, ok := x.assetParams[aa]; ok {
-		return ledgercore.AssetParamsDelta{Params: &result.value}, result.exists, nil
+		if !result.exists {
+			return ledgercore.AssetParamsDelta{}, false, nil
+		}
+		return ledgercore.AssetParamsDelta{Params: &result.value}, true, nil
 	}
 
 	if fromCache { // hasn't been found yet; we were asked not to query DB
@@ -262,7 +268,10 @@ func (x *roundCowBase) lookupAssetParams(addr basics.Address, aidx basics.AssetI
 func (x *roundCowBase) lookupAppLocalState(addr basics.Address, aidx basics.AppIndex, fromCache bool) (ledgercore.AppLocalStateDelta, bool, error) {
 	aa := ledgercore.AccountApp{Address: addr, App: aidx}
 	if result, ok := x.appLocalStates[aa]; ok {
-		return ledgercore.AppLocalStateDelta{State: &result.value}, result.exists, nil
+		if !result.exists {
+			return ledgercore.AppLocalStateDelta{}, false, nil
+		}
+		return ledgercore.AppLocalStateDelta{State: &result.value}, true, nil
 	}
 
 	if fromCache { // hasn't been found yet; we were asked not to query DB
@@ -285,7 +294,10 @@ func (x *roundCowBase) lookupAppLocalState(addr basics.Address, aidx basics.AppI
 func (x *roundCowBase) lookupAssetHolding(addr basics.Address, aidx basics.AssetIndex, fromCache bool) (ledgercore.AssetHoldingDelta, bool, error) {
 	aa := ledgercore.AccountAsset{Address: addr, Asset: aidx}
 	if result, ok := x.assets[aa]; ok {
-		return ledgercore.AssetHoldingDelta{Holding: &result.value}, result.exists, nil
+		if !result.exists {
+			return ledgercore.AssetHoldingDelta{}, false, nil
+		}
+		return ledgercore.AssetHoldingDelta{Holding: &result.value}, true, nil
 	}
 
 	if fromCache { // hasn't been found yet; we were asked not to query DB

ledger/ledgercore/statedelta.go

@@ -161,7 +161,7 @@ type NewAccountDeltas struct {
 	// cache for addr to deltas index resolution
 	acctsCache map[basics.Address]int
 
-	// AppResources deltas. If app params or local state is deleted, there is a nil value in appResources.Params or appResources.State
+	// AppResources deltas. If app params or local state is deleted, there is a nil value in appResources.Params or appResources.State and Deleted flag set
 	appResources []AppResourceRecord
 	// caches for {addr, app id} to app params delta resolution
 	appResourcesCache map[AccountApp]int
@@ -213,40 +213,48 @@ func (ad NewAccountDeltas) GetData(addr basics.Address) (AccountData, bool) {
 func (ad NewAccountDeltas) GetAppParams(addr basics.Address, aidx basics.AppIndex) (AppParamsDelta, bool) {
 	idx, ok := ad.appResourcesCache[AccountApp{addr, aidx}]
 	var result AppParamsDelta
+	var exist bool
 	if ok {
 		result = ad.appResources[idx].Params
+		exist = result.Deleted || result.Params != nil
 	}
-	return result, ok
+	return result, exist
 }
 
 // GetAssetParams returns asset params delta value
 func (ad NewAccountDeltas) GetAssetParams(addr basics.Address, aidx basics.AssetIndex) (AssetParamsDelta, bool) {
 	idx, ok := ad.assetResourcesCache[AccountAsset{addr, aidx}]
 	var result AssetParamsDelta
+	var exist bool
 	if ok {
 		result = ad.assetResources[idx].Params
+		exist = result.Deleted || result.Params != nil
 	}
-	return result, ok
+	return result, exist
 }
 
 // GetAppLocalState returns app local state delta value
 func (ad NewAccountDeltas) GetAppLocalState(addr basics.Address, aidx basics.AppIndex) (AppLocalStateDelta, bool) {
 	idx, ok := ad.appResourcesCache[AccountApp{addr, aidx}]
 	var result AppLocalStateDelta
+	var exist bool
 	if ok {
 		result = ad.appResources[idx].State
+		exist = result.Deleted || result.State != nil
 	}
-	return result, ok
+	return result, exist
 }
 
 // GetAssetHolding returns asset holding delta value
 func (ad NewAccountDeltas) GetAssetHolding(addr basics.Address, aidx basics.AssetIndex) (AssetHoldingDelta, bool) {
 	idx, ok := ad.assetResourcesCache[AccountAsset{addr, aidx}]
 	var result AssetHoldingDelta
+	var exist bool
 	if ok {
 		result = ad.assetResources[idx].Holding
+		exist = result.Deleted || result.Holding != nil
 	}
-	return result, ok
+	return result, exist
 }
 
 // ModifiedAccounts returns list of addresses of modified accounts
@@ -505,11 +513,13 @@ func (ad NewAccountDeltas) ToModifiedCreatables(seen map[basics.CreatableIndex]s
 				Created: false,
 				Creator: aapp.Address,
 			}
-		} else if _, ok := seen[basics.CreatableIndex(rec.Aidx)]; !ok {
-			result[basics.CreatableIndex(rec.Aidx)] = ModifiedCreatable{
-				Ctype:   basics.AppCreatable,
-				Created: true,
-				Creator: aapp.Address,
+		} else if rec.Params.Params != nil {
+			if _, ok := seen[basics.CreatableIndex(rec.Aidx)]; !ok {
+				result[basics.CreatableIndex(rec.Aidx)] = ModifiedCreatable{
+					Ctype:   basics.AppCreatable,
+					Created: true,
+					Creator: aapp.Address,
+				}
 			}
 		}
 	}
@@ -522,11 +532,13 @@ func (ad NewAccountDeltas) ToModifiedCreatables(seen map[basics.CreatableIndex]s
 				Created: false,
 				Creator: aapp.Address,
 			}
-		} else if _, ok := seen[basics.CreatableIndex(rec.Aidx)]; !ok {
-			result[basics.CreatableIndex(rec.Aidx)] = ModifiedCreatable{
-				Ctype:   basics.AssetCreatable,
-				Created: true,
-				Creator: aapp.Address,
+		} else if rec.Params.Params != nil {
+			if _, ok := seen[basics.CreatableIndex(rec.Aidx)]; !ok {
+				result[basics.CreatableIndex(rec.Aidx)] = ModifiedCreatable{
+					Ctype:   basics.AssetCreatable,
+					Created: true,
+					Creator: aapp.Address,
+				}
 			}
 		}
 	}