Skip to content
This repository was archived by the owner on Nov 20, 2023. It is now read-only.

fix: missing EIP-2718 support checking tx type #21

Merged
sorpaas merged 2 commits into from
May 15, 2023
Merged

fix: missing EIP-2718 support checking tx type #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85a84c2
fix: missing EIP-2718 support checking tx type
vimpunk May 15, 2023
4a66053
fix: missing EIP-2681 for nonce upper bound
vimpunk May 15, 2023
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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion ethjson/src/test_helpers/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ impl MultiTransaction {
r: Default::default(),
s: Default::default(),
v: Default::default(),
secret: self.secret.clone(),
secret: self.secret,
access_list,
}
}
Expand Down Expand Up @@ -163,11 +163,16 @@ pub struct PostStateIndexes {

/// State test indexed state result deserialization.
#[derive(Debug, PartialEq, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct PostStateResult {
/// Post state hash
pub hash: H256,
/// Indexes
pub indexes: PostStateIndexes,
/// Expected error if the test is meant to fail
pub expect_exception: Option<String>,
/// Transaction bytes
pub txbytes: Bytes,
}

#[cfg(test)]
Expand Down Expand Up @@ -204,20 +209,24 @@ mod tests {
"EIP150": [
{
"hash": "3e6dacc1575c6a8c76422255eca03529bbf4c0dda75dfc110b22d6dc4152396f",
"txbytes" : "0xf861800a84042c1d8094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0f141d67812db948c9a4ea43c27d695248205c121ae8d924d23517ab09e38f369a03fe3cfedb4c9a7e61340b6fec87917690e92082f752ad820ad5006c7d49185ed",
"indexes": { "data": 0, "gas": 0, "value": 0 }
},
{
"hash": "99a450d8ce5b987a71346d8a0a1203711f770745c7ef326912e46761f14cd764",
"txbytes" : "0xf861800a84042c1d8094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0f141d67812db948c9a4ea43c27d695248205c121ae8d924d23517ab09e38f369a03fe3cfedb4c9a7e61340b6fec87917690e92082f752ad820ad5006c7d49185ed",
"indexes": { "data": 0, "gas": 0, "value": 1 }
}
],
"EIP158": [
{
"hash": "3e6dacc1575c6a8c76422255eca03529bbf4c0dda75dfc110b22d6dc4152396f",
"txbytes" : "0xf861800a84042c1d8094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0f141d67812db948c9a4ea43c27d695248205c121ae8d924d23517ab09e38f369a03fe3cfedb4c9a7e61340b6fec87917690e92082f752ad820ad5006c7d49185ed",
"indexes": { "data": 0, "gas": 0, "value": 0 }
},
{
"hash": "99a450d8ce5b987a71346d8a0a1203711f770745c7ef326912e46761f14cd764",
"txbytes" : "0xf861800a84042c1d8094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0f141d67812db948c9a4ea43c27d695248205c121ae8d924d23517ab09e38f369a03fe3cfedb4c9a7e61340b6fec87917690e92082f752ad820ad5006c7d49185ed",
"indexes": { "data": 0, "gas": 0, "value": 1 }
}
]
Expand Down
2 changes: 1 addition & 1 deletion evm
Open in desktop
Submodule evm updated from 01bcbd to e7138f
2 changes: 1 addition & 1 deletion jsontests/res/ethtests
Open in desktop
Submodule ethtests updated from b25623 to bac70c
68 changes: 56 additions & 12 deletions jsontests/src/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,19 @@ impl Test {

let block_randomness = if spec.is_eth2() {
self.0.env.random.map(|r| {
// Convert between U256 and H256. U256 is in little-endian but since H256 is just
// a string-like byte array, it's big endian (MSB is the first element of the array).
//
// Byte order here is important because this opcode has the same value as DIFFICULTY
// (0x44), and so for older forks of Ethereum, the threshold value of 2^64 is used to
// distinguish between the two: if it's below, the value corresponds to the DIFFICULTY
// opcode, otherwise to the PREVRANDAO opcode.
let mut buf = [0u8; 32];
r.0.to_big_endian(&mut buf);
H256(buf)
})
// Convert between U256 and H256. U256 is in little-endian but since H256 is just
// a string-like byte array, it's big endian (MSB is the first element of the array).
//
// Byte order here is important because this opcode has the same value as DIFFICULTY
// (0x44), and so for older forks of Ethereum, the threshold value of 2^64 is used to
// distinguish between the two: if it's below, the value corresponds to the DIFFICULTY
// opcode, otherwise to the PREVRANDAO opcode.
u256_to_h256(r.0)
})
} else {
None
};


Some(MemoryVicinity {
gas_price,
origin: self.unwrap_caller(),
Expand Down Expand Up @@ -261,6 +258,25 @@ fn test_run(name: &str, test: Test) {
let transaction = test.0.transaction.select(&state.indexes);
let mut backend = MemoryBackend::new(&vicinity, original_state.clone());

// Test case may be expected to fail with an unsupported tx type if the current fork is
// older than Berlin (see EIP-2718). However, this is not implemented in sputnik itself and rather
// in the code hosting sputnik. https://github.com/rust-blockchain/evm/pull/40
let tx_type = TxType::from_txbytes(&state.txbytes);
if matches!(
spec,
ForkSpec::EIP150
| ForkSpec::EIP158 | ForkSpec::Frontier
| ForkSpec::Homestead
| ForkSpec::Byzantium
| ForkSpec::Constantinople
| ForkSpec::ConstantinopleFix
| ForkSpec::Istanbul
) && tx_type != TxType::Legacy
&& state.expect_exception == Some("TR_TypeNotSupported".to_string())
{
continue;
}

// Only execute valid transactions
if let Ok(transaction) = crate::utils::transaction::validate(
transaction,
Expand Down Expand Up @@ -342,3 +358,31 @@ fn test_run(name: &str, test: Test) {
}
}
}

/// Denotes the type of transaction.
#[derive(Debug, PartialEq)]
enum TxType {
/// All transactions before EIP-2718 are legacy.
Legacy,
/// https://eips.ethereum.org/EIPS/eip-2718
AccessList,
/// https://eips.ethereum.org/EIPS/eip-1559
DynamicFee,
}

impl TxType {
/// Whether this is a legacy, access list, dynamic fee, etc transaction
// Taken from geth's core/types/transaction.go/UnmarshalBinary, but we only detect the transaction
// type rather than unmarshal the entire payload.
fn from_txbytes(txbytes: &[u8]) -> Self {
match txbytes[0] {
b if b > 0x7f => Self::Legacy,
1 => Self::AccessList,
2 => Self::DynamicFee,
_ => panic!(
"Unknown tx type. \
You may need to update the TxType enum if Ethereum introduced new enveloped transaction types."
),
}
}
}
4 changes: 2 additions & 2 deletions jsontests/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pub fn u256_to_h256(u: U256) -> H256 {
pub fn unwrap_to_account(s: &ethjson::spec::Account) -> MemoryAccount {
MemoryAccount {
balance: s.balance.clone().unwrap().into(),
nonce: s.nonce.clone().unwrap().into(),
nonce: s.nonce.unwrap().0.as_u64(),
code: s.code.clone().unwrap().into(),
storage: s
.storage
Expand Down Expand Up @@ -48,7 +48,7 @@ pub fn unwrap_to_state(a: &ethjson::spec::State) -> BTreeMap<H160, MemoryAccount
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct TrieAccount {
/// Nonce of the account.
pub nonce: U256,
pub nonce: u64,
/// Balance of the account.
pub balance: U256,
/// Storage root of the account.
Expand Down