Skip to content

Commit 77712bb

Browse files
authored
Merge pull request #1 from scroll-tech/feat/cleanup
feat: cleanup files
2 parents cdda1dc + 25517f2 commit 77712bb

File tree

73 files changed

+168
-8447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+168
-8447
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ typechain
88
cache
99
cache-hardhat
1010
artifacts
11+
artifacts-hardhat
1112
broadcast
1213

1314
# logs

.gitmodules

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[submodule "lib/forge-std"]
2+
path = lib/forge-std
3+
url = https://github.com/foundry-rs/forge-std
4+
[submodule "lib/solmate"]
5+
path = lib/solmate
6+
url = https://github.com/transmissions11/solmate
7+
[submodule "lib/ds-test"]
8+
path = lib/ds-test
9+
url = https://github.com/dapphub/ds-test

.husky/pre-commit

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env sh
22
. "$(dirname -- "$0")/_/husky.sh"
33

4-
cd contracts
54
yarn lint-staged

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
# Scroll Contracts
22

3-
This directory contains the solidity code for Scroll L1 bridge and rollup contracts and L2 bridge and pre-deployed contracts. You can also find contract APIs and more details in the [`docs`](./docs) folder.
3+
This directory contains the solidity code for Scroll L1 bridge and rollup contracts and L2 bridge and pre-deployed contracts.
44

55
## Directory Structure
66

77
<pre>
8-
├── <a href="./docs/">docs</a>: Documentation for the contracts
9-
├── <a href="./integration-test/">integration-test</a>: Hardhat integration tests
8+
├── <a href="./hardhat-test/">hardhat-test</a>: Hardhat integration tests
109
├── <a href="./lib/">lib</a>: External libraries and testing tools
1110
├── <a href="./scripts">scripts</a>: Deployment scripts
1211
├── <a href="./src">src</a>
@@ -72,7 +71,7 @@ yarn install
7271
- Run `yarn prettier:solidity` to run linting in fix mode, will auto-format all solidity codes.
7372
- Run `yarn prettier` to run linting in fix mode, will auto-format all typescript codes.
7473
- Run `yarn prepare` to install the precommit linting hook.
75-
- Run `forge build` to compile contracts with foundry.
74+
- Run `forge build --evm-version cancun` to compile contracts with foundry.
7675
- Run `npx hardhat compile` to compile with hardhat.
77-
- Run `forge test -vvv` to run foundry units tests. It will compile all contracts before running the unit tests.
76+
- Run `forge test --evm-version cancun -vvv` to run foundry units tests. It will compile all contracts before running the unit tests.
7877
- Run `npx hardhat test` to run integration tests. It may not compile all contracts before running, it's better to run `npx hardhat compile` first.

deployments/README.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

deployments/l1geth.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

deployments/l2geth.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)