Skip to content

debug build not to call txpool_contentFrom api #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
siburu merged 5 commits into from
Jul 4, 2025
Merged

debug build not to call txpool_contentFrom api #68

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c07cfde
split ContentFrom function to indivisual file and create debug tag ve…
May 27, 2025
f25bc08
debug build not to use txpool_content_from
Jun 13, 2025
085b1e3
change debug flag name to be common to other modules
Jun 24, 2025
219544d
refactoring
Jul 2, 2025
e548313
rename filename
Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions pkg/client/txpool/txpool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,6 @@ type RPCTransaction struct {
YParity *hexutil.Uint64 `json:"yParity,omitempty"`
}

// ContentFrom calls `txpool_contentFrom` of the Ethereum RPC
func ContentFrom(ctx context.Context, client *ethclient.Client, address common.Address) (map[string]map[string]*RPCTransaction, error) {
var res map[string]map[string]*RPCTransaction
if err := client.Client().CallContext(ctx, &res, "txpool_contentFrom", address); err != nil {
return nil, err
}
return res, nil
}

// PendingTransactions returns pending txs sent from `address` sorted by nonce.
func PendingTransactions(ctx context.Context, client *ethclient.Client, address common.Address) ([]*RPCTransaction, error) {
txs, err := ContentFrom(ctx, client, address)
Expand Down
24 changes: 24 additions & 0 deletions pkg/client/txpool/txpool_content_from.debug.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
//go:build ethereum_ibc_relay_chain_debug

package txpool

import (
"os"
"context"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/ethclient"
)

// ContentFrom calls `txpool_contentFrom` of the Ethereum RPC
func ContentFrom(ctx context.Context, client *ethclient.Client, address common.Address) (map[string]map[string]*RPCTransaction, error) {
res := make(map[string]map[string]*RPCTransaction)
val, ok := os.LookupEnv("RELAYER_SKIP_TXPOOL_CONTENT_FROM")
if ok && val == "1" {
} else {
if err := client.Client().CallContext(ctx, &res, "txpool_contentFrom", address); err != nil {
return nil, err
}
}
return res, nil
}
19 changes: 19 additions & 0 deletions pkg/client/txpool/txpool_content_from.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//go:build !ethereum_ibc_relay_chain_debug

package txpool

import (
"context"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/ethclient"
)

// ContentFrom calls `txpool_contentFrom` of the Ethereum RPC
func ContentFrom(ctx context.Context, client *ethclient.Client, address common.Address) (map[string]map[string]*RPCTransaction, error) {
var res map[string]map[string]*RPCTransaction
if err := client.Client().CallContext(ctx, &res, "txpool_contentFrom", address); err != nil {
return nil, err
}
return res, nil
}