Merge pull request #2 from fetchai/feat/cudos-reinstate-reconciliation

feat: Reinstating reconciliation from the PR#375

app/app.go

@@ -372,7 +372,7 @@ func New(
 
 	app.GovKeeper = *govKeeper.SetHooks(
 		govtypes.NewMultiGovHooks(
-		// register the governance hooks
+			// register the governance hooks
 		),
 	)
 
@@ -739,6 +739,32 @@ func (app *App) RegisterUpgradeHandlers(cfg module.Configurator) {
 			panic("Network info not found for chain id: " + ctx.ChainID())
 		}
 
+		err := app.DeleteContractStates(ctx, &networkInfo, manifest)
+		if err != nil {
+			return nil, err
+		}
+
+		// Call the separate function to handle the admin upgrade
+		err = app.UpgradeContractAdmins(ctx, &networkInfo, manifest)
+		if err != nil {
+			return nil, err
+		}
+
+		err = app.ProcessReconciliation(ctx, &networkInfo, manifest)
+		if err != nil {
+			return nil, err
+		}
+
+		err = app.ChangeContractLabels(ctx, &networkInfo, manifest)
+		if err != nil {
+			return nil, err
+		}
+
+		err = app.ChangeContractVersions(ctx, &networkInfo, manifest)
+		if err != nil {
+			return nil, err
+		}
+
 		_, genDoc, err := genutiltypes.GenesisStateFromGenFile(app.cudosPath)
 		if err != nil {
 			panic(fmt.Errorf("failed to unmarshal genesis state: %w", err))
@@ -792,7 +818,7 @@ func (app *App) RegisterUpgradeHandlers(cfg module.Configurator) {
 
 		err = fundCommunityPool(ctx, app, genesisData, networkInfo, manifest)
 		if err != nil {
-			panic(fmt.Errorf("Failed to fund community pool: %w", err))
+			panic(fmt.Errorf("failed to fund community pool: %w", err))
 		}
 
 		err = VerifySupply(genesisData, networkInfo, manifest)

app/ordered_map.go

@@ -34,7 +34,7 @@ func (om *OrderedMap[K, V]) Set(key K, value V) {
 // Set adds a key-value pair to the map - it must not exist before
 func (om *OrderedMap[K, V]) SetNew(key K, value V) {
 	if om.Has(key) {
-		panic(fmt.Errorf("Key %s already exist", key))
+		panic(fmt.Errorf("key %v already exist", key))
 	}
 	om.Set(key, value)
 }

app/reconciliation_data_testnet.csv

@@ -0,0 +1,3 @@
+0x0b3777b5Dbea0C579c05898E7160351F114B9E08,0490657da13c62de6495a39958aa864d0a1beff1f4cf65ad1a86c67362b94eb1f35eff0eb1f9ccba919d909707adda21531d286fdff74f9a94f2d63e7979ce26c5,fetch1uvye96zkp86egcwrnsff22ama3c0m8h2aemmsd,,,
+0x6ACBEDc7616dA8AB5Cf0bB04fC3aA8CbB2629675,04b049b9a4e0745990f1dd2f95c0940f6ef6e34e6a61735de007faef914698ccdc9d0503cf00558819f744554bfd33895aeada4357b2a6bfb44332b08da8a52c14,fetch1kydzrk0ylc60zt34m00qttev5h3dgz72scl79d,,,
+0x3Ffa3598647e93136cf02434629b500E5a40473A,04f40cc694aa1f42b5eaa97ba9500001573f5aa4ef06114837bc972538bf0a67a93d9507472d4562532d9344767bffa20db3034653f34f20958aef135d97afc622,fetch1753h55um54pnskd77x0pfpv3le2e4cdhf3dhqc,,,