feat: upgrades + audit fixes

.github/workflows/docker.yml

@@ -11,13 +11,6 @@ on:
       - "**.go"
       - "go.mod"
       - "go.sum"
-  pull_request:
-    branches:
-      - "main"
-    paths:
-      - "**.go"
-      - "go.mod"
-      - "go.sum"
 
 env:
   REGISTRY: ghcr.io
@@ -64,3 +57,5 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha
+        env:
+          VERSION: ${{ github.ref_name }}

Dockerfile

@@ -32,7 +32,7 @@ ADD https://github.com/CosmWasm/wasmvm/releases/download/${LIBWASMVM_VERSION}/li
 RUN cp /lib/libwasmvm_muslc.`uname -m`.a /lib/libwasmvm_muslc.a
 
 # force it to use static lib (from above) not standard libwasmvm.so file
-RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LDFLAGS="-linkmode=external -extldflags \"-L/code/mimalloc/build -lmimalloc -Wl,-z,muldefs -static\"" make build
+RUN VERSION=${VERSION} LEDGER_ENABLED=false BUILD_TAGS=muslc LDFLAGS="-linkmode=external -extldflags \"-L/code/mimalloc/build -lmimalloc -Wl,-z,muldefs -static\"" make build
 
 FROM alpine:3.18
 

Dockerfile.arm64

@@ -9,7 +9,7 @@ RUN apt install -y vim
 WORKDIR /code
 COPY . /code/
 
-RUN LEDGER_ENABLED=false make build
+RUN VERSION=${VERSION} LEDGER_ENABLED=false make build
 
 RUN cp /go/pkg/mod/github.com/\!cosm\!wasm/wasmvm/v2@v*/internal/api/libwasmvm.`uname -m`.so /lib/libwasmvm.so
 

app/app.go

@@ -71,6 +71,8 @@
 
 	// local imports
 	"github.com/initia-labs/miniwasm/app/keepers"
+	"github.com/skip-mev/block-sdk/v2/block"
+	blockservice "github.com/skip-mev/block-sdk/v2/block/service"
 
 	// kvindexer
 	kvindexermodule "github.com/initia-labs/kvindexer/x/kvindexer"
@@ -493,6 +495,9 @@
 	// Register node gRPC service for grpc-gateway.
 	nodeservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
 
+	// Register the Block SDK mempool API routes.
+	blockservice.RegisterGRPCGatewayRoutes(apiSvr.ClientCtx, apiSvr.GRPCGatewayRouter)
+
 	// Register grpc-gateway routes for all modules.
 	app.BasicModuleManager.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
 
@@ -520,6 +525,14 @@
 		app.BaseApp.GRPCQueryRouter(), clientCtx,
 		app.Simulate, app.interfaceRegistry,
 	)
+
+	// Register the Block SDK mempool transaction service.
+	mempool, ok := app.Mempool().(block.Mempool)
+	if !ok {
+		panic("mempool is not a block.Mempool")
+	}
+
+	blockservice.RegisterMempoolService(app.GRPCQueryRouter(), mempool)
 }
 
 // RegisterTendermintService implements the Application.RegisterTendermintService method.

app/genesis.go

@@ -121,6 +121,7 @@ func (genState GenesisState) ConfigureMinGasPrices(cdc codec.JSONCodec) GenesisS
 	var opChildGenState opchildtypes.GenesisState
 	cdc.MustUnmarshalJSON(genState[opchildtypes.ModuleName], &opChildGenState)
 	opChildGenState.Params.MinGasPrices = nil
+	opChildGenState.Params.HookMaxGas = 3_000_000
 	genState[opchildtypes.ModuleName] = cdc.MustMarshalJSON(&opChildGenState)
 
 	return genState

app/ibc-hooks/receive.go

@@ -27,7 +27,7 @@ func (h WasmHooks) onRecvIcs20Packet(
 	data transfertypes.FungibleTokenPacketData,
 ) ibcexported.Acknowledgement {
 	isWasmRouted, hookData, err := validateAndParseMemo(data.GetMemo())
-	if !isWasmRouted || hookData.Message == nil {
+	if !isWasmRouted || (err == nil && hookData.Message == nil) {
 		return im.App.OnRecvPacket(ctx, packet, relayer)
 	} else if err != nil {
 		return newEmitErrorAcknowledgement(err)
@@ -91,7 +91,7 @@ func (h WasmHooks) onRecvIcs721Packet(
 	data nfttransfertypes.NonFungibleTokenPacketData,
 ) ibcexported.Acknowledgement {
 	isWasmRouted, hookData, err := validateAndParseMemo(data.GetMemo())
-	if !isWasmRouted || hookData.Message == nil {
+	if !isWasmRouted || (err == nil && hookData.Message == nil) {
 		return im.App.OnRecvPacket(ctx, packet, relayer)
 	} else if err != nil {
 		return newEmitErrorAcknowledgement(err)

app/keepers/keepers.go

@@ -397,7 +397,6 @@ func NewAppKeeper(
 			appKeepers.keys[packetforwardtypes.StoreKey],
 			appKeepers.TransferKeeper,
 			appKeepers.IBCKeeper.ChannelKeeper,
-			communityPoolKeeper,
 			appKeepers.BankKeeper,
 			// ics4wrapper: transfer -> packet forward -> rate limit
 			rateLimitKeeper,
@@ -410,7 +409,6 @@ func NewAppKeeper(
 			appKeepers.PacketForwardKeeper,
 			0,
 			packetforwardkeeper.DefaultForwardTransferPacketTimeoutTimestamp,
-			packetforwardkeeper.DefaultRefundTransferPacketTimeoutTimestamp,
 		)
 
 		// create the rate limit keeper

app/upgrade.go

@@ -10,7 +10,7 @@
 	opchildtypes "github.com/initia-labs/OPinit/x/opchild/types"
 )
 
-const upgradeName = "0.6.4"
+const upgradeName = "0.7.1"
 
 // RegisterUpgradeHandlers returns upgrade handlers
 func (app *MinitiaApp) RegisterUpgradeHandlers(cfg module.Configurator) {
@@ -32,7 +32,7 @@
 				}
 			}
 
-			return vm, nil
+			return app.ModuleManager.RunMigrations(ctx, cfg, vm)
 		},
 	)
 }

client/docs/config.json

@@ -194,6 +194,17 @@
           "Params": "MarketMapParams"
         }
       }
+    },
+    {
+      "url": "./tmp-swagger-gen/sdk/auction/v1/query.swagger.json",
+      "operationIds": {
+        "rename": {
+          "Params": "AuctionParams"
+        }
+      }
+    },
+    {
+      "url": "./tmp-swagger-gen/sdk/mempool/v1/query.swagger.json"
     }
   ]
 }