Skip to content

Commit

Permalink
Merge branch 'main' into rep-price-feed
Browse files Browse the repository at this point in the history
  • Loading branch information
rustboyar committed Nov 3, 2023
2 parents 287e1b1 + 40c70c3 commit e95ed28
Show file tree
Hide file tree
Showing 56 changed files with 3,674 additions and 243 deletions.
1 change: 1 addition & 0 deletions .assets/380953098cfaf9c52baabfd063712d8e6bcef690.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions .assets/541043868751fc5ea1344f681b00906bdf734fdf.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions .assets/64a0110786c519e361963abb7399874664375a85.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions .assets/b5cb0fd07fde8594230045982589445fc02ace52.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LEDGER_SENDER=
PRIVATE_KEY=

# Test rpc_endpoints
RPC_MAINNET=https://rpc.flashbots.net
RPC_MAINNET=https://eth.llamarpc.com
RPC_AVALANCHE=https://api.avax.network/ext/bc/C/rpc
RPC_OPTIMISM=https://mainnet.optimism.io
RPC_POLYGON=https://polygon-rpc.com
Expand All @@ -16,7 +16,7 @@ RPC_HARMONY=https://api.harmony.one
RPC_METIS=https://andromeda.metis.io/?owner=1088
RPC_BASE=https://mainnet.base.org
RPC_ZKEVM=https://zkevm-rpc.com
RPC_GNOSIS=https://rpc.gnosischain.com
RPC_GNOSIS=https://rpc.ankr.com/gnosis
RPC_BNB=https://binance.llamarpc.com

# Etherscan api keys for verification & download utils
Expand Down
44 changes: 43 additions & 1 deletion .github/workflows/ipfs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,19 @@ jobs:
runs-on: ubuntu-latest
name: Ipfs uploader
steps:
- uses: actions/checkout@v3
- name: Generate a token
id: generate_token
if: github.event_name != 'pull_request'
uses: actions/create-github-app-token@v1
with:
app_id: ${{ secrets.UPDATE_BOT_APP_ID }}
private_key: ${{ secrets.UPDATE_BOT_TOKEN }}

- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ steps.generate_token.outputs.token || github.token }}
persist-credentials: true

- uses: actions/setup-node@v3
with:
Expand All @@ -44,6 +54,17 @@ jobs:
run: |
cat .github/outputs/all_changed_files.json
- name: replace main with hash
if: github.event_name != 'pull_request' && steps.changed-files.outputs.any_changed == 'true'
run: |
json_array=($(jq -r '.[]' ".github/outputs/all_changed_files.json"))
for i in "${json_array[@]}"
do
npx prettier $i --write
sed -i 's@https://github.com/bgd-labs/aave-proposals-v3/blob/main/@https://github.com/bgd-labs/aave-proposals-v3/blob/${{ github.sha }}/@g' $i
sed -i 's@https://github.com/bgd-labs/aave-proposals-v3/tree/main/@https://github.com/bgd-labs/aave-proposals-v3/blob/${{ github.sha }}/@g' $i
done
- name: Upload
if: steps.changed-files.outputs.any_changed == 'true'
env:
Expand All @@ -55,3 +76,24 @@ jobs:
do
npx aave-cli ipfs ${{ github.event_name != 'pull_request' && '-u' || ''}} $i
done
- name: check diff and potentially commit
if: github.event_name != 'pull_request' && steps.changed-files.outputs.any_changed == 'true'
env:
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
run: |
if [[ -z $(git status -s) ]]
then
echo "tree is clean"
else
git config --global user.name 'Cache bot'
git config --global user.email '[email protected]'
git config --global pull.rebase true
git stash
git pull origin ${{ github.event.repository.default_branch }}
git stash apply
git add src
git commit -am "fix(cache): automated cache update [skip ci]"
git push origin ${{ github.event.repository.default_branch }}
exit
fi
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ test :; forge test -vvv
test-contract :; forge test --match-contract ${filter} -vvv

# Deploy
deploy-ledger :; forge script ${contract} --rpc-url ${chain} $(if ${dry},--sender 0x25F2226B597E8F9514B3F68F00f494cF4f286491 -vvvv,--broadcast --ledger --mnemonics foo --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv)
deploy-pk :; forge script ${contract} --rpc-url ${chain} $(if ${dry},--sender 0x25F2226B597E8F9514B3F68F00f494cF4f286491 -vvvv,--broadcast --private-key ${PRIVATE_KEY} --verify -vvvv)
deploy-ledger :; forge script ${contract} --rpc-url ${chain} $(if ${dry},--sender 0x25F2226B597E8F9514B3F68F00f494cF4f286491 -vvvv,--broadcast --ledger --mnemonics foo --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv --slow)
deploy-pk :; forge script ${contract} --rpc-url ${chain} $(if ${dry},--sender 0x25F2226B597E8F9514B3F68F00f494cF4f286491 -vvvv,--broadcast --private-key ${PRIVATE_KEY} --verify -vvvv --slow)


# Utilities
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
## Reserve changes

### Reserve altered

#### MANA ([0x0F5D2fB29fb7d3CFeE444a200298f468908cC942](https://etherscan.io/address/0x0F5D2fB29fb7d3CFeE444a200298f468908cC942))

| description | value before | value after |
| --- | --- | --- |
| liquidationThreshold | 48 % | 37 % |


#### YFI ([0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e](https://etherscan.io/address/0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e))

| description | value before | value after |
| --- | --- | --- |
| liquidationThreshold | 45 % | 43 % |


#### 1INCH ([0x111111111117dC0aa78b770fA6A738034120C302](https://etherscan.io/address/0x111111111117dC0aa78b770fA6A738034120C302))

| description | value before | value after |
| --- | --- | --- |
| liquidationThreshold | 24 % | 1 % |


#### DPI ([0x1494CA1F11D487c2bBe4543E90080AeBa4BA3C2b](https://etherscan.io/address/0x1494CA1F11D487c2bBe4543E90080AeBa4BA3C2b))

| description | value before | value after |
| --- | --- | --- |
| liquidationThreshold | 16 % | 14 % |


#### UNI ([0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984](https://etherscan.io/address/0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984))

| description | value before | value after |
| --- | --- | --- |
| liquidationThreshold | 70 % | 64 % |


#### REN ([0x408e41876cCCDC0F92210600ef50372656052a38](https://etherscan.io/address/0x408e41876cCCDC0F92210600ef50372656052a38))

| description | value before | value after |
| --- | --- | --- |
| liquidationThreshold | 27 % | 25 % |


#### CVX ([0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B](https://etherscan.io/address/0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B))

| description | value before | value after |
| --- | --- | --- |
| liquidationThreshold | 33 % | 30 % |


#### LINK ([0x514910771AF9Ca656af840dff83E8264EcF986CA](https://etherscan.io/address/0x514910771AF9Ca656af840dff83E8264EcF986CA))

| description | value before | value after |
| --- | --- | --- |
| liquidationThreshold | 82 % | 81 % |


#### xSUSHI ([0x8798249c2E607446EfB7Ad49eC89dD1865Ff4272](https://etherscan.io/address/0x8798249c2E607446EfB7Ad49eC89dD1865Ff4272))

| description | value before | value after |
| --- | --- | --- |
| liquidationThreshold | 28 % | 1 % |


#### MKR ([0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2](https://etherscan.io/address/0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2))

| description | value before | value after |
| --- | --- | --- |
| liquidationThreshold | 35 % | 30 % |


#### SNX ([0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F](https://etherscan.io/address/0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F))

| description | value before | value after |
| --- | --- | --- |
| liquidationThreshold | 43 % | 41 % |


#### ENS ([0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72](https://etherscan.io/address/0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72))

| description | value before | value after |
| --- | --- | --- |
| liquidationThreshold | 50 % | 47 % |


#### CRV ([0xD533a949740bb3306d119CC777fa900bA034cd52](https://etherscan.io/address/0xD533a949740bb3306d119CC777fa900bA034cd52))

| description | value before | value after |
| --- | --- | --- |
| liquidationThreshold | 42 % | 38 % |


#### ZRX ([0xE41d2489571d322189246DaFA5ebDe1F4699F498](https://etherscan.io/address/0xE41d2489571d322189246DaFA5ebDe1F4699F498))

| description | value before | value after |
| --- | --- | --- |
| liquidationThreshold | 37 % | 34 % |


#### BAL ([0xba100000625a3754423978a60c9317c58a424e3D](https://etherscan.io/address/0xba100000625a3754423978a60c9317c58a424e3D))

| description | value before | value after |
| --- | --- | --- |
| liquidationThreshold | 25 % | 21 % |


## Raw diff

```json
{
"reserves": {
"0x0F5D2fB29fb7d3CFeE444a200298f468908cC942": {
"liquidationThreshold": {
"from": 4800,
"to": 3700
}
},
"0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e": {
"liquidationThreshold": {
"from": 4500,
"to": 4300
}
},
"0x111111111117dC0aa78b770fA6A738034120C302": {
"liquidationThreshold": {
"from": 2400,
"to": 100
}
},
"0x1494CA1F11D487c2bBe4543E90080AeBa4BA3C2b": {
"liquidationThreshold": {
"from": 1600,
"to": 1400
}
},
"0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984": {
"liquidationThreshold": {
"from": 7000,
"to": 6400
}
},
"0x408e41876cCCDC0F92210600ef50372656052a38": {
"liquidationThreshold": {
"from": 2700,
"to": 2500
}
},
"0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B": {
"liquidationThreshold": {
"from": 3300,
"to": 3000
}
},
"0x514910771AF9Ca656af840dff83E8264EcF986CA": {
"liquidationThreshold": {
"from": 8200,
"to": 8100
}
},
"0x8798249c2E607446EfB7Ad49eC89dD1865Ff4272": {
"liquidationThreshold": {
"from": 2800,
"to": 100
}
},
"0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2": {
"liquidationThreshold": {
"from": 3500,
"to": 3000
}
},
"0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F": {
"liquidationThreshold": {
"from": 4300,
"to": 4100
}
},
"0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72": {
"liquidationThreshold": {
"from": 5000,
"to": 4700
}
},
"0xD533a949740bb3306d119CC777fa900bA034cd52": {
"liquidationThreshold": {
"from": 4200,
"to": 3800
}
},
"0xE41d2489571d322189246DaFA5ebDe1F4699F498": {
"liquidationThreshold": {
"from": 3700,
"to": 3400
}
},
"0xba100000625a3754423978a60c9317c58a424e3D": {
"liquidationThreshold": {
"from": 2500,
"to": 2100
}
}
}
}
```
Loading

0 comments on commit e95ed28

Please sign in to comment.