feat: Cudos partial balance and delegations movement (#387)

fetchai · Oct 9, 2024 · 8872709 · 8872709
1 parent c91059e
commit 8872709
Show file tree

Hide file tree

Showing 6 changed files with 241 additions and 201 deletions.
diff --git a/app/app.go b/app/app.go
@@ -727,7 +727,7 @@ func (app *App) GetSubspace(moduleName string) paramstypes.Subspace {
 	return subspace
 }
 
-func getNetworkInfo(app *App, ctx *sdk.Context, manifest *UpgradeManifest, expectedChainIdOfMergeSourceGenesis string) (*NetworkConfig, error) {
+func getNetworkInfo(app *App, ctx sdk.Context, manifest *UpgradeManifest, expectedChainIdOfMergeSourceGenesis string) (*NetworkConfig, error) {
 	// Load network config from file if given
 	var networkInfo *NetworkConfig
 	var err error
@@ -761,7 +761,7 @@ func getNetworkInfo(app *App, ctx *sdk.Context, manifest *UpgradeManifest, expec
 	return networkInfo, nil
 }
 
-func LoadAndParseMergeSourceInputFiles(app *App, ctx *sdk.Context, manifest *UpgradeManifest) (*GenesisData, *NetworkConfig, error) {
+func LoadAndParseMergeSourceInputFiles(app *App, ctx sdk.Context, manifest *UpgradeManifest) (*GenesisData, *NetworkConfig, error) {
 
 	cudosJsonData, cudosGenDoc, err := LoadCudosGenesis(app, manifest)
 
@@ -776,7 +776,7 @@ func LoadAndParseMergeSourceInputFiles(app *App, ctx *sdk.Context, manifest *Upg
 
 	cudosConfig := NewCudosMergeConfig(networkInfo.CudosMerge)
 
-	genesisData, err := parseGenesisData(*cudosJsonData, cudosGenDoc, cudosConfig, manifest)
+	genesisData, err := parseGenesisData(app, ctx, *cudosJsonData, cudosGenDoc, cudosConfig, manifest)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to parse genesis data: %w", err)
 	}
@@ -793,7 +793,7 @@ func (app *App) RegisterUpgradeHandlers(cfg module.Configurator) {
 
 		manifest := NewUpgradeManifest()
 
-		cudosGenesisData, networkInfo, err := LoadAndParseMergeSourceInputFiles(app, &ctx, manifest)
+		cudosGenesisData, networkInfo, err := LoadAndParseMergeSourceInputFiles(app, ctx, manifest)
 		if err != nil {
 			return nil, fmt.Errorf("cudos merge: %w", err)
 		}

diff --git a/app/ordered_map.go b/app/ordered_map.go
@@ -82,6 +82,27 @@ func (om *OrderedMap[K, V]) MustGet(key K) V {
 	return value
 }
 
+func (om *OrderedMap[K, V]) GetOrSetDefault(key K, defaultValue V) (V, bool) {
+	if value, exists := om.Get(key); exists {
+		return value, false
+	} else {
+		om.Set(key, defaultValue)
+		return om.MustGet(key), true
+	}
+}
+
+// Iterate returns a channel that yields key-value pairs in insertion order
+func (om *OrderedMap[K, V]) Iterate() <-chan Pair[K, V] {
+	ch := make(chan Pair[K, V])
+	go func() {
+		for _, key := range om.keys {
+			ch <- Pair[K, V]{Key: key, Value: om.MustGet(key)}
+		}
+		close(ch)
+	}()
+	return ch
+}
+
 func (om *OrderedMap[K, V]) Has(key K) bool {
 	_, exists := om.Get(key)
 	return exists