feat: simapp/v2 (cosmos#20412)

Co-authored-by: marbar3778 <[email protected]> Co-authored-by: Marko <[email protected]> Co-authored-by: Likhita Polavarapu <[email protected]> Co-authored-by: unknown unknown <unknown@unknown>
public-awesome · Jun 19, 2024 · 2d014b2 · 2d014b2
1 parent ca195c1
commit 2d014b2
Show file tree

Hide file tree

Showing 28 changed files with 3,137 additions and 12 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -485,6 +485,30 @@ jobs:
           cd simapp
           go test -mod=readonly -timeout 30m -tags='app_v1 norace ledger test_ledger_mock' ./...
 
+  test-simapp-v2:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          check-latest: true
+          cache: true
+          cache-dependency-path: go.sum
+      - uses: technote-space/[email protected]
+        id: git_diff
+        with:
+          PATTERNS: |
+            **/*.go
+            go.mod
+            go.sum
+            **/go.mod
+            **/go.sum
+      - name: simapp-v2-smoke-test
+        if: env.GIT_DIFF
+        run: |
+          ./scripts/simapp-v2-init.sh
+
   test-collections:
     runs-on: ubuntu-latest
     steps:

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,6 +11,15 @@
       "program": "${fileDirname}",
       "args": ["-test.timeout", "30m", "-test.v"],
       "buildFlags": "-tags e2e"
+    },
+    {
+      "name": "Start: simapp/v2",
+      "type": "go",
+      "request": "launch",
+      "mode": "debug",
+      "program": "${workspaceFolder}/simapp/v2/simdv2",
+      "args": ["start"],
+      "buildFlags": ""
     }
   ]
 }
diff --git a/codec/depinject.go b/codec/depinject.go
@@ -35,11 +35,11 @@ func ProvideInterfaceRegistry(
 		SigningOptions: signingOptions,
 	})
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, fmt.Errorf("failed to create interface registry: %w", err)
 	}
 
 	if err := interfaceRegistry.SigningContext().Validate(); err != nil {
-		return nil, nil, err
+		return nil, nil, fmt.Errorf("failed to validate signing context: %w", err)
 	}
 
 	return interfaceRegistry, interfaceRegistry, nil

diff --git a/contrib/images/simd-env/Dockerfile b/contrib/images/simd-env/Dockerfile
@@ -24,6 +24,7 @@ COPY x/mint/go.mod x/mint/go.sum /work/x/mint/
 COPY x/consensus/go.mod x/consensus/go.sum /work/x/consensus/
 COPY x/accounts/go.mod x/accounts/go.sum /work/x/accounts/
 COPY runtime/v2/go.mod runtime/v2/go.sum /work/runtime/v2/
+COPY server/v2/go.mod server/v2/go.sum /work/server/v2/
 COPY server/v2/appmanager/go.mod server/v2/appmanager/go.sum /work/server/v2/appmanager/
 COPY server/v2/stf/go.mod server/v2/stf/go.sum /work/server/v2/stf/
 COPY server/v2/cometbft/go.mod server/v2/cometbft/go.sum /work/server/v2/cometbft/

diff --git a/core/header/service.go b/core/header/service.go
@@ -33,6 +33,10 @@ func (i *Info) Bytes() ([]byte, error) {
 	binary.LittleEndian.PutUint64(heightBytes, uint64(i.Height))
 	buf = append(buf, heightBytes...)
 
+	// TODO; permit empty hash OK for genesis block?
+	if len(i.Hash) == 0 {
+		i.Hash = make([]byte, hashSize)
+	}
 	// Encode Hash
 	if len(i.Hash) != hashSize {
 		return nil, errors.New("invalid hash size")
@@ -44,6 +48,9 @@ func (i *Info) Bytes() ([]byte, error) {
 	binary.LittleEndian.PutUint64(timeBytes, uint64(i.Time.Unix()))
 	buf = append(buf, timeBytes...)
 
+	if len(i.AppHash) == 0 {
+		i.AppHash = make([]byte, hashSize)
+	}
 	// Encode AppHash
 	if len(i.Hash) != hashSize {
 		return nil, errors.New("invalid hash size")

diff --git a/runtime/v2/module.go b/runtime/v2/module.go
@@ -101,6 +101,7 @@ func init() {
 			ProvideModuleManager,
 			ProvideGenesisTxHandler,
 			ProvideCometService,
+			ProvideAppVersionModifier,
 		),
 		appconfig.Invoke(SetupAppBuilder),
 	)

diff --git a/scripts/simapp-v2-init.sh b/scripts/simapp-v2-init.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -x
+
+ROOT=$PWD
+SIMAPP_DIR="$ROOT/simapp/v2"
+
+SIMD="$ROOT/build/simdv2"
+CONFIG="${CONFIG:-$HOME/.simappv2/config}"
+
+cd "$SIMAPP_DIR"
+go build -o "$ROOT/build/simdv2" simdv2/main.go
+
+$SIMD init simapp-v2-node --chain-id simapp-v2-chain
+
+cd "$CONFIG"
+
+# to enable the api server
+$SIMD config set app api.enable true
+
+# to change the voting_period
+jq '.app_state.gov.voting_params.voting_period = "600s"' genesis.json > temp.json && mv temp.json genesis.json
+
+# to change the inflation
+jq '.app_state.mint.minter.inflation = "0.300000000000000000"' genesis.json > temp.json && mv temp.json genesis.json
+
+# change the initial height to 2 to work around store/v2 and iavl limitations with a genesis block
+jq '.initial_height = 2' genesis.json > temp.json && mv temp.json genesis.json
+
+$SIMD keys add test_validator --indiscreet
+VALIDATOR_ADDRESS=$($SIMD keys show test_validator -a --keyring-backend test)
+
+$SIMD genesis add-genesis-account "$VALIDATOR_ADDRESS" 1000000000stake
+$SIMD genesis gentx test_validator 1000000000stake --keyring-backend test
+$SIMD genesis collect-gentxs
+
+$SIMD start &
+SIMD_PID=$!
+
+cnt=0
+while ! $SIMD query block --type=height 5; do
+  cnt=$((cnt + 1))
+  if [ $cnt -gt 30 ]; then
+    kill -9 "$SIMD_PID"
+    exit 1
+  fi
+  sleep 1
+done
+
+kill -9 "$SIMD_PID"
diff --git a/server/v2/cometbft/go.mod b/server/v2/cometbft/go.mod
@@ -9,6 +9,7 @@ replace (
 	cosmossdk.io/depinject => ../../../depinject
 	cosmossdk.io/server/v2 => ../
 	cosmossdk.io/server/v2/appmanager => ../appmanager
+	cosmossdk.io/store => ../../../store
 	cosmossdk.io/store/v2 => ../../../store/v2
 	cosmossdk.io/x/accounts => ../../../x/accounts
 	cosmossdk.io/x/auth => ../../../x/auth

diff --git a/server/v2/cometbft/go.sum b/server/v2/cometbft/go.sum
@@ -12,8 +12,6 @@ cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI=
 cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM=
 cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE=
 cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
-cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc h1:R9O9d75e0qZYUsVV0zzi+D7cNLnX2JrUOQNoIPaF0Bg=
-cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc/go.mod h1:amTTatOUV3u1PsKmNb87z6/galCxrRbz9kRdJkL0DyU=
 cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240417181816-5e7aae0db1f5 h1:eb0kcGyaYHSS0do7+MIWg7UKlskSH01biRNENbm/zDA=
 cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240417181816-5e7aae0db1f5/go.mod h1:drzY4oVisyWvSgpsM7ccQ7IX3efMuVIvd9Eij1Gm/6o=
 cosmossdk.io/x/tx v0.13.3 h1:Ha4mNaHmxBc6RMun9aKuqul8yHiL78EKJQ8g23Zf73g=

diff --git a/server/v2/streaming/context.go b/server/v2/streaming/context.go
@@ -1,6 +1,6 @@
 package streaming
 
-import "cosmossdk.io/log"
+import "cosmossdk.io/core/log"
 
 // Context is an interface used by an App to pass context information
 // needed to process store streaming requests.

diff --git a/server/v2/streaming/streaming_test.go b/server/v2/streaming/streaming_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"cosmossdk.io/log"
+	"cosmossdk.io/core/log"
 )
 
 type PluginTestSuite struct {

diff --git a/simapp/v2/README.md b/simapp/v2/README.md
@@ -0,0 +1,8 @@
+---
+sidebar_position: 1
+---
+
+# `SimApp/v2`
+
+SimApp is an application built using the Cosmos SDK for testing and educational purposes.
+`SimApp/v2` demonstrate a runtime/v2, server/v2 and store/v2 wiring.