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(reduce-gas-on-withdraw): merge from release/v0.1.0 #12

Open
wants to merge 64 commits into
base: feature/reduce-gas-on-withdraw
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
d6b4fe1
test: setup integration test
huyhuynh3103 Dec 5, 2023
af27310
chore: storage layout
huyhuynh3103 Dec 5, 2023
6a28e43
test: setup integration test
huyhuynh3103 Dec 5, 2023
175d78a
chore: storage layout
huyhuynh3103 Dec 5, 2023
bb82db2
test: setup init test
huyhuynh3103 Dec 11, 2023
208ba22
chore: lint test
huyhuynh3103 Dec 13, 2023
cd915f9
test: done setup
huyhuynh3103 Dec 14, 2023
c84f274
chore: storage layout
huyhuynh3103 Dec 14, 2023
7524c08
test(BridgeManager): add set config test
huyhuynh3103 Jan 16, 2024
98e051d
chore: storage layout
huyhuynh3103 Jan 17, 2024
870f4f1
test(BridgeManager): add set config test
huyhuynh3103 Jan 17, 2024
85409af
chore: storage layout
huyhuynh3103 Jan 17, 2024
913a442
chore: add ci scripts
huyhuynh3103 Jan 17, 2024
e3267c4
chore: storage layout
huyhuynh3103 Jan 17, 2024
cc7177d
test(BridgeManager): add configs test
huyhuynh3103 Jan 17, 2024
27785d1
test(BridgeManager): deploy mainchain gateway V3
huyhuynh3103 Jan 17, 2024
7c3f21f
chore: storage layout
huyhuynh3103 Jan 17, 2024
7aa03da
chore: lint code only
huyhuynh3103 Jan 17, 2024
8c094a3
test(BridgeManager): add deploy ronin gateway
huyhuynh3103 Jan 17, 2024
a4c947b
chore: storage layout
huyhuynh3103 Jan 17, 2024
164859f
chore: fix comment
huyhuynh3103 Jan 17, 2024
bea17e5
test: add mock tokens
huyhuynh3103 Jan 17, 2024
8186246
chore: storage layout
huyhuynh3103 Jan 17, 2024
0b060aa
test(BridgeManager): add configs
huyhuynh3103 Jan 17, 2024
dbe09b1
test: add scripts
huyhuynh3103 Jan 17, 2024
f53462d
forge install: foundry-deployment-kit
huyhuynh3103 Jan 17, 2024
9b58711
script: add deployment scripts
huyhuynh3103 Jan 17, 2024
af175eb
chore: storage layout
huyhuynh3103 Jan 17, 2024
82c6cd0
Merge branch 'feature/migrate-hardhat-test' into implement-feature/mi…
huyhuynh3103 Jan 18, 2024
e421099
chore: storage layout
huyhuynh3103 Jan 18, 2024
9498c45
test: reuse deployment scripts in test
huyhuynh3103 Jan 18, 2024
2445b52
chore: storage-layout
huyhuynh3103 Jan 18, 2024
1c154b4
Merge pull request #8 from axieinfinity/implement-feature/ci/add-new-…
huyhuynh3103 Jan 18, 2024
f4774e6
chore: storage layout
huyhuynh3103 Jan 18, 2024
40da15f
build: skip test/ and script/ in CI
huyhuynh3103 Jan 18, 2024
c5677c2
build: fix skip test/ and script/ in CI
huyhuynh3103 Jan 18, 2024
01f004d
chore: storage layout
huyhuynh3103 Jan 18, 2024
7da3c7a
build: clean cache and recompile in CI pre-push
huyhuynh3103 Jan 18, 2024
567444f
Merge pull request #10 from axieinfinity/implement-feature/ci/add-new…
huyhuynh3103 Jan 18, 2024
b893137
build: fix pre-push script
huyhuynh3103 Jan 18, 2024
9c971d1
chore: storage layout
huyhuynh3103 Jan 18, 2024
30c1900
build: remove --force in pre-push ci
huyhuynh3103 Jan 18, 2024
d7e9152
chore: storage layout
huyhuynh3103 Jan 18, 2024
9d15d17
Merge pull request #11 from axieinfinity/implement-feature/ci/add-new…
huyhuynh3103 Jan 18, 2024
61b0eed
Merge pull request #9 from axieinfinity/feature/ci
nxqbao Jan 18, 2024
c132f84
Merge pull request #13 from axieinfinity/merge/release/v0.1.0-feature…
huyhuynh3103 Jan 18, 2024
bfa13c7
Merge branch 'feature/migrate-hardhat-test' into implement-feature/mi…
huyhuynh3103 Jan 18, 2024
b5fdb4c
chore: storage layout
huyhuynh3103 Jan 18, 2024
2908990
Merge pull request #7 from axieinfinity/implement-feature/migrate-har…
huyhuynh3103 Jan 18, 2024
0de12b4
script(GeneralConfig): fix mapping contract name
huyhuynh3103 Jan 18, 2024
3efac3c
Merge pull request #16 from axieinfinity/implement-feature/migrate-ha…
huyhuynh3103 Jan 18, 2024
a1783b0
Merge pull request #15 from axieinfinity/feature/migrate-hardhat-test
huyhuynh3103 Jan 18, 2024
2f40a18
Merge pull request #17 from axieinfinity/merge/release/v0.1.0-feature…
huyhuynh3103 Jan 18, 2024
381c48f
test(RoninBridgeManager): add test cast vote for adding bridge operators
huyhuynh3103 Jan 19, 2024
ff16062
test(MainchainGatewayV3): add test submit withdrawal
huyhuynh3103 Jan 19, 2024
bf4083d
chore: add storage-layout
huyhuynh3103 Jan 20, 2024
fca468c
chore: add contract-code-size
huyhuynh3103 Jan 20, 2024
dab5239
forge install: foundry-deployment-kit
huyhuynh3103 Jan 20, 2024
21784ee
test(bridge-setup): setup 2 local chains + remove pre-compute address…
huyhuynh3103 Jan 20, 2024
fdc99d8
chore: contract sizes
huyhuynh3103 Jan 20, 2024
4db9429
ci: start 2 local chains in CI
huyhuynh3103 Jan 20, 2024
dadb201
fix(ci): start 2 local chain at backgrounds
huyhuynh3103 Jan 20, 2024
98ca0e6
Merge pull request #19 from axieinfinity/implement-feature/migrate-ha…
huyhuynh3103 Jan 21, 2024
a0f6096
Merge pull request #20 from axieinfinity/feature/migrate-hardhat-test
huyhuynh3103 Jan 22, 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
64 changes: 64 additions & 0 deletions .github/workflows/create-PR-deploy-to-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Create PR Deploy to Release

on:
push:
branches:
- deploy/*
pull_request:
types:
- opened
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 }}'
fetch-depth: 0
fetch-tags: 'true'

- name: Get Testnet Latest Tag
if: ${{ env.NETWORK == 'testnet' }}
run: |
echo "LATESTTAG=$(git describe --tags --match "*testnet*" --abbrev=0)" >> $GITHUB_ENV

- name: Get Mainnet Latest Tag
if: ${{ env.NETWORK == 'mainnet' }}
run: |
echo "LATESTTAG=$(git describe --tags --match "*mainnet*" --abbrev=0)" >> $GITHUB_ENV

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

- name: Generate Release note
id: template
run: |
echo "VERSION=${{ env.VERSION }} - SHA: ${{ github.sha }}" > CHANGELOG.md

- 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 }}
1 change: 0 additions & 1 deletion .github/workflows/create-PR-implement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,5 @@ jobs:
branch: ${{ env.HEAD_BRANCH }}
base: ${{env.FEATURE_BRANCH}}
labels: automated PR
team-reviewers: axieinfinity/smart-contract
title: 'feat(${{env.FEATURE_NAME}}): implement `${{env.IMPLEMENT_NAME}}`'
body: ${{ steps.template.outputs.result }}
47 changes: 47 additions & 0 deletions .github/workflows/create-PR-release-to-network.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Create PR from release to network

on:
pull_request:
branches:
- release/*
types:
- closed

permissions:
contents: write
pull-requests: write

env:
HEAD_BRANCH: ${{ github.head_ref || github.ref_name }}
RELEASE_BRANCH: ${{ github.event.pull_request.base.ref}}

jobs:
merge-release-to-network:
runs-on: ubuntu-latest
if: ${{ (github.event.pull_request.merged == true) && (contains(github.head_ref, 'deploy') || contains(github.ref_name, 'deploy')) }}
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: ${{ env.NETWORK }}

- name: Reset promotion branch
run: |
git fetch origin ${RELEASE_BRANCH}:${RELEASE_BRANCH}
git reset --hard ${RELEASE_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(`${{ env.NETWORK }}`): merge from `${{ env.HEAD_BRANCH}}`'
body: ${{ steps.template.outputs.result }}
branch: ${{env.PR_BRANCH}}
241 changes: 40 additions & 201 deletions .github/workflows/create-PR-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,213 +13,53 @@ env:
HEAD_BRANCH: ${{ github.head_ref || github.ref_name }}

jobs:
mergeRelease2FeatureRnsUnified:
fetchAllFeatureBranches:
runs-on: ubuntu-latest
steps:
- name: Set env
run: |
echo "PR_BRANCH=merge/${HEAD_BRANCH}-feature/rns-unified" >> $GITHUB_ENV
- uses: actions/checkout@v3
with:
ref: feature/rns-unified
- 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: feature/rns-unified

- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
labels: automated PR
team-reviewers: axieinfinity/smart-contract
delete-branch: true
title: 'chore(rns-unified): merge from `${{env.HEAD_BRANCH}}`'
body: ${{ steps.template.outputs.result }}
branch: ${{env.PR_BRANCH}}

mergeRelease2FeatureController:
runs-on: ubuntu-latest
steps:
- name: Set env
run: |
echo "PR_BRANCH=merge/${HEAD_BRANCH}-feature/controller" >> $GITHUB_ENV
- uses: actions/checkout@v3
with:
ref: feature/controller
- 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: feature/controller

- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
labels: automated PR
team-reviewers: axieinfinity/smart-contract
delete-branch: true
title: 'chore(controller): merge from `${{env.HEAD_BRANCH}}`'
body: ${{ steps.template.outputs.result }}
branch: ${{env.PR_BRANCH}}

mergeRelease2FeatureDomainPrice:
runs-on: ubuntu-latest
steps:
- name: Set env
run: |
echo "PR_BRANCH=merge/${HEAD_BRANCH}-feature/domain-price" >> $GITHUB_ENV
- uses: actions/checkout@v3
with:
ref: feature/domain-price
- 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: feature/domain-price

- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
labels: automated PR
team-reviewers: axieinfinity/smart-contract
delete-branch: true
title: 'chore(domain-price): merge from `${{env.HEAD_BRANCH}}`'
body: ${{ steps.template.outputs.result }}
branch: ${{env.PR_BRANCH}}

mergeRelease2FeatureAuction:
runs-on: ubuntu-latest
steps:
- name: Set env
run: |
echo "PR_BRANCH=merge/${HEAD_BRANCH}-feature/auction" >> $GITHUB_ENV
- uses: actions/checkout@v3
with:
ref: feature/auction
- 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: feature/auction

- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
labels: automated PR
team-reviewers: axieinfinity/smart-contract
delete-branch: true
title: 'chore(auction): merge from `${{env.HEAD_BRANCH}}`'
body: ${{ steps.template.outputs.result }}
branch: ${{env.PR_BRANCH}}

mergeRelease2FeaturePublicResolver:
runs-on: ubuntu-latest
steps:
- name: Set env
run: |
echo "PR_BRANCH=merge/${HEAD_BRANCH}-feature/public-resolver" >> $GITHUB_ENV
- uses: actions/checkout@v3
with:
ref: feature/public-resolver
- 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: feature/public-resolver

- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
labels: automated PR
team-reviewers: axieinfinity/smart-contract
delete-branch: true
title: 'chore(public-resolver): merge from `${{env.HEAD_BRANCH}}`'
body: ${{ steps.template.outputs.result }}
branch: ${{env.PR_BRANCH}}

mergeRelease2FeatureCI:
runs-on: ubuntu-latest
steps:
- name: Set env
run: |
echo "PR_BRANCH=merge/${HEAD_BRANCH}-feature/ci" >> $GITHUB_ENV
- uses: actions/checkout@v3
with:
ref: feature/ci
- 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: feature/ci

- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
labels: automated PR
team-reviewers: axieinfinity/smart-contract
delete-branch: true
title: 'chore(ci): merge from `${{env.HEAD_BRANCH}}`'
body: ${{ steps.template.outputs.result }}
branch: ${{env.PR_BRANCH}}

mergeRelease2FeatureReverseRegistrar:
- 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}-feature/reverse-registrar" >> $GITHUB_ENV
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: feature/reverse-registrar
ref: ${{matrix.branch_name}}
- name: Reset promotion branch
run: |
git fetch origin ${HEAD_BRANCH}:${HEAD_BRANCH}
Expand All @@ -232,14 +72,13 @@ jobs:
template: .github/template/create-pull-request.md
vars: |
fromBranch: ${{env.HEAD_BRANCH}}
toBranch: feature/reverse-registrar
toBranch: ${{matrix.branch_name}}

- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
labels: automated PR
team-reviewers: axieinfinity/smart-contract
delete-branch: true
title: 'chore(reverse-registrar): merge from `${{env.HEAD_BRANCH}}`'
title: 'chore(`${{env.FEATURE_NAME}}`): merge from `${{env.HEAD_BRANCH}}`'
body: ${{ steps.template.outputs.result }}
branch: ${{env.PR_BRANCH}}
Loading
Loading