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

Deploy Compound III USDC market on Optimism #838

Closed
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
5380a4c
Add deploy script for Optimism usdc market
dmitriy-woof-software Mar 4, 2024
15aa71f
Add Optimism and Optimism-goerli networks. And usdt market
dmitriy-woof-software Mar 4, 2024
9a873cf
Add wstETH collateral token
dmitriy-woof-software Mar 4, 2024
c9204ad
Use Gauntlet recommended parameters for configuration
dmitriy-woof-software Mar 4, 2024
c2f834d
Add Optimism COMP and pauseGuardian addresses
dmitriy-woof-software Mar 4, 2024
4a03e9b
Fix regexp in contract import
dmitriy-woof-software Mar 4, 2024
ddfd9a9
Update spaces and commas
dmitriy-woof-software Mar 4, 2024
5208c87
Update offsets and commas
dmitriy-woof-software Mar 4, 2024
61f097f
Merge main into bergman-works/deploy-compound-v3-on-optimism
dmitriy-woof-software Mar 4, 2024
7bbb4cb
Update PR id in migration
dmitriy-woof-software Mar 4, 2024
b329070
Remove goerli-optimism network deployment
dmitriy-woof-software Mar 13, 2024
b2d986c
usdc market deploy; update roots; add wstETH into relations
dmitriy-woof-software Mar 18, 2024
7430898
update migration description text; add optimism whale; update importTest
dmitriy-woof-software Mar 18, 2024
039bef2
update workflows names because git does not display them on actions tab
dmitriy-woof-software Mar 18, 2024
294270d
return initial workflows names
dmitriy-woof-software Mar 18, 2024
06bc28e
update configuration to zero values; remove old roots values; add opt…
dmitriy-woof-software Mar 19, 2024
33ef440
update borrowMin to fix scenario; skip non-weth scenario; update COMP…
dmitriy-woof-software Mar 22, 2024
90ad0ee
Merge branch 'main' of github.com:dmitriy-bergman-works/comet-optimis…
dmitriy-woof-software Mar 23, 2024
c014093
remove only from tests
dmitriy-woof-software Mar 23, 2024
b253058
add usdc market deployment on optimism network
dmitriy-woof-software Mar 23, 2024
341335c
udpate migration PR id
dmitriy-woof-software Mar 23, 2024
4b716e6
remove optimism-usdt scenario
dmitriy-woof-software Mar 24, 2024
a607fd9
add pull_request key into deploy-market to trigger workflow
dmitriy-woof-software Mar 25, 2024
5b94aff
add pull_request key into enact-migration and prepare-migration to tr…
dmitriy-woof-software Mar 25, 2024
0f17792
remove pull_request key
dmitriy-woof-software Mar 25, 2024
84d9689
remove custom offsets in hardat.config.ts; update configuration.json …
dmitriy-woof-software Mar 25, 2024
c174483
remove linter changes
dmitriy-woof-software Mar 25, 2024
761e8f2
remove bracket
dmitriy-woof-software Mar 25, 2024
547f29c
update borrowMin to 1e0
dmitriy-woof-software Mar 25, 2024
29014df
remove wstETH as collateral asset
dmitriy-woof-software Mar 26, 2024
2abd324
remove wstEth from relations. update configuration
dmitriy-woof-software Mar 26, 2024
8740523
Merge branch 'main' of github.com:dmitriy-bergman-works/comet-optimis…
dmitriy-woof-software Apr 3, 2024
7f5df08
update deploy-market.yaml
dmitriy-woof-software Apr 4, 2024
20ba98f
Modified deployment roots from GitHub Actions
Apr 6, 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
6 changes: 4 additions & 2 deletions .github/workflows/deploy-market.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
- base
- base-goerli
- linea-goerli
- optimism
deployment:
description: Deployment Name (e.g. "usdc")
required: true
Expand All @@ -38,13 +39,14 @@ jobs:
ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
BASESCAN_KEY: ${{ secrets.BASESCAN_KEY }}
LINEASCAN_KEY: ${{ secrets.LINEASCAN_KEY }}
OPTIMISMSCAN_KEY: ${{ secrets.OPTIMISMSCAN_KEY }}
steps:
- name: Seacrest
uses: hayesgm/seacrest@5748b3a066f517973ca2ca03d0af39bbf2b82d10
with:
wallet_connect_project_id: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
requested_network: "${{ inputs.network }}"
ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"sepolia\":\"https://sepolia.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://clean-spring-wind.base-mainnet.discover.quiknode.pro/$QUICKNODE_KEY\",\"base-goerli\":\"https://base-goerli.infura.io/v3/$INFURA_KEY\",\"linea-goerli\":\"https://linea-goerli.infura.io/v3/$INFURA_KEY\"}')[inputs.network] }}"
ethereum_url: "${{ fromJSON('{\"optimism\":\"https://optimism-mainnet.infura.io/v3/$INFURA_KEY\",\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"sepolia\":\"https://sepolia.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://clean-spring-wind.base-mainnet.discover.quiknode.pro/$QUICKNODE_KEY\",\"base-goerli\":\"https://base-goerli.infura.io/v3/$INFURA_KEY\",\"linea-goerli\":\"https://linea-goerli.infura.io/v3/$INFURA_KEY\"}')[inputs.network] }}"
port: 8585
if: github.event.inputs.eth_pk == ''

Expand Down Expand Up @@ -86,4 +88,4 @@ jobs:
git config user.email "<>"
git add deployments/\*/roots.json
git commit -m "Modified deployment roots from GitHub Actions"
git push origin
git push origin
8 changes: 5 additions & 3 deletions .github/workflows/enact-migration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
- base
- base-goerli
- linea-goerli
- optimism
deployment:
description: Deployment Name (e.g. "usdc")
required: true
Expand Down Expand Up @@ -46,6 +47,7 @@ jobs:
ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
BASESCAN_KEY: ${{ secrets.BASESCAN_KEY }}
LINEASCAN_KEY: ${{ secrets.LINEASCAN_KEY }}
OPTIMISMSCAN_KEY: ${{ secrets.OPTIMISMSCAN_KEY }}
steps:
- name: Get governance network
run: |
Expand All @@ -63,7 +65,7 @@ jobs:
with:
wallet_connect_project_id: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
requested_network: "${{ inputs.network }}"
ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"sepolia\":\"https://sepolia.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://clean-spring-wind.base-mainnet.discover.quiknode.pro/$QUICKNODE_KEY\",\"base-goerli\":\"https://base-goerli.infura.io/v3/$INFURA_KEY\",\"linea-goerli\":\"https://linea-goerli.infura.io/v3/$INFURA_KEY\"}')[inputs.network] }}"
ethereum_url: "${{ fromJSON('{\"optimism\":\"https://optimism-mainnet.infura.io/v3/$INFURA_KEY\",\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"sepolia\":\"https://sepolia.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://clean-spring-wind.base-mainnet.discover.quiknode.pro/$QUICKNODE_KEY\",\"base-goerli\":\"https://base-goerli.infura.io/v3/$INFURA_KEY\",\"linea-goerli\":\"https://linea-goerli.infura.io/v3/$INFURA_KEY\"}')[inputs.network] }}"
port: 8585
if: github.event.inputs.eth_pk == ''

Expand All @@ -72,7 +74,7 @@ jobs:
with:
wallet_connect_project_id: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
requested_network: "${{ env.GOV_NETWORK }}"
ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"sepolia\":\"https://sepolia.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\"}')[env.GOV_NETWORK] }}"
ethereum_url: "${{ fromJSON('{\"optimism\":\"https://optimism-mainnet.infura.io/v3/$INFURA_KEY\",\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"sepolia\":\"https://sepolia.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\"}')[env.GOV_NETWORK] }}"
port: 8685
if: github.event.inputs.eth_pk == '' && env.GOV_NETWORK != ''

Expand Down Expand Up @@ -118,4 +120,4 @@ jobs:
git config user.email "<>"
git add deployments/${{ github.event.inputs.network }}/${{ github.event.inputs.deployment }}/migrations/${{ github.event.inputs.migration }}.ts
git commit -m "Modified migration from GitHub Actions" || echo "No changes to commit"
git push origin
git push origin
6 changes: 4 additions & 2 deletions .github/workflows/prepare-migration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ on:
- arbitrum-goerli
- base
- base-goerli
- optimism
deployment:
description: Deployment Name (e.g. "usdc")
required: true
Expand All @@ -40,13 +41,14 @@ jobs:
ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
BASESCAN_KEY: ${{ secrets.BASESCAN_KEY }}
LINEASCAN_KEY: ${{ secrets.LINEASCAN_KEY }}
OPTIMISMSCAN_KEY: ${{ secrets.OPTIMISMSCAN_KEY }}
steps:
- name: Seacrest
uses: hayesgm/seacrest@5748b3a066f517973ca2ca03d0af39bbf2b82d10
with:
wallet_connect_project_id: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
requested_network: "${{ inputs.network }}"
ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"sepolia\":\"https://sepolia.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://clean-spring-wind.base-mainnet.discover.quiknode.pro/$QUICKNODE_KEY\",\"base-goerli\":\"https://base-goerli.infura.io/v3/$INFURA_KEY\",\"linea-goerli\":\"https://linea-goerli.infura.io/v3/$INFURA_KEY\"}')[inputs.network] }}"
ethereum_url: "${{ fromJSON('{\"optimism\":\"https://optimism-mainnet.infura.io/v3/$INFURA_KEY\",\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"sepolia\":\"https://sepolia.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\",\"base\":\"https://clean-spring-wind.base-mainnet.discover.quiknode.pro/$QUICKNODE_KEY\",\"base-goerli\":\"https://base-goerli.infura.io/v3/$INFURA_KEY\",\"linea-goerli\":\"https://linea-goerli.infura.io/v3/$INFURA_KEY\"}')[inputs.network] }}"
port: 8585
if: github.event.inputs.eth_pk == ''

Expand Down Expand Up @@ -79,4 +81,4 @@ jobs:
if: success() || failure() # run this step even if previous step failed
with:
name: ${{ github.event.inputs.network }}-${{ github.event.inputs.deployment }}-${{ github.event.inputs.migration }}
path: deployments/${{ github.event.inputs.network }}/${{ github.event.inputs.deployment }}/artifacts/${{ github.event.inputs.migration }}.json
path: deployments/${{ github.event.inputs.network }}/${{ github.event.inputs.deployment }}/artifacts/${{ github.event.inputs.migration }}.json
3 changes: 2 additions & 1 deletion .github/workflows/run-contract-linter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
LINEASCAN_KEY: ${{ secrets.LINEASCAN_KEY }}
OPTIMISMSCAN_KEY: ${{ secrets.OPTIMISMSCAN_KEY }}
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -26,4 +27,4 @@ jobs:
run: yarn install --non-interactive --frozen-lockfile && yarn build

- name: Run linter on modified contracts
run: git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep ^contracts/ | xargs yarn solhint
run: git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep ^contracts/ | xargs yarn solhint
1 change: 1 addition & 0 deletions .github/workflows/run-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
LINEASCAN_KEY: ${{ secrets.LINEASCAN_KEY }}
OPTIMISMSCAN_KEY: ${{ secrets.OPTIMISMSCAN_KEY }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/run-eslint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
LINEASCAN_KEY: ${{ secrets.LINEASCAN_KEY }}
OPTIMISMSCAN_KEY: ${{ secrets.OPTIMISMSCAN_KEY }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/run-forge-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
LINEASCAN_KEY: ${{ secrets.LINEASCAN_KEY }}
OPTIMISMSCAN_KEY: ${{ secrets.OPTIMISMSCAN_KEY }}

- name: Build Comet with older solc versions
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/run-gas-profiler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
LINEASCAN_KEY: ${{ secrets.LINEASCAN_KEY }}
OPTIMISMSCAN_KEY: ${{ secrets.OPTIMISMSCAN_KEY }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/run-scenarios.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
bases: [ development, mainnet, mainnet-weth, goerli, goerli-weth, sepolia-usdc, sepolia-weth, fuji, mumbai, polygon, arbitrum-usdc.e, arbitrum-usdc, arbitrum-goerli-usdc, arbitrum-goerli-usdc.e, base-usdbc, base-weth, base-usdc, base-goerli, base-goerli-weth, linea-goerli]
bases: [ development, mainnet, mainnet-weth, goerli, goerli-weth, sepolia-usdc, sepolia-weth, fuji, mumbai, polygon, arbitrum-usdc.e, arbitrum-usdc, arbitrum-goerli-usdc, arbitrum-goerli-usdc.e, base-usdbc, base-weth, base-usdc, base-goerli, base-goerli-weth, linea-goerli, optimism-usdc]
name: Run scenarios
env:
ETHERSCAN_KEY: ${{ secrets.ETHERSCAN_KEY }}
Expand All @@ -18,6 +18,7 @@ jobs:
ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
BASESCAN_KEY: ${{ secrets.BASESCAN_KEY }}
LINEASCAN_KEY: ${{ secrets.LINEASCAN_KEY }}
OPTIMISMSCAN_KEY: ${{ secrets.OPTIMISMSCAN_KEY }}
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand Down Expand Up @@ -63,4 +64,4 @@ jobs:
with:
name: Scenario Tests (${{ matrix.bases }}) # Name of the check run which will be created
path: scenario-results.json # Path to test results (inside artifact .zip)
reporter: mocha-json # Format of test results
reporter: mocha-json # Format of test results
7 changes: 4 additions & 3 deletions .github/workflows/run-semgrep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@ name: Run Semgrep
on:
# Scan changed files in PRs (diff-aware scanning):
pull_request: {}
# On-demand
# On-demand
workflow_dispatch: {}

jobs:
semgrep:
# User-definable name of this GitHub Actions job:
name: Scan
# If you are self-hosting, change the following `runs-on` value:
# If you are self-hosting, change the following `runs-on` value:
runs-on: ubuntu-latest
env:
ETHERSCAN_KEY: ${{ secrets.ETHERSCAN_KEY }}
SNOWTRACE_KEY: ${{ secrets.SNOWTRACE_KEY }}
INFURA_KEY: ${{ secrets.INFURA_KEY }}
POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
OPTIMISMSCAN_KEY: ${{ secrets.OPTIMISMSCAN_KEY }}
container:
# A Docker image with Semgrep installed. Do not change this.
image: returntocorp/semgrep
Expand All @@ -43,7 +44,7 @@ jobs:
# Run security, performance & Compound specific rules
- run: semgrep ci --sarif --output=semgrep.sarif || true
env:
SEMGREP_RULES: rules/solidity/security rules/solidity/performance compound/solidity
SEMGREP_RULES: rules/solidity/security rules/solidity/performance compound/solidity
# Upload findings to GitHub Advanced Security Dashboard
- name: Upload findings to GitHub Advanced Security Dashboard
uses: github/codeql-action/upload-sarif@v2
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/run-unit-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
LINEASCAN_KEY: ${{ secrets.LINEASCAN_KEY }}
OPTIMISMSCAN_KEY: ${{ secrets.OPTIMISMSCAN_KEY }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ native asset (i.e. 2 ETH for Goerli, 2 AVAX for Fuji)
The `clone-multisig` script can be used to clone the multisig and its configuration from an existing deployment, e.g.:

```bash
DST_NETWORK=optimism-goerli npx hardhat run scripts/clone-multisig.ts
DST_NETWORK=optimism npx hardhat run scripts/clone-multisig.ts
```

### Liquidation Bot
Expand Down
17 changes: 15 additions & 2 deletions deployments/goerli/usdc/relations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,20 @@ export default {
field: {
slot: '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'
}
}
},
},
opL1CrossDomainMessenger: {
delegates: {
field: async () => '0xDa2332D0a7608919Cd331B1304Cd179129a90495',
},
},
opL1StandardBridge: {
delegates: {
field: {
slot:
'0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc',
},
},
},
lineaMessageService: {
artifact: 'contracts/bridges/linea/IMessageService.sol:IMessageService',
Expand All @@ -63,5 +76,5 @@ export default {
slot: '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'
}
}
}
},
};
8 changes: 5 additions & 3 deletions deployments/goerli/usdc/roots.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
"baseL1StandardBridge": "0xfA6D8Ee5BE770F84FC001D098C4bD604Fe01284a",
"lineaMessageService": "0x70BaD09280FD342D02fe64119779BC1f0791BAC2",
"lineaL1TokenBridge": "0xaA012D038E6440535Ec66eDf2DA592F4F8398133",
"lineaL1usdcBridge": "0x9c556D2cCfb6157E4A6305aa9963EdD6ca5047cB",
"lineaL1usdcBridge": "0x9c556D2cCfb6157E4A6305aa9963EdD6ca5047cB",
"CCTPTokenMessenger": "0xd0c3da58f55358142b8d3e06c1c30c5c6114efe8",
"CCTPMessageTransmitter": "0x26413e8157cd32011e726065a5462e97dd4d03d9"
}
"CCTPMessageTransmitter": "0x26413e8157cd32011e726065a5462e97dd4d03d9",
"opL1CrossDomainMessenger": "0x5086d1eEF304eb5284A0f6720f79403b4e9bE294",
"opL1StandardBridge": "0x636Af16bf2f682dD3109e60102b8E1A089FedAa8"
}
15 changes: 14 additions & 1 deletion deployments/mainnet/usdc/relations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,18 @@ export default {
slot: '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'
}
}
},
opL1CrossDomainMessenger: {
delegates: {
field: async () => '0x2150Bc3c64cbfDDbaC9815EF615D6AB8671bfe43'
}
},
opL1StandardBridge: {
delegates: {
field: {
slot:
'0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'
}
}
}
};
};
10 changes: 6 additions & 4 deletions deployments/mainnet/usdc/roots.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
"bulker": "0xa397a8C2086C554B531c02E29f3291c9704B00c7",
"fxRoot": "0xfe5e5D361b2ad62c541bAb87C45a0B9B018389a2",
"arbitrumInbox": "0x4Dbd4fc535Ac27206064B68FfCf827b0A60BAB3f",
"arbitrumL1GatewayRouter": "0x72Ce9c846789fdB6fC1f34aC4AD25Dd9ef7031ef",
"CCTPTokenMessenger": "0xbd3fa81b58ba92a82136038b25adec7066af3155",
"arbitrumL1GatewayRouter": "0x72Ce9c846789fdB6fC1f34aC4AD25Dd9ef7031ef",
"CCTPTokenMessenger": "0xbd3fa81b58ba92a82136038b25adec7066af3155",
"CCTPMessageTransmitter": "0x0a992d191deec32afe36203ad87d7d289a738f81",
"baseL1CrossDomainMessenger": "0x866E82a600A1414e583f7F13623F1aC5d58b0Afa",
"baseL1StandardBridge": "0x3154Cf16ccdb4C6d922629664174b904d80F2C35"
}
"baseL1StandardBridge": "0x3154Cf16ccdb4C6d922629664174b904d80F2C35",
"opL1CrossDomainMessenger": "0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1",
"opL1StandardBridge": "0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1"
}
65 changes: 65 additions & 0 deletions deployments/optimism/usdc/configuration.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"name": "Compound USDC",
"symbol": "cUSDCv3",
"baseToken": "USDC",
"baseTokenAddress": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
"baseTokenPriceFeed": "0x16a9FA2FDa030272Ce99B29CF780dFA30361E0f3",
"pauseGuardian": "0x3fFd6c073a4ba24a113B18C8F373569640916A45",
"borrowMin": "1e0",
"storeFrontPriceFactor": 0.6,
"targetReserves": "20000000e6",
"rates": {
"supplyKink": 0.9,
"supplySlopeLow": 0.059,
"supplySlopeHigh": 2.9,
"supplyBase": 0,
"borrowKink": 0.9,
"borrowSlopeLow": 0.061,
"borrowSlopeHigh": 3.2,
"borrowBase": 0.015
},
"tracking": {
"indexScale": "1e15",
"baseSupplySpeed": "0e15",
"baseBorrowSpeed": "0e15",
"baseMinForRewards": "1000e6"
},
"assets": {
"OP": {
"address": "0x4200000000000000000000000000000000000042",
"priceFeed": "0x0D276FC14719f9292D5C1eA2198673d1f4269246",
"decimals": "18",
"borrowCF": 0.65,
"liquidateCF": 0.7,
"liquidationFactor": 0.8,
"supplyCap": "0e18"
},
"WETH": {
"address": "0x4200000000000000000000000000000000000006",
"priceFeed": "0x13e3Ee699D1909E989722E753853AE30b17e08c5",
"decimals": "18",
"borrowCF": 0.83,
"liquidateCF": 0.9,
"liquidationFactor": 0.95,
"supplyCap": "0e18"
},
"WBTC": {
"address": "0x68f180fcCe6836688e9084f035309E29Bf0A2095",
"priceFeed": "0x718A5788b89454aAE3A028AE9c111A29Be6c2a6F",
"decimals": "8",
"borrowCF": 0.8,
"liquidateCF": 0.85,
"liquidationFactor": 0.95,
"supplyCap": "0e8"
},
"wstETH": {
"address": "0x1F32b1c2345538c0c6f582fCB022739c4A194Ebb",
"priceFeed": "0x698B585CbC4407e2D54aa898B2600B53C68958f7",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the market-based wstETH / USD price feed. Lido's recent proposals to list wstETH seem to go with the exchange-rate-based wstETH / stETH * ETH / USD custom price feed. Let's maybe wait for them to finalize on that decision and make the same decision here to be consistent.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not clear. Could we not wait for Lido's decision?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you suggested, you could just exclude wstETH for now until that decision has been made.

"decimals": "18",
"borrowCF": 0.75,
"liquidateCF": 0.8,
"liquidationFactor": 0.9,
"supplyCap": "0e18"
}
}
}
Loading