Merge branch 'main' into dapp-tests/update-contract-deployment

sei-protocol · Nov 14, 2024 · f07c608 · f07c608
2 parents 50153f9 + 47a578b
commit f07c608
Show file tree

Hide file tree

Showing 1,016 changed files with 14 additions and 508,821 deletions.
diff --git a/app/app.go b/app/app.go
@@ -1605,15 +1605,17 @@ func (app *App) ProcessBlock(ctx sdk.Context, txs [][]byte, req BlockProcessRequ
 	lazyWriteEvents := app.BankKeeper.WriteDeferredBalances(ctx)
 	events = append(events, lazyWriteEvents...)
 
-	// Sum up total used per block
-	blockTotalGasUsed := int64(0)
+	// Sum up total used per block only for evm transactions
+	evmTotalGasUsed := int64(0)
 	for _, txResult := range txResults {
-		blockTotalGasUsed += txResult.GasUsed
+		if txResult.EvmTxInfo != nil {
+			evmTotalGasUsed += txResult.GasUsed
+		}
 	}
 
 	endBlockResp := app.EndBlock(ctx, abci.RequestEndBlock{
 		Height:       req.GetHeight(),
-		BlockGasUsed: blockTotalGasUsed,
+		BlockGasUsed: evmTotalGasUsed,
 	})
 
 	events = append(events, endBlockResp.Events...)

diff --git a/contracts/test/ERC20toCW20PointerTest.js b/contracts/test/ERC20toCW20PointerTest.js
@@ -86,7 +86,7 @@ describe("ERC20 to CW20 Pointer", function () {
             });
 
             describe("transfer()", function () {
-                it.only("should transfer", async function () {
+                it("should transfer", async function () {
                     let sender = accounts[0];
                     let recipient = accounts[1];
 

diff --git a/go.mod b/go.mod
@@ -344,7 +344,7 @@ require (
 )
 
 replace (
-	github.com/CosmWasm/wasmd => github.com/sei-protocol/sei-wasmd v0.2.4
+	github.com/CosmWasm/wasmd => github.com/sei-protocol/sei-wasmd v0.2.5-0.20241107175838-0d53ba130a0e
 	github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
 	github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.3.44
 	github.com/cosmos/iavl => github.com/sei-protocol/sei-iavl v0.2.0

diff --git a/go.sum b/go.sum
@@ -1359,8 +1359,8 @@ github.com/sei-protocol/sei-tendermint v0.4.3 h1:/Nx3Q309B4N61P3e6ScYiVuHgBRdapc
 github.com/sei-protocol/sei-tendermint v0.4.3/go.mod h1:4LSlJdhl3nf3OmohliwRNUFLOB1XWlrmSodrIP7fLh4=
 github.com/sei-protocol/sei-tm-db v0.0.5 h1:3WONKdSXEqdZZeLuWYfK5hP37TJpfaUa13vAyAlvaQY=
 github.com/sei-protocol/sei-tm-db v0.0.5/go.mod h1:Cpa6rGyczgthq7/0pI31jys2Fw0Nfrc+/jKdP1prVqY=
-github.com/sei-protocol/sei-wasmd v0.2.4 h1:W++xiJ1P57BhBW8TGk8vfPRJlWXr1vp2kQCvSc8Qpaw=
-github.com/sei-protocol/sei-wasmd v0.2.4/go.mod h1:fKHnK3Nms+BZeGvXeIC3SEzUDfkB7/tYOf95kVOhiO4=
+github.com/sei-protocol/sei-wasmd v0.2.5-0.20241107175838-0d53ba130a0e h1:/w3VQZBOzCUQNDLFdAPm3nguyD7l2K6453E+U++2p40=
+github.com/sei-protocol/sei-wasmd v0.2.5-0.20241107175838-0d53ba130a0e/go.mod h1:fKHnK3Nms+BZeGvXeIC3SEzUDfkB7/tYOf95kVOhiO4=
 github.com/sei-protocol/tm-db v0.0.4 h1:7Y4EU62Xzzg6wKAHEotm7SXQR0aPLcGhKHkh3qd0tnk=
 github.com/sei-protocol/tm-db v0.0.4/go.mod h1:PWsIWOTwdwC7Ow/GUvx8HgUJTO691pBuorIQD8JvwAs=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=

diff --git a/precompiles/common/expected_keepers.go b/precompiles/common/expected_keepers.go
@@ -83,7 +83,7 @@ type WasmdKeeper interface {
 }
 
 type WasmdViewKeeper interface {
-	QuerySmart(ctx sdk.Context, contractAddr sdk.AccAddress, req []byte) ([]byte, error)
+	QuerySmartSafe(ctx sdk.Context, contractAddr sdk.AccAddress, req []byte) ([]byte, error)
 }
 
 type StakingKeeper interface {

diff --git a/precompiles/pointer/pointer.go b/precompiles/pointer/pointer.go
@@ -134,7 +134,7 @@ func (p PrecompileExecutor) AddCW20(ctx sdk.Context, method *ethabi.Method, call
 	if err != nil {
 		return nil, 0, err
 	}
-	res, err := p.wasmdKeeper.QuerySmart(ctx, cwAddress, []byte("{\"token_info\":{}}"))
+	res, err := p.wasmdKeeper.QuerySmartSafe(ctx, cwAddress, []byte("{\"token_info\":{}}"))
 	if err != nil {
 		return nil, 0, err
 	}
@@ -165,7 +165,7 @@ func (p PrecompileExecutor) AddCW721(ctx sdk.Context, method *ethabi.Method, cal
 	if err != nil {
 		return nil, 0, err
 	}
-	res, err := p.wasmdKeeper.QuerySmart(ctx, cwAddress, []byte("{\"contract_info\":{}}"))
+	res, err := p.wasmdKeeper.QuerySmartSafe(ctx, cwAddress, []byte("{\"contract_info\":{}}"))
 	if err != nil {
 		return nil, 0, err
 	}

diff --git a/precompiles/wasmd/wasmd.go b/precompiles/wasmd/wasmd.go
@@ -448,8 +448,7 @@ func (p PrecompileExecutor) query(ctx sdk.Context, method *abi.Method, args []in
 		rerr = err
 		return
 	}
-
-	res, err := p.wasmdViewKeeper.QuerySmart(ctx, contractAddr, req)
+	res, err := p.wasmdViewKeeper.QuerySmartSafe(ctx, contractAddr, req)
 	if err != nil {
 		rerr = err
 		return

diff --git a/vue/src/store/generated/CosmWasm/wasmd/cosmwasm.wasm.v1/index.d.ts b/vue/src/store/generated/CosmWasm/wasmd/cosmwasm.wasm.v1/index.d.ts