Merge branch 'main' into pointers/erc1155-cw1155

app/receipt.go

@@ -195,12 +195,7 @@ func (app *App) translateCW721Event(ctx sdk.Context, wasmEvent abci.Event, point
 	}
 	var topics []common.Hash
 	switch action {
-	case "transfer_nft", "send_nft":
-		topics = []common.Hash{
-			ERC721TransferTopic,
-			app.GetEvmAddressAttribute(ctx, wasmEvent, "sender"),
-			app.GetEvmAddressAttribute(ctx, wasmEvent, "recipient"),
-		}
+	case "transfer_nft", "send_nft", "burn":
 		tokenID := GetTokenIDAttribute(wasmEvent)
 		if tokenID == nil {
 			return nil, false
@@ -242,21 +237,6 @@ func (app *App) translateCW721Event(ctx sdk.Context, wasmEvent abci.Event, point
 			Topics:  topics,
 			Data:    EmptyHash.Bytes(),
 		}, true
-	case "burn":
-		topics = []common.Hash{
-			ERC721TransferTopic,
-			app.GetEvmAddressAttribute(ctx, wasmEvent, "sender"),
-			EmptyHash,
-		}
-		tokenID := GetTokenIDAttribute(wasmEvent)
-		if tokenID == nil {
-			return nil, false
-		}
-		return &ethtypes.Log{
-			Address: pointerAddr,
-			Topics:  topics,
-			Data:    common.BigToHash(tokenID).Bytes(),
-		}, true
 	case "mint":
 		tokenID := GetTokenIDAttribute(wasmEvent)
 		if tokenID == nil {

precompiles/common/expected_keepers.go

@@ -60,11 +60,13 @@ type EVMKeeper interface {
 		ctx sdk.Context, evm *vm.EVM, cw20Addr string, metadata utils.ERCMetadata,
 	) (contractAddr common.Address, err error)
 	UpsertERCCW721Pointer(
-		ctx sdk.Context, evm *vm.EVM, suppliedGas uint64, cw721Addr string, metadata utils.ERCMetadata,
-	) (contractAddr common.Address, remainingGas uint64, err error)
+		ctx sdk.Context, evm *vm.EVM, cw721Addr string, metadata utils.ERCMetadata,
+	) (contractAddr common.Address, err error)
 	UpsertERCCW1155Pointer(
-		ctx sdk.Context, evm *vm.EVM, suppliedGas uint64, cw1155Addr string, metadata utils.ERCMetadata,
-	) (contractAddr common.Address, remainingGas uint64, err error)
+		ctx sdk.Context, evm *vm.EVM, cw1155Addr string, metadata utils.ERCMetadata,
+	) (contractAddr common.Address, err error)
+	GetEVMGasLimitFromCtx(ctx sdk.Context) uint64
+	GetCosmosGasLimitFromEVMGas(ctx sdk.Context, evmGas uint64) uint64
 }
 
 type AccountKeeper interface {

precompiles/pointer/pointer.go

@@ -81,9 +81,9 @@ func (p PrecompileExecutor) Execute(ctx sdk.Context, method *ethabi.Method, call
 	case AddCW20Pointer:
 		return p.AddCW20(ctx, method, caller, args, value, evm)
 	case AddCW721Pointer:
-		return p.AddCW721(ctx, method, caller, args, value, evm, suppliedGas)
+		return p.AddCW721(ctx, method, caller, args, value, evm)
 	case AddCW1155Pointer:
-		return p.AddCW1155(ctx, method, caller, args, value, evm, suppliedGas)
+		return p.AddCW1155(ctx, method, caller, args, value, evm)
 	default:
 		err = fmt.Errorf("unknown method %s", method.Name)
 	}
@@ -190,7 +190,7 @@ func (p PrecompileExecutor) AddCW721(ctx sdk.Context, method *ethabi.Method, cal
 	return
 }
 
-func (p PrecompileExecutor) AddCW1155(ctx sdk.Context, method *ethabi.Method, caller common.Address, args []interface{}, value *big.Int, evm *vm.EVM, suppliedGas uint64) (ret []byte, remainingGas uint64, err error) {
+func (p PrecompileExecutor) AddCW1155(ctx sdk.Context, method *ethabi.Method, caller common.Address, args []interface{}, value *big.Int, evm *vm.EVM) (ret []byte, remainingGas uint64, err error) {
 	if err := pcommon.ValidateNonPayable(value); err != nil {
 		return nil, 0, err
 	}
@@ -202,7 +202,7 @@ func (p PrecompileExecutor) AddCW1155(ctx sdk.Context, method *ethabi.Method, ca
 	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
 	}
@@ -212,10 +212,12 @@ func (p PrecompileExecutor) AddCW1155(ctx sdk.Context, method *ethabi.Method, ca
 	}
 	name := formattedRes["name"].(string)
 	symbol := formattedRes["symbol"].(string)
-	contractAddr, remainingGas, err := p.evmKeeper.UpsertERCCW1155Pointer(ctx, evm, suppliedGas, cwAddr, utils.ERCMetadata{Name: name, Symbol: symbol})
+	contractAddr, err := p.evmKeeper.UpsertERCCW1155Pointer(ctx, evm, cwAddr, utils.ERCMetadata{Name: name, Symbol: symbol})
 	if err != nil {
 		return nil, 0, err
 	}
 	ret, err = method.Outputs.Pack(contractAddr)
+	remainingGas = pcommon.GetRemainingGas(ctx, p.evmKeeper)
 	return
 }
+

x/evm/integration_test.go

@@ -608,4 +608,3 @@ func signTx(txBuilder client.TxBuilder, privKey cryptotypes.PrivKey, acc authtyp
 	_ = txBuilder.SetSignatures(sigsV2...)
 	return txBuilder.GetTx()
 }
-

x/evm/keeper/pointer_upgrade.go

@@ -74,10 +74,10 @@ func (k *Keeper) UpsertERCCW721Pointer(
 }
 
 func (k *Keeper) UpsertERCCW1155Pointer(
-	ctx sdk.Context, evm *vm.EVM, suppliedGas uint64, cw1155Addr string, metadata utils.ERCMetadata,
-) (contractAddr common.Address, remainingGas uint64, err error) {
+	ctx sdk.Context, evm *vm.EVM, cw1155Addr string, metadata utils.ERCMetadata,
+) (contractAddr common.Address, err error) {
 	return k.UpsertERCPointer(
-		ctx, evm, suppliedGas, "cw1155", []interface{}{
+		ctx, evm, "cw721", []interface{}{
 			cw1155Addr, metadata.Name, metadata.Symbol,
 		}, k.GetERC1155CW1155Pointer, k.SetERC1155CW1155Pointer,
 	)

x/evm/keeper/pointer_upgrade_test.go

@@ -123,10 +123,12 @@ func TestUpsertERC721Pointer(t *testing.T) {
 }
 
 func TestUpsertERC1155Pointer(t *testing.T) {
-	k, ctx := testkeeper.MockEVMKeeper()
+	k := &testkeeper.EVMTestApp.EvmKeeper
+	ctx := testkeeper.EVMTestApp.GetContextForDeliverTx([]byte{}).WithBlockTime(time.Now())
+	ctx = ctx.WithGasMeter(sdk.NewInfiniteGasMeterWithMultiplier(ctx))
 	var addr common.Address
 	err := k.RunWithOneOffEVMInstance(ctx, func(e *vm.EVM) error {
-		a, _, err := k.UpsertERCCW1155Pointer(ctx, e, math.MaxUint64, "test", utils.ERCMetadata{
+		a, err := k.UpsertERCCW1155Pointer(ctx, e, "test", utils.ERCMetadata{
 			Name:   "test",
 			Symbol: "test",
 		})
@@ -136,7 +138,7 @@ func TestUpsertERC1155Pointer(t *testing.T) {
 	require.Nil(t, err)
 	var newAddr common.Address
 	err = k.RunWithOneOffEVMInstance(ctx, func(e *vm.EVM) error {
-		a, _, err := k.UpsertERCCW1155Pointer(ctx, e, math.MaxUint64, "test", utils.ERCMetadata{
+		a, err := k.UpsertERCCW1155Pointer(ctx, e, "test", utils.ERCMetadata{
 			Name:   "test2",
 			Symbol: "test2",
 		})

x/evm/migrations/migrate_all_pointers.go

@@ -143,7 +143,7 @@ func MigrateERCCW1155Pointers(ctx sdk.Context, k *keeper.Keeper) error {
 			continue
 		}
 		_ = k.RunWithOneOffEVMInstance(ctx, func(e *vm.EVM) error {
-			_, _, err := k.UpsertERCCW1155Pointer(ctx, e, math.MaxUint64, cwAddr, utils.ERCMetadata{
+			_, err := k.UpsertERCCW1155Pointer(ctx.WithGasMeter(sdk.NewInfiniteGasMeterWithMultiplier(ctx)), e, cwAddr, utils.ERCMetadata{
 				Name:   oName.(string),
 				Symbol: oSymbol.(string),
 			})

x/evm/migrations/migrate_all_pointers_test.go

@@ -65,7 +65,7 @@ func TestMigrateERCCW1155Pointers(t *testing.T) {
 	ctx := testkeeper.EVMTestApp.GetContextForDeliverTx([]byte{}).WithBlockTime(time.Now())
 	var pointerAddr common.Address
 	require.Nil(t, k.RunWithOneOffEVMInstance(ctx, func(e *vm.EVM) error {
-		a, _, err := k.UpsertERCCW1155Pointer(ctx, e, math.MaxUint64, "test", utils.ERCMetadata{Name: "name", Symbol: "symbol"})
+		a, err := k.UpsertERCCW1155Pointer(ctx, e, "test", utils.ERCMetadata{Name: "name", Symbol: "symbol"})
 		pointerAddr = a
 		return err
 	}, func(s1, s2 string) {}))

x/evm/module.go

@@ -211,6 +211,18 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 	})
 
 	_ = cfg.RegisterMigration(types.ModuleName, 11, func(ctx sdk.Context) error {
+		return migrations.MigrateDeliverTxHookWasmGasLimitParam(ctx, am.keeper)
+	})
+
+	_ = cfg.RegisterMigration(types.ModuleName, 12, func(ctx sdk.Context) error {
+		return migrations.MigrateBlockBloom(ctx, am.keeper)
+	})
+
+	_ = cfg.RegisterMigration(types.ModuleName, 13, func(ctx sdk.Context) error {
+		return migrations.MigrateEip1559Params(ctx, am.keeper)
+	})
+
+	_ = cfg.RegisterMigration(types.ModuleName, 14, func(ctx sdk.Context) error {
 		return migrations.StoreCWPointerCode(ctx, am.keeper, false, false, true)
 	})
 }