-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into add-timelock-contract
- Loading branch information
Showing
56 changed files
with
2,366 additions
and
297 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| name: Force-Merge PR (Bypass Audit Requirement) | ||
| # - This git action may only be used in exceptional cases | ||
| # - Exceptional cases are for example issues in an audit-protected contract that do not touch the code itself such | ||
| # as an issue with the solidity pragma or some issue in a comment | ||
| # - it can only be executed by the CTO or the Information Security Manager/Architect | ||
| # - a valid reason must be provided in order to force-merge a given PR | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| pr_number: | ||
| description: 'PR number to bypass' | ||
| required: true | ||
| justification: | ||
| description: 'Reason for bypass' | ||
| required: true | ||
|
|
||
| jobs: | ||
| force-merge-pr-bypass-audit: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: write | ||
| pull-requests: write | ||
| steps: | ||
| - name: Fetch Information Security Team Members | ||
| env: | ||
| GH_PAT: ${{ secrets.GIT_TOKEN }} | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| run: | | ||
| ##### Unset default GITHUB_TOKEN (insufficient permissions) | ||
| unset GITHUB_TOKEN | ||
| ##### Authenticate with Personal Access Token | ||
| echo "::add-mask::$GH_PAT" # Mask the token | ||
| echo $GH_PAT | gh auth login --with-token | ||
| ##### Fetch team members of 'informationsecuritymanager' team | ||
| ORG_NAME="lifinance" | ||
| TEAM_SLUG="informationsecuritymanager" | ||
| TEAM_MEMBERS=$(gh api \ | ||
| -H "Accept: application/vnd.github+json" \ | ||
| -H "X-GitHub-Api-Version: 2022-11-28" \ | ||
| "/orgs/$ORG_NAME/teams/$TEAM_SLUG/members" | jq -r '.[].login') | ||
| if [[ -z "$TEAM_MEMBERS" ]]; then | ||
| echo -e "\033[31mERROR: Could not retrieve team members of $TEAM_SLUG.\033[0m" | ||
| exit 1 | ||
| fi | ||
| echo "The following users are members of $TEAM_SLUG: $TEAM_MEMBERS" | ||
| echo "$TEAM_MEMBERS" > team_members.txt | ||
| - name: Verify Actor's Team Membership | ||
| run: | | ||
| ##### Check if the actor is in the team members list | ||
| ACTOR="${{ github.actor }}" | ||
| TEAM_MEMBERS=$(cat team_members.txt) | ||
| # Strict validation of actor against team members | ||
| if echo "$TEAM_MEMBERS" | while read -r member; do | ||
| [[ "$member" == "$ACTOR" ]] && exit 0 | ||
| done; then | ||
| echo -e "\033[32m$ACTOR is authorized to approve bypasses.\033[0m" | ||
| echo "CONTINUE=true" >> "$GITHUB_ENV" | ||
| else | ||
| echo -e "\033[31mERROR: $ACTOR is NOT authorized to approve bypasses\033[0m" | ||
| exit 1 | ||
| fi | ||
| - name: Log Justification | ||
| if: env.CONTINUE == 'true' | ||
| run: | | ||
| echo "Bypass approved for PR #${{ github.event.inputs.pr_number }} by $ACTOR." | ||
| echo "Justification: ${{ github.event.inputs.justification }}" | ||
| - name: Merge the PR | ||
| uses: actions/[email protected] | ||
| if: env.CONTINUE == 'true' | ||
| with: | ||
| script: | | ||
| const pr = parseInt(core.getInput('pr_number')); | ||
| console.log(`Merging PR ${pr} now`) | ||
| // Fetch PR details | ||
| const { data: prData } = await github.rest.pulls.get({ | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| pull_number: pr | ||
| }); | ||
| // Validate PR state | ||
| if (!prData.mergeable) { | ||
| throw new Error('PR is not in a mergeable state'); | ||
| } | ||
| await github.rest.pulls.merge({ | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| pull_number: pr, | ||
| merge_method: "squash", | ||
| commit_title: `[BYPASS] ${prData.title}`, | ||
| commit_message: `Bypassed by ${context.actor}\nJustification: ${core.getInput('justification')}` | ||
| }); | ||
| - name: Send Discord message | ||
| uses: Ilshidur/[email protected] | ||
| with: | ||
| args: | | ||
| :warning: '${{ github.actor }} just bypassed the audit requirement controls to force-merge PR #${{ github.event.inputs.pr_number }}.' | ||
| env: | ||
| DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_DEV_SMARTCONTRACTS }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -123,6 +123,7 @@ jobs: | |
| echo "Current version: $CURRENT_VERSION" | ||
| VERSION_FRAGMENT="" | ||
| BETA="" | ||
| # Determine the type of version bump | ||
| if [[ "$BRANCH_NAME" == "main" ]]; then | ||
|
|
@@ -151,10 +152,9 @@ jobs: | |
| PATCH=$((PATCH + 1)) | ||
| elif [[ "$VERSION_FRAGMENT" == "beta" ]]; then | ||
| PATCH=$((PATCH + 1)) | ||
| NEW_VERSION="${MAJOR}.${MINOR}.${PATCH}-beta" | ||
| else | ||
| NEW_VERSION="${MAJOR}.${MINOR}.${PATCH}" | ||
| BETA="-beta" | ||
| fi | ||
| NEW_VERSION="${MAJOR}.${MINOR}.${PATCH}${BETA}" | ||
| echo "New version: $NEW_VERSION" | ||
| echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV | ||
|
|
@@ -169,7 +169,7 @@ jobs: | |
| run: | | ||
| cd lifi-contract-types | ||
| TMP=$(mktemp) | ||
| jq '.version="${NEW_VERSION}"' package.json > "$TMP" && mv "$TMP" package.json | ||
| jq --arg version "$NEW_VERSION" '.version=$version' package.json > "$TMP" && mv "$TMP" package.json | ||
| git config user.name github-actions | ||
| git config user.email [email protected] | ||
| echo "Updating version from $LATEST_TAG to $NEW_VERSION" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| { | ||
| "mainnet": { | ||
| "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", | ||
| "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" | ||
| }, | ||
| "optimism": { | ||
| "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", | ||
| "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" | ||
| }, | ||
| "polygon": { | ||
| "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", | ||
| "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" | ||
| }, | ||
| "boba": { | ||
| "relayReceiver": "0xa06e1351e2fd2d45b5d35633ca7ecf328684a109", | ||
| "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" | ||
| }, | ||
| "arbitrum": { | ||
| "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", | ||
| "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" | ||
| }, | ||
| "avalanche": { | ||
| "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", | ||
| "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" | ||
| }, | ||
| "blast": { | ||
| "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", | ||
| "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" | ||
| }, | ||
| "mode": { | ||
| "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", | ||
| "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" | ||
| }, | ||
| "linea": { | ||
| "relayReceiver": "0x00000000aa467eba42a3d604b3d74d63b2b6c6cb", | ||
| "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" | ||
| }, | ||
| "taiko": { | ||
| "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", | ||
| "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" | ||
| }, | ||
| "scroll": { | ||
| "relayReceiver": "0xa5f565650890fba1824ee0f21ebbbf660a179934", | ||
| "relaySolver": "0xf70da97812CB96acDF810712Aa562db8dfA3dbEF" | ||
| } | ||
| } |
Oops, something went wrong.