feat: Upgrade tia branch to cosmos sdk v0.50.1 (#382)

* project builds * fix unit tests * go version in workflows * some lint issues * fix sim non determinism * go version in workflows * single node fix * fix rollkit init-local * init-local works * try liveness with init-local * update init_local to work in CI * script permisions * remove it option from docker run * make celestia devnet run in background * rollup script too * comment out e2e * some lint fixes * use version latest in golangci-lint action * more lint fixes * silence lint error on usage of deprecated func * fix .golangci.yml formatting * add extra sleep in liveness * cometbft to v0.38.5 * Update cmd/ojod/cmd/commands.go Co-authored-by: Adam Wozniak <[email protected]> * move TODO to top of file --------- Co-authored-by: Adam Wozniak <[email protected]> (cherry picked from commit 8649e17) # Conflicts: # go.mod # go.sum # scripts/celestia_devnet.sh # tools/tools.go
ojo-network · Feb 29, 2024 · 4e63551 · 4e63551
1 parent 4c582d3
commit 4e63551
Show file tree

Hide file tree

Showing 143 changed files with 3,339 additions and 2,095 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
         if: env.GIT_DIFF
         uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21.1'
           cache: true
         env:
           GOOS: ${{ matrix.targetos }}

diff --git a/.github/workflows/code-ql.yml b/.github/workflows/code-ql.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21.1'
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3

diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21.1'
           cache: true
 
       - uses: actions/checkout@v4

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -17,13 +17,13 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21.1'
       - uses: actions/checkout@v4
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v4
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.53
+          version: latest
           args: --timeout 5m
 
   super-linter:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21.1'
           cache: true
 
       - name: Set Env

diff --git a/.github/workflows/simulations.yml b/.github/workflows/simulations.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21.1'
 
       - name: Install runsim
         run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
@@ -38,7 +38,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: '1.20'
+          go-version: '1.21.1'
           cache: true
       - name: Test application non-determinism
         if: env.GIT_DIFF
@@ -60,7 +60,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: '1.20'
+          go-version: '1.21.1'
           cache: true
       - uses: actions/cache@v4
         if: env.GIT_DIFF
@@ -87,7 +87,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: '1.20'
+          go-version: '1.21.1'
           cache: true
       - uses: actions/cache@v4
         if: env.GIT_DIFF
@@ -113,7 +113,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: '1.20'
+          go-version: '1.21.1'
           cache: true
       - uses: actions/cache@v4
         if: env.GIT_DIFF

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21.1'
       - name: Display Go Version
         run: go version
       - uses: actions/cache@v4
@@ -38,7 +38,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: '1.20'
+          go-version: '1.21.1'
           cache: true
       - name: Test and Create Coverage Report
         if: env.GIT_DIFF
@@ -74,16 +74,24 @@ jobs:
           name: ojod-linux-amd64
           path: ./build
 
-      - name: Start single node chain
+      - name: Start celestia devnet
         if: env.GIT_DIFF
         run: |
           chmod +x ./build/ojod
-          ./scripts/single-node.sh
+          chmod +x ./scripts/celestia_devnet.sh
+          ./scripts/celestia_devnet.sh &
+      - name: Start ojod rollup
+        if: env.GIT_DIFF
+        run: |
+          sleep 30s
+          chmod +x ./build/ojod
+          chmod +x ./scripts/init-local.sh
+          ./scripts/init-local.sh &
       - name: Test Local Network Liveness
         if: env.GIT_DIFF
         run: |
           sleep 1m
-          ./scripts/localnet-liveness.sh 50 5 50 localhost:26657
+          ./scripts/localnet-liveness.sh 50 5 50 localhost:36657
 
   test-e2e:
     runs-on: ubuntu-latest
@@ -100,7 +108,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: '1.20'
+          go-version: '1.21.1'
           cache: true
 
       - name: Test E2E

diff --git a/.golangci.yml b/.golangci.yml
@@ -56,6 +56,12 @@ issues:
     - linters:
         - lll
       source: "https://"
+    - text: "SA1019: codec.NewAminoCodec is deprecated" # TODO remove once migration path is set out
+      linters:
+        - staticcheck
+    - text: "SA1019: \"github.com/cosmos/ibc-go/v8/modules/core/02-client/types\" is deprecated"
+      linters:
+        - staticcheck
   max-same-issues: 50
 
 linters-settings:

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Builder
-FROM golang:1.20-alpine AS builder
+FROM golang:1.21.1-alpine AS builder
 
 RUN apk add --no-cache \
     ca-certificates \

diff --git a/ante/ante.go b/ante/ante.go
@@ -1,14 +1,14 @@
 package ante
 
 import (
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	storetypes "cosmossdk.io/store/types"
+	txsigning "cosmossdk.io/x/tx/signing"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	cosmosante "github.com/cosmos/cosmos-sdk/x/auth/ante"
-	"github.com/cosmos/cosmos-sdk/x/auth/signing"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
-	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
-	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
+	ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
+	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 )
 
 type HandlerOptions struct {
@@ -17,7 +17,7 @@ type HandlerOptions struct {
 	FeegrantKeeper    cosmosante.FeegrantKeeper
 	OracleKeeper      OracleKeeper
 	IBCKeeper         *ibckeeper.Keeper
-	SignModeHandler   signing.SignModeHandler
+	SignModeHandler   *txsigning.HandlerMap
 	SigGasConsumer    cosmosante.SignatureVerificationGasConsumer
 	TXCounterStoreKey storetypes.StoreKey
 }

diff --git a/ante/ante_test.go b/ante/ante_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	tmrand "github.com/cometbft/cometbft/libs/rand"
-	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+	cmtrand "github.com/cometbft/cometbft/libs/rand"
+	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
@@ -29,15 +29,20 @@ type IntegrationTestSuite struct {
 
 func (s *IntegrationTestSuite) SetupTest() {
 	app := ojoapp.Setup(s.T())
-	ctx := app.BaseApp.NewContext(false, tmproto.Header{
-		ChainID: fmt.Sprintf("test-chain-%s", tmrand.Str(4)),
+	ctx := app.BaseApp.NewContextLegacy(false, cmtproto.Header{
+		ChainID: fmt.Sprintf("test-chain-%s", cmtrand.Str(4)),
 		Height:  1,
 	})
 
 	s.app = app
 	s.ctx = ctx
 
-	encodingConfig := testutil.MakeTestEncodingConfig()
+	encodingConfig := testutil.TestEncodingConfig{
+		InterfaceRegistry: app.InterfaceRegistry(),
+		Codec:             app.AppCodec(),
+		TxConfig:          app.GetTxConfig(),
+		Amino:             app.LegacyAmino(),
+	}
 	encodingConfig.Amino.RegisterConcrete(&testdata.TestMsg{}, "testdata.TestMsg", nil)
 	testdata.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 	s.clientCtx = client.Context{}.
@@ -51,7 +56,7 @@ func (suite *IntegrationTestSuite) CreateTestTx(privs []cryptotypes.PrivKey, acc
 		sigV2 := signing.SignatureV2{
 			PubKey: priv.PubKey(),
 			Data: &signing.SingleSignatureData{
-				SignMode:  suite.clientCtx.TxConfig.SignModeHandler().DefaultMode(),
+				SignMode:  signing.SignMode(*suite.clientCtx.TxConfig.SignModeHandler().DefaultMode().Enum()),
 				Signature: nil,
 			},
 			Sequence: accSeqs[i],
@@ -67,13 +72,21 @@ func (suite *IntegrationTestSuite) CreateTestTx(privs []cryptotypes.PrivKey, acc
 	sigsV2 = []signing.SignatureV2{}
 	for i, priv := range privs {
 		signerData := xauthsigning.SignerData{
+			Address:       sdk.AccAddress(priv.PubKey().Bytes()).String(),
 			ChainID:       chainID,
 			AccountNumber: accNums[i],
 			Sequence:      accSeqs[i],
+			PubKey:        priv.PubKey(),
 		}
 		sigV2, err := tx.SignWithPrivKey(
-			suite.clientCtx.TxConfig.SignModeHandler().DefaultMode(), signerData,
-			suite.txBuilder, priv, suite.clientCtx.TxConfig, accSeqs[i])
+			suite.ctx,
+			signing.SignMode(*suite.clientCtx.TxConfig.SignModeHandler().DefaultMode().Enum()),
+			signerData,
+			suite.txBuilder,
+			priv,
+			suite.clientCtx.TxConfig,
+			accSeqs[i],
+		)
 		if err != nil {
 			return nil, err
 		}

diff --git a/ante/fee.go b/ante/fee.go
@@ -1,9 +1,10 @@
 package ante
 
 import (
+	"cosmossdk.io/math"
+	evidencetypes "cosmossdk.io/x/evidence/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
 
 	appparams "github.com/ojo-network/ojo/app/params"
 	oracletypes "github.com/ojo-network/ojo/x/oracle/types"
@@ -56,7 +57,7 @@ func checkFees(minGasPrices sdk.DecCoins, fees sdk.Coins, gasLimit uint64) error
 	// Determine the required fees by multiplying each required minimum gas
 	// price by the gas limit, where fee = ceil(minGasPrice * gasLimit).
 	// Zero fees are removed.
-	glDec := sdk.NewDec(int64(gasLimit))
+	glDec := math.LegacyNewDec(int64(gasLimit))
 	for _, gp := range minGasPrices {
 		if gasLimit == 0 || gp.IsZero() {
 			continue

diff --git a/ante/fee_test.go b/ante/fee_test.go
@@ -1,6 +1,7 @@
 package ante_test
 
 import (
+	"cosmossdk.io/math"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -29,7 +30,7 @@ func (suite *IntegrationTestSuite) TestFeeAndPriority() {
 		if denom == "" {
 			denom = minGas.Denom
 		}
-		f := sdk.MustNewDecFromStr(factor)
+		f := math.LegacyMustNewDecFromStr(factor)
 		return sdk.DecCoins{sdk.NewDecCoinFromDec(denom, minGas.Amount.Mul(f))}
 	}
 	mkTx := func(fee sdk.Coins) signing.Tx {
@@ -103,6 +104,6 @@ func (suite *IntegrationTestSuite) checkFeeAnte(tx sdk.Tx, feeExpected sdk.Coins
 	if len(feeExpected) == 0 {
 		require.True(fee.IsZero(), "fee should be zero, got: %s", fee)
 	} else {
-		require.True(fee.IsEqual(feeExpected), "Fee expected %s, got: %s", feeExpected, fee)
+		require.True(fee.Equal(feeExpected), "Fee expected %s, got: %s", feeExpected, fee)
 	}
 }
diff --git a/ante/fee_unit_test.go b/ante/fee_unit_test.go
@@ -3,8 +3,8 @@ package ante
 import (
 	"testing"
 
+	evidence "cosmossdk.io/x/evidence/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	evidence "github.com/cosmos/cosmos-sdk/x/evidence/types"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/ante/spam_prevention_test.go b/ante/spam_prevention_test.go
@@ -1,6 +1,7 @@
 package ante_test
 
 import (
+	"cosmossdk.io/errors"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -70,5 +71,5 @@ func (ok dummyOracleKeeper) ValidateFeeder(ctx sdk.Context, feederAddr sdk.AccAd
 		return nil
 	}
 
-	return sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "feeder is not authorized")
+	return errors.Wrap(sdkerrors.ErrUnauthorized, "feeder is not authorized")
 }