Refactor

fetchai · Oct 4, 2024 · e7b6c8f · e7b6c8f
1 parent 959f5dd
commit e7b6c8f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/app/app.go b/app/app.go
@@ -732,16 +732,16 @@ func getNetworkInfo(app *App, ctx sdk.Context, manifest *UpgradeManifest) (*Netw
 	var networkInfo *NetworkConfig
 	var err error
 	if app.cudosMigrationConfigPath != "" {
-		app.Logger().Info("Loading network config", "file", app.cudosMigrationConfigPath, "hash", app.cudosMigrationConfigSha256)
+		app.Logger().Info("cudos merge: loading network config", "file", app.cudosMigrationConfigPath, "hash", app.cudosMigrationConfigSha256)
 		networkInfo, err = LoadNetworkConfigFromFile(app.cudosMigrationConfigPath, &app.cudosMigrationConfigSha256)
-		manifest.ConfigSource = fmt.Sprintf("file %s %s", app.cudosMigrationConfigPath, app.cudosMigrationConfigSha256)
+		manifest.NetworkConfigFileSha256 = app.cudosMigrationConfigSha256
 		if err != nil {
 			return nil, err
 		}
 		// Config file not given, config from hardcoded map
 	} else if info, ok := NetworkInfos[ctx.ChainID()]; ok {
-		app.Logger().Info("Loading network from map", "chain", ctx.ChainID())
-		manifest.ConfigSource = fmt.Sprintf("config map %s", ctx.ChainID())
+		app.Logger().Info("cudos merge: loading network from map", "chain", ctx.ChainID())
+		manifest.NetworkConfigFileSha256 = ctx.ChainID()
 		networkInfo = &info
 	} else {
 		return nil, fmt.Errorf("network info not found for chain id: %s", ctx.ChainID())

diff --git a/app/upgrade_cudos.go b/app/upgrade_cudos.go
@@ -158,6 +158,7 @@ func CudosMergeUpgradeHandler(app *App, ctx sdk.Context, cudosCfg *CudosMergeCon
 	if app.cudosGenesisSha256 != actualGenesisSha256Hex {
 		return fmt.Errorf("sha256 failed to verify: genesis file \"%v\" hash %v does not match expected hash %v", app.cudosGenesisPath, actualGenesisSha256Hex, app.cudosGenesisSha256)
 	}
+	manifest.GenesisFileSha256 = actualGenesisSha256Hex
 
 	_, genDoc, err := genutiltypes.GenesisStateFromGenFile(app.cudosGenesisPath)
 	if err != nil {
@@ -767,7 +768,7 @@ func withdrawGenesisStakingDelegations(app *App, genesisData *GenesisData, cudos
 		return fmt.Errorf("remaining bonded pool balance %s is too high", bondedPool.balance.String())
 	}
 
-	app.Logger().Info("remaining bonded pool balance", "amount", bondedPool.balance.String())
+	app.Logger().Info("cudos merge: remaining bonded pool balance", "amount", bondedPool.balance.String())
 	err = moveGenesisBalance(genesisData, genesisData.bondedPoolAddress, cudosCfg.config.RemainingStakingBalanceAddr, bondedPool.balance, "remaining_bonded_pool_balance", manifest, cudosCfg)
 	if err != nil {
 		return err
@@ -782,7 +783,7 @@ func withdrawGenesisStakingDelegations(app *App, genesisData *GenesisData, cudos
 		return fmt.Errorf("remaining not-bonded pool balance %s is too high", notBondedPool.balance.String())
 	}
 
-	app.Logger().Info("Remaining not-bonded pool balance", "amount", notBondedPool.balance.String())
+	app.Logger().Info("cudos merge: remaining not-bonded pool balance", "amount", notBondedPool.balance.String())
 	err = moveGenesisBalance(genesisData, genesisData.notBondedPoolAddress, cudosCfg.config.RemainingStakingBalanceAddr, notBondedPool.balance, "remaining_not_bonded_pool_balance", manifest, cudosCfg)
 	if err != nil {
 		return err

diff --git a/app/upgrade_cudos_distribution.go b/app/upgrade_cudos_distribution.go
@@ -396,12 +396,12 @@ func withdrawGenesisDistributionRewards(app *App, genesisData *GenesisData, cudo
 
 	communityBalance, _ := genesisData.distributionInfo.feePool.communityPool.TruncateDecimal()
 	remainingBalance := distributionModuleAccount.balance.Sub(communityBalance)
-	app.Logger().Info("Remaining dist balance", "amount", remainingBalance.String())
+	app.Logger().Info("cudos merge: remaining dist balance", "amount", remainingBalance.String())
 
 	// TODO: Write to manifest?
 	err = checkTolerance(remainingBalance, maxToleratedRemainingDistributionBalance)
 	if err != nil {
-		return fmt.Errorf("Remaining distribution balance %s is too high", remainingBalance.String())
+		return fmt.Errorf("remaining distribution balance %s is too high", remainingBalance.String())
 	}
 
 	err = moveGenesisBalance(genesisData, genesisData.distributionInfo.distributionModuleAccountAddress, cudosCfg.config.RemainingDistributionBalanceAddr, distributionModuleAccount.balance, "remaining_distribution_module_balance", manifest, cudosCfg)

diff --git a/app/upgrade_v_11_4_manifest.go b/app/upgrade_v_11_4_manifest.go
@@ -13,17 +13,19 @@ import (
 const manifestFilenameBase = "upgrade_manifest.json"
 
 type UpgradeManifest struct {
-	ConfigSource       string                     `json:"config_source"`
-	Reconciliation     *UpgradeReconciliation     `json:"reconciliation,omitempty"`
-	Contracts          *Contracts                 `json:"contracts,omitempty"`
-	IBC                *UpgradeIBCTransfers       `json:"ibc,omitempty"`
-	Migration          *UpgradeMigation           `json:"migration,omitempty"`
-	MoveGenesisBalance *UpgradeMoveGenesisBalance `json:"move_genesis_balance,omitempty"`
-	Delegate           *UpgradeDelegate           `json:"delegate,omitempty"`
-	MoveMintedBalance  *UpgradeMoveMintedBalance  `json:"move_minted_balance,omitempty"`
-	VestingCollision   *UpgradeVestingCollision   `json:"vesting_collision,omitempty"`
-	MoveDelegations    *UpgradeMoveDelegations    `json:"move_delegation,omitempty"`
-	CreatedAccounts    *UpgradeCreatedAccounts    `json:"created_accounts,omitempty"`
+	// Following 2 hash data members are intentionally without `omitempty` parameter in `json:...` decorator
+	GenesisFileSha256       string                     `json:"genesis_file_sha256"`
+	NetworkConfigFileSha256 string                     `json:"network_config_file_sha256"`
+	Reconciliation          *UpgradeReconciliation     `json:"reconciliation,omitempty"`
+	Contracts               *Contracts                 `json:"contracts,omitempty"`
+	IBC                     *UpgradeIBCTransfers       `json:"ibc,omitempty"`
+	Migration               *UpgradeMigation           `json:"migration,omitempty"`
+	MoveGenesisBalance      *UpgradeMoveGenesisBalance `json:"move_genesis_balance,omitempty"`
+	Delegate                *UpgradeDelegate           `json:"delegate,omitempty"`
+	MoveMintedBalance       *UpgradeMoveMintedBalance  `json:"move_minted_balance,omitempty"`
+	VestingCollision        *UpgradeVestingCollision   `json:"vesting_collision,omitempty"`
+	MoveDelegations         *UpgradeMoveDelegations    `json:"move_delegation,omitempty"`
+	CreatedAccounts         *UpgradeCreatedAccounts    `json:"created_accounts,omitempty"`
 }
 
 func NewUpgradeManifest() *UpgradeManifest {