From 5432f3cd9b14def3bda8ee70d97c65ad19b4b1ec Mon Sep 17 00:00:00 2001 From: jonathansumner Date: Thu, 16 May 2024 15:40:46 +0100 Subject: [PATCH 1/4] chore: add structs for future PR merge --- cmd/fetchd/cmd/gen_asi_upgrade_manifest.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cmd/fetchd/cmd/gen_asi_upgrade_manifest.go b/cmd/fetchd/cmd/gen_asi_upgrade_manifest.go index 6527c083..6d9e25c2 100644 --- a/cmd/fetchd/cmd/gen_asi_upgrade_manifest.go +++ b/cmd/fetchd/cmd/gen_asi_upgrade_manifest.go @@ -19,9 +19,16 @@ type ASIUpgradeTransfers struct { To string `json:"to"` } +type ASIUpgradeSupplyMint struct { + LandingAddress string `json:"landing_address"` + Amount types.Coins `json:"amount"` + NewSupplyTotal types.Coins `json:"new_supply_total"` +} + type ASIUpgradeManifest struct { - IBC *ASIUpgradeTransfers `json:"ibc,omitempty"` - Reconciliation *ASIUpgradeTransfers `json:"reconciliation,omitempty"` + SupplyMint []ASIUpgradeSupplyMint `json:"supply_mint"` + IBC *ASIUpgradeTransfers `json:"ibc,omitempty"` + Reconciliation *ASIUpgradeTransfers `json:"reconciliation,omitempty"` } func SaveASIManifest(manifest *ASIUpgradeManifest, config *config2.Config) error { From da1486050371b304a0e4c018c23172606324001e Mon Sep 17 00:00:00 2001 From: jonathansumner Date: Mon, 20 May 2024 12:06:50 +0100 Subject: [PATCH 2/4] feat: add supply mint to manifest --- cmd/fetchd/cmd/genesis-asi-upgrade.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmd/fetchd/cmd/genesis-asi-upgrade.go b/cmd/fetchd/cmd/genesis-asi-upgrade.go index aaa9df36..3b844e5a 100644 --- a/cmd/fetchd/cmd/genesis-asi-upgrade.go +++ b/cmd/fetchd/cmd/genesis-asi-upgrade.go @@ -154,7 +154,7 @@ func ASIGenesisUpgradeCmd(defaultNodeHome string) *cobra.Command { ASIGenesisUpgradeReplaceDenom(jsonData, networkConfig) // supplement the genesis supply - ASIGenesisUpgradeASISupply(jsonData, networkConfig) + ASIGenesisUpgradeASISupply(jsonData, networkConfig, &manifest) // replace addresses across the genesis file ASIGenesisUpgradeReplaceAddresses(jsonData, networkConfig) @@ -453,7 +453,7 @@ func ASIGenesisUpgradeWithdrawReconciliationBalances(jsonData map[string]interfa return nil } -func ASIGenesisUpgradeASISupply(jsonData map[string]interface{}, networkInfo NetworkConfig) { +func ASIGenesisUpgradeASISupply(jsonData map[string]interface{}, networkInfo NetworkConfig, manifest *ASIUpgradeManifest) { denomInfo := networkInfo.DenomInfo supplyInfo := networkInfo.SupplyInfo additionalSupply, ok := sdk.NewIntFromString(supplyInfo.SupplyToMint) @@ -496,6 +496,14 @@ func ASIGenesisUpgradeASISupply(jsonData map[string]interface{}, networkInfo Net // add the additional coins to the overflow address balance overflowAddressBalanceCoins = overflowAddressBalanceCoins.Add(additionalSupplyCoin) + // add the new supply mint record to the manifest + mintRecord := ASIUpgradeSupplyMint{ + LandingAddress: supplyInfo.UpdatedSupplyOverflowAddr, + Amount: sdk.NewCoins(additionalSupplyCoin), + NewSupplyTotal: sdk.NewCoins(newSupplyCoins), + } + manifest.SupplyMint = append(manifest.SupplyMint, mintRecord) + // update the supply in the bank module supply[curSupplyIdx].(map[string]interface{})["amount"] = newSupplyCoins.Amount.String() balances[(*balancesMap)[supplyInfo.UpdatedSupplyOverflowAddr]].(map[string]interface{})["coins"] = getInterfaceSliceFromCoins(overflowAddressBalanceCoins) From 34c3ce6ab216ee94e4c726df4a140d7432a66d02 Mon Sep 17 00:00:00 2001 From: jonathansumner Date: Tue, 21 May 2024 13:14:38 +0100 Subject: [PATCH 3/4] chore: rename to be more clear --- cmd/fetchd/cmd/gen_asi_upgrade_manifest.go | 14 +++++++------- cmd/fetchd/cmd/genesis-asi-upgrade.go | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/fetchd/cmd/gen_asi_upgrade_manifest.go b/cmd/fetchd/cmd/gen_asi_upgrade_manifest.go index 6d9e25c2..b007de72 100644 --- a/cmd/fetchd/cmd/gen_asi_upgrade_manifest.go +++ b/cmd/fetchd/cmd/gen_asi_upgrade_manifest.go @@ -19,16 +19,16 @@ type ASIUpgradeTransfers struct { To string `json:"to"` } -type ASIUpgradeSupplyMint struct { - LandingAddress string `json:"landing_address"` - Amount types.Coins `json:"amount"` - NewSupplyTotal types.Coins `json:"new_supply_total"` +type ASIUpgradeSupply struct { + LandingAddress string `json:"landing_address"` + MintedAmount types.Coins `json:"minted_amount"` + ResultingSupplyTotal types.Coins `json:"resulting_supply_total"` } type ASIUpgradeManifest struct { - SupplyMint []ASIUpgradeSupplyMint `json:"supply_mint"` - IBC *ASIUpgradeTransfers `json:"ibc,omitempty"` - Reconciliation *ASIUpgradeTransfers `json:"reconciliation,omitempty"` + Supply *ASIUpgradeSupply `json:"supply_mint,omitempty"` + IBC *ASIUpgradeTransfers `json:"ibc,omitempty"` + Reconciliation *ASIUpgradeTransfers `json:"reconciliation,omitempty"` } func SaveASIManifest(manifest *ASIUpgradeManifest, config *config2.Config) error { diff --git a/cmd/fetchd/cmd/genesis-asi-upgrade.go b/cmd/fetchd/cmd/genesis-asi-upgrade.go index 3b844e5a..9f915b22 100644 --- a/cmd/fetchd/cmd/genesis-asi-upgrade.go +++ b/cmd/fetchd/cmd/genesis-asi-upgrade.go @@ -497,12 +497,12 @@ func ASIGenesisUpgradeASISupply(jsonData map[string]interface{}, networkInfo Net overflowAddressBalanceCoins = overflowAddressBalanceCoins.Add(additionalSupplyCoin) // add the new supply mint record to the manifest - mintRecord := ASIUpgradeSupplyMint{ - LandingAddress: supplyInfo.UpdatedSupplyOverflowAddr, - Amount: sdk.NewCoins(additionalSupplyCoin), - NewSupplyTotal: sdk.NewCoins(newSupplyCoins), + supplyRecord := ASIUpgradeSupply{ + LandingAddress: supplyInfo.UpdatedSupplyOverflowAddr, + MintedAmount: sdk.NewCoins(additionalSupplyCoin), + ResultingSupplyTotal: sdk.NewCoins(newSupplyCoins), } - manifest.SupplyMint = append(manifest.SupplyMint, mintRecord) + manifest.Supply = &supplyRecord // update the supply in the bank module supply[curSupplyIdx].(map[string]interface{})["amount"] = newSupplyCoins.Amount.String() From 9952c0b1ad5a7c0a0783cbcfed9af0688118a502 Mon Sep 17 00:00:00 2001 From: jonathansumner Date: Tue, 21 May 2024 13:21:45 +0100 Subject: [PATCH 4/4] chore: renaming --- cmd/fetchd/cmd/gen_asi_upgrade_manifest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/fetchd/cmd/gen_asi_upgrade_manifest.go b/cmd/fetchd/cmd/gen_asi_upgrade_manifest.go index b007de72..680920dc 100644 --- a/cmd/fetchd/cmd/gen_asi_upgrade_manifest.go +++ b/cmd/fetchd/cmd/gen_asi_upgrade_manifest.go @@ -26,7 +26,7 @@ type ASIUpgradeSupply struct { } type ASIUpgradeManifest struct { - Supply *ASIUpgradeSupply `json:"supply_mint,omitempty"` + Supply *ASIUpgradeSupply `json:"supply,omitempty"` IBC *ASIUpgradeTransfers `json:"ibc,omitempty"` Reconciliation *ASIUpgradeTransfers `json:"reconciliation,omitempty"` }