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(controller): merge from release/v0.2.0 #73

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
9cdf8e1
Feature: add namehash function for `RNSUnified` (#14)
Oct 11, 2023
d030533
feat: implement Auction contract for RNS (#18)
Oct 12, 2023
e80c251
feat: add`RNSDomainPrice` contract (#19)
Oct 12, 2023
4492422
Resolve merge conflict/auction (#25)
Oct 12, 2023
f59b8b8
Merge branch 'release-testnet/v0.2.0' into feature/auction
ducthotran2010 Oct 12, 2023
113a81e
chore: resolve merge conflict 'feature/domain-price' into release-tes…
Oct 12, 2023
02f884f
Merge branch 'release-testnet/v0.2.0' into feature/domain-price
ducthotran2010 Oct 12, 2023
80d4738
chore: resolve confict
ducthotran2010 Oct 12, 2023
5bdcf13
chore: resolve merge conflict 'feature/domain-price' into release-tes…
ducthotran2010 Oct 12, 2023
0ddf631
feat: return tax price in `RNSDomainPrice` (#34)
TuDo1403 Oct 13, 2023
4f64729
chore: pull latest from 'release/test-net/v0.2.0' to feature/rns-unif…
TuDo1403 Oct 13, 2023
11c4121
feat: reuse `LibRNSDomain` for namehash and compute id (#32)
TuDo1403 Oct 13, 2023
88e8543
Merge branch 'release-testnet/v0.2.0' into resolve-conflict/rns-unifi…
TuDo1403 Oct 13, 2023
01ec462
resolve conflicts
TuDo1403 Oct 13, 2023
0e248d3
chore: resolve merge conflict 'feature/rns-unified' into release-test…
TuDo1403 Oct 13, 2023
2f78c97
fix: resolve conflict
TuDo1403 Oct 13, 2023
58d7bec
chore: resolve merge conflict 'feature/rns-unified' into release-test…
TuDo1403 Oct 13, 2023
f257099
chore: merge 'release-testnet/v0.2.0' into feature/controller (#35)
TuDo1403 Oct 13, 2023
8425f06
feat: allow maintain reservation status for ids listed in auction con…
TuDo1403 Oct 13, 2023
b09eb66
feat: remove setter and event
TuDo1403 Oct 13, 2023
4051d86
feat: update RONRegistrarController into testnet v0.2.0 (#49)
TuDo1403 Oct 14, 2023
06d9c0b
Merge branch 'release-testnet/v0.2.0' into merge/release-testnet/v0.2…
TuDo1403 Oct 14, 2023
b924017
Merge branch 'release-testnet/v0.2.0' into merge/release-testnet/v0.2…
TuDo1403 Oct 14, 2023
7c997ba
fix: fix operator not assigned in RNSDomainPrice::initialize
TuDo1403 Oct 14, 2023
6dabda4
chore: pull latest from 'release/test-net/v0.2.0' to feature/domain-p…
TuDo1403 Oct 14, 2023
6ea2558
chore: pull latest from 'release/test-net/v0.2.0' to feature/auction …
TuDo1403 Oct 14, 2023
a752039
Merge branch 'feature/auction' into implement-feature/permanent-tax-f…
TuDo1403 Oct 14, 2023
fbfe1b4
Merge branch 'feature/domain-price' into fix/initialize/domain-price
TuDo1403 Oct 14, 2023
a5853cd
fix: operator not assigned in RNSDomainPrice.initialize (#50)
TuDo1403 Oct 14, 2023
9ff32b8
feat: maintain reserved status for ids listed in RNSAuction contract …
TuDo1403 Oct 14, 2023
9cb5293
feat: update Domain Price into testnet v0.2.0 (#52)
TuDo1403 Oct 14, 2023
adbf663
Merge branch 'release-testnet/v0.2.0' into merge/feature/auction/rele…
TuDo1403 Oct 14, 2023
6ad6f52
chore: pull lasest features from 'release-testnet/v0.2.0' into featur…
TuDo1403 Oct 14, 2023
1f44a65
feat: update Auction into testnet v0.2.0 (#54)
TuDo1403 Oct 14, 2023
0d08649
fix: relative import style (#56)
TuDo1403 Oct 14, 2023
df8e51b
feat: update Reverse Registrar into testnet v0.2.0 (#62)
TuDo1403 Oct 14, 2023
a157137
feat: update Reverse Registrar into testnet v0.2.0 (#66)
TuDo1403 Oct 15, 2023
a584092
forge install: foundry-deployment-kit
TuDo1403 Oct 15, 2023
270fa18
feat: add rns contract collection deploy script
TuDo1403 Oct 15, 2023
ccf2f31
chore: rename migration
TuDo1403 Oct 15, 2023
bad243f
forge install: foundry-deployment-kit
TuDo1403 Oct 15, 2023
7b8f9b0
chore: remove ProxyAdmin artifact
TuDo1403 Oct 15, 2023
e0d7c31
feat: add verify script
TuDo1403 Oct 15, 2023
0616777
feat: update deployment script
TuDo1403 Oct 17, 2023
ab3f829
feat: add debug script
TuDo1403 Oct 17, 2023
646b463
Merge branch 'migration/deploy-rns-contract-collection' into implemen…
TuDo1403 Oct 17, 2023
c5f4759
feat: add deployment script (#67)
TuDo1403 Oct 17, 2023
48452e8
Merge branch 'release/v0.2.0' into implement-feature/scripting/debug-…
TuDo1403 Oct 17, 2023
cf00984
feat: add debug script (#68)
TuDo1403 Oct 17, 2023
a0e8050
chore: add deployment artifacts
TuDo1403 Oct 17, 2023
e2e240f
chore: add deployment artifacts into 'release/v0.2.0 (#69)
TuDo1403 Oct 17, 2023
ac2fa29
feat: add workflow to create pull request
ducthotran2010 Oct 18, 2023
649b368
feat: rm request team reviewers
ducthotran2010 Oct 18, 2023
8a0b64c
feat(ci): implement `create-pull-request` (#70)
ducthotran2010 Oct 20, 2023
5554568
feat(ci): add workflow to create pull request (#71)
ducthotran2010 Oct 20, 2023
476c49f
Merge branch 'feature/rns-unified' into merge/release/v0.2.0-feature/…
TuDo1403 Oct 20, 2023
fba8981
forge install: foundry-deployment-kit
TuDo1403 Oct 20, 2023
fa33b3f
feat: update protected logic
TuDo1403 Oct 20, 2023
3ca7b42
chore(rns-unified): merge from `release/v0.2.0` (#75)
ducthotran2010 Oct 20, 2023
419ddcb
Merge branch 'feature/rns-unified' into implement-feature/rns-unified…
TuDo1403 Oct 20, 2023
3b30eb3
Update src/RNSUnified.sol
TuDo1403 Oct 20, 2023
66ae414
feat: add doc
TuDo1403 Oct 20, 2023
3e2ea27
Update src/RNSUnified.sol
ducthotran2010 Oct 20, 2023
49fa4fd
feat(rns-unified): implement `protected-rule` (#79)
TuDo1403 Oct 20, 2023
53277d9
feat: add expiry check
TuDo1403 Oct 20, 2023
dd72b1e
Merge branch 'feature/domain-price' into implement-feature/domain-pri…
TuDo1403 Oct 20, 2023
02f6ab9
Merge branch 'feature/domain-price' into merge/release/v0.2.0-feature…
TuDo1403 Oct 20, 2023
84a0eed
chore(domain-price): merge from `release/v0.2.0` (#74)
ducthotran2010 Oct 20, 2023
9c77133
Merge branch 'feature/domain-price' into implement-feature/domain-pri…
TuDo1403 Oct 20, 2023
68d8d9a
feat: update logic & migration script
TuDo1403 Oct 21, 2023
f3f590d
Update src/RNSDomainPrice.sol
TuDo1403 Oct 21, 2023
ddd81c0
format: reorder function
TuDo1403 Oct 23, 2023
56aaf0d
feat(domain-price): implement `auction-domain-expiry` (#82)
TuDo1403 Oct 23, 2023
a94afeb
feat: update RNSUnified into 'release/v0.2.0' (#84)
TuDo1403 Oct 23, 2023
c97f0b1
Merge branch 'feature/domain-price' into merge/release/v0.2.0-feature…
TuDo1403 Oct 23, 2023
280acba
chore(domain-price): merge from `release/v0.2.0` (#86)
TuDo1403 Oct 23, 2023
dc0ee7b
chore: add ugrade artiface RNSUnified, RNSAuction, RNSDomainPrice
TuDo1403 Oct 23, 2023
f7ba28f
feature/enhnace pipeline for avoiding looping
huyngopt1994 Oct 23, 2023
a19a380
Fix syntax
huyngopt1994 Oct 23, 2023
c861a00
Update the correct branch name
huyngopt1994 Oct 23, 2023
e128e70
Update .github/workflows/create-PR-release.yml
ducthotran2010 Oct 23, 2023
fb37816
feat(enhance): Pipeline for avoiding hardcode (#88)
ducthotran2010 Oct 23, 2023
3499af5
chore: add upgrade artiface RNSUnified, RNSAuction, RNSDomainPrice (#87)
ducthotran2010 Oct 23, 2023
aab5592
chore(`feature/ci`): merge from `release/v0.2.0` (#78)
ducthotran2010 Oct 23, 2023
70322e2
chore: update PR title
ducthotran2010 Oct 23, 2023
5b37dd5
chore(ci): update PR title (#92)
ducthotran2010 Oct 23, 2023
aaad2cb
chore(`domain-price`): merge from `release/v0.2.0` (#91)
TuDo1403 Oct 24, 2023
c0f54e8
feat: Add tax and limit renewal duration for auction domains (#94)
TuDo1403 Oct 24, 2023
f3df240
Merge branch 'feature/auction' into merge/release/v0.2.0-feature/auction
TuDo1403 Oct 24, 2023
98c17d9
chore(`auction`): merge from `release/v0.2.0` (#77)
TuDo1403 Oct 24, 2023
345a490
feat: forbid contract bidder
TuDo1403 Oct 24, 2023
b23f0c9
feat: update migration script
TuDo1403 Oct 24, 2023
d596a17
format: rename script
TuDo1403 Oct 24, 2023
9ecc86f
format: rename outdated error
TuDo1403 Oct 24, 2023
5a3867b
feat(auction): implement `eoa-bidder` (#96)
TuDo1403 Oct 24, 2023
929b660
feat: add upload-sig script
TuDo1403 Oct 24, 2023
ebb4170
feat: add script to upload event & error & fn selectors (#98)
ducthotran2010 Oct 24, 2023
f1d8a86
feat: forbid contract to place bid in `RNSAuction` (#97)
ducthotran2010 Oct 24, 2023
7ba3c5e
feat: add RNSAuction migration artifact
TuDo1403 Oct 24, 2023
09726ff
feat: add OVERRIDER_ROLE and migration scripts
TuDo1403 Oct 24, 2023
b58214e
Update src/RNSDomainPrice.sol
ducthotran2010 Oct 24, 2023
f35ddbd
feat: use overrider role for bulkSetDomainPrice
TuDo1403 Oct 24, 2023
bc6b372
feat: add RNSDomainPrice artifact with overrider role
TuDo1403 Oct 24, 2023
b3e6069
feat(domain-price): implement `overrider-role` (#100)
TuDo1403 Oct 24, 2023
1e40778
Merge branch 'feature/domain-price' into merge/release/v0.2.0-feature…
TuDo1403 Oct 24, 2023
422f5e5
chore(`domain-price`): merge from `release/v0.2.0` (#95)
TuDo1403 Oct 24, 2023
35340bf
feat: add overrider role to set & override name price, renewal fee (#…
TuDo1403 Oct 24, 2023
6a59401
chore(`rns-unified`): merge from `release/v0.2.0` (#85)
TuDo1403 Oct 24, 2023
8ff0b70
feat: disable minting 3rd level domain
TuDo1403 Oct 24, 2023
f11e51c
feat: skip namehash tests
TuDo1403 Oct 24, 2023
4f3f980
chore: add doc
TuDo1403 Oct 24, 2023
b78ba47
feat: update RNSUnified artifact that ban 3rd level domain
TuDo1403 Oct 24, 2023
c197fc7
Merge branch 'release/v0.2.0' into deploy/v0.2.0-testnet
TuDo1403 Oct 24, 2023
bbd003a
feat(rns-unified): implement `ban-3rd-level-domain` (#103)
TuDo1403 Oct 24, 2023
959e320
feat: disallow minting 3rd domain in RNSUnified (#105)
TuDo1403 Oct 24, 2023
3d734e5
Merge branch 'release/v0.2.0' into deploy/v0.2.0-testnet
TuDo1403 Oct 24, 2023
e5b778b
chore: add 20231024 migration artifacts (#104)
TuDo1403 Oct 24, 2023
775ad22
Merge branch 'feature/controller' into merge/release/v0.2.0-feature/c…
TuDo1403 Oct 24, 2023
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: 10 additions & 0 deletions .debug.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Fork block number to debug
BLOCK=0x0
# Caller
FROM=0x0000000000000000000000000000000000000000
# Callee
TO=0x0000000000000000000000000000000000000000
# Sent Value
VALUE=0x27cdb0997a65b2de99
# Call Data
CALLDATA=0x0
2 changes: 2 additions & 0 deletions .github/template/create-pull-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
### Description
PR to merge from [{{ .fromBranch }}](/axieinfinity/rns-contracts/tree/{{ .fromBranch }}) to [{{ .toBranch }}](/axieinfinity/rns-contracts/tree/{{ .toBranch }}).
50 changes: 50 additions & 0 deletions .github/workflows/create-PR-implement.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Create Pull Request From Implement To Feature
on:
push:
branches:
- 'implement-feature/**'
- 'implement-feature/**/**'

concurrency:
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
cancel-in-progress: true

env:
HEAD_BRANCH: ${{ github.head_ref || github.ref_name }}

jobs:
createPullRequest:
runs-on: ubuntu-latest
steps:
- name: Set env
run: |
echo "FEATURE_NAME=$(echo ${HEAD_BRANCH} | cut -d'/' -f2)" >> $GITHUB_ENV
echo "FEATURE_BRANCH=feature/$(echo ${HEAD_BRANCH} | cut -d'/' -f2)" >> $GITHUB_ENV
echo "IMPLEMENT_NAME=$(echo ${HEAD_BRANCH} | cut -d'/' -f3)" >> $GITHUB_ENV

- uses: actions/checkout@v3
with:
ref: ${{env.FEATURE_BRANCH}}

- name: Reset promotion branch
run: |
git fetch origin ${HEAD_BRANCH}:${HEAD_BRANCH}
git reset --hard ${HEAD_BRANCH}

- name: Render template
id: template
uses: chuhlomin/[email protected]
with:
template: .github/template/create-pull-request.md
vars: |
fromBranch: ${{env.HEAD_BRANCH}}
toBranch: ${{ env.FEATURE_BRANCH }}

- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
branch: ${{ env.HEAD_BRANCH }}
base: ${{env.FEATURE_BRANCH}}
labels: automated PR
title: 'feat(${{env.FEATURE_NAME}}): implement `${{env.IMPLEMENT_NAME}}`'
body: ${{ steps.template.outputs.result }}
50 changes: 50 additions & 0 deletions .github/workflows/create-PR-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Create Pull Request From Release to Feature
on:
push:
branches:
- 'release/*'
- 'release*/*'

concurrency:
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
cancel-in-progress: true

env:
HEAD_BRANCH: ${{ github.head_ref || github.ref_name }}

jobs:
mergeRelease2FeatureRepo:
runs-on: ubuntu-latest
strategy:
matrix:
branch_name: [feature/rns-unified, feature/controller, feature/domain-price, feature/auction, feature/public-resolver, feature/ci, feature/reverse-registrar]
steps:
- name: Set env
run: |
echo "PR_BRANCH=merge/${HEAD_BRANCH}-${{matrix.branch_name}}" >> $GITHUB_ENV
echo "FEATURE_NAME=$(echo ${{matrix.branch_name}} | cut -d'/' -f2)" >> $GITHUB_ENV
- uses: actions/checkout@v3
with:
ref: ${{matrix.branch_name}}
- name: Reset promotion branch
run: |
git fetch origin ${HEAD_BRANCH}:${HEAD_BRANCH}
git reset --hard ${HEAD_BRANCH}

- name: Render template
id: template
uses: chuhlomin/[email protected]
with:
template: .github/template/create-pull-request.md
vars: |
fromBranch: ${{env.HEAD_BRANCH}}
toBranch: ${{matrix.branch_name}}

- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
labels: automated PR
delete-branch: true
title: 'chore(`${{env.FEATURE_NAME}}`): merge from `${{env.HEAD_BRANCH}}`'
body: ${{ steps.template.outputs.result }}
branch: ${{env.PR_BRANCH}}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ docs/
# Dotenv file
.env
.vscode
.debug.env

node_modules/
yarn-error.log
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@
[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
527 changes: 527 additions & 0 deletions broadcast/20231015_Deploy.s.sol/2021/run-1697372924.json

Large diffs are not rendered by default.

2,036 changes: 2,036 additions & 0 deletions broadcast/20231015_Deploy.s.sol/2021/run-1697372932.json

Large diffs are not rendered by default.

2,036 changes: 2,036 additions & 0 deletions broadcast/20231015_Deploy.s.sol/2021/run-latest.json

Large diffs are not rendered by default.

52 changes: 52 additions & 0 deletions broadcast/20231020_RNSUpgrade.s.sol/2021/run-1697784642.json

Large diffs are not rendered by default.

111 changes: 111 additions & 0 deletions broadcast/20231020_RNSUpgrade.s.sol/2021/run-1697784648.json

Large diffs are not rendered by default.

111 changes: 111 additions & 0 deletions broadcast/20231020_RNSUpgrade.s.sol/2021/run-latest.json

Large diffs are not rendered by default.

52 changes: 52 additions & 0 deletions broadcast/20231024_UpgradeAuction.s.sol/2021/run-1698122959.json

Large diffs are not rendered by default.

111 changes: 111 additions & 0 deletions broadcast/20231024_UpgradeAuction.s.sol/2021/run-1698122966.json

Large diffs are not rendered by default.

111 changes: 111 additions & 0 deletions broadcast/20231024_UpgradeAuction.s.sol/2021/run-latest.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

166 changes: 166 additions & 0 deletions broadcast/20231024_UpgradeDomainPrice.s.sol/2021/run-1698139063.json

Large diffs are not rendered by default.

166 changes: 166 additions & 0 deletions broadcast/20231024_UpgradeDomainPrice.s.sol/2021/run-latest.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

111 changes: 111 additions & 0 deletions broadcast/20231024_UpgradeRNSUnified.s.sol/2021/run-1698142390.json

Large diffs are not rendered by default.

111 changes: 111 additions & 0 deletions broadcast/20231024_UpgradeRNSUnified.s.sol/2021/run-latest.json

Large diffs are not rendered by default.

39 changes: 39 additions & 0 deletions debug.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Source (or "dot") the .env file to load environment variables
if [ -f .env ]; then
source .debug.env
else
echo "Error: .debug.env file not found."
fi

verify_arg=""
extra_argument=""
op_command=""

for arg in "$@"; do
case $arg in
--trezor)
op_command=""
extra_argument+=trezor@
;;
--broadcast)
op_command="op run --env-file="./.env" --"
;;
--log)
set -- "${@/#--log/}"
extra_argument+=log@
;;
*) ;;
esac
done

# Remove the @ character from the end of extra_argument
extra_argument="${extra_argument%%@}"

echo Debug Tx...
echo From: ${FROM}
echo To: ${TO}
echo Value: ${VALUE}
echo Calldata:
cast pretty-calldata ${CALLDATA}
calldata=$(cast calldata 'debug(uint256,address,address,uint256,bytes)', ${BLOCK} ${FROM} ${TO} ${VALUE} ${CALLDATA})
${op_command} forge script ${verify_arg} --legacy ${@} script/Debug.s.sol --sig 'run(bytes,string)' ${calldata} "${extra_argument}"
1 change: 1 addition & 0 deletions deployments/ronin-mainnet/.chainId
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2020
1 change: 1 addition & 0 deletions deployments/ronin-testnet/.chainId
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2021
Loading