feat(local-ic): genesis config builder (#1141)

* builder, * migrate types & MnemonicToAddress * default builder test * add eth + avs load state example (avs) * use cosmos as base example * update v47 params for cosmoshub * remove unused * more chains with IBC generation * update chains, `SetAppendedIBCPathLink`, 4 IBC gen * use ibc.DockerImage instead of custom type * `uid_gid` -> original `uid-gid` for Yaml * `SetStartupCommands` * only override ports if first new chain * nit * fix uidgid * fix: local-ic go namespace (#1142) * `github.com/strangelove-ventures/interchaintest/localinterchain` * `interchaintest/localic` * `interchaintest/local-interchain` * uid-gid * order * remove stale comment
strangelove-ventures · May 29, 2024 · 2e881e2 · 2e881e2
1 parent 1340e70
commit 2e881e2
Show file tree

Hide file tree

Showing 36 changed files with 680 additions and 272 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,8 @@ interchaintest.test
 vendor
 examples/hyperspace/exported_state.json
 
-go.work.sum
+go.work.sum
+
+# testing generation
+local-interchain/interchain/types/chains
+local-interchain/interchain/types/configs
diff --git a/chain/cosmos/genesis.go b/chain/cosmos/genesis.go
@@ -42,7 +42,7 @@ func ModifyGenesis(genesisKV []GenesisKV) func(ibc.ChainConfig, []byte) ([]byte,
 			}
 
 			if err := dyno.Set(g, values.Value, path...); err != nil {
-				return nil, fmt.Errorf("failed to set value (index:%d) in genesis json: %w", idx, err)
+				return nil, fmt.Errorf("failed to set key '%s' as '%+v' (index:%d) in genesis json: %w", values.Key, values.Value, idx, err)
 			}
 		}
 

diff --git a/chain/cosmos/ics.go b/chain/cosmos/ics.go
@@ -365,7 +365,21 @@ func (c *CosmosChain) transformCCVState(ctx context.Context, ccvState []byte, co
 		(semver.Compare(providerVersion, icsVer330) < 0 && semver.Compare(consumerVersion, icsVer330) < 0) {
 		return ccvState, nil
 	}
+
 	var imageVersion, toVersion string
+
+	if icsCfg.ProviderVerOverride != "" {
+		imageVersion = icsCfg.ProviderVerOverride
+	}
+
+	if icsCfg.ConsumerVerOverride != "" {
+		toVersion = icsCfg.ConsumerVerOverride
+	}
+
+	if imageVersion == toVersion && imageVersion != "" {
+		return ccvState, nil
+	}
+
 	// The trick here is that when we convert the state to a consumer < 3.3.0, we need a converter that knows about that version; those are >= 4.0.0, and need a --to flag.
 	// Other than that, this is a question of using whichever version is newer. If it's the provider's, we need a --to flag to tell it the consumer version.
 	// If it's the consumer's, we don't need a --to flag cause it'll assume the consumer version.
@@ -382,13 +396,6 @@ func (c *CosmosChain) transformCCVState(ctx context.Context, ccvState []byte, co
 		imageVersion = consumerVersion
 	}
 
-	if icsCfg.ProviderVerOverride != "" {
-		imageVersion = icsCfg.ProviderVerOverride
-	}
-	if icsCfg.ConsumerVerOverride != "" {
-		toVersion = icsCfg.ConsumerVerOverride
-	}
-
 	c.log.Info("Transforming CCV state", zap.String("provider", providerVersion), zap.String("consumer", consumerVersion), zap.String("imageVersion", imageVersion), zap.String("toVersion", toVersion))
 
 	err := c.GetNode().WriteFile(ctx, ccvState, "ccvconsumer.json")

diff --git a/cmd/interchaintest/example_matrix_custom.json b/cmd/interchaintest/example_matrix_custom.json
@@ -14,7 +14,7 @@
           {
             "Repository": "ghcr.io/strangelove-ventures/heighliner/gaia",
             "Version": "latest",
-            "UidGid": "1025:1025"
+            "uid-gid": "1025:1025"
           }
         ],
         "Bin": "gaiad",
@@ -35,7 +35,7 @@
           {
             "Repository": "ghcr.io/strangelove-ventures/heighliner/osmosis",
             "Version": "latest",
-            "UidGid": "1025:1025"
+            "uid-gid": "1025:1025"
           }
         ],
         "Bin": "osmosisd",

diff --git a/ibc/types.go b/ibc/types.go
@@ -260,9 +260,9 @@ type SidecarConfig struct {
 }
 
 type DockerImage struct {
-	Repository string `yaml:"repository"`
-	Version    string `yaml:"version"`
-	UidGid     string `yaml:"uid-gid"`
+	Repository string `json:"repository" yaml:"repository"`
+	Version    string `json:"version" yaml:"version"`
+	UidGid     string `json:"uid-gid" yaml:"uid-gid"`
 }
 
 type CometMockConfig struct {
@@ -410,6 +410,6 @@ type PathUpdateOptions struct {
 }
 
 type ICSConfig struct {
-	ProviderVerOverride string
-	ConsumerVerOverride string
+	ProviderVerOverride string `yaml:"provider,omitempty" json:"provider,omitempty"`
+	ConsumerVerOverride string `yaml:"consumer,omitempty" json:"consumer,omitempty"`
 }
diff --git a/local-interchain/README.md b/local-interchain/README.md
@@ -119,7 +119,6 @@ Here is a base chain template with every feature the configuration accepts. Acco
     "ibc_paths": ["juno-ibc-1"],
     "debugging": true,
     "block_time": "500ms",
-    "encoding-options": ["juno"],
     "host_port_override": {
         "26656": "26656",
         "26657": "26657",

diff --git a/local-interchain/chains/base.json b/local-interchain/chains/base.json
@@ -8,7 +8,8 @@
             "bech32_prefix": "juno",
             "docker_image": {
                 "repository": "ghcr.io/cosmoscontracts/juno",
-                "version": "v17.0.0"
+                "version": "v17.0.0",
+                "uid-gid": "1000:1000"
             },
             "gas_prices": "0%DENOM%",
             "chain_type": "cosmos",
@@ -19,7 +20,6 @@
             "number_node": 0,
             "debugging": true,
             "block_time": "5000ms",
-            "encoding-options": ["juno"],
             "host_port_override": {
                 "26657": "26657",
                 "1317": "1317",

diff --git a/local-interchain/chains/base_ibc.json b/local-interchain/chains/base_ibc.json
@@ -35,7 +35,6 @@
                 "version": "v17.0.0"
             },
             "block_time": "2s",
-            "encoding-options": ["juno"],
             "gas_prices": "0%DENOM%",
             "gas_adjustment": 2.0,
             "ibc_paths": ["atom-juno", "juno-terra"]
@@ -50,7 +49,6 @@
                 "version": "v2.3.4"
             },
             "block_time": "2s",
-            "encoding-options": ["wasm"],
             "gas_prices": "0%DENOM%",
             "gas_adjustment": 2.0,
             "ibc_paths": ["atom-terra", "juno-terra"]

diff --git a/local-interchain/chains/cosmoshub.json b/local-interchain/chains/cosmoshub.json
@@ -7,7 +7,7 @@
             "binary": "gaiad",
             "bech32_prefix": "cosmos",
             "docker_image": {
-                "version": "v10.0.1"
+                "version": "v16.0.0"
             },
             "gas_prices": "0%DENOM%",
             "chain_type": "cosmos",
@@ -21,15 +21,15 @@
             "genesis": {
                 "modify": [
                     {
-                        "key": "app_state.gov.voting_params.voting_period",
+                        "key": "app_state.gov.params.voting_period",
                         "value": "15s"
                     },
                     {
-                        "key": "app_state.gov.deposit_params.max_deposit_period",
+                        "key": "app_state.gov.params.max_deposit_period",
                         "value": "15s"
                     },
                     {
-                        "key": "app_state.gov.deposit_params.min_deposit.0.denom",
+                        "key": "app_state.gov.params.min_deposit.0.denom",
                         "value": "uatom"
                     }
                 ],

diff --git a/local-interchain/chains/eth.json b/local-interchain/chains/eth.json
@@ -5,7 +5,7 @@
             "chain_id": "31337",
             "denom": "wei",
             "binary": "anvil",
-            "bech32_prefix": "n/a",
+            "bech32_prefix": "0x",
             "docker_image": {
                 "repository": "ghcr.io/foundry-rs/foundry",
                 "version": "latest"
@@ -18,7 +18,14 @@
             "debugging": true,
             "host_port_override": {
                 "8545": "8545"
-            }
+            },
+            "config_file_overrides": [
+                {
+                    "paths": {
+                        "--load-state": "chains/state/avs-and-eigenlayer-deployed-anvil-state.json"
+                    }
+                }
+            ]
         }
     ]
 }
diff --git a/local-interchain/chains/juno_ibc.json b/local-interchain/chains/juno_ibc.json
@@ -20,7 +20,6 @@
             "block_time": "500ms",
             "ibc_paths": ["juno-ibc-1"],
             "debugging": true,
-            "encoding-options": ["juno"],
             "genesis": {
                 "modify": [
                     {
@@ -79,7 +78,6 @@
                 ]
             },
             "block_time": "500ms",
-            "encoding-options": ["juno"],
             "gas_prices": "0%DENOM%",
             "gas_adjustment": 2.0,
             "ibc_paths": ["juno-ibc-1"]

diff --git a/local-interchain/chains/osmosis.json b/local-interchain/chains/osmosis.json
@@ -0,0 +1,28 @@
+{
+    "chains": [
+        {
+            "name": "osmosis",
+            "chain_id": "localosmo-1",
+            "denom": "uosmo",
+            "binary": "osmosisd",
+            "bech32_prefix": "osmo",
+            "docker_image": {
+                "version": "v25.0.0"
+            },
+            "ibc_paths": ["osmo-ibc-1"]
+        },
+        {
+            "name": "osmosis",
+            "chain_id": "localosmo-2",
+            "denom": "uosmo",
+            "binary": "osmosisd",
+            "bech32_prefix": "osmo",
+            "docker_image": {
+                "version": "v25.0.0"
+            },
+            "ibc_paths": ["osmo-ibc-1"]
+        }
+    ]
+}
+
+
diff --git a/local-interchain/chains/stargaze.json b/local-interchain/chains/stargaze.json
@@ -7,7 +7,7 @@
             "binary": "starsd",
             "bech32_prefix": "stars",
             "docker_image": {
-                "version": "v10.0.1"
+                "version": "v13.0.0"
             },
             "gas_prices": "0%DENOM%",
             "chain_type": "cosmos",
@@ -18,19 +18,18 @@
             "number_node": 0,
             "debugging": true,
             "block_time": "500ms",
-            "encoding-options": ["wasm"],
             "genesis": {
                 "modify": [
                     {
-                        "key": "app_state.gov.voting_params.voting_period",
+                        "key": "app_state.gov.params.voting_period",
                         "value": "15s"
                     },
                     {
-                        "key": "app_state.gov.deposit_params.max_deposit_period",
+                        "key": "app_state.gov.params.max_deposit_period",
                         "value": "15s"
                     },
                     {
-                        "key": "app_state.gov.deposit_params.min_deposit.0.denom",
+                        "key": "app_state.gov.params.min_deposit.0.denom",
                         "value": "ustars"
                     }
                 ],

diff --git a/local-interchain/chains/state/README.md b/local-interchain/chains/state/README.md
@@ -0,0 +1,3 @@
+
+## avs-and-eigenlayer-deployed-anvil-state.json
+- <https://github.com/mangata-finance/eigen-layer-monorepo/blob/main/tests/integration/avs-and-eigenlayer-deployed-anvil-state.json>
diff --git a/local-interchain/chains/state/avs-and-eigenlayer-deployed-anvil-state.json b/local-interchain/chains/state/avs-and-eigenlayer-deployed-anvil-state.json
diff --git a/local-interchain/cmd/local-ic/interaction.go b/local-interchain/cmd/local-ic/interaction.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/strangelove-ventures/localinterchain/interchain/handlers"
+	"github.com/strangelove-ventures/interchaintest/local-interchain/interchain/handlers"
 )
 
 const (