Merge branch 'main' into jeremy-hotfix-trace-block-resilient-to-tx-er…

…rs/main

app/app.go

@@ -680,7 +680,7 @@ func New(
 
 	app.GovKeeper = govkeeper.NewKeeper(
 		appCodec, keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper,
-		&stakingKeeper, govRouter,
+		&stakingKeeper, app.ParamsKeeper, govRouter,
 	)
 
 	// this line is used by starport scaffolding # stargate/app/keeperDefinition

app/receipt.go

@@ -60,7 +60,7 @@ func (app *App) AddCosmosEventsToEVMReceiptIfApplicable(ctx sdk.Context, tx sdk.
 		// check if there is a ERC721 pointer to contract Addr
 		pointerAddr, _, exists = app.EvmKeeper.GetERC721CW721Pointer(wasmToEvmEventCtx, contractAddr)
 		if exists {
-			log, eligible := app.translateCW721Event(wasmToEvmEventCtx, wasmEvent, pointerAddr, contractAddr)
+			log, eligible := app.translateCW721Event(wasmToEvmEventCtx, wasmEvent, pointerAddr, contractAddr, response)
 			if eligible {
 				log.Index = uint(len(logs))
 				logs = append(logs, log)
@@ -173,7 +173,7 @@ func (app *App) translateCW20Event(ctx sdk.Context, wasmEvent abci.Event, pointe
 	return nil, false
 }
 
-func (app *App) translateCW721Event(ctx sdk.Context, wasmEvent abci.Event, pointerAddr common.Address, contractAddr string) (*ethtypes.Log, bool) {
+func (app *App) translateCW721Event(ctx sdk.Context, wasmEvent abci.Event, pointerAddr common.Address, contractAddr string, response sdk.DeliverTxHookInput) (*ethtypes.Log, bool) {
 	action, found := GetAttributeValue(wasmEvent, "action")
 	if !found {
 		return nil, false
@@ -185,9 +185,35 @@ func (app *App) translateCW721Event(ctx sdk.Context, wasmEvent abci.Event, point
 		if tokenID == nil {
 			return nil, false
 		}
+		sender := common.Hash{}
+		// unfortunately CW721 transfer events differ from ERC721 transfer events
+		// in that CW721 include sender (which can be different than owner) whereas
+		// ERC721 always include owner. The following logic refer to the owner
+		// event emitted before the transfer and use that instead to populate the
+		// synthetic ERC721 event.
+		ownerEvents := GetEventsOfType(response, wasmtypes.EventTypeCW721PreTransferOwner)
+		for _, ownerEvent := range ownerEvents {
+			if len(ownerEvent.Attributes) != 3 ||
+				string(ownerEvent.Attributes[0].Key) != wasmtypes.AttributeKeyContractAddr ||
+				string(ownerEvent.Attributes[0].Value) != contractAddr {
+				continue
+			}
+			tokenIDStr, _ := GetAttributeValue(wasmEvent, "token_id")
+			if string(ownerEvent.Attributes[1].Key) != wasmtypes.AttributeKeyTokenId ||
+				string(ownerEvent.Attributes[1].Value) != tokenIDStr ||
+				string(ownerEvent.Attributes[2].Key) != wasmtypes.AttributeKeyOwner {
+				continue
+			}
+			ownerAcc, err := sdk.AccAddressFromBech32(string(ownerEvent.Attributes[2].Value))
+			if err != nil {
+				continue
+			}
+			owner := app.EvmKeeper.GetEVMAddressOrDefault(ctx, ownerAcc)
+			sender = common.BytesToHash(owner[:])
+		}
 		topics = []common.Hash{
 			ERC721TransferTopic,
-			app.GetEvmAddressAttribute(ctx, wasmEvent, "sender"),
+			sender,
 			app.GetEvmAddressAttribute(ctx, wasmEvent, "recipient"),
 			common.BigToHash(tokenID),
 		}

app/receipt_test.go

@@ -168,7 +168,8 @@ func TestEvmEventsForCw721(t *testing.T) {
 	amt := sdk.NewCoins(sdk.NewCoin("usei", sdk.NewInt(1000000000000)))
 	k.BankKeeper().MintCoins(ctx, "evm", amt)
 	k.BankKeeper().SendCoinsFromModuleToAccount(ctx, "evm", creator, amt)
-	recipient, _ := testkeeper.MockAddressPair()
+	privKeyRecipient := testkeeper.MockPrivateKey()
+	recipient, _ := testkeeper.PrivateKeyToAddresses(privKeyRecipient)
 	payload := []byte(fmt.Sprintf("{\"mint\":{\"token_id\":\"1\",\"owner\":\"%s\"}}", recipient.String()))
 	msg := &wasmtypes.MsgExecuteContract{
 		Sender:   creator.String(),
@@ -320,18 +321,20 @@ func TestEvmEventsForCw721(t *testing.T) {
 	require.True(t, found)
 	require.Equal(t, common.HexToHash("0x1").Bytes(), receipt.Logs[0].Data)
 
-	// revoke all
-	payload = []byte(fmt.Sprintf("{\"revoke_all\":{\"operator\":\"%s\"}}", recipient.String()))
+	// transfer on behalf
+	k.BankKeeper().MintCoins(ctx, "evm", amt)
+	k.BankKeeper().SendCoinsFromModuleToAccount(ctx, "evm", recipient, amt)
+	payload = []byte(fmt.Sprintf("{\"transfer_nft\":{\"token_id\":\"2\",\"recipient\":\"%s\"}}", recipient.String()))
 	msg = &wasmtypes.MsgExecuteContract{
-		Sender:   creator.String(),
+		Sender:   recipient.String(),
 		Contract: contractAddr.String(),
 		Msg:      payload,
 	}
 	txBuilder = testkeeper.EVMTestApp.GetTxConfig().NewTxBuilder()
 	txBuilder.SetMsgs(msg)
 	txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin("usei", sdk.NewInt(1000000))))
 	txBuilder.SetGasLimit(300000)
-	tx = signTx(txBuilder, privKey, k.AccountKeeper().GetAccount(ctx, creator))
+	tx = signTx(txBuilder, privKeyRecipient, k.AccountKeeper().GetAccount(ctx, recipient))
 	txbz, err = testkeeper.EVMTestApp.GetTxConfig().TxEncoder()(tx)
 	require.Nil(t, err)
 	sum = sha256.Sum256(txbz)
@@ -342,12 +345,66 @@ func TestEvmEventsForCw721(t *testing.T) {
 	require.Equal(t, 1, len(receipt.Logs))
 	require.NotEmpty(t, receipt.LogsBloom)
 	require.Equal(t, mockPointerAddr.Hex(), receipt.Logs[0].Address)
-	_, found = testkeeper.EVMTestApp.EvmKeeper.GetEVMTxDeferredInfo(ctx)
-	require.True(t, found)
+	require.Equal(t, uint32(0), receipt.Logs[0].Index)
+	ownerHash := receipt.Logs[0].Topics[1]
+	// make sure that the owner is set correctly to the creator, not the spender.
+	creatorEvmAddr := testkeeper.EVMTestApp.EvmKeeper.GetEVMAddressOrDefault(ctx, creator)
+	require.Equal(t, common.BytesToHash(creatorEvmAddr[:]).Hex(), ownerHash)
+	tokenIdHash = receipt.Logs[0].Topics[3]
+	require.Equal(t, "0x0000000000000000000000000000000000000000000000000000000000000002", tokenIdHash)
 	require.Equal(t, common.HexToHash("0x0").Bytes(), receipt.Logs[0].Data)
 
-	// burn
+	// transfer back
+	payload = []byte(fmt.Sprintf("{\"transfer_nft\":{\"token_id\":\"2\",\"recipient\":\"%s\"}}", creator.String()))
+	msg = &wasmtypes.MsgExecuteContract{
+		Sender:   recipient.String(),
+		Contract: contractAddr.String(),
+		Msg:      payload,
+	}
+	txBuilder = testkeeper.EVMTestApp.GetTxConfig().NewTxBuilder()
+	txBuilder.SetMsgs(msg)
+	txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin("usei", sdk.NewInt(1000000))))
+	txBuilder.SetGasLimit(300000)
+	tx = signTx(txBuilder, privKeyRecipient, k.AccountKeeper().GetAccount(ctx, recipient))
+	txbz, err = testkeeper.EVMTestApp.GetTxConfig().TxEncoder()(tx)
+	require.Nil(t, err)
+	sum = sha256.Sum256(txbz)
+	res = testkeeper.EVMTestApp.DeliverTx(ctx.WithEventManager(sdk.NewEventManager()), abci.RequestDeliverTx{Tx: txbz}, tx, sum)
+	require.Equal(t, uint32(0), res.Code)
+
+	// burn on behalf
 	payload = []byte("{\"burn\":{\"token_id\":\"2\"}}")
+	msg = &wasmtypes.MsgExecuteContract{
+		Sender:   recipient.String(),
+		Contract: contractAddr.String(),
+		Msg:      payload,
+	}
+	txBuilder = testkeeper.EVMTestApp.GetTxConfig().NewTxBuilder()
+	txBuilder.SetMsgs(msg)
+	txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin("usei", sdk.NewInt(1000000))))
+	txBuilder.SetGasLimit(300000)
+	tx = signTx(txBuilder, privKeyRecipient, k.AccountKeeper().GetAccount(ctx, recipient))
+	txbz, err = testkeeper.EVMTestApp.GetTxConfig().TxEncoder()(tx)
+	require.Nil(t, err)
+	sum = sha256.Sum256(txbz)
+	res = testkeeper.EVMTestApp.DeliverTx(ctx.WithEventManager(sdk.NewEventManager()), abci.RequestDeliverTx{Tx: txbz}, tx, sum)
+	require.Equal(t, uint32(0), res.Code)
+	receipt, err = testkeeper.EVMTestApp.EvmKeeper.GetTransientReceipt(ctx, common.BytesToHash(sum[:]))
+	require.Nil(t, err)
+	require.Equal(t, 1, len(receipt.Logs))
+	require.NotEmpty(t, receipt.LogsBloom)
+	require.Equal(t, mockPointerAddr.Hex(), receipt.Logs[0].Address)
+	require.Equal(t, uint32(0), receipt.Logs[0].Index)
+	ownerHash = receipt.Logs[0].Topics[1]
+	// make sure that the owner is set correctly to the creator, not the spender.
+	creatorEvmAddr = testkeeper.EVMTestApp.EvmKeeper.GetEVMAddressOrDefault(ctx, creator)
+	require.Equal(t, common.BytesToHash(creatorEvmAddr[:]).Hex(), ownerHash)
+	tokenIdHash = receipt.Logs[0].Topics[3]
+	require.Equal(t, "0x0000000000000000000000000000000000000000000000000000000000000002", tokenIdHash)
+	require.Equal(t, common.HexToHash("0x0").Bytes(), receipt.Logs[0].Data)
+
+	// revoke all
+	payload = []byte(fmt.Sprintf("{\"revoke_all\":{\"operator\":\"%s\"}}", recipient.String()))
 	msg = &wasmtypes.MsgExecuteContract{
 		Sender:   creator.String(),
 		Contract: contractAddr.String(),
@@ -370,8 +427,6 @@ func TestEvmEventsForCw721(t *testing.T) {
 	require.Equal(t, mockPointerAddr.Hex(), receipt.Logs[0].Address)
 	_, found = testkeeper.EVMTestApp.EvmKeeper.GetEVMTxDeferredInfo(ctx)
 	require.True(t, found)
-	tokenIdHash = receipt.Logs[0].Topics[3]
-	require.Equal(t, "0x0000000000000000000000000000000000000000000000000000000000000002", tokenIdHash)
 	require.Equal(t, common.HexToHash("0x0").Bytes(), receipt.Logs[0].Data)
 }
 

go.mod

@@ -344,9 +344,9 @@ require (
 )
 
 replace (
-	github.com/CosmWasm/wasmd => github.com/sei-protocol/sei-wasmd v0.2.5-0.20241107175838-0d53ba130a0e
+	github.com/CosmWasm/wasmd => github.com/sei-protocol/sei-wasmd v0.2.8
 	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/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.3.45
 	github.com/cosmos/iavl => github.com/sei-protocol/sei-iavl v0.2.0
 	github.com/cosmos/ibc-go/v3 => github.com/sei-protocol/sei-ibc-go/v3 v3.3.2
 	github.com/ethereum/go-ethereum => github.com/sei-protocol/go-ethereum v1.13.5-sei-9.0.20241120141252-bf6b5923d7d7

go.sum

@@ -1347,8 +1347,8 @@ github.com/sei-protocol/go-ethereum v1.13.5-sei-9.0.20241120141252-bf6b5923d7d7
 github.com/sei-protocol/go-ethereum v1.13.5-sei-9.0.20241120141252-bf6b5923d7d7/go.mod h1:kcRZmuzRn1lVejiFNTz4l4W7imnpq1bDAnuKS/RyhbQ=
 github.com/sei-protocol/goutils v0.0.2 h1:Bfa7Sv+4CVLNM20QcpvGb81B8C5HkQC/kW1CQpIbXDA=
 github.com/sei-protocol/goutils v0.0.2/go.mod h1:iYE2DuJfEnM+APPehr2gOUXfuLuPsVxorcDO+Tzq9q8=
-github.com/sei-protocol/sei-cosmos v0.3.44 h1:7wLuJguQBhQ1ljU92lEDrZDLcNt+JbUcX7r1Y7V1qws=
-github.com/sei-protocol/sei-cosmos v0.3.44/go.mod h1:ZwWxF/69WlcLEn4BzVjPPToTFkE2sjPanU8PNNyKoOk=
+github.com/sei-protocol/sei-cosmos v0.3.45 h1:l6ss5Y4OC+vvu+74lWz8EUBJN68x0CRuaEYtqA+TvOs=
+github.com/sei-protocol/sei-cosmos v0.3.45/go.mod h1:ZwWxF/69WlcLEn4BzVjPPToTFkE2sjPanU8PNNyKoOk=
 github.com/sei-protocol/sei-db v0.0.45 h1:95ygzGFMyvaGwEUmzlKi8MxwXfbluoNzbaIjy9zOG6o=
 github.com/sei-protocol/sei-db v0.0.45/go.mod h1:m5g7p0QeAS3dNJHIl28zQpzOgxQmvYqPb7t4hwgIOCA=
 github.com/sei-protocol/sei-iavl v0.2.0 h1:OisPjXiDT+oe+aeckzDEFgkZCYuUjHgs/PP8DPicN+I=
@@ -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.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/sei-wasmd v0.2.8 h1:b7tnn3quY1msT0smbXIFdz83NXn8eYn5ARE0ShC6+1o=
+github.com/sei-protocol/sei-wasmd v0.2.8/go.mod h1:gcBpeDTCqCscmYq5/rYuRZW0r3pGSO3rs5MUlPucSDY=
 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=