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(mainnet): merge from merge/deploy/v0.3.4-mainnet #205

Merged
merged 112 commits into from
Apr 20, 2024
Merged
Changes from 3 commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
b48bbbb
release(0.3.0): Upgrade `RNSAuction` and Deploy `RNSOperation` (#138)
ducthotran2010 Dec 5, 2023
aee4221
forge install: foundry-deployment-kit
TuDo1403 Dec 18, 2023
4154dcd
forge install: contract-libs
TuDo1403 Dec 18, 2023
40d7d4a
feat: migrate all migrations script to new foundry-deployment-kit ver…
TuDo1403 Dec 18, 2023
33b7cfb
feat(migration-script): implement `update-new-migration-scripts` (#142)
ducthotran2010 Dec 18, 2023
1a26114
feat: adapt all migrations to new version of 'foundry-deployment-kit'…
ducthotran2010 Dec 18, 2023
e3e8d3a
feat: add CI auto merge when merge from deploy to release
qui-pham Jan 4, 2024
fff4b00
Merge branch 'testnet' into feature/ci
qui-pham Jan 4, 2024
7b4f237
feat: add CI auto merge when merge from deploy to release (#148)
qui-pham Jan 4, 2024
a2183b2
chore(ci): auto GitFlow (#151)
qui-pham Jan 4, 2024
b8d0af8
chore(ci): change condition to trigger workflows
qui-pham Jan 4, 2024
3d399a2
feat(ci): implement `trigger` (#154)
qui-pham Jan 4, 2024
f74f6d8
Merge branch 'release/v0.3.2' into feature/ci
qui-pham Jan 4, 2024
85a05fc
chore(ci): change trigger condition (#155)
qui-pham Jan 4, 2024
85e5e5b
chore(`ci`): merge from `release/v0.3.2` (#156)
qui-pham Jan 4, 2024
5578e4b
chore: fix condition
qui-pham Jan 4, 2024
5200ca5
Merge branch 'feature/ci' into implement-feature/ci/trigger
qui-pham Jan 4, 2024
3f36137
feat(ci): implement `trigger` (#157)
qui-pham Jan 4, 2024
353a809
chore: change condition to trigger CI (#158)
qui-pham Jan 4, 2024
ab4fa1f
chore: trigger CI
qui-pham Jan 4, 2024
451c8b9
Update merge-release-to-network.yml
qui-pham Jan 4, 2024
8ac9da9
chore: trigger CI (#160)
qui-pham Jan 4, 2024
ef70d70
chore(`ci`): merge from `release/v0.3.2` (#159)
qui-pham Jan 5, 2024
42afc5b
chore: add workflow automate create from deploy to release
qui-pham Jan 5, 2024
f67d1de
Merge branch 'feature/ci' into implement-feature/ci/trigger
qui-pham Jan 5, 2024
97c4c7d
feat(ci): implement `trigger` (#162)
qui-pham Jan 5, 2024
fcc7548
chore(`release/v0.3.3`): merge from `deploy/v0.3.3-testnet` (#163)
qui-pham Jan 5, 2024
51cb719
Merge branch 'testnet' into merge/merge/deploy/v0.3.3-testnet
qui-pham Jan 5, 2024
9db847b
chore(`ci`): merge from `release/v0.3.3` (#165)
qui-pham Jan 5, 2024
cf29deb
chore(`testnet`): merge from `merge/deploy/v0.3.3-testnet` (#164)
qui-pham Jan 5, 2024
6bb381b
chore: change from automate to create PR
qui-pham Jan 5, 2024
1f8beb7
chore: delete automerge
qui-pham Jan 5, 2024
196b963
Merge branch 'feature/ci' into implement-feature/ci/trigger
qui-pham Jan 5, 2024
d365c1b
feat(ci): implement `trigger` (#166)
qui-pham Jan 5, 2024
d47d7d7
feat(ci): Change workflows (#167)
qui-pham Jan 5, 2024
162a36d
chore(`ci`): merge from `deploy/v0.3.3-testnet` (#169)
qui-pham Jan 5, 2024
4499302
chore(`release/v0.3.3`): merge from `deploy/v0.3.3-testnet` (#168)
qui-pham Jan 5, 2024
87e8889
Merge branch 'testnet' into merge/merge/deploy/v0.3.3-testnet
qui-pham Jan 5, 2024
6eca2be
chore(`testnet`): merge from `merge/deploy/v0.3.3-testnet` (#170)
qui-pham Jan 5, 2024
bbf9d2a
Merge branch 'feature/ci' into merge/release/v0.3.3-feature/ci
qui-pham Jan 5, 2024
afb32ca
chore(`ci`): merge from `release/v0.3.3` (#171)
qui-pham Jan 5, 2024
c7d8e0a
chore: add changelog and change workflows
qui-pham Jan 5, 2024
5334b56
Merge branch 'feature/ci' into implement-feature/ci/trigger
qui-pham Jan 5, 2024
e2eba5b
feat(ci): implement `trigger` (#172)
qui-pham Jan 5, 2024
690acd4
Merge branch 'release/v0.3.3' into feature/ci
qui-pham Jan 5, 2024
c6c4258
chore: add changelog and change workflows (#174)
qui-pham Jan 5, 2024
9f859c4
chore(`ci`): merge from `release/v0.3.3` (#175)
qui-pham Jan 5, 2024
f990c74
chore: add changelog and change workflows
qui-pham Jan 5, 2024
b592ade
Merge branch 'feature/ci' into implement-feature/ci/trigger
qui-pham Jan 5, 2024
dec05bd
feat(ci): implement `trigger` (#176)
qui-pham Jan 5, 2024
0b6b2d8
chore: add changelog and change workflows (#177)
qui-pham Jan 5, 2024
676abe9
[create-pull-request] automated change
qui-pham Jan 5, 2024
fc84b01
chore(`release/v0.3.3`): merge from `deploy/v0.3.3-testnet` (#179)
qui-pham Jan 5, 2024
e013d64
Merge commit '1a26114e422a1b05dfd77c287466f3b1dc063ef6' into implemen…
TuDo1403 Feb 11, 2024
f84ab88
chore: update foundry-deployment-kit
TuDo1403 Feb 11, 2024
285eae5
script: move validate logic into post check function, reuse script lo…
TuDo1403 Feb 11, 2024
ad19359
script: split parameters in ISharedArgument
TuDo1403 Feb 11, 2024
959c628
script: minor refactor
TuDo1403 Feb 11, 2024
f57a162
fix(RNSDomainPrice): add tier overriding functionalities
TuDo1403 Feb 18, 2024
fd00c63
fix(RNSDomainPrice): fix tier logic
TuDo1403 Feb 18, 2024
773d80f
fix(RNSDomainPrice): minor refactor
TuDo1403 Feb 20, 2024
61135ba
fix(RNSOperation): add bulkOverrideTiers
TuDo1403 Feb 20, 2024
087dab9
fix(RNSDomainPrice): fix tier logic
TuDo1403 Feb 20, 2024
bc623c2
fix(RNSDomainPrice): fix tier logic
TuDo1403 Feb 21, 2024
f52d3fc
chore: update v0.3.4-testnet deployment artifacts
TuDo1403 Feb 21, 2024
bfea1c0
[create-pull-request] automated change
TuDo1403 Feb 21, 2024
aeb1a62
fix: apply suggestions
TuDo1403 Feb 21, 2024
e3d0e45
chore: update dev doc
TuDo1403 Feb 21, 2024
1a34ad0
feat(script): implement `adapt-new-migration-script` (#184)
TuDo1403 Feb 21, 2024
747c81b
chore(`release/v0.3.4`): merge from `deploy/v0.3.4-testnet` (#188)
TuDo1403 Feb 21, 2024
4374e60
fix(RNSDomainPrice): refactor getRenewalFee logic
TuDo1403 Feb 21, 2024
984ece9
fix(RNSDomainPrice): minor refactor
TuDo1403 Feb 21, 2024
0c8cb00
fix(RNSDomainPrice): fix event TierOverridingUpdated
TuDo1403 Feb 23, 2024
903c0d7
forge install: foundry-deployment-kit
TuDo1403 Dec 18, 2023
76e962b
forge install: contract-libs
TuDo1403 Dec 18, 2023
1453169
feat: migrate all migrations script to new foundry-deployment-kit ver…
TuDo1403 Dec 18, 2023
35646fe
chore: update foundry-deployment-kit
TuDo1403 Feb 11, 2024
9ca988a
script: move validate logic into post check function, reuse script lo…
TuDo1403 Feb 11, 2024
a681418
script: split parameters in ISharedArgument
TuDo1403 Feb 11, 2024
c41d583
script: minor refactor
TuDo1403 Feb 11, 2024
e17a8ed
chore: update forge-std
TuDo1403 Feb 11, 2024
962a73e
forge install: foundry-deployment-kit
TuDo1403 Feb 11, 2024
b101363
script: add migration script for v0.3.4
TuDo1403 Feb 18, 2024
0676eda
forge install: foundry-deployment-kit
TuDo1403 Feb 20, 2024
d28e57b
forge install: foundry-deployment-kit
TuDo1403 Feb 20, 2024
8fbbecc
script: minor fix script
TuDo1403 Feb 20, 2024
b87cf5c
script: minor fix script
TuDo1403 Feb 20, 2024
7ec1084
script: minor script fix and add rns operation deploy script
TuDo1403 Feb 21, 2024
138e7a0
script: resolve conflict
TuDo1403 Feb 23, 2024
daef22e
feat(tier): implement `add-tier-att-to-rns-record` (#183)
TuDo1403 Mar 12, 2024
399a1ef
Merge branch 'feature/tier' into implement-feature/script/add-v0.3.4-…
TuDo1403 Mar 12, 2024
8fe81bb
script: add bash script for bulk override tiers and bulk reset renewa…
TuDo1403 Mar 12, 2024
112ebf2
forge install: foundry-deployment-kit
TuDo1403 Mar 12, 2024
2a13fb9
chore: rename script
TuDo1403 Mar 12, 2024
cfc362d
script: move override tier to post check
TuDo1403 Mar 13, 2024
55b5cea
feat(RNSDomainPrice): add `bulkOverrideTiers` (#194)
TuDo1403 Mar 13, 2024
fa9925c
chore: add deployment artifact
TuDo1403 Mar 13, 2024
e8f3eed
chore: add deployment artifact
TuDo1403 Mar 13, 2024
4205e8f
[create-pull-request] automated change
TuDo1403 Mar 13, 2024
c96a4d6
chore(`release/v0.3.4`): merge from `deploy/v0.3.4-testnet` (#193)
TuDo1403 Mar 13, 2024
b58a1da
Merge branch 'feature/script' into merge/release/v0.3.4-feature/script
TuDo1403 Mar 25, 2024
cd0628a
Merge branch 'feature/script' into merge/release/v0.3.4-feature/script
TuDo1403 Mar 25, 2024
0b32c2e
chore(`script`): merge from `release/v0.3.4` (#190)
TuDo1403 Mar 25, 2024
1f23eb8
Merge branch 'feature/script' into implement-feature/script/add-v0.3.…
TuDo1403 Mar 25, 2024
a374601
fix: resolve conflict
TuDo1403 Mar 25, 2024
b413651
feat(script): implement `add-v0.3.4-rns-unified-migration-script` (#185)
TuDo1403 Mar 25, 2024
b9481fe
script: add migration script for release/v0.3.4 (#198)
TuDo1403 Mar 25, 2024
31f2c28
Merge branch 'mainnet' into deploy/v0.3.4-mainnet
TuDo1403 Apr 20, 2024
5c71bed
[create-pull-request] automated change
TuDo1403 Apr 20, 2024
536201d
Merge branch 'release/v0.3.4' into merge/deploy/v0.3.4-mainnet
TuDo1403 Apr 20, 2024
6293acb
Update CHANGELOG.md
TuDo1403 Apr 20, 2024
64bef13
chore(`release/v0.3.4`): merge from `deploy/v0.3.4-mainnet` (#195)
TuDo1403 Apr 20, 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
87 changes: 87 additions & 0 deletions .github/workflows/create-PR-deploy-to-feature.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
name: Create Pull Request From Deploy to Feature
on:
push:
branches:
- 'deploy/*'

permissions:
contents: write
pull-requests: write

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

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

jobs:
fetchAllFeatureBranches:
runs-on: ubuntu-latest

steps:
- id: step1
name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0

- id: step2
name: List all the remote feature branches
run: |
branches=$(git branch -r | grep -E '.*origin\/feature\/.*' | sed -e "s/.*origin\///" | tr "\n" " ")
JSON="["
for branch in ${branches[@]}; do
echo $branch
JSONline="\"$branch\","
# we don't need to iterate on the same branch over and over, so
# onnly include it when it wasn't included
if [[ "$JSON" != *"$JSONline"* ]]; then
JSON="$JSON$JSONline"
fi
done
# Remove last "," and add the closing bracket
if [[ $JSON == *, ]]; then
JSON="${JSON%?}"
fi
JSON="$JSON]"
echo $JSON
echo "BRANCHES={\"branch_name\": $( echo "$JSON" )}" >> "$GITHUB_OUTPUT"
outputs:
BRANCHES: ${{ steps.step2.outputs.BRANCHES }}

mergeRelease2FeatureRepo:
runs-on: ubuntu-latest
needs: fetchAllFeatureBranches
strategy:
matrix: ${{ fromJSON(needs.fetchAllFeatureBranches.outputs.BRANCHES) }}
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}}
42 changes: 42 additions & 0 deletions .github/workflows/create-PR-deploy-to-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Create PR Deploy to Release

on:
push:
branches:
- deploy/*

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

permissions:
contents: write
pull-requests: write

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Set Env
run: |
echo "PR_BRANCH=merge/${HEAD_BRANCH}" >> $GITHUB_ENV
echo "VERSION=$(echo -n ${{ env.HEAD_BRANCH }} | sed 's/.*deploy\///' | cut -d'-' -f1)" >> $GITHUB_ENV
echo "NETWORK=$(echo -n ${{ env.HEAD_BRANCH }} | sed 's/.*deploy\/v[0-9\.]*-\(.*\)/\1/')" >> $GITHUB_ENV
- name: Checkout code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
ref: 'release/${{ env.VERSION }}'

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

- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 #v5.0.2
with:
labels: automated PR
delete-branch: true
title: 'chore(`release/${{ env.VERSION }}`): merge from `${{ env.HEAD_BRANCH}}`'
body: ${{ steps.template.outputs.result }}
branch: ${{ env.PR_BRANCH }}
5 changes: 3 additions & 2 deletions .github/workflows/merge-release-to-network.yml
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@ jobs:
- name: Set Env
run: |
echo "PR_BRANCH=merge/${HEAD_BRANCH}" >> $GITHUB_ENV
echo "VERSION=$(echo -n ${{ env.HEAD_BRANCH }} | sed 's/deploy\///' | cut -d'-' -f1)" >> $GITHUB_ENV
echo "NETWORK=$(echo -n ${{ env.HEAD_BRANCH }} | sed 's/deploy\/v[0-9\.]*-\(.*\)/\1/')" >> $GITHUB_ENV
echo "VERSION=$(echo -n ${{ env.HEAD_BRANCH }} | sed 's/.*deploy\///' | cut -d'-' -f1)" >> $GITHUB_ENV
echo "NETWORK=$(echo -n ${{ env.HEAD_BRANCH }} | sed 's/.*deploy\/v[0-9\.]*-\(.*\)/\1/')" >> $GITHUB_ENV

- name: Set Mainnet Tag
if: ${{ env.NETWORK == 'mainnet' }}
@@ -72,5 +72,6 @@ jobs:
gh release create "$tag" \
--repo="$GITHUB_REPOSITORY" \
--title="${{ env.NETWORK }} - ${{ env.VERSION }}" \
--notes-start-tag="v0.3.2-testnet" \
--generate-notes