Merge branch 'main' into feat/cosmos-50

Author: beer-1

Dockerfile

@@ -0,0 +1,57 @@
+FROM golang:1.21-alpine AS go-builder
+#ARG arch=x86_64
+
+# See https://github.com/CosmWasm/wasmvm/releases
+ENV LIBWASMVM_VERSION=v1.5.0
+
+# this comes from standard alpine nightly file
+#  https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile
+# with some changes to support our toolchain, etc
+RUN set -eux; apk add --no-cache ca-certificates build-base;
+
+RUN apk add git cmake
+# NOTE: add these to run with LEDGER_ENABLED=true
+# RUN apk add libusb-dev linux-headers
+
+WORKDIR /code
+COPY . /code/
+
+# Install mimalloc
+RUN git clone --depth 1 https://github.com/microsoft/mimalloc; cd mimalloc; mkdir build; cd build; cmake ..; make -j$(nproc); make install
+ENV MIMALLOC_RESERVE_HUGE_OS_PAGES=4
+
+# See https://github.com/\!cosm\!wasm/wasmvm/releases
+ADD https://github.com/\!cosm\!wasm/wasmvm/releases/download/${LIBWASMVM_VERSION}/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a
+ADD https://github.com/\!cosm\!wasm/wasmvm/releases/download/${LIBWASMVM_VERSION}/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a
+
+# Highly recommend to verify the version hash
+# RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep a5e63292ec67f5bdefab51b42c3fbc3fa307c6aefeb6b409d971f1df909c3927
+# RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep 762307147bf8f550bd5324b7f7c4f17ee20805ff93dc06cc073ffbd909438320
+# Copy the library you want to the final location that will be found by the linker flag `-linitia_muslc`
+
+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
+
+FROM alpine:3.15.4
+
+RUN addgroup minitia \
+    && adduser -G minitia -D -h /minitia minitia
+
+WORKDIR /minitia
+
+COPY --from=go-builder /code/build/minitiad /usr/local/bin/minitiad
+
+USER minitia
+
+# rest server
+EXPOSE 1317
+# grpc
+EXPOSE 9090
+# tendermint p2p
+EXPOSE 26656
+# tendermint rpc
+EXPOSE 26657
+
+CMD ["/usr/local/bin/minitiad", "version"]

Makefile

@@ -120,17 +120,17 @@ endif
 
 build-linux:
 	mkdir -p $(BUILDDIR)
-	docker build --no-cache --tag initia/minitiad ./
-	docker create --name temp initia/minitiad:latest
+	docker build --no-cache --tag initia/minimwasm ./
+	docker create --name temp initia/minimwasm:latest
 	docker cp temp:/usr/local/bin/minitiad $(BUILDDIR)/
 	docker rm temp
 
 build-linux-with-shared-library:
 	mkdir -p $(BUILDDIR)
-	docker build --tag initia/minitiad-shared ./ -f ./shared.Dockerfile
-	docker create --name temp initia/minitiad-shared:latest
+	docker build --tag initia/miniwasm-shared ./ -f ./shared.Dockerfile
+	docker create --name temp initia/miniwasm-shared:latest
 	docker cp temp:/usr/local/bin/minitiad $(BUILDDIR)/
-	docker cp temp:/lib/libinitia.so $(BUILDDIR)/
+	docker cp temp:/lib/libwasmvm.so $(BUILDDIR)/
 	docker rm temp
 
 install: go.sum 

app/app.go

@@ -95,6 +95,7 @@ import (
 	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 
 	// initia imports
+	initialanes "github.com/initia-labs/initia/app/lanes"
 	"github.com/initia-labs/initia/app/params"
 	ibctestingtypes "github.com/initia-labs/initia/x/ibc/testing/types"
 	icaauth "github.com/initia-labs/initia/x/intertx"
@@ -105,7 +106,6 @@ import (
 	opchild "github.com/initia-labs/OPinit/x/opchild"
 	opchildkeeper "github.com/initia-labs/OPinit/x/opchild/keeper"
 	opchildtypes "github.com/initia-labs/OPinit/x/opchild/types"
-	initialanes "github.com/initia-labs/initia/app/lanes"
 
 	// skip imports
 	mevabci "github.com/skip-mev/block-sdk/abci"

app/ibc-middleware/util.go

@@ -87,19 +87,10 @@ func jsonStringHasKey(memo, key string) (found bool, jsonObject map[string]inter
 
 // newEmitErrorAcknowledgement creates a new error acknowledgement after having emitted an event with the
 // details of the error.
-func newEmitErrorAcknowledgement(ctx sdk.Context, err error, errorContexts ...string) channeltypes.Acknowledgement {
-	attributes := make([]sdk.Attribute, len(errorContexts)+1)
-	attributes[0] = sdk.NewAttribute("error", err.Error())
-	for i, s := range errorContexts {
-		attributes[i+1] = sdk.NewAttribute("error-context", s)
+func newEmitErrorAcknowledgement(ctx sdk.Context, err error) channeltypes.Acknowledgement {
+	return channeltypes.Acknowledgement{
+		Response: &channeltypes.Acknowledgement_Error{
+			Error: fmt.Sprintf("ibc wasm hook error: %s", err.Error()),
+		},
 	}
-
-	ctx.EventManager().EmitEvents(sdk.Events{
-		sdk.NewEvent(
-			"ibc-acknowledgement-error",
-			attributes...,
-		),
-	})
-
-	return channeltypes.NewErrorAcknowledgement(err)
 }

app/lanes/free.go

@@ -3,25 +3,27 @@ package lanes
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
 	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
 
 	"github.com/skip-mev/block-sdk/block/base"
 )
 
 // FreeLaneMatchHandler returns the default match handler for the free lane. The
 // default implementation matches transactions that are ibc related. In particular,
-// any transaction that is a MsgTimeout, MsgAcknowledgement.
+// any transaction that is a MsgUpdateClient, MsgTimeout, MsgAcknowledgement.
 func FreeLaneMatchHandler() base.MatchHandler {
 	return func(ctx sdk.Context, tx sdk.Tx) bool {
 		for _, msg := range tx.GetMsgs() {
 			switch msg.(type) {
+			case *clienttypes.MsgUpdateClient:
 			case *channeltypes.MsgTimeout:
-				return true
 			case *channeltypes.MsgAcknowledgement:
-				return true
+			default:
+				return false
 			}
 		}
 
-		return false
+		return true
 	}
 }

app/test_helpers.go

@@ -79,6 +79,13 @@ func SetupWithGenesisAccounts(
 ) *MinitiaApp {
 	app, genesisState := setup(nil, true)
 
+	if len(genAccs) == 0 {
+		privAcc := secp256k1.GenPrivKey()
+		genAccs = []authtypes.GenesisAccount{
+			authtypes.NewBaseAccount(privAcc.PubKey().Address().Bytes(), privAcc.PubKey(), 0, 0),
+		}
+	}
+
 	// set genesis accounts
 	authGenesis := authtypes.NewGenesisState(authtypes.DefaultParams(), genAccs)
 	genesisState[authtypes.ModuleName] = app.AppCodec().MustMarshalJSON(authGenesis)
@@ -95,15 +102,7 @@ func SetupWithGenesisAccounts(
 		valSet = tmtypes.NewValidatorSet([]*tmtypes.Validator{validator})
 	}
 
-	if len(genAccs) == 0 {
-		privAcc := secp256k1.GenPrivKey()
-		genAccs = []authtypes.GenesisAccount{
-			authtypes.NewBaseAccount(privAcc.PubKey().Address().Bytes(), privAcc.PubKey(), 0, 0),
-		}
-	}
-
 	validators := make([]opchildtypes.Validator, 0, len(valSet.Validators))
-
 	for _, val := range valSet.Validators {
 		pk, err := cryptocodec.FromTmPubKeyInterface(val.PubKey)
 		if err != nil {

cmd/minitiad/config.go

@@ -59,14 +59,14 @@ func initTendermintConfig() *tmcfg.Config {
 	cfg.Consensus.CreateEmptyBlocks = false
 	cfg.Consensus.CreateEmptyBlocksInterval = time.Minute
 
-	// block time from 5s to 0.5s
-	cfg.Consensus.TimeoutPropose = cfg.Consensus.TimeoutPropose / 10
-	cfg.Consensus.TimeoutProposeDelta = cfg.Consensus.TimeoutProposeDelta / 10
-	cfg.Consensus.TimeoutPrevote = cfg.Consensus.TimeoutPrevote / 10
-	cfg.Consensus.TimeoutPrevoteDelta = cfg.Consensus.TimeoutPrevoteDelta / 10
-	cfg.Consensus.TimeoutPrecommit = cfg.Consensus.TimeoutPrecommit / 10
-	cfg.Consensus.TimeoutPrecommitDelta = cfg.Consensus.TimeoutPrecommitDelta / 10
-	cfg.Consensus.TimeoutCommit = cfg.Consensus.TimeoutCommit / 10
+	// block time to 0.5s
+	cfg.Consensus.TimeoutPropose = 300 * time.Millisecond
+	cfg.Consensus.TimeoutProposeDelta = 500 * time.Millisecond
+	cfg.Consensus.TimeoutPrevote = 1000 * time.Millisecond
+	cfg.Consensus.TimeoutPrevoteDelta = 500 * time.Millisecond
+	cfg.Consensus.TimeoutPrecommit = 1000 * time.Millisecond
+	cfg.Consensus.TimeoutPrecommitDelta = 500 * time.Millisecond
+	cfg.Consensus.TimeoutCommit = 500 * time.Millisecond
 
 	return cfg
 }

go.mod

@@ -4,11 +4,13 @@ go 1.21.5
 
 require (
 	cosmossdk.io/api v0.7.2
+	cosmossdk.io/client/v2 v2.0.0-beta.1
 	cosmossdk.io/core v0.11.0
 	cosmossdk.io/errors v1.0.0
 	cosmossdk.io/log v1.2.1
 	cosmossdk.io/math v1.2.0
 	cosmossdk.io/store v1.0.1
+	cosmossdk.io/tools/confix v0.1.1
 	cosmossdk.io/x/feegrant v0.1.0
 	cosmossdk.io/x/upgrade v0.1.1
 	// we also need to update `LIBWASMVM_VERSION` of images/private/Dockerfile#5
@@ -25,6 +27,7 @@ require (
 	github.com/initia-labs/OPinit v0.2.0-beta.0
 	github.com/initia-labs/initia v0.2.0-beta.0
 	github.com/pkg/errors v0.9.1
+	github.com/prometheus/client_golang v1.17.0
 	github.com/rakyll/statik v0.1.7
 	github.com/skip-mev/block-sdk v0.0.0-20231213233341-deceeb0e993b
 	github.com/spf13/cast v1.5.1
@@ -33,12 +36,6 @@ require (
 	github.com/stretchr/testify v1.8.4
 )
 
-require (
-	cosmossdk.io/client/v2 v2.0.0-beta.1
-	cosmossdk.io/tools/confix v0.1.1
-	github.com/prometheus/client_golang v1.17.0
-)
-
 require (
 	cloud.google.com/go v0.110.9 // indirect
 	cloud.google.com/go/compute v1.23.2 // indirect

shared.Dockerfile

@@ -0,0 +1,32 @@
+FROM golang:1.21-bullseye AS go-builder
+
+# Install minimum necessary dependencies, build Cosmos SDK, remove packages
+RUN apt update
+RUN apt install -y curl git build-essential
+# debug: for live editting in the image
+RUN apt install -y vim
+
+WORKDIR /code
+COPY . /code/
+
+RUN LEDGER_ENABLED=false make build
+
+RUN cp /go/pkg/mod/github.com/\!cosm\!wasm/wasmvm@v*/internal/api/libwasmvm.`uname -m`.so /lib/libwasmvm.so
+
+FROM ubuntu:20.04
+
+WORKDIR /root
+
+COPY --from=go-builder /code/build/minitiad /usr/local/bin/minitiad
+COPY --from=go-builder /lib/libwasmvm.so /lib/libwasmvm.so
+
+# rest server
+EXPOSE 1317
+# grpc
+EXPOSE 9090
+# tendermint p2p
+EXPOSE 26656
+# tendermint rpc
+EXPOSE 26657
+
+CMD ["/usr/local/bin/minitiad", "version"]