Fix ee integration tests (#3592)

## Issue Addressed

Resolves #3573 

## Proposed Changes

Fix the bytecode for the deposit contract deployment transaction and value for deposit transaction in the execution engine integration tests. Also verify that all published transaction make it to the execution payload and have a valid status.
This commit is contained in:
Pawan Dhananjay 2022-09-23 03:52:43 +00:00
parent fa6ad1a11a
commit 3a3dddc5fb
2 changed files with 30 additions and 11 deletions

View File

@ -239,13 +239,16 @@ impl<E: GenericExecutionEngine> TestRig<E> {
// Submit transactions before getting payload // Submit transactions before getting payload
let txs = transactions::<MainnetEthSpec>(account1, account2); let txs = transactions::<MainnetEthSpec>(account1, account2);
let mut pending_txs = Vec::new();
for tx in txs.clone().into_iter() { for tx in txs.clone().into_iter() {
self.ee_a let pending_tx = self
.ee_a
.execution_engine .execution_engine
.provider .provider
.send_transaction(tx, None) .send_transaction(tx, None)
.await .await
.unwrap(); .unwrap();
pending_txs.push(pending_tx);
} }
/* /*
@ -328,8 +331,6 @@ impl<E: GenericExecutionEngine> TestRig<E> {
.unwrap() .unwrap()
.execution_payload; .execution_payload;
assert_eq!(valid_payload.transactions.len(), txs.len());
/* /*
* Execution Engine A: * Execution Engine A:
* *
@ -393,6 +394,18 @@ impl<E: GenericExecutionEngine> TestRig<E> {
.await .await
.unwrap(); .unwrap();
assert_eq!(status, PayloadStatus::Valid); assert_eq!(status, PayloadStatus::Valid);
assert_eq!(valid_payload.transactions.len(), pending_txs.len());
// Verify that all submitted txs were successful
for pending_tx in pending_txs {
let tx_receipt = pending_tx.await.unwrap().unwrap();
assert_eq!(
tx_receipt.status,
Some(1.into()),
"Tx index {} has invalid status ",
tx_receipt.transaction_index
);
}
/* /*
* Execution Engine A: * Execution Engine A:

View File

@ -1,7 +1,7 @@
use deposit_contract::{encode_eth1_tx_data, BYTECODE, CONTRACT_DEPLOY_GAS, DEPOSIT_GAS}; use deposit_contract::{encode_eth1_tx_data, BYTECODE, CONTRACT_DEPLOY_GAS, DEPOSIT_GAS};
use ethers_core::types::{ use ethers_core::types::{
transaction::{eip2718::TypedTransaction, eip2930::AccessList}, transaction::{eip2718::TypedTransaction, eip2930::AccessList},
Address, Bytes, Eip1559TransactionRequest, TransactionRequest, Address, Bytes, Eip1559TransactionRequest, TransactionRequest, U256,
}; };
use types::{DepositData, EthSpec, Hash256, Keypair, Signature}; use types::{DepositData, EthSpec, Hash256, Keypair, Signature};
@ -56,30 +56,36 @@ impl Transaction {
.value(1) .value(1)
.with_access_list(AccessList::default()) .with_access_list(AccessList::default())
.into(), .into(),
Self::DeployDepositContract(addr) => TransactionRequest::new() Self::DeployDepositContract(addr) => {
let mut bytecode = String::from_utf8(BYTECODE.to_vec()).unwrap();
bytecode.retain(|c| c.is_ascii_hexdigit());
let bytecode = hex::decode(&bytecode[1..]).unwrap();
TransactionRequest::new()
.from(*addr) .from(*addr)
.data(Bytes::from(BYTECODE.to_vec())) .data(Bytes::from(bytecode))
.gas(CONTRACT_DEPLOY_GAS) .gas(CONTRACT_DEPLOY_GAS)
.into(), .into()
}
Self::DepositDepositContract { Self::DepositDepositContract {
sender, sender,
deposit_contract_address, deposit_contract_address,
} => { } => {
let keypair = Keypair::random(); let keypair = Keypair::random();
let amount: u64 = 32_000_000_000;
let mut deposit = DepositData { let mut deposit = DepositData {
pubkey: keypair.pk.into(), pubkey: keypair.pk.into(),
withdrawal_credentials: Hash256::zero(), withdrawal_credentials: Hash256::zero(),
amount: 32_000_000_000, amount,
signature: Signature::empty().into(), signature: Signature::empty().into(),
}; };
deposit.signature = deposit.create_signature(&keypair.sk, &E::default_spec()); deposit.signature = deposit.create_signature(&keypair.sk, &E::default_spec());
TransactionRequest::new() TransactionRequest::new()
.from(*sender) .from(*sender)
.to(*deposit_contract_address) .to(*deposit_contract_address)
.data(Bytes::from(encode_eth1_tx_data(&deposit).unwrap())) .data(Bytes::from(encode_eth1_tx_data(&deposit).unwrap()))
.gas(DEPOSIT_GAS) .gas(DEPOSIT_GAS)
.value(U256::from(amount) * U256::exp10(9))
.into() .into()
} }
} }