chore: Move l1-contracts-foundry (matter-labs#504)

Co-authored-by: Danil <[email protected]> Co-authored-by: Agustin Aon <[email protected]>
lambdaclass · Jun 3, 2024 · 8a70bbb · 8a70bbb
1 parent fe0b7f4
commit 8a70bbb
Show file tree

Hide file tree

Showing 27 changed files with 42 additions and 51 deletions.
diff --git a/.github/workflows/l1-contracts-foundry-ci.yaml b/.github/workflows/l1-contracts-foundry-ci.yaml
@@ -29,7 +29,7 @@ jobs:
         run: yarn
 
       - name: Build artifacts
-        working-directory: ./l1-contracts-foundry
+        working-directory: ./l1-contracts
         run: forge build
 
       - name: Build system-contract artifacts
@@ -40,8 +40,8 @@ jobs:
         with:
           key: artifacts-l1-contracts-foudry-${{ github.sha }}
           path: |
-            l1-contracts-foundry/cache
-            l1-contracts-foundry/out
+            l1-contracts/cache
+            l1-contracts/out
             system-contracts/artifacts-zk
             system-contracts/bootloader/build
             system-contracts/cache-zk
@@ -63,8 +63,8 @@ jobs:
           fail-on-cache-miss: true
           key: artifacts-l1-contracts-foudry-${{ github.sha }}
           path: |
-            l1-contracts-foundry/cache
-            l1-contracts-foundry/out
+            l1-contracts/cache
+            l1-contracts/out
             system-contracts/artifacts-zk
             system-contracts/bootloader/build
             system-contracts/cache-zk
@@ -75,8 +75,8 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
 
       - name: Copy configs from template
-        working-directory: ./l1-contracts-foundry
-        run: cp -r script-config-template script-config
+        working-directory: ./l1-contracts
+        run: cp -r deploy-script-config-template script-config
 
       - name: Run anvil
         run: |
@@ -100,18 +100,18 @@ jobs:
           fi
 
       - name: Run DeployL1 script
-        working-directory: ./l1-contracts-foundry
-        run: forge script ./script/DeployL1.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY
+        working-directory: ./l1-contracts
+        run: forge script ./deploy-scripts/DeployL1.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY
 
       - name: Run DeployErc20 script
-        working-directory: ./l1-contracts-foundry
-        run: forge script ./script/DeployErc20.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY
+        working-directory: ./l1-contracts
+        run: forge script ./deploy-scripts/DeployErc20.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY
 # TODO restore scripts verification
 #      - name: Run RegisterHyperchain script
-#        working-directory: ./l1-contracts-foundry
+#        working-directory: ./l1-contracts
 #        run: |
 #          cat ./script-out/output-deploy-l1.toml >> ./script-config/register-hyperchain.toml
-#          forge script ./script/RegisterHyperchain.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY
+#          forge script ./deploy-scripts/RegisterHyperchain.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY
 #      - name: Run InitializeL2WethToken script
 #        working-directory: ./l1-contracts-foundry
-#        run: forge script ./script/InitializeL2WethToken.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY
+#        run: forge script ./deploy-scripts/InitializeL2WethToken.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY
diff --git a/.gitignore b/.gitignore
@@ -22,7 +22,7 @@ l1-contracts/lcov.info
 l1-contracts/report/*
 l1-contracts/coverage/*
 l1-contracts/out/*
-l1-contracts-foundry/broadcast/*
-l1-contracts-foundry/script-config/*
-l1-contracts-foundry/script-out/*
-!l1-contracts-foundry/script-out/.gitkeep
+l1-contracts/broadcast/*
+l1-contracts/script-config/*
+l1-contracts/script-out/*
+!l1-contracts/script-out/.gitkeep
diff --git a/.gitmodules b/.gitmodules
@@ -4,12 +4,11 @@
 [submodule "l1-contracts/lib/murky"]
 	path = l1-contracts/lib/murky
 	url = https://github.com/dmfxyz/murky
-[submodule "l1-contracts-foundry/lib/forge-std"]
-	path = l1-contracts-foundry/lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
-[submodule "l1-contracts-foundry/lib/openzeppelin-contracts"]
-	path = l1-contracts-foundry/lib/openzeppelin-contracts
-	url = https://github.com/Openzeppelin/openzeppelin-contracts
-[submodule "l1-contracts-foundry/lib/openzeppelin-contracts-upgradeable"]
-	path = l1-contracts-foundry/lib/openzeppelin-contracts-upgradeable
+[submodule "l1-contracts/lib/openzeppelin-contracts-upgradeable"]
+	path = l1-contracts/lib/openzeppelin-contracts-upgradeable
 	url = https://github.com/Openzeppelin/openzeppelin-contracts-upgradeable
+	branch = release-v4.9
+[submodule "l1-contracts/lib/openzeppelin-contracts"]
+	path = l1-contracts/lib/openzeppelin-contracts
+	url = https://github.com/Openzeppelin/openzeppelin-contracts
+	branch = release-v4.9
diff --git a/l1-contracts-foundry/foundry.toml b/l1-contracts-foundry/foundry.toml
diff --git a/l1-contracts-foundry/lib/forge-std b/l1-contracts-foundry/lib/forge-std
diff --git a/l1-contracts-foundry/lib/openzeppelin-contracts-upgradeable b/l1-contracts-foundry/lib/openzeppelin-contracts-upgradeable
diff --git a/...-config-template/config-deploy-erc20.toml → ...-config-template/config-deploy-erc20.toml b/...-config-template/config-deploy-erc20.toml → ...-config-template/config-deploy-erc20.toml
diff --git a/...ipt-config-template/config-deploy-l1.toml → ...ipt-config-template/config-deploy-l1.toml b/...ipt-config-template/config-deploy-l1.toml → ...ipt-config-template/config-deploy-l1.toml
diff --git a/...fig-template/config-deploy-paymaster.toml → ...fig-template/config-deploy-paymaster.toml b/...fig-template/config-deploy-paymaster.toml → ...fig-template/config-deploy-paymaster.toml
diff --git a/...late/config-initialize-l2-weth-token.toml → ...late/config-initialize-l2-weth-token.toml b/...late/config-initialize-l2-weth-token.toml → ...late/config-initialize-l2-weth-token.toml
diff --git a/...ate/config-initialize-shared-bridges.toml → ...ate/config-initialize-shared-bridges.toml b/...ate/config-initialize-shared-bridges.toml → ...ate/config-initialize-shared-bridges.toml
diff --git a/...-config-template/register-hyperchain.toml → ...-config-template/register-hyperchain.toml b/...-config-template/register-hyperchain.toml → ...-config-template/register-hyperchain.toml
diff --git a/...ontracts-foundry/script/AcceptAdmin.s.sol → ...ontracts/deploy-scripts/AcceptAdmin.s.sol b/...ontracts-foundry/script/AcceptAdmin.s.sol → ...ontracts/deploy-scripts/AcceptAdmin.s.sol
diff --git a/...ontracts-foundry/script/DeployErc20.s.sol → ...ontracts/deploy-scripts/DeployErc20.s.sol b/...ontracts-foundry/script/DeployErc20.s.sol → ...ontracts/deploy-scripts/DeployErc20.s.sol
diff --git a/l1-contracts-foundry/script/DeployL1.s.sol → l1-contracts/deploy-scripts/DeployL1.s.sol b/l1-contracts-foundry/script/DeployL1.s.sol → l1-contracts/deploy-scripts/DeployL1.s.sol
diff --git a/...acts-foundry/script/DeployPaymaster.s.sol → ...acts/deploy-scripts/DeployPaymaster.s.sol b/...acts-foundry/script/DeployPaymaster.s.sol → ...acts/deploy-scripts/DeployPaymaster.s.sol
diff --git a/...oundry/script/InitializeL2WethToken.s.sol → ...eploy-scripts/InitializeL2WethToken.s.sol b/...oundry/script/InitializeL2WethToken.s.sol → ...eploy-scripts/InitializeL2WethToken.s.sol
diff --git a/...dry/script/InitializeSharedBridgeOnL2.sol → ...oy-scripts/InitializeSharedBridgeOnL2.sol b/...dry/script/InitializeSharedBridgeOnL2.sol → ...oy-scripts/InitializeSharedBridgeOnL2.sol
diff --git a/...s-foundry/script/RegisterHyperchain.s.sol → ...s/deploy-scripts/RegisterHyperchain.s.sol b/...s-foundry/script/RegisterHyperchain.s.sol → ...s/deploy-scripts/RegisterHyperchain.s.sol
diff --git a/l1-contracts-foundry/script/Utils.sol → l1-contracts/deploy-scripts/Utils.sol b/l1-contracts-foundry/script/Utils.sol → l1-contracts/deploy-scripts/Utils.sol
diff --git a/l1-contracts/foundry.toml b/l1-contracts/foundry.toml
@@ -2,6 +2,20 @@
 src = 'contracts'
 out = 'out'
 libs = ['node_modules', 'lib']
+remappings = [
+    "@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/",
+    "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/",
+    "l2-contracts/=../l2-contracts/contracts/"
+]
+allow_paths = ["../l2-contracts/contracts"]
+fs_permissions = [
+    { access = "read", path = "../system-contracts/bootloader/build/artifacts" },
+    { access = "read", path = "../system-contracts/artifacts-zk/contracts-preprocessed" },
+    { access = "read", path = "../l2-contracts/artifacts-zk/" },
+    { access = "read", path = "./script-config" },
+    { access = "read-write", path = "./script-out" },
+    { access = "read", path = "./out" }
+]
 cache_path = 'cache-forge'
 test = 'test/foundry'
 solc_version = "0.8.24"

diff --git a/l1-contracts/lib/forge-std b/l1-contracts/lib/forge-std
diff --git a/l1-contracts/lib/murky b/l1-contracts/lib/murky
diff --git a/...tracts-foundry/lib/openzeppelin-contracts → l1-contracts/lib/openzeppelin-contracts b/...tracts-foundry/lib/openzeppelin-contracts → l1-contracts/lib/openzeppelin-contracts
diff --git a/l1-contracts/lib/openzeppelin-contracts-upgradeable b/l1-contracts/lib/openzeppelin-contracts-upgradeable
diff --git a/l1-contracts/remappings.txt b/l1-contracts/remappings.txt
@@ -1,5 +1,4 @@
 @ensdomains/=node_modules/@ensdomains/
-@openzeppelin/=node_modules/@openzeppelin/
 ds-test/=lib/forge-std/lib/ds-test/src/
 eth-gas-reporter/=node_modules/eth-gas-reporter/
 forge-std/=lib/forge-std/src/

diff --git a/l1-contracts-foundry/script-out/.gitkeep → l1-contracts/script-out/.gitkeep b/l1-contracts-foundry/script-out/.gitkeep → l1-contracts/script-out/.gitkeep
+1 −0		.gitattributes
+6 −12		.github/workflows/ci.yml
+3 −1		.github/workflows/sync.yml
+0 −3		.gitmodules
+1 −1		README.md
+3 −3		foundry.toml
+0 −1		lib/ds-test
+1 −1		package.json
+635 −0		scripts/vm.py
+518 −225		src/StdAssertions.sol
+28 −12		src/StdChains.sol
+2 −2		src/StdCheats.sol
+9 −3		src/StdInvariant.sol
+7 −11		src/StdJson.sol
+201 −106		src/StdStorage.sol
+179 −0		src/StdToml.sol
+61 −33		src/StdUtils.sol
+4 −4		src/Test.sol
+1,590 −417		src/Vm.sol
+234 −0		src/mocks/MockERC20.sol
+231 −0		src/mocks/MockERC721.sol
+39 −909		test/StdAssertions.t.sol
+35 −32		test/StdChains.t.sol
+20 −12		test/StdCheats.t.sol
+3 −1		test/StdError.t.sol
+49 −0		test/StdJson.t.sol
+8 −8		test/StdMath.t.sol
+159 −11		test/StdStorage.t.sol
+49 −0		test/StdToml.t.sol
+20 −20		test/StdUtils.t.sol
+15 −0		test/Vm.t.sol
+8 −0		test/fixtures/test.json
+6 −0		test/fixtures/test.toml
+441 −0		test/mocks/MockERC20.t.sol
+721 −0		test/mocks/MockERC721.t.sol
+9 −3		.github/workflows/run_tests.yml
+2 −3		.github/workflows/slither.yml
+1 −0		.gitignore
+13 −16		README.md
+12 −3		differential_testing/README.md
+13 −0		differential_testing/scripts/generate_complete_proof.ts
+9 −0		differential_testing/scripts/generate_complete_root.ts
+1 −1		differential_testing/scripts/generate_root.ts
+1,015 −174		differential_testing/scripts/package-lock.json
+5 −2		differential_testing/scripts/package.json
+87 −0		differential_testing/test/CompleteDifferentialTests.t.sol
+1 −1		differential_testing/test/DifferentialTests.t.sol
+1 −1		lib/forge-std
+1 −1		lib/openzeppelin-contracts
+ −		reports/murky_gas_report.png
+17 −6		script/Merkle.s.sol
+16 −18		script/common/ScriptHelper.sol
+8 −14		script/test/Merkle.s.t.sol
+116 −0		src/CompleteMerkle.sol
+18 −17		src/Merkle.sol
+7 −7		src/Xorkle.sol
+63 −53		src/common/MurkyBase.sol
+76 −0		src/test/CompleteMerkle.t.sol
+11 −10		src/test/Merkle.t.sol
+6 −8		src/test/MurkyBase.t.sol
+31 −13		src/test/StandardInput.t.sol
+10 −10		src/test/Xorkle.t.sol