fix: return proper synthetic tx in eth_getBlockByNumber RPC (#3634)

* fix gas payment event indexing * revert events changes * changelog * add todo
zeta-chain · Mar 5, 2025 · 33eb8ef · 33eb8ef
1 parent f7681d8
commit 33eb8ef
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/changelog.md b/changelog.md
@@ -43,6 +43,7 @@
 * [3517](https://github.com/zeta-chain/node/pull/3517) - remove duplicate gateway event appending to fix false positive on multiple events in same tx
 * [3602](https://github.com/zeta-chain/node/pull/3602) - hardcode gas limits to avoid estimate gas calls
 * [3622](https://github.com/zeta-chain/node/pull/3622) - allow object for tracerConfig in `debug_traceTransaction` RPC
+* [3634](https://github.com/zeta-chain/node/pull/3634) - return proper synthetic tx in `eth_getBlockByNumber` RPC
 
 ### Tests
 

diff --git a/precompiles/bank/method_test.go b/precompiles/bank/method_test.go
@@ -1,10 +1,11 @@
 package bank
 
 import (
-	"github.com/zeta-chain/node/e2e/contracts/erc1967proxy"
 	"math/big"
 	"testing"
 
+	"github.com/zeta-chain/node/e2e/contracts/erc1967proxy"
+
 	sdkmath "cosmossdk.io/math"
 	storetypes "cosmossdk.io/store/types"
 

diff --git a/precompiles/staking/staking_test.go b/precompiles/staking/staking_test.go
@@ -2,9 +2,10 @@ package staking
 
 import (
 	"encoding/json"
-	"github.com/zeta-chain/node/e2e/contracts/erc1967proxy"
 	"testing"
 
+	"github.com/zeta-chain/node/e2e/contracts/erc1967proxy"
+
 	"math/big"
 
 	"cosmossdk.io/log"

diff --git a/rpc/types/events.go b/rpc/types/events.go
@@ -273,7 +273,8 @@ func ParseTxBlockResult(
 	if len(txs.Txs) == 0 {
 		return nil, nil, nil
 	}
-	parsedTx := txs.Txs[0]
+	// TODO: check why when there are multiple synthetic txs events are in reversed order
+	parsedTx := txs.Txs[len(txs.Txs)-1]
 	if parsedTx.Type == CosmosEVMTxType {
 		return &ethermint.TxResult{
 				Height: height,

diff --git a/x/crosschain/keeper/utils_test.go b/x/crosschain/keeper/utils_test.go
@@ -2,10 +2,11 @@
 package keeper_test
 
 import (
-	"github.com/zeta-chain/node/e2e/contracts/erc1967proxy"
 	"math/big"
 	"testing"
 
+	"github.com/zeta-chain/node/e2e/contracts/erc1967proxy"
+
 	sdkmath "cosmossdk.io/math"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"

diff --git a/x/fungible/keeper/deposits_test.go b/x/fungible/keeper/deposits_test.go
@@ -1,6 +1,9 @@
 package keeper_test
 
 import (
+	"math/big"
+	"testing"
+
 	"cosmossdk.io/math"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/mock"
@@ -9,8 +12,6 @@ import (
 	"github.com/zeta-chain/node/e2e/contracts/reverter"
 	"github.com/zeta-chain/node/e2e/contracts/testdappv2"
 	crosschaintypes "github.com/zeta-chain/node/x/crosschain/types"
-	"math/big"
-	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/common"