Skip to content

Commit

Permalink
Merge branch 'main' into bump_bindings_84e3
Browse files Browse the repository at this point in the history
  • Loading branch information
@mask-pp
mask-pp committed May 10, 2024
2 parents 8f9b275 + 5c4a025 commit 6ccd897
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 156 deletions.
107 changes: 0 additions & 107 deletions packages/taiko-client/pkg/rpc/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ package rpc
import (
"context"
"math/big"
"strconv"
"strings"
"time"

"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/txpool"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/params"
Expand Down Expand Up @@ -197,111 +195,6 @@ func GetBlockProofStatus(
}, nil
}

type AccountPoolContent map[string]map[string]map[string]*types.Transaction
type AccountPoolContentFrom map[string]map[string]*types.Transaction

// Content GetPendingTxs fetches the pending transactions from tx pool.
func Content(ctx context.Context, client *EthClient) (AccountPoolContent, error) {
ctxWithTimeout, cancel := ctxWithTimeoutOrDefault(ctx, defaultTimeout)
defer cancel()

var result AccountPoolContent
return result, client.CallContext(ctxWithTimeout, &result, "txpool_content")
}

// ContentFrom fetches a given account's transactions list from a node's transactions pool.
func ContentFrom(
ctx context.Context,
rawRPC *EthClient,
address common.Address,
) (AccountPoolContentFrom, error) {
ctxWithTimeout, cancel := ctxWithTimeoutOrDefault(ctx, defaultTimeout)
defer cancel()

var result AccountPoolContentFrom
return result, rawRPC.CallContext(
ctxWithTimeout,
&result,
"txpool_contentFrom",
address,
)
}

// IncreaseGasTipCap tries to increase the given transaction's gasTipCap.
func IncreaseGasTipCap(
ctx context.Context,
cli *Client,
opts *bind.TransactOpts,
address common.Address,
txReplacementTipMultiplier *big.Int,
maxGasTipCap *big.Int,
) (*bind.TransactOpts, error) {
ctxWithTimeout, cancel := ctxWithTimeoutOrDefault(ctx, defaultTimeout)
defer cancel()

log.Info("Try replacing a transaction with same nonce", "sender", address, "nonce", opts.Nonce)

originalTx, err := GetPendingTxByNonce(ctxWithTimeout, cli.L1, address, opts.Nonce.Uint64())
if err != nil || originalTx == nil {
log.Warn(
"Original transaction not found",
"sender", address,
"nonce", opts.Nonce,
"error", err,
)

opts.GasTipCap = new(big.Int).Mul(opts.GasTipCap, txReplacementTipMultiplier)
} else {
log.Info(
"Original transaction to replace",
"sender", address,
"nonce", opts.Nonce,
"gasTipCap", originalTx.GasTipCap(),
"gasFeeCap", originalTx.GasFeeCap(),
)

opts.GasTipCap = new(big.Int).Mul(originalTx.GasTipCap(), txReplacementTipMultiplier)
}

if maxGasTipCap != nil && opts.GasTipCap.Cmp(maxGasTipCap) > 0 {
log.Info(
"New gasTipCap exceeds limit, keep waiting",
"multiplier", txReplacementTipMultiplier,
"newGasTipCap", opts.GasTipCap,
"maxTipCap", maxGasTipCap,
)
return nil, txpool.ErrReplaceUnderpriced
}

return opts, nil
}

// GetPendingTxByNonce tries to retrieve a pending transaction with a given nonce in a node's mempool.
func GetPendingTxByNonce(
ctx context.Context,
cli *EthClient,
address common.Address,
nonce uint64,
) (*types.Transaction, error) {
ctxWithTimeout, cancel := ctxWithTimeoutOrDefault(ctx, defaultTimeout)
defer cancel()

content, err := ContentFrom(ctxWithTimeout, cli, address)
if err != nil {
return nil, err
}

for _, txMap := range content {
for txNonce, tx := range txMap {
if txNonce == strconv.Itoa(int(nonce)) {
return tx, nil
}
}
}

return nil, nil
}

// SetHead makes a `debug_setHead` RPC call to set the chain's head, should only be used
// for testing purpose.
func SetHead(ctx context.Context, client *EthClient, headNum *big.Int) error {
Expand Down
41 changes: 0 additions & 41 deletions packages/taiko-client/pkg/rpc/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,9 @@ package rpc

import (
"context"
"math/big"
"os"
"strconv"
"testing"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/params"
"github.com/stretchr/testify/require"
)

Expand All @@ -22,38 +16,3 @@ func TestStringToBytes32(t *testing.T) {
require.Equal(t, [32]byte{}, StringToBytes32(""))
require.Equal(t, [32]byte{0x61, 0x62, 0x63}, StringToBytes32("abc"))
}

func TestL1ContentFrom(t *testing.T) {
client := newTestClient(t)
l2Head, err := client.L2.HeaderByNumber(context.Background(), nil)
require.Nil(t, err)

baseFeeInfo, err := client.TaikoL2.GetBasefee(nil, 0, uint32(l2Head.GasUsed))
require.Nil(t, err)

testAddrPrivKey, err := crypto.ToECDSA(common.FromHex(os.Getenv("L1_PROPOSER_PRIVATE_KEY")))
require.Nil(t, err)

testAddr := crypto.PubkeyToAddress(testAddrPrivKey.PublicKey)

nonce, err := client.L2.PendingNonceAt(context.Background(), testAddr)
require.Nil(t, err)

tx := types.NewTransaction(
nonce,
testAddr,
common.Big1,
100000,
new(big.Int).SetUint64(uint64(10*params.GWei)+baseFeeInfo.Basefee.Uint64()),
[]byte{},
)
signedTx, err := types.SignTx(tx, types.LatestSignerForChainID(client.L2.ChainID), testAddrPrivKey)
require.Nil(t, err)
require.Nil(t, client.L2.SendTransaction(context.Background(), signedTx))

content, err := ContentFrom(context.Background(), client.L2, testAddr)
require.Nil(t, err)

require.NotZero(t, len(content["pending"]))
require.Equal(t, signedTx.Nonce(), content["pending"][strconv.Itoa(int(signedTx.Nonce()))].Nonce())
}
24 changes: 17 additions & 7 deletions packages/taiko-client/prover/event_handler/block_proposed.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,14 +295,24 @@ func (h *BlockProposedEventHandler) checkExpirationAndSubmitProof(
return nil
}

// The proof submitted to protocol is invalid.
h.proofContestCh <- &proofProducer.ContestRequestBody{
BlockID: e.BlockId,
ProposedIn: new(big.Int).SetUint64(e.Raw.BlockNumber),
ParentHash: proofStatus.ParentHeader.Hash(),
Meta: &e.Meta,
Tier: e.Meta.MinTier,
// If the current proof has not been contested, we should contest it at first.
if proofStatus.CurrentTransitionState.Contester == rpc.ZeroAddress {
h.proofContestCh <- &proofProducer.ContestRequestBody{
BlockID: e.BlockId,
ProposedIn: new(big.Int).SetUint64(e.Raw.BlockNumber),
ParentHash: proofStatus.ParentHeader.Hash(),
Meta: &e.Meta,
Tier: e.Meta.MinTier,
}
} else {
// The invalid proof submitted to protocol is contested by another prover,
// we need to submit a proof with a higher tier.
h.proofSubmissionCh <- &proofProducer.ProofRequestBody{
Tier: proofStatus.CurrentTransitionState.Tier + 1,
Event: e,
}
}

return nil
}

Expand Down
8 changes: 8 additions & 0 deletions packages/taiko-client/prover/prover.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,10 @@ func (p *Prover) Name() string {
func (p *Prover) selectSubmitter(minTier uint16) proofSubmitter.Submitter {
for _, s := range p.proofSubmitters {
if s.Tier() >= minTier {
if !p.IsGuardianProver() && s.Tier() >= encoding.TierGuardianMinorityID {
continue
}

log.Debug("Proof submitter selected", "tier", s.Tier(), "minTier", minTier)
return s
}
Expand All @@ -460,6 +464,10 @@ func (p *Prover) selectSubmitter(minTier uint16) proofSubmitter.Submitter {
func (p *Prover) getSubmitterByTier(tier uint16) proofSubmitter.Submitter {
for _, s := range p.proofSubmitters {
if s.Tier() == tier {
if !p.IsGuardianProver() && s.Tier() >= encoding.TierGuardianMinorityID {
continue
}

return s
}
}
Expand Down
7 changes: 6 additions & 1 deletion packages/taiko-client/prover/prover_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,9 @@ func (s *ProverTestSuite) TestProveExpiredUnassignedBlock() {
}

func (s *ProverTestSuite) TestSelectSubmitter() {
submitter := s.p.selectSubmitter(encoding.TierGuardianMajorityID - 1)
s.p.cfg.GuardianProverMajorityAddress = common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT_ADDRESS"))
s.True(s.p.IsGuardianProver())
submitter := s.p.selectSubmitter(encoding.TierGuardianMinorityID + 1)
s.NotNil(submitter)
s.Equal(encoding.TierGuardianMajorityID, submitter.Tier())
}
Expand All @@ -369,6 +371,9 @@ func (s *ProverTestSuite) TestSelectSubmitterNotFound() {
}

func (s *ProverTestSuite) TestGetSubmitterByTier() {
s.p.cfg.GuardianProverMajorityAddress = common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT_ADDRESS"))
s.True(s.p.IsGuardianProver())

submitter := s.p.getSubmitterByTier(encoding.TierGuardianMajorityID)
s.NotNil(submitter)
s.Equal(encoding.TierGuardianMajorityID, submitter.Tier())
Expand Down

0 comments on commit 6ccd897

Please sign in to comment.