update the wasm module

OllO-Station · May 6, 2024 · c250750 · c250750
1 parent 1a3bcce
commit c250750
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git 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
@@ -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())