Skip to content

Commit

Permalink
Merge pull request #10 from l2beat/main
Browse files Browse the repository at this point in the history
[pull] main from l2beat:main
  • Loading branch information
kodiakhq[bot] authored Oct 19, 2024
2 parents f4b8d77 + 3bfda00 commit c0ffa9e
Show file tree
Hide file tree
Showing 738 changed files with 34,073 additions and 3,668 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
name: Deploy backend
name: Deploy backend prod

concurrency:
group: backend-deployment
group: backend-deployment-prod
permissions: {}

on:
workflow_dispatch: {}
push:
branches:
- main
Expand Down Expand Up @@ -33,11 +34,9 @@ jobs:
TURBO_TEAM=${{ vars.TURBO_TEAM }}
TURBO_TOKEN=${{ secrets.TURBO_TOKEN }}
tags: |
registry.heroku.com/${{ secrets.HEROKU_BACKEND_DEV }}/web
registry.heroku.com/${{ secrets.HEROKU_BACKEND_PROD }}/web
- name: Release published containers
run: |
heroku container:release -a ${{ secrets.HEROKU_BACKEND_DEV }} -v web
heroku container:release -a ${{ secrets.HEROKU_BACKEND_PROD }} -v web
env:
HEROKU_ORGANIZATION: ${{ vars.HEROKU_ORG }}
Expand Down
43 changes: 43 additions & 0 deletions .github/workflows/deploy-backend-stage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Deploy backend stage

concurrency:
group: backend-deployment-stage
permissions: {}

on:
workflow_dispatch: {}
push:
branches:
- main

jobs:
deploy-backend:
name: Deploy backend
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
- name: Install heroku CLI
run: curl https://cli-assets.heroku.com/install-ubuntu.sh | sh
- name: Login to heroku container registry
uses: docker/login-action@v3
with:
username: "_"
password: ${{ secrets.HEROKU_TOKEN }}
registry: registry.heroku.com
- name: Build and publish containers
uses: docker/build-push-action@v5
with:
push: true
file: Dockerfile.backend
build-args: |
TURBO_TEAM=${{ vars.TURBO_TEAM }}
TURBO_TOKEN=${{ secrets.TURBO_TOKEN }}
tags: |
registry.heroku.com/${{ secrets.HEROKU_BACKEND_DEV }}/web
- name: Release published containers
run: |
heroku container:release -a ${{ secrets.HEROKU_BACKEND_DEV }} -v web
env:
HEROKU_ORGANIZATION: ${{ vars.HEROKU_ORG }}
HEROKU_API_KEY: ${{ secrets.HEROKU_TOKEN }}
2 changes: 0 additions & 2 deletions packages/backend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,6 @@ ETHEREUM_RPC_URL_FOR_TVL=https://another.rpc/mainnet

The tvl feature is configured via the following environment variables:

- `ERROR_ON_UNSYNCED_TVL` - Optional. Defaults to false

**Feature flags:**

- `tvl` - enables tvl feature
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"$schema": "../../../../discovery/schemas/contract.v2.schema.json",
"ignoreInWatchMode": ["nonce"],
"ignoreMethods": ["getThreshold", "getOwners"]
"ignoreMethods": ["getThreshold", "getOwners"],
"fields": {
"GnosisSafe_modules": {
"target": {
"permissions": [{ "type": "act" }]
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"L1_TOKEN_BRIDGE",
"L1_USDC_BRIDGE",
"l1StandardBridge",
"messenger"
"messenger",
"L1_OP_USDC_BRIDGE"
],
"ignoreMethods": ["getL1CallValue"],
"ignoreInWatchMode": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"fields": {
"deputyGuardian": {
"target": {
"description": "Deputy Guardian of {{ $.address }}. It can act on behalf of the {{ safe }}."
"description": "Deputy Guardian of {{ $.address }}. It can act on behalf of the {{ safe }}.",
"permissions": [{ "type": "act" }]
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@
"fields": {
"proposer": {
"target": {
"role": "Proposer"
"permissions": [{ "type": "propose" }]
}
},
"PROPOSER": {
"target": {
"role": "Proposer"
"permissions": [{ "type": "propose" }]
}
},
"challenger": {
"target": {
"role": "Challenger"
"permissions": [{ "type": "challenge" }]
}
},
"CHALLENGER": {
"target": {
"role": "Challenger"
"permissions": [{ "type": "challenge" }]
}
},
"deletedOutputs": {
Expand Down
Loading

0 comments on commit c0ffa9e

Please sign in to comment.