feat: ignore the first tx (connect oracle extension tx)

milkyway-labs · Nov 28, 2024 · 1f306b0 · 1f306b0
1 parent f171805
commit 1f306b0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/node/remote/config.go b/node/remote/config.go
@@ -6,19 +6,21 @@ import (
 
 // Details represents a node details for a remote node
 type Details struct {
-	RPC  *RPCConfig  `yaml:"rpc"`
-	GRPC *GRPCConfig `yaml:"grpc"`
+	RPC                          *RPCConfig  `yaml:"rpc"`
+	GRPC                         *GRPCConfig `yaml:"grpc"`
+	IgnoreConnectVoteExtensionTx bool        `yaml:"ignore_connect_vote_extension_tx"` // ignore tx[0] for the chains that are using Skip Oracle
 }
 
-func NewDetails(rpc *RPCConfig, grpc *GRPCConfig) *Details {
+func NewDetails(rpc *RPCConfig, grpc *GRPCConfig, ignoreConnectVoteExtensionTx bool) *Details {
 	return &Details{
-		RPC:  rpc,
-		GRPC: grpc,
+		RPC:                          rpc,
+		GRPC:                         grpc,
+		IgnoreConnectVoteExtensionTx: ignoreConnectVoteExtensionTx,
 	}
 }
 
 func DefaultDetails() *Details {
-	return NewDetails(DefaultRPCConfig(), DefaultGrpcConfig())
+	return NewDetails(DefaultRPCConfig(), DefaultGrpcConfig(), false)
 }
 
 // Validate implements node.Details

diff --git a/node/remote/node.go b/node/remote/node.go
@@ -36,8 +36,9 @@ type Node struct {
 
 	computeTxHash types.TxHashCalculator
 
-	client          *httpclient.HTTP
-	txServiceClient tx.ServiceClient
+	client                       *httpclient.HTTP
+	txServiceClient              tx.ServiceClient
+	ignoreConnectVoteExtensionTx bool
 }
 
 // NewNode allows to build a new Node instance
@@ -74,8 +75,9 @@ func NewNode(
 
 		computeTxHash: txHashCalculator,
 
-		client:          rpcClient,
-		txServiceClient: tx.NewServiceClient(grpcConnection),
+		client:                       rpcClient,
+		txServiceClient:              tx.NewServiceClient(grpcConnection),
+		ignoreConnectVoteExtensionTx: cfg.IgnoreConnectVoteExtensionTx,
 	}, nil
 }
 
@@ -269,9 +271,14 @@ func (cp *Node) Tx(hash string) (*types.Tx, error) {
 }
 
 // Txs implements node.Node
+
 func (cp *Node) Txs(block *tmctypes.ResultBlock) ([]*types.Tx, error) {
-	txResponses := make([]*types.Tx, len(block.Block.Txs))
-	for i, tmTx := range block.Block.Txs {
+	txs := block.Block.Txs
+	if cp.ignoreConnectVoteExtensionTx && len(block.Block.Txs) > 0 {
+		txs = block.Block.Txs[1:]
+	}
+	txResponses := make([]*types.Tx, len(txs))
+	for i, tmTx := range txs {
 		txResponse, err := cp.Tx(fmt.Sprintf("%X", cp.computeTxHash(tmTx)))
 		if err != nil {
 			return nil, err