Skip to content

Commit c32e8f6

Browse files
authored
chore(mainnet): merge from merge/deploy/v0.3.5-mainnet (#263)
2 parents 6146011 + ef96ae6 commit c32e8f6

File tree

60 files changed

+5938
-76323
lines changed

Some content is hidden

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

60 files changed

+5938
-76323
lines changed

.github/workflows/test.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,18 @@ jobs:
3434
with:
3535
version: nightly
3636

37+
- name: Update package with soldeer
38+
run: forge soldeer update
39+
40+
- name: Recursively update dependencies
41+
run: |
42+
chmod +x ./update-deps.sh
43+
./update-deps.sh
44+
3745
- name: Run Forge build
3846
run: |
3947
forge --version
40-
forge build --sizes
48+
forge build
4149
id: build
4250

4351
- name: Run Forge tests

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,6 @@ node_modules/
2121
yarn-error.log
2222
.yarn
2323
.yarnrc.yml
24-
script/data/*
24+
script/data/*
25+
dependencies
26+
deployments/**/exported_address

.gitmodules

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
[submodule "lib/forge-std"]
2-
path = lib/forge-std
3-
url = https://github.com/foundry-rs/forge-std
4-
[submodule "lib/openzeppelin-contracts"]
5-
path = lib/openzeppelin-contracts
6-
url = https://github.com/openzeppelin/openzeppelin-contracts
71
[submodule "lib/contract-template"]
82
path = lib/contract-template
93
url = https://github.com/axieinfinity/contract-template
@@ -13,15 +7,3 @@
137
[submodule "lib/buffer"]
148
path = lib/buffer
159
url = https://github.com/ensdomains/buffer
16-
[submodule "lib/pyth-sdk-solidity"]
17-
path = lib/pyth-sdk-solidity
18-
url = https://github.com/pyth-network/pyth-sdk-solidity
19-
[submodule "lib/solady"]
20-
path = lib/solady
21-
url = https://github.com/vectorized/solady
22-
[submodule "lib/foundry-deployment-kit"]
23-
path = lib/foundry-deployment-kit
24-
url = https://github.com/axieinfinity/foundry-deployment-kit
25-
[submodule "lib/contract-libs"]
26-
path = lib/contract-libs
27-
url = https://github.com/axieinfinity/contract-libs

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION=v0.3.4 - SHA: 31f2c28744fa8628b707591dd30496a7bc63f6bb
1+
VERSION=v0.3.5 - SHA: a2bcb414c1279064b8ec14230dc2b64f7a7de271

broadcast/20240624_MigrateAuctionAndControllerTreasuryAndDeployRNSCommission.s.sol/2021/run-1719309944.json

Lines changed: 406 additions & 0 deletions
Large diffs are not rendered by default.

broadcast/20240624_MigrateAuctionAndControllerTreasuryAndDeployRNSCommission.s.sol/2021/run-latest.json

Lines changed: 406 additions & 0 deletions
Large diffs are not rendered by default.

broadcast/20240704_UpgradeControllerAndDeployRNSCommissionMainnet.sol/2020/run-1720085014.json

Lines changed: 249 additions & 0 deletions
Large diffs are not rendered by default.

broadcast/20240704_UpgradeControllerAndDeployRNSCommissionMainnet.sol/2020/run-latest.json

Lines changed: 249 additions & 0 deletions
Large diffs are not rendered by default.

debug.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
source lib/foundry-deployment-kit/debug.sh
1+
source dependencies/@fdk-0.3.0-beta/debug.sh

0 commit comments

Comments
 (0)