Skip to content
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.

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

chore(testnet): merge from merge/deploy/v0.3.5-testnet #257

Merged
merged 84 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
0cc9997
chore(deps): bump undici from 5.28.3 to 5.28.4
dependabot[bot] Apr 4, 2024
a444299
chore(deps): bump tar from 6.2.0 to 6.2.1
dependabot[bot] Apr 11, 2024
5df9795
chore(`mainnet`): merge from `merge/deploy/v0.3.4-mainnet` (#205)
TuDo1403 Apr 20, 2024
8a9d5a1
Merge branch 'mainnet' into dependabot/npm_and_yarn/tar-6.2.1
TuDo1403 Apr 20, 2024
2a7ae40
Merge branch 'mainnet' into dependabot/npm_and_yarn/undici-5.28.4
TuDo1403 Apr 20, 2024
05b6ff1
chore(deps): bump tar from 6.2.0 to 6.2.1 (#203)
TuDo1403 Apr 20, 2024
68a1108
Merge branch 'mainnet' into dependabot/npm_and_yarn/undici-5.28.4
TuDo1403 Apr 20, 2024
00d638a
chore(deps): bump undici from 5.28.3 to 5.28.4 (#202)
TuDo1403 Apr 20, 2024
f73a96a
fix: resolve conflict testnet branch (#216)
tringuyenskymavis May 21, 2024
9f4e94b
define RNSCommission contract for multi treasury transfer
tringuyenskymavis Jun 3, 2024
a85d833
fix(RNSCommission): fix naming
tringuyenskymavis Jun 3, 2024
cb0f7d9
rm unnecessary file
tringuyenskymavis Jun 3, 2024
ac1e12a
fix(RNSCommission):add _allowedSenders mapping and related function
tringuyenskymavis Jun 3, 2024
ef9e7f8
fix(RNSCommission): Use AccessControl to manage senders
tringuyenskymavis Jun 4, 2024
11d2edf
fix RNSCommission
tringuyenskymavis Jun 4, 2024
9394b46
fix(RNSCommission): rm fallback()
tringuyenskymavis Jun 5, 2024
d097c49
fix(RNSCommission): fix naming
tringuyenskymavis Jun 5, 2024
b706102
fix(RNSCommission): fix naming
tringuyenskymavis Jun 5, 2024
cad6124
fix(RNSCommission): fix naming
tringuyenskymavis Jun 6, 2024
e2d4138
fix(RNSCommission)
tringuyenskymavis Jun 6, 2024
b71cceb
fix(RNSCommission): fix naming
tringuyenskymavis Jun 6, 2024
b670cd0
test(RNSCommission):unit test RNSCommission
tringuyenskymavis Jun 6, 2024
57260f5
rm comment
tringuyenskymavis Jun 6, 2024
91e7455
test tree
tringuyenskymavis Jun 7, 2024
c39ea0f
chore: update RNSCommission testcases
tringuyenskymavis Jun 24, 2024
3ccf07c
script: prepare script + param for RNSCommission deploy
tringuyenskymavis Jun 24, 2024
6a8ef70
script: migrate auction + controller treasury and deploy RNSCommissio…
tringuyenskymavis Jun 24, 2024
6de652a
chore: change treasury address
tringuyenskymavis Jun 24, 2024
de2a260
feat(multi-treasury): implement `add-interface-and-implementation` (#…
TuDo1403 Jun 24, 2024
a2920b0
chore: add RNSCommission to Contract Type
tringuyenskymavis Jun 24, 2024
86d81c8
Merge branch 'feature/multi-treasury' into implement-feature/multi-tr…
TuDo1403 Jun 24, 2024
b45f976
Merge branch 'feature/script' into merge/release/v0.3.5-feature/script
TuDo1403 Jun 24, 2024
0f241d5
Merge branch 'feature/multi-treasury' into merge/release/v0.3.5-featu…
TuDo1403 Jun 24, 2024
194b757
chore(`multi-treasury`): merge from `release/v0.3.5` (#213)
TuDo1403 Jun 24, 2024
2e6c11d
chore(`script`): merge from `release/v0.3.5` (#214)
TuDo1403 Jun 24, 2024
2780c76
feat(multi-treasury): implement `add-test-and-script` (#221)
tringuyenskymavis Jun 24, 2024
2a449e1
feat(multi-treasury): add RNSCommission contract and all related scri…
tringuyenskymavis Jun 24, 2024
251408b
chore(`multi-treasury`): merge from `release/v0.3.5` (#227)
TuDo1403 Jun 24, 2024
8124bf0
Merge branch 'feature/script' into merge/release/v0.3.5-feature/script
TuDo1403 Jun 24, 2024
1f0a33f
chore(`script`): merge from `release/v0.3.5` (#224)
TuDo1403 Jun 24, 2024
95084dd
script: adapt fdk-3.0.0
TuDo1403 Jun 25, 2024
e7f8da7
script: add install script
TuDo1403 Jun 25, 2024
f103cbf
script: update ci for soldeer recursive deps update
TuDo1403 Jun 25, 2024
1c696e2
script: remove printing contract sizes in ci
TuDo1403 Jun 25, 2024
6d713d3
chore: remove unused lib contract-libs
TuDo1403 Jun 25, 2024
fd2af97
chore: refactor foundry.toml
TuDo1403 Jun 25, 2024
9d65056
script: use console instead of console2, resolve compiler warning
TuDo1403 Jun 25, 2024
8dc3f44
script: only run soldeer update if deps exist lock file
TuDo1403 Jun 25, 2024
f199352
script: add more log in update-deps.sh
TuDo1403 Jun 25, 2024
f33480d
script: prevent reverting at the start of the script
TuDo1403 Jun 25, 2024
d177ec2
chore: resolve corrupted artifact
TuDo1403 Jun 25, 2024
ae8e469
chore: resolve corrupted RNSDomainPrice logic artifact in ronin-testn…
TuDo1403 Jun 25, 2024
bbbe619
Merge branch 'feature/script' into merge/release/v0.3.5-feature/script
TuDo1403 Jun 25, 2024
b58743a
Merge branch 'feature/multi-treasury' into merge/release/v0.3.5-featu…
TuDo1403 Jun 25, 2024
b0e2e47
chore(`script`): merge from `release/v0.3.5` (#232)
TuDo1403 Jun 25, 2024
c3c34b0
chore(`multi-treasury`): merge from `release/v0.3.5` (#231)
TuDo1403 Jun 25, 2024
e4a877d
Merge branch 'feature/script' into implement-feature/script/adapt-fdk…
TuDo1403 Jun 25, 2024
30a4975
feat(script): implement `adapt-fdk-3.0.0` (#228)
TuDo1403 Jun 25, 2024
f09bf3f
script: adapt fdk-v3.0.0 and soldeer package manager (#233)
TuDo1403 Jun 25, 2024
0424bff
fix(RONRegistrarController): emit TreasuryUpdated event when setTreasury
TuDo1403 Jun 25, 2024
b95e559
chore(`multi-treasury`): merge from `release/v0.3.5` (#236)
TuDo1403 Jun 25, 2024
55b95dd
chore(`script`): merge from `release/v0.3.5` (#235)
TuDo1403 Jun 25, 2024
6acdf38
feat(controller): implement `add-treasury-update-event` (#237)
TuDo1403 Jun 25, 2024
a19ea12
fix(RONRegistrarController): emit event `TreasuryUpdated` when settin…
TuDo1403 Jun 25, 2024
4b70374
Merge branch 'feature/multi-treasury' into merge/release/v0.3.5-featu…
TuDo1403 Jun 25, 2024
09526cc
Merge branch 'feature/script' into merge/release/v0.3.5-feature/script
TuDo1403 Jun 25, 2024
56bb9c2
chore(`multi-treasury`): merge from `release/v0.3.5` (#241)
TuDo1403 Jun 25, 2024
dc8a7df
chore(`script`): merge from `release/v0.3.5` (#240)
TuDo1403 Jun 25, 2024
ef2adf6
chore: fix typo
tringuyenskymavis Jun 25, 2024
566c578
chore: grant permission for update-deps.sh
TuDo1403 Jun 25, 2024
bec3dc6
feat(script): implement `grant-permission-update-deps` (#242)
TuDo1403 Jun 25, 2024
e6cf4d4
script: grant permission for `update-deps.sh` (#243)
TuDo1403 Jun 25, 2024
127716f
chore: add null address error
tringuyenskymavis Jun 25, 2024
255b5ba
Update src/RNSCommission.sol
TuDo1403 Jun 25, 2024
3bd1dea
feat(multi-treasury): implement `add-null-address-error` (#247)
TuDo1403 Jun 25, 2024
17bedad
chore(`multi-treasury`): merge from `release/v0.3.5` (#246)
TuDo1403 Jun 25, 2024
62509fb
fix(RNSCommission): fix typo and revert if commission recipient is n…
TuDo1403 Jun 25, 2024
f2628d7
chore(`multi-treasury`): merge from `release/v0.3.5` (#251)
TuDo1403 Jun 25, 2024
b2bd46e
script: upgrade controller + migrate auction treasury + RNSCommission…
tringuyenskymavis Jun 25, 2024
7601fb9
feat(multi-treasury): implement `upgrade-controller-and-deploy-rnscom…
TuDo1403 Jun 25, 2024
4bb6a99
feat(multi-treasury): upgrade controller (#253)
tringuyenskymavis Jun 25, 2024
f1f54b0
chore: add artifacts
nxqbao Jun 25, 2024
8a35630
[create-pull-request] automated change
nxqbao Jun 25, 2024
07c832d
chore(`release/v0.3.5`): merge from `deploy/v0.3.5-testnet` (#255)
TuDo1403 Jun 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,18 @@ jobs:
with:
version: nightly

- name: Update package with soldeer
run: forge soldeer update

- name: Recursively update dependencies
run: |
chmod +x ./update-deps.sh
./update-deps.sh

- name: Run Forge build
run: |
forge --version
forge build --sizes
forge build
id: build

- name: Run Forge tests
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ node_modules/
yarn-error.log
.yarn
.yarnrc.yml
script/data/*
script/data/*
dependencies
deployments/**/exported_address
18 changes: 0 additions & 18 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
[submodule "lib/forge-std"]
path = lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "lib/openzeppelin-contracts"]
path = lib/openzeppelin-contracts
url = https://github.com/openzeppelin/openzeppelin-contracts
[submodule "lib/contract-template"]
path = lib/contract-template
url = https://github.com/axieinfinity/contract-template
Expand All @@ -13,15 +7,3 @@
[submodule "lib/buffer"]
path = lib/buffer
url = https://github.com/ensdomains/buffer
[submodule "lib/pyth-sdk-solidity"]
path = lib/pyth-sdk-solidity
url = https://github.com/pyth-network/pyth-sdk-solidity
[submodule "lib/solady"]
path = lib/solady
url = https://github.com/vectorized/solady
[submodule "lib/foundry-deployment-kit"]
path = lib/foundry-deployment-kit
url = https://github.com/axieinfinity/foundry-deployment-kit
[submodule "lib/contract-libs"]
path = lib/contract-libs
url = https://github.com/axieinfinity/contract-libs
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION=v0.3.4 - SHA: 31f2c28744fa8628b707591dd30496a7bc63f6bb
VERSION=v0.3.5 - SHA: f1f54b02ad8dbef3ef9eae7b3ea0aa753d136df5

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion debug.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
source lib/foundry-deployment-kit/debug.sh
source dependencies/@fdk-0.3.0-beta/debug.sh
Loading
Loading