From c25075066403905c0eb578c531d80912d7599b93 Mon Sep 17 00:00:00 2001 From: thr2240 Date: Mon, 6 May 2024 15:01:41 +0000 Subject: [PATCH] update the wasm module --- running_script.sh | 2 +- x/wasm/keeper/keeper.go | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/running_script.sh b/running_script.sh index bb743ce..d5e933f 100755 --- a/running_script.sh +++ b/running_script.sh @@ -24,7 +24,7 @@ MONIKER="ollo_testnet" # otherwise your balance will be wiped quickly # The keyring test does not require private key to steal tokens from you KEYRING="test" -LOGLEVEL="info" +LOGLEVEL="debug" # Set dedicated home directory for the ollod instance HOMEDIR="$HOME/.ollo" # to trace evm diff --git a/x/wasm/keeper/keeper.go b/x/wasm/keeper/keeper.go index 822673c..385c872 100644 --- a/x/wasm/keeper/keeper.go +++ b/x/wasm/keeper/keeper.go @@ -26,7 +26,7 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/tendermint/tendermint/libs/log" - // "github.com/ollo-station/ollo/x/wasm/ioutils" + "github.com/ollo-station/ollo/x/wasm/ioutils" "github.com/ollo-station/ollo/x/wasm/types" ) @@ -202,13 +202,14 @@ func (k Keeper) create(ctx sdk.Context, creator sdk.AccAddress, wasmCode []byte, return 0, checksum, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "can not create code") } - // if ioutils.IsGzip(wasmCode) { - // ctx.GasMeter().ConsumeGas(k.gasRegister.UncompressCosts(len(wasmCode)), "Uncompress gzip bytecode") - // wasmCode, err = ioutils.Uncompress(wasmCode, uint64(types.MaxWasmSize)) - // if err != nil { - // return 0, checksum, sdkerrors.Wrap(types.ErrCreateFailed, err.Error()) - // } - // } + + if ioutils.IsGzip(wasmCode) { + ctx.GasMeter().ConsumeGas(k.gasRegister.UncompressCosts(len(wasmCode)), "Uncompress gzip bytecode") + wasmCode, err = ioutils.Uncompress(wasmCode, uint64(types.MaxWasmSize)) + if err != nil { + return 0, checksum, sdkerrors.Wrap(types.ErrCreateFailed, err.Error()) + } + } ctx.GasMeter().ConsumeGas(k.gasRegister.CompileCosts(len(wasmCode)), "Compiling wasm bytecode") checksum, err = k.wasmVM.Create(wasmCode) @@ -244,13 +245,13 @@ func (k Keeper) storeCodeInfo(ctx sdk.Context, codeID uint64, codeInfo types.Cod } func (k Keeper) importCode(ctx sdk.Context, codeID uint64, codeInfo types.CodeInfo, wasmCode []byte) error { - // if ioutils.IsGzip(wasmCode) { - // var err error - // wasmCode, err = ioutils.Uncompress(wasmCode, uint64(types.MaxWasmSize)) - // if err != nil { - // return sdkerrors.Wrap(types.ErrCreateFailed, err.Error()) - // } - // } + if ioutils.IsGzip(wasmCode) { + var err error + wasmCode, err = ioutils.Uncompress(wasmCode, uint64(types.MaxWasmSize)) + if err != nil { + return sdkerrors.Wrap(types.ErrCreateFailed, err.Error()) + } + } newCodeHash, err := k.wasmVM.Create(wasmCode) if err != nil { return sdkerrors.Wrap(types.ErrCreateFailed, err.Error())