[Cadence 1.0] Improve Migration

cmd/util/ledger/migrations/cadence_values_migration.go

@@ -160,10 +160,14 @@ func (m *CadenceBaseMigrator) MigrateAccount(
 	}
 
 	// Merge the changes to the original payloads.
+	expectedWriteAddress := flow.ConvertAddress(address)
+	expectedOriginalAddress := flow.ConvertAddress(address)
+
 	return MergeRegisterChanges(
 		migrationRuntime.Snapshot.Payloads,
 		result.WriteSet,
-		flow.ConvertAddress(address),
+		expectedWriteAddress,
+		expectedOriginalAddress,
 		m.log,
 	)
 }

cmd/util/ledger/migrations/deploy_migration.go

@@ -17,6 +17,7 @@ func NewTransactionBasedMigration(
 	tx *flow.TransactionBody,
 	chainID flow.ChainID,
 	logger zerolog.Logger,
+	expectedWriteAddress flow.Address,
 ) ledger.Migration {
 	return func(payloads []*ledger.Payload) ([]*ledger.Payload, error) {
 
@@ -53,7 +54,7 @@ func NewTransactionBasedMigration(
 		return MergeRegisterChanges(
 			snapshot.Payloads,
 			executionSnapshot.WriteSet,
-			// we expect more  than one address to change here
+			expectedWriteAddress,
 			flow.EmptyAddress,
 			logger,
 		)
@@ -81,7 +82,12 @@ func NewDeploymentMigration(
 		AddArgument(jsoncdc.MustEncode(cadence.String(contract.Code))).
 		AddAuthorizer(authorizer)
 
-	return NewTransactionBasedMigration(tx, chainID, logger)
+	return NewTransactionBasedMigration(
+		tx,
+		chainID,
+		logger,
+		authorizer,
+	)
 }
 
 func NewBurnerDeploymentMigration(

cmd/util/ledger/migrations/merge.go

@@ -11,7 +11,8 @@ import (
 func MergeRegisterChanges(
 	originalPayloads map[flow.RegisterID]*ledger.Payload,
 	changes map[flow.RegisterID]flow.RegisterValue,
-	expectedAddress flow.Address,
+	expectedChangeAddress flow.Address,
+	expectedOriginalAddress flow.Address,
 	logger zerolog.Logger,
 ) ([]*ledger.Payload, error) {
 
@@ -24,15 +25,15 @@ func MergeRegisterChanges(
 			continue
 		}
 
-		if expectedAddress != flow.EmptyAddress {
+		if expectedChangeAddress != flow.EmptyAddress {
 			ownerAddress := flow.BytesToAddress([]byte(id.Owner))
 
-			if ownerAddress != expectedAddress {
+			if ownerAddress != expectedChangeAddress {
 				// something was changed that does not belong to this account. Log it.
 				logger.Error().
 					Str("key", id.String()).
-					Str("owner_address", ownerAddress.Hex()).
-					Str("account", expectedAddress.Hex()).
+					Str("actual_address", ownerAddress.Hex()).
+					Str("expected_address", expectedChangeAddress.Hex()).
 					Hex("value", value).
 					Msg("key is part of the change set, but is for a different account")
 			}
@@ -50,15 +51,15 @@ func MergeRegisterChanges(
 			continue
 		}
 
-		if expectedAddress != flow.EmptyAddress {
+		if expectedOriginalAddress != flow.EmptyAddress {
 			ownerAddress := flow.BytesToAddress([]byte(id.Owner))
 
-			if ownerAddress != expectedAddress {
+			if ownerAddress != expectedOriginalAddress {
 				// something was changed that does not belong to this account. Log it.
 				logger.Error().
 					Str("key", id.String()).
-					Str("owner_address", ownerAddress.Hex()).
-					Str("account", expectedAddress.Hex()).
+					Str("actual_address", ownerAddress.Hex()).
+					Str("expected_address", expectedOriginalAddress.Hex()).
 					Hex("value", value.Value()).
 					Msg("key is part of the original set, but is for a different account")
 			}