Skip to content

Commit dbd8800

Browse files
Revert "fix: wasm docker file + wasm simapp gas limit (#7830)"
This reverts commit 7f0cf54.
1 parent 81f71dd commit dbd8800

File tree

3 files changed

+5
-29
lines changed

3 files changed

+5
-29
lines changed

modules/light-clients/08-wasm/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23.4-alpine as builder-base
1+
FROM golang:1.23.4-alpine as builder
22

33
ARG LIBWASM_VERSION
44
ARG TARGETARCH
@@ -23,12 +23,12 @@ RUN go mod download
2323

2424
# Since it is not easy to fully cache a RUN script download of libwasmvm, we use two different stages
2525
# and copy the correct file in the final stage. The multistage setup also helps speed up the build process
26-
FROM alpine:3.21 AS amd64-stage
26+
FROM alpine:3.18 AS amd64-stage
2727
ARG LIBWASM_VERSION
2828
ADD https://github.com/CosmWasm/wasmvm/releases/download/${LIBWASM_VERSION}/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a
2929

3030

31-
FROM alpine:3.21 AS arm64-stage
31+
FROM alpine:3.18 AS arm64-stage
3232
ARG LIBWASM_VERSION
3333
ADD https://github.com/CosmWasm/wasmvm/releases/download/${LIBWASM_VERSION}/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a
3434

@@ -44,6 +44,6 @@ COPY --from=libwasm-stage /lib/libwasmvm_muslc.* /lib/
4444
RUN go build -mod=readonly -tags "netgo ledger muslc" -ldflags '-X github.com/cosmos/cosmos-sdk/version.Name=sim -X github.com/cosmos/cosmos-sdk/version.AppName=simd -X github.com/cosmos/cosmos-sdk/version.Version= -X github.com/cosmos/cosmos-sdk/version.Commit= -X "github.com/cosmos/cosmos-sdk/version.BuildTags=netgo ledger muslc," -w -s -linkmode=external -extldflags "-Wl,-z,muldefs -static"' -trimpath -o /go/build/ ./...
4545

4646

47-
FROM alpine:3.21
47+
FROM alpine:3.18
4848
COPY --from=builder /go/build/simd /bin/simd
4949
ENTRYPOINT ["simd"]

modules/light-clients/08-wasm/testing/simapp/app.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ import (
110110
cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1"
111111
cmtcrypto "github.com/cometbft/cometbft/crypto"
112112
cmted25519 "github.com/cometbft/cometbft/crypto/ed25519"
113-
cmttypes "github.com/cometbft/cometbft/types"
114113

115114
wasm "github.com/cosmos/ibc-go/modules/light-clients/08-wasm"
116115
wasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
@@ -975,17 +974,6 @@ func (app *SimApp) InitChainer(ctx sdk.Context, req *abci.InitChainRequest) (*ab
975974
if err := app.UpgradeKeeper.SetModuleVersionMap(ctx, app.ModuleManager.GetVersionMap()); err != nil {
976975
panic(err)
977976
}
978-
979-
paramsProto, err := app.ConsensusParamsKeeper.ParamsStore.Get(ctx)
980-
if err != nil {
981-
return nil, err
982-
}
983-
consensusParams := cmttypes.ConsensusParamsFromProto(paramsProto)
984-
consensusParams.Block.MaxGas = 75_000_000 // The same as Cosmos Hub at the moment
985-
if err := app.ConsensusParamsKeeper.ParamsStore.Set(ctx, consensusParams.ToProto()); err != nil {
986-
return nil, err
987-
}
988-
989977
return app.ModuleManager.InitGenesis(ctx, genesisState)
990978
}
991979

modules/light-clients/08-wasm/testing/simapp/simd/cmd/root.go

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
corestore "cosmossdk.io/core/store"
1717
"cosmossdk.io/log"
1818
confixcmd "cosmossdk.io/tools/confix/cmd"
19-
txsigning "cosmossdk.io/x/tx/signing"
2019

2120
"github.com/cosmos/cosmos-sdk/client"
2221
"github.com/cosmos/cosmos-sdk/client/config"
@@ -28,7 +27,6 @@ import (
2827
"github.com/cosmos/cosmos-sdk/client/rpc"
2928
"github.com/cosmos/cosmos-sdk/client/snapshot"
3029
"github.com/cosmos/cosmos-sdk/codec"
31-
addresscodec "github.com/cosmos/cosmos-sdk/codec/address"
3230
"github.com/cosmos/cosmos-sdk/server"
3331
serverconfig "github.com/cosmos/cosmos-sdk/server/config"
3432
servertypes "github.com/cosmos/cosmos-sdk/server/types"
@@ -66,17 +64,11 @@ func NewRootCmd() *cobra.Command {
6664
initClientCtx := client.Context{}.
6765
WithCodec(encodingConfig.Codec).
6866
WithInterfaceRegistry(encodingConfig.InterfaceRegistry).
69-
WithTxConfig(encodingConfig.TxConfig).
7067
WithLegacyAmino(encodingConfig.Amino).
7168
WithInput(os.Stdin).
7269
WithAccountRetriever(types.AccountRetriever{}).
73-
WithAddressCodec(addresscodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix())).
74-
WithValidatorAddressCodec(addresscodec.NewBech32Codec(sdk.GetConfig().GetBech32ValidatorAddrPrefix())).
75-
WithConsensusAddressCodec(addresscodec.NewBech32Codec(sdk.GetConfig().GetBech32ConsensusAddrPrefix())).
7670
WithHomeDir(simapp.DefaultNodeHome).
77-
WithViper(""). // uses by default the binary name as prefix
78-
WithAddressPrefix(sdk.GetConfig().GetBech32AccountAddrPrefix()).
79-
WithValidatorPrefix(sdk.GetConfig().GetBech32ValidatorAddrPrefix())
71+
WithViper("") // In simapp, we don't use any prefix for env variables.
8072

8173
rootCmd := &cobra.Command{
8274
Use: "simd",
@@ -104,10 +96,6 @@ func NewRootCmd() *cobra.Command {
10496
txConfigOpts := tx.ConfigOptions{
10597
EnabledSignModes: enabledSignModes,
10698
TextualCoinMetadataQueryFn: txmodule.NewGRPCCoinMetadataQueryFn(initClientCtx),
107-
SigningOptions: &txsigning.Options{
108-
AddressCodec: initClientCtx.InterfaceRegistry.SigningContext().AddressCodec(),
109-
ValidatorAddressCodec: initClientCtx.InterfaceRegistry.SigningContext().ValidatorAddressCodec(),
110-
},
11199
}
112100
txConfigWithTextual, err := tx.NewTxConfigWithOptions(
113101
codec.NewProtoCodec(encodingConfig.InterfaceRegistry),

0 commit comments

Comments
 (0)