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

Jump to bottom

feat(zk): zksolc linking #800

Merged

Karrq merged 69 commits into main from feat/zksolc-link

Jan 27, 2025

Contributor

Karrq commented Dec 20, 2024 •

edited

Loading

What 💻

Add functions to use zksolc --link
Process deploy-time linking (both CREATE and CREATE2)
Update default zksolc to 1.5.9

Why ✋

Allow tests & scripts to rely on contracts with libraries that have not been deployed yet


          feat(zk): zksolc linking

d6489ae

Karrq self-assigned this

Karrq requested a review from a team as a code owner

December 20, 2024 21:37

Karrq added 7 commits

January 7, 2025 17:53


          fix(zk:libs): calculate addresses w/ proper nonce

e5b805d

chore: identify action to deploy libs in EraVM


          Merge remote-tracking branch 'origin/main' into feat/zksolc-link

44aebad


          Merge remote-tracking branch 'origin/main' into feat/zksolc-link

f5dcfa1


          fix: don't always assume DCC is present

262d2a7


          feat(executor): deploy_library in strategy

b79cada


          fix(zk): create address computation

1941e33


          chore: cleanup unused imports

93babb9

nbaztec reviewed

View reviewed changes

crates/evm/evm/src/executors/strategy.rs Show resolved Hide resolved

crates/forge/src/multi_runner.rs Outdated Show resolved Hide resolved

crates/linking/src/lib.rs Outdated Show resolved Hide resolved

crates/linking/src/lib.rs Outdated Show resolved Hide resolved

crates/strategy/zksync/src/executor.rs Outdated Show resolved Hide resolved

crates/zksync/compilers/src/link.rs Show resolved Hide resolved

crates/zksync/compilers/src/link.rs Outdated Show resolved Hide resolved

crates/zksync/compilers/src/link.rs Outdated Show resolved Hide resolved

crates/zksync/compilers/src/link.rs Outdated Show resolved Hide resolved

crates/zksync/core/src/lib.rs Show resolved Hide resolved

Karrq added 2 commits

January 10, 2025 19:02


          test(zk): deploy-time linking (script/test)

5ed5154


          chore: default zksolc to 1.5.8

018f3f0

elfedy reviewed

View reviewed changes

crates/config/src/zksync.rs Outdated Show resolved Hide resolved

elfedy reviewed

View reviewed changes

crates/forge/src/multi_runner.rs Outdated Show resolved Hide resolved

elfedy reviewed

View reviewed changes

crates/forge/src/multi_runner.rs Outdated Show resolved Hide resolved

elfedy reviewed

View reviewed changes

crates/forge/tests/it/zk/linking.rs Outdated Show resolved Hide resolved

elfedy reviewed

View reviewed changes

crates/linking/src/lib.rs Outdated Show resolved Hide resolved

elfedy reviewed

View reviewed changes

crates/linking/src/lib.rs Outdated Show resolved Hide resolved

elfedy reviewed

View reviewed changes

crates/linking/src/lib.rs Outdated Show resolved Hide resolved

elfedy reviewed

View reviewed changes

crates/strategy/zksync/src/executor.rs Outdated Show resolved Hide resolved

elfedy reviewed

View reviewed changes

crates/zksync/compiler/src/lib.rs Outdated Show resolved Hide resolved

elfedy reviewed

View reviewed changes

crates/zksync/compilers/src/lib.rs Outdated Show resolved Hide resolved

elfedy reviewed

View reviewed changes

crates/zksync/compilers/src/dual_compiled_contracts.rs Show resolved Hide resolved

Karrq added 6 commits

January 13, 2025 19:02


          chore: lints

c7f4f35


          refactor: allow multiple lib deployments

c1c2615


          refactor(link): move to executor strategy

1ec71e4

fix(strategy): remove get_mut for `DualCompiledContracts`


          fix: compilation

624119d


          feat(strategy:link): pass config

8ba1e1c


          feat(zk:link): dedicated linker module

98c56fc

fix(zk:link): use version from config
refactor(zk:config): extract config -> zksolc compiler logic into
function
chore: lints

nbaztec reviewed

View reviewed changes

crates/zksync/compilers/src/dual_compiled_contracts.rs Outdated Show resolved Hide resolved

Karrq added 2 commits

January 23, 2025 16:52


          test(zk): DualCompiledContracts::find units

8aa4479


          fix: clippy

81c6cf8

Karrq requested a review from nbaztec

January 23, 2025 16:55

Karrq added 5 commits

January 23, 2025 19:44


          refactor(strategy): dedicated linking module

f8a4f95


          fix: forgot to commit the new files

dec820b


          chore: fmt

eea5fb8


          Merge remote-tracking branch 'origin/main' into feat/zksolc-link

7a75263


          fix(zk:link): new nonce types

b41be0d

Jrigada self-requested a review

January 24, 2025 13:56

nbaztec previously approved these changes

View reviewed changes

Jrigada previously approved these changes

View reviewed changes

Jrigada added this to the Release 0.0.5 milestone

Karrq linked an issue

that may be closed by this pull request

Support zksolc link #723

Closed


          Merge remote-tracking branch 'origin/main' into feat/zksolc-link

91eb6e7

Karrq dismissed stale reviews from Jrigada and nbaztec via

91eb6e7

January 24, 2025 17:07

elfedy reviewed

View reviewed changes

crates/forge/tests/it/zk/linking.rs Outdated Show resolved Hide resolved

crates/forge/tests/it/zk/linking.rs Outdated Show resolved Hide resolved

crates/script/src/build.rs Outdated Show resolved Hide resolved

crates/script/src/build.rs Outdated Show resolved Hide resolved

crates/script/src/build.rs Show resolved Hide resolved

crates/script/src/runner.rs Show resolved Hide resolved

Karrq added 7 commits

January 27, 2025 13:43


          Merge remote-tracking branch 'origin/main' into feat/zksolc-link

bee4b2a


          test(zk): use default zksolc version normally

21b9920


          docs: add notes on diverging sections

a48bfe5


          fix(zk): remove duplicate code from merge

fbf900b


          refactor(script:zk): move linking to own module

7046a3a


          chore: fmt

72b7f27


          chore: clippy

4b2f052

Karrq enabled auto-merge (squash)

January 27, 2025 14:25

elfedy approved these changes

View reviewed changes

Karrq merged commit b69695a into main

23 checks passed

Karrq deleted the feat/zksolc-link branch

January 27, 2025 14:28

github-actions bot mentioned this pull request

chore(main): release foundry-zksync 0.0.5 #868

Open

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet