Skip to content

Commit

Permalink
Fixes from rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@mdehoog
mdehoog committed Nov 3, 2023
1 parent 0dc3295 commit 576599f
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 31 deletions.
22 changes: 11 additions & 11 deletions Cargo.lock
View file

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

20 changes: 10 additions & 10 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,16 +186,16 @@ color-eyre = "0.6"
#ethers-solc = { path = "../ethers-rs/ethers-solc" }

[patch.crates-io]
ethers = { git = "https://github.com/gakonst/ethers-rs", rev = "841ff8c47980798fbb47991e047f8481b1d5eb39" }
ethers-addressbook = { git = "https://github.com/gakonst/ethers-rs", rev = "841ff8c47980798fbb47991e047f8481b1d5eb39" }
ethers-core = { git = "https://github.com/gakonst/ethers-rs", rev = "841ff8c47980798fbb47991e047f8481b1d5eb39" }
ethers-contract = { git = "https://github.com/gakonst/ethers-rs", rev = "841ff8c47980798fbb47991e047f8481b1d5eb39" }
ethers-contract-abigen = { git = "https://github.com/gakonst/ethers-rs", rev = "841ff8c47980798fbb47991e047f8481b1d5eb39" }
ethers-providers = { git = "https://github.com/gakonst/ethers-rs", rev = "841ff8c47980798fbb47991e047f8481b1d5eb39" }
ethers-signers = { git = "https://github.com/gakonst/ethers-rs", rev = "841ff8c47980798fbb47991e047f8481b1d5eb39" }
ethers-middleware = { git = "https://github.com/gakonst/ethers-rs", rev = "841ff8c47980798fbb47991e047f8481b1d5eb39" }
ethers-etherscan = { git = "https://github.com/gakonst/ethers-rs", rev = "841ff8c47980798fbb47991e047f8481b1d5eb39" }
ethers-solc = { git = "https://github.com/gakonst/ethers-rs", rev = "841ff8c47980798fbb47991e047f8481b1d5eb39" }
ethers = { git = "https://github.com/gakonst/ethers-rs", rev = "42e0b89c1e743a87312ea4247612f2077f61a9ff" }
ethers-addressbook = { git = "https://github.com/gakonst/ethers-rs", rev = "42e0b89c1e743a87312ea4247612f2077f61a9ff" }
ethers-core = { git = "https://github.com/gakonst/ethers-rs", rev = "42e0b89c1e743a87312ea4247612f2077f61a9ff" }
ethers-contract = { git = "https://github.com/gakonst/ethers-rs", rev = "42e0b89c1e743a87312ea4247612f2077f61a9ff" }
ethers-contract-abigen = { git = "https://github.com/gakonst/ethers-rs", rev = "42e0b89c1e743a87312ea4247612f2077f61a9ff" }
ethers-providers = { git = "https://github.com/gakonst/ethers-rs", rev = "42e0b89c1e743a87312ea4247612f2077f61a9ff" }
ethers-signers = { git = "https://github.com/gakonst/ethers-rs", rev = "42e0b89c1e743a87312ea4247612f2077f61a9ff" }
ethers-middleware = { git = "https://github.com/gakonst/ethers-rs", rev = "42e0b89c1e743a87312ea4247612f2077f61a9ff" }
ethers-etherscan = { git = "https://github.com/gakonst/ethers-rs", rev = "42e0b89c1e743a87312ea4247612f2077f61a9ff" }
ethers-solc = { git = "https://github.com/gakonst/ethers-rs", rev = "42e0b89c1e743a87312ea4247612f2077f61a9ff" }

foundry-compilers = { git = "https://github.com/foundry-rs/compilers" }
foundry-block-explorers = { git = "https://github.com/foundry-rs/block-explorers" }
Expand Down
20 changes: 10 additions & 10 deletions crates/anvil/core/src/eth/transaction/ethers_compat.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ impl From<TypedTransactionRequest> for EthersTypedTransactionRequest {
nonce: Some(0.into()),
chain_id: None,
},
source_hash: Some(source_hash),
source_hash: source_hash,
mint: Some(mint),
is_system_tx: Some(is_system_tx),
is_system_tx: is_system_tx,
})
}
}
Expand Down Expand Up @@ -145,9 +145,9 @@ fn to_ethers_transaction_with_hash_and_sender(
s: t.signature.s,
access_list: None,
transaction_type: None,
source_hash: None,
source_hash: H256::zero(),
mint: None,
is_system_tx: None,
is_system_tx: false,
other: Default::default(),
},
TypedTransaction::EIP2930(t) => EthersTransaction {
Expand All @@ -170,9 +170,9 @@ fn to_ethers_transaction_with_hash_and_sender(
s: U256::from(t.s.as_bytes()),
access_list: Some(t.access_list),
transaction_type: Some(1u64.into()),
source_hash: None,
source_hash: H256::zero(),
mint: None,
is_system_tx: None,
is_system_tx: false,
other: Default::default(),
},
TypedTransaction::EIP1559(t) => EthersTransaction {
Expand All @@ -195,9 +195,9 @@ fn to_ethers_transaction_with_hash_and_sender(
s: U256::from(t.s.as_bytes()),
access_list: Some(t.access_list),
transaction_type: Some(2u64.into()),
source_hash: None,
source_hash: H256::zero(),
mint: None,
is_system_tx: None,
is_system_tx: false,
other: Default::default(),
},
TypedTransaction::Deposit(t) => EthersTransaction {
Expand All @@ -220,9 +220,9 @@ fn to_ethers_transaction_with_hash_and_sender(
s: 0.into(),
access_list: None,
transaction_type: Some(126u64.into()),
source_hash: Some(t.source_hash),
source_hash: t.source_hash,
mint: Some(t.mint),
is_system_tx: Some(t.is_system_tx),
is_system_tx: t.is_system_tx,
other: Default::default(),
},
}
Expand Down

0 comments on commit 576599f

Please sign in to comment.