chore: merge main into upstream-fef2098
#768
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* remove zksync-web3-rs * simplify estimate_fee calls
fix: insert transaction type into EIP-712 transactions
deps: update foundry-compilers
* Add cargo nextest to zk tests * Enable nextest on foundry upstream test suite * remove foundry test added by mistake
Fix display name of zksync verifier
* Add test for constructor * Create bank contract to reuse and remove extra event * Forge fmt
* Add missing injection and clear it afterwards * Update crates/cheatcodes/src/inspector.rs Co-authored-by: Federico Rodríguez <[email protected]> * Update crates/cheatcodes/src/inspector.rs Co-authored-by: Federico Rodríguez <[email protected]> * Update crates/cheatcodes/src/inspector.rs Co-authored-by: Federico Rodríguez <[email protected]> * clarify clear message * Cargo fmt --------- Co-authored-by: Federico Rodríguez <[email protected]>
* Encode correctly paymaster input * add test for create with paymaster * Update crates/forge/tests/it/zk/paymaster.rs Co-authored-by: Karrq <[email protected]> --------- Co-authored-by: Karrq <[email protected]>
fix: use dedicated gas limit for each tx in inspect_batch
Add tx type to zk tx in cast send
* chore: update `Vm.sol` interface * chore: restore `EvmVersion::Paris` as default * Add fix for nonce update in evm context and initialization of crypto provider for tests * Add rustls dependency * Fix Cargo lock * Enable foundry tests * Add missing rustls * Remove windows from matrices * Remove extra initialization * Clippy and update vm.sol * Update crates/cast/bin/main.rs Co-authored-by: Nisheeth Barthwal <[email protected]> * Update crates/forge/tests/it/test_helpers.rs Co-authored-by: Nisheeth Barthwal <[email protected]> * Cargo fmt * Update .github/scripts/matrices.py Co-authored-by: Federico Rodríguez <[email protected]> --------- Co-authored-by: Francesco Dainese <[email protected]> Co-authored-by: Nisheeth Barthwal <[email protected]> Co-authored-by: Federico Rodríguez <[email protected]>
fix(cast:send): use ETH wallet for eth provider
Karrq
commented
Dec 4, 2024
|
|
||
| tx::validate_from_address(eth.wallet.from, from)?; | ||
|
|
||
| // Zksync transaction | ||
| let (tx, _) = builder.build(&zk_signer).await?; | ||
| let (tx, _) = builder.build(&signer).await?; | ||
| let signer = Arc::new(signer); |
There was a problem hiding this comment.
Here we Arc the signer so we can pass it to both wallets without instantiating it twice (for ledger)
| let provider = ProviderBuilder::<_, _, AnyNetwork>::default() | ||
| .wallet(zk_wallet) | ||
| .wallet(wallet) |
There was a problem hiding this comment.
@nbaztec said this wasn't meant to be this way, hence why I was getting type issues
| @@ -935,7 +936,7 @@ where | |||
| /// and the corresponding [`AnyReceipt`]. | |||
| pub async fn send_with_receipt( | |||
| self, | |||
| ) -> Result<(Address, AnyTransactionReceipt), ContractDeploymentError> { | |||
| ) -> Result<(Address, <Zksync as Network>::ReceiptResponse), ContractDeploymentError> { | |||
There was a problem hiding this comment.
I decided to make use of the associated type since we don't really care what it would be otherwise...
This way any changes from alloy-zksync will be reflected here
Jrigada
approved these changes
Dec 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What 💻
mainbranch into outdatedupstream-fef2098Why ✋
upstream-fef2098makes use of alloy 0.6.0Evidence 📷
Include screenshots, screen recordings, or
consoleoutput here demonstrating that your changes work as intendedNotes 📝
The real changes are in commit
fc19cbb