chores: bump deps and update swagger (#92)

* bump deps and update swagger * fix lint * bump kvindexer and submodules * update readme --------- Co-authored-by: Geoff Lee <[email protected]>
initia-labs · Feb 4, 2025 · ed1728e · ed1728e
1 parent d01ae95
commit ed1728e
Show file tree

Hide file tree

Showing 21 changed files with 1,109 additions and 240 deletions.
diff --git a/.github/workflows/build-darwin-amd64.yml b/.github/workflows/build-darwin-amd64.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.22"
+          go-version: "1.23"
 
       - name: Set environment variables
         run: |

diff --git a/.github/workflows/build-darwin-arm64.yml b/.github/workflows/build-darwin-arm64.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.22"
+          go-version: "1.23"
       - name: Set environment variables
         run: |
           MINIWASM_NETWORK_NAME="miniwasm-1"

diff --git a/.github/workflows/build-linux-amd64.yml b/.github/workflows/build-linux-amd64.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.22"
+          go-version: "1.23"
 
       - name: Set environment variables
         run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,7 +27,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.22
+          go-version: 1.23
       - name: Install openssl
         run: sudo apt-get install libssl-dev
       - uses: actions/checkout@v3

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22-alpine3.19 AS go-builder
+FROM golang:1.23-alpine AS go-builder
 #ARG arch=x86_64
 
 # See https://github.com/CosmWasm/wasmvm/releases

diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -1,4 +1,4 @@
-FROM arm64v8/golang:1.22-bullseye AS go-builder
+FROM arm64v8/golang:1.23-bullseye AS go-builder
 
 # Install minimum necessary dependencies, build Cosmos SDK, remove packages
 RUN apt update

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ MiniWasm is an optimistic rollup consumer chain powered by WasmVM, designed to s
 
 ## Prerequisites
 
-- Go v1.22.7+
+- Go v1.23.3+
 
 ## Getting Started
 

diff --git a/app/blocksdk.go b/app/blocksdk.go
@@ -130,16 +130,20 @@ func setupBlockSDK(
 		app.BaseApp.CheckTx,
 	)
 	checkTxHandler := blockchecktx.NewMempoolParityCheckTx(
-		app.Logger(), mempool,
-		app.txConfig.TxDecoder(), mevCheckTx.CheckTx(),
+		app.Logger(),
+		mempool,
+		app.txConfig.TxDecoder(),
+		mevCheckTx.CheckTx(),
+		app.BaseApp,
 	)
 	checkTx := checkTxHandler.CheckTx()
 
-	proposalHandler := blockabci.NewProposalHandler(
+	proposalHandler := blockabci.New(
 		app.Logger(),
 		app.txConfig.TxDecoder(),
 		app.txConfig.TxEncoder(),
 		mempool,
+		true,
 	)
 
 	prepareProposalHandler := proposalHandler.PrepareProposalHandler()

diff --git a/app/ibc-hooks/ack_test.go b/app/ibc-hooks/ack_test.go
@@ -132,7 +132,7 @@ func Test_OnAckPacket_ICS721(t *testing.T) {
 	_, _, addr := keyPubAddr()
 	_, _, addr2 := keyPubAddr()
 
-	data := nfttransfertypes.NonFungibleTokenPacketDataWasm{
+	data := nfttransfertypes.NonFungibleTokenPacketData{
 		ClassId:   "classId",
 		ClassUri:  "classUri",
 		ClassData: "classData",
@@ -184,7 +184,7 @@ func Test_OnAckPacket_memo_ICS721(t *testing.T) {
 	contractAddr, err := sdk.AccAddressFromBech32(contractAddrBech32)
 	require.NoError(t, err)
 
-	data := nfttransfertypes.NonFungibleTokenPacketDataWasm{
+	data := nfttransfertypes.NonFungibleTokenPacketData{
 		ClassId:   "classId",
 		ClassUri:  "classUri",
 		ClassData: "classData",

diff --git a/app/ibc-hooks/receive_test.go b/app/ibc-hooks/receive_test.go
@@ -129,7 +129,7 @@ func Test_OnReceivePacket_ICS721(t *testing.T) {
 	_, _, addr := keyPubAddr()
 	_, _, addr2 := keyPubAddr()
 
-	data := nfttransfertypes.NonFungibleTokenPacketDataWasm{
+	data := nfttransfertypes.NonFungibleTokenPacketData{
 		ClassId:   "classId",
 		ClassUri:  "classUri",
 		ClassData: "classData",
@@ -176,7 +176,7 @@ func Test_onReceivePacket_memo_ICS721(t *testing.T) {
 	require.NoError(t, err)
 
 	contractAddrBech32 := instantiateRes.Address
-	data := nfttransfertypes.NonFungibleTokenPacketDataWasm{
+	data := nfttransfertypes.NonFungibleTokenPacketData{
 		ClassId:   "classId",
 		ClassUri:  "classUri",
 		ClassData: "classData",

diff --git a/app/ibc-hooks/timeout_test.go b/app/ibc-hooks/timeout_test.go
@@ -113,7 +113,7 @@ func Test_OnTimeoutPacket_ICS721(t *testing.T) {
 	_, _, addr := keyPubAddr()
 	_, _, addr2 := keyPubAddr()
 
-	data := nfttransfertypes.NonFungibleTokenPacketDataWasm{
+	data := nfttransfertypes.NonFungibleTokenPacketData{
 		ClassId:   "classId",
 		ClassUri:  "classUri",
 		ClassData: "classData",
@@ -162,7 +162,7 @@ func Test_OnTimeoutPacket_memo_ICS721(t *testing.T) {
 	contractAddr, err := sdk.AccAddressFromBech32(contractAddrBech32)
 	require.NoError(t, err)
 
-	data := nfttransfertypes.NonFungibleTokenPacketDataWasm{
+	data := nfttransfertypes.NonFungibleTokenPacketData{
 		ClassId:   "classId",
 		ClassUri:  "classUri",
 		ClassData: "classData",

diff --git a/app/ibc-hooks/util.go b/app/ibc-hooks/util.go
@@ -39,14 +39,12 @@ func isIcs20Packet(packetData []byte) (isIcs20 bool, ics20data transfertypes.Fun
 	return true, data
 }
 
-const wasmPortPrefix = "wasm."
-
 func isIcs721Packet(packetData []byte) (isIcs721 bool, ics721data nfttransfertypes.NonFungibleTokenPacketData) {
 	// Use wasm port prefix to ack like normal wasm chain.
 	//
 	// initia l1 is handling encoding and decoding depends on port id,
 	// so miniwasm should ack like normal wasm chain.
-	if data, err := nfttransfertypes.DecodePacketData(packetData, wasmPortPrefix); err != nil {
+	if data, err := nfttransfertypes.DecodePacketData(packetData); err != nil {
 		return false, data
 	} else {
 		return true, data

diff --git a/app/ibc-hooks/util_test.go b/app/ibc-hooks/util_test.go
@@ -35,7 +35,7 @@ func Test_isIcs20Packet(t *testing.T) {
 func Test_isIcs721Packet(t *testing.T) {
 	nftTransferMsg := nfttransfertypes.NewNonFungibleTokenPacketData("class_id", "uri", "data", []string{"1", "2", "3"}, []string{"uri1", "uri2", "uri3"}, []string{"data1", "data2", "data3"}, "sender", "receiver", "memo")
 
-	ok, _nftTransferMsg := isIcs721Packet(nftTransferMsg.GetBytes(wasmPortPrefix))
+	ok, _nftTransferMsg := isIcs721Packet(nftTransferMsg.GetBytes())
 	require.True(t, ok)
 	require.Equal(t, nftTransferMsg, _nftTransferMsg)
 

diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -96,9 +96,9 @@ import (
 	tokenfactorytypes "github.com/initia-labs/miniwasm/x/tokenfactory/types"
 
 	// noble forwarding keeper
-	forwarding "github.com/noble-assets/forwarding/v2/x/forwarding"
-	forwardingkeeper "github.com/noble-assets/forwarding/v2/x/forwarding/keeper"
-	forwardingtypes "github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	forwarding "github.com/noble-assets/forwarding/v2"
+	forwardingkeeper "github.com/noble-assets/forwarding/v2/keeper"
+	forwardingtypes "github.com/noble-assets/forwarding/v2/types"
 	// kvindexer
 )
 
@@ -317,7 +317,7 @@ func NewAppKeeper(
 		authorityAddr,
 	)
 
-	appKeepers.IBCKeeper.ClientKeeper.WithPostUpdateHandler(
+	appKeepers.IBCKeeper.ClientKeeper.SetPostUpdateHandler(
 		appKeepers.OPChildKeeper.UpdateHostValidatorSet,
 	)
 

diff --git a/app/keepers/keys.go b/app/keepers/keys.go
@@ -43,7 +43,7 @@ import (
 	tokenfactorytypes "github.com/initia-labs/miniwasm/x/tokenfactory/types"
 
 	// noble forwarding keeper
-	forwardingtypes "github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	forwardingtypes "github.com/noble-assets/forwarding/v2/types"
 )
 
 func (appKeepers *AppKeepers) GenerateKeys() {

diff --git a/app/modules.go b/app/modules.go
@@ -65,8 +65,8 @@ import (
 	tokenfactorytypes "github.com/initia-labs/miniwasm/x/tokenfactory/types"
 
 	// noble forwarding keeper
-	forwarding "github.com/noble-assets/forwarding/v2/x/forwarding"
-	forwardingtypes "github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	forwarding "github.com/noble-assets/forwarding/v2"
+	forwardingtypes "github.com/noble-assets/forwarding/v2/types"
 )
 
 // module account permissions

diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go