Skip to content

simulators/ethereum/engine: Retry Sending Transactions #528

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
holiman merged 1 commit into from
Apr 27, 2022
Merged

simulators/ethereum/engine: Retry Sending Transactions #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 8 additions & 42 deletions simulators/ethereum/engine/enginetests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,10 +541,7 @@ func invalidPayloadTestCaseGen(payloadField string) func(*TestEnv) {
txFunc := func() {
// Function to send at least one transaction each block produced
// Send the transaction to the prevRandaoContractAddr
tx := t.makeNextTransaction(prevRandaoContractAddr, big1, nil)
if err := t.Eth.SendTransaction(t.Ctx(), tx); err != nil {
t.Fatalf("FAIL (%s): Unable to send transaction: %v", t.TestName, err)
}
t.sendNextTransaction(t.CLMock.NextBlockProducer, prevRandaoContractAddr, big1, nil)
}

// Produce blocks before starting the test
Expand Down Expand Up @@ -948,12 +945,8 @@ func transactionReorg(t *TestEnv) {
// Data is the key where a `1` will be stored
data := common.LeftPadBytes([]byte{byte(i)}, 32)
t.Logf("transactionReorg, i=%v, data=%v\n", i, data)
tx = t.makeNextTransaction(sstoreContractAddr, big0, data)
tx = t.sendNextTransaction(t.Engine, sstoreContractAddr, big0, data)

// Send the transaction
if err := t.Eth.SendTransaction(t.Ctx(), tx); err != nil {
t.Fatalf("FAIL (%s): Unable to send transaction: %v", t.TestName, err)
}
// Get the receipt
receipt, _ := t.Eth.TransactionReceipt(t.Ctx(), tx.Hash())
if receipt != nil {
Expand Down Expand Up @@ -1019,10 +1012,7 @@ func sidechainReorg(t *TestEnv) {
// Produce two payloads, send fcU with first payload, check transaction outcome, then reorg, check transaction outcome again

// This single transaction will change its outcome based on the payload
tx := t.makeNextTransaction(prevRandaoContractAddr, big0, nil)
if err := t.Eth.SendTransaction(t.Ctx(), tx); err != nil {
t.Fatalf("FAIL (%s): Unable to send transaction: %v", t.TestName, err)
}
tx := t.sendNextTransaction(t.Engine, prevRandaoContractAddr, big0, nil)
t.Logf("INFO (%s): sent tx %v", t.TestName, tx.Hash())

t.CLMock.produceSingleBlock(BlockProcessCallbacks{
Expand Down Expand Up @@ -1154,11 +1144,7 @@ func outOfOrderPayloads(t *TestEnv) {
// We send the transactions after we got the Payload ID, before the CLMocker gets the prepared Payload
OnPayloadProducerSelected: func() {
for i := 0; i < txPerPayload; i++ {
tx := t.makeNextTransaction(recipient, amountPerTx, nil)
err := t.Eth.SendTransaction(t.Ctx(), tx)
if err != nil {
t.Fatalf("FAIL (%s): Unable to send transaction: %v", t.TestName, err)
}
t.sendNextTransaction(t.CLMock.NextBlockProducer, recipient, amountPerTx, nil)
}
},
})
Expand Down Expand Up @@ -1244,21 +1230,7 @@ func suggestedFeeRecipient(t *TestEnv) {

// Send multiple transactions
for i := 0; i < txCount; i++ {
tx := t.makeNextTransaction(vaultAccountAddr, big0, nil)
// Empty self tx
for {
err := t.Eth.SendTransaction(t.Ctx(), tx)
if err == nil {
break
}
// Retry sending the same transaction after a second
select {
case <-time.After(time.Second):
case <-t.Timeout:
t.Fatalf("FAIL (%s): Timeout while waiting to send transaction: %v", t.TestName, err)
}
}

t.sendNextTransaction(t.Engine, vaultAccountAddr, big0, nil)
}
// Produce the next block with the fee recipient set
t.CLMock.NextFeeRecipient = feeRecipient
Expand Down Expand Up @@ -1313,17 +1285,14 @@ func prevRandaoOpcodeTx(t *TestEnv) {
// Try to send many transactions before PoW transition to guarantee at least one enters in the block
go func(t *TestEnv) {
for {
t.sendNextTransaction(t.Engine, prevRandaoContractAddr, big0, nil)

select {
case <-t.Timeout:
t.Fatalf("FAIL (%s): Timeout while sending PREVRANDAO opcode transactions: %v")
case <-ttdReached:
return
case <-time.After(time.Second / 10):
tx := t.makeNextTransaction(prevRandaoContractAddr, big0, nil)
if err := t.Eth.SendTransaction(t.Ctx(), tx); err != nil {
t.Fatalf("FAIL (%s): Unable to send transaction: %v", t.TestName, err)
}
t.Logf("INFO (%s): sent tx %v", t.TestName, tx.Hash())
}
}
}(t)
Expand Down Expand Up @@ -1356,10 +1325,7 @@ func prevRandaoOpcodeTx(t *TestEnv) {
)
t.CLMock.produceBlocks(txCount, BlockProcessCallbacks{
OnPayloadProducerSelected: func() {
tx := t.makeNextTransaction(prevRandaoContractAddr, big0, nil)
if err := t.Eth.SendTransaction(t.Ctx(), tx); err != nil {
t.Fatalf("FAIL (%s): Unable to send transaction: %v", t.TestName, err)
}
tx := t.sendNextTransaction(t.Engine, prevRandaoContractAddr, big0, nil)
txs = append(txs, tx)
currentTxIndex++
},
Expand Down
15 changes: 15 additions & 0 deletions simulators/ethereum/engine/testenv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,21 @@ func (t *TestEnv) makeNextTransaction(recipient common.Address, amount *big.Int,
return signedTx
}

func (t *TestEnv) sendNextTransaction(sender *EngineClient, recipient common.Address, amount *big.Int, payload []byte) *types.Transaction {
tx := t.makeNextTransaction(recipient, amount, payload)
for {
err := sender.Eth.SendTransaction(sender.Ctx(), tx)
if err == nil {
return tx
}
select {
case <-time.After(time.Second):
case <-t.Timeout:
t.Fatalf("FAIL (%s): Timeout while trying to send transaction: %v", t.TestName, err)
}
}
}

// CallContext is a helper method that forwards a raw RPC request to
// the underlying RPC client. This can be used to call RPC methods
// that are not supported by the ethclient.Client.
Expand Down