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.

Sign up for GitHub

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

Jump to bottom

feat(core): add aglaMerkl #118

Merged
merged 16 commits into from
Nov 23, 2023
Merged

feat(core): add aglaMerkl #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8b7b9fa
feat(core): add aglaMerkl
greedythib Nov 22, 2023
1fbce50
lint file
greedythib Nov 22, 2023
4ba54cc
update sdk
greedythib Nov 22, 2023
9fae768
build: update sdk
greedythib Nov 22, 2023
8820e21
fix: ci
greedythib Nov 22, 2023
fb6d6b4
fix: gh secret
greedythib Nov 22, 2023
8a25b20
fix ci
greedythib Nov 22, 2023
6c4d407
fix: ci
greedythib Nov 23, 2023
8e60a49
fix ci
greedythib Nov 23, 2023
69d20bc
fix ci
greedythib Nov 23, 2023
46e8f5f
fix: ci
greedythib Nov 23, 2023
c954266
fix: ci
greedythib Nov 23, 2023
155db66
fix ci
greedythib Nov 23, 2023
5c9d1b2
fix ci
greedythib Nov 23, 2023
03cbfd5
Merge branch 'main' into feat/core
greedythib Nov 23, 2023
100365f
fix: fix ci
BaptistG Nov 23, 2023
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
9 changes: 7 additions & 2 deletions .github/workflows/format_token_list.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,17 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: "14"
node-version: "18"

- name: Install dependencies
shell: bash
run: echo "//npm.pkg.github.com/:_authToken=${{secrets.GITHUB_TOKEN}}" >> .npmrc && yarn install --frozen-lockfile --verbose && rm -f .npmrc
run: |
echo "//npm.pkg.github.com/:_authToken=${{ secrets.GH_REGISTRY_ACCESS_TOKEN }}" >> ~/.npmrc
yarn install --frozen-lockfile
rm -f ~/.npmrc
- name: Validate JSON file
run: yarn validate

- name: Discord notification (failure)
if: failure()
uses: Ilshidur/action-discord@master
Expand Down
1 change: 1 addition & 0 deletions .npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@angleprotocol:registry=https://npm.pkg.github.com
1 change: 0 additions & 1 deletion .nprmc
View file
Open in desktop

This file was deleted.

88 changes: 72 additions & 16 deletions ERC20_LIST.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,10 @@
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/crvFRAXUSDC.svg",
"name": "Curve.fi FRAX/USDC",
"symbol": "crvFRAXUSDC",
"underlyingTokens": ["0x853d955aCEf822Db058eb8505911ED77F175b99e", "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"],
"underlyingTokens": [
"0x853d955aCEf822Db058eb8505911ED77F175b99e",
"0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
],
"useInSwap": false
},
"0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490": {
Expand All @@ -496,7 +499,10 @@
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/LUSD3CRV.svg",
"name": "Curve.fi Factory USD Metapool: Liquity",
"symbol": "LUSD3CRV",
"underlyingTokens": ["0x5f98805A4E8be255a32880FDeC7F6728C6568bA0", "0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"],
"underlyingTokens": [
"0x5f98805A4E8be255a32880FDeC7F6728C6568bA0",
"0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"
],
"useInSwap": false
},
"0xa9d2Eea75C80fF9669cc998c276Ff26D741Dcb26": {
Expand All @@ -507,7 +513,9 @@
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/sd-crvFRAXUSDC.svg",
"name": "Angle Curve.fi FRAX/USDC Stake DAO Staker",
"symbol": "sd-crvFRAXUSDC",
"underlyingTokens": ["0x3175Df0976dFA876431C2E9eE6Bc45b65d3473CC"],
"underlyingTokens": [
"0x3175Df0976dFA876431C2E9eE6Bc45b65d3473CC"
],
"useInSwap": false,
"wrappingMethod": "BorrowStaker"
},
Expand All @@ -519,7 +527,9 @@
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/sd-3CRV.svg",
"name": "Angle Curve.fi DAI/USDC/USDT Stake DAO Staker",
"symbol": "sd-3CRV",
"underlyingTokens": ["0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"],
"underlyingTokens": [
"0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"
],
"useInSwap": false,
"wrappingMethod": "BorrowStaker"
},
Expand All @@ -531,7 +541,9 @@
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/sd-crvLUSD3CRV.svg",
"name": "Angle Curve.fi Factory USD Metapool: Liquity Stake DAO Staker",
"symbol": "sd-crvLUSD3CRV",
"underlyingTokens": ["0xEd279fDD11cA84bEef15AF5D39BB4d4bEE23F0cA"],
"underlyingTokens": [
"0xEd279fDD11cA84bEef15AF5D39BB4d4bEE23F0cA"
],
"useInSwap": false,
"wrappingMethod": "BorrowStaker"
},
Expand All @@ -543,7 +555,9 @@
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/cvx-crvFRAXUSDC.svg",
"name": "Angle Curve.fi FRAX/USDC Convex Staker",
"symbol": "cvx-crvFRAXUSDC",
"underlyingTokens": ["0x3175Df0976dFA876431C2E9eE6Bc45b65d3473CC"],
"underlyingTokens": [
"0x3175Df0976dFA876431C2E9eE6Bc45b65d3473CC"
],
"useInSwap": false,
"wrappingMethod": "BorrowStaker"
},
Expand All @@ -555,7 +569,9 @@
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/cvx-3CRV.svg",
"name": "Angle Curve.fi DAI/USDC/USDT Convex Staker",
"symbol": "cvx-3CRV",
"underlyingTokens": ["0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"],
"underlyingTokens": [
"0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"
],
"useInSwap": false,
"wrappingMethod": "BorrowStaker"
},
Expand All @@ -567,7 +583,9 @@
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/cvx-crvLUSD3CRV.svg",
"name": "Angle Curve.fi Factory USD Metapool: Liquity Convex Staker",
"symbol": "cvx-crvLUSD3CRV",
"underlyingTokens": ["0xEd279fDD11cA84bEef15AF5D39BB4d4bEE23F0cA"],
"underlyingTokens": [
"0xEd279fDD11cA84bEef15AF5D39BB4d4bEE23F0cA"
],
"useInSwap": false,
"wrappingMethod": "BorrowStaker"
},
Expand Down Expand Up @@ -735,7 +753,9 @@
"decimals": 18,
"symbol": "amDAI",
"wrappingMethod": "Aave Matic Market",
"underlyingTokens": ["0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063"],
"underlyingTokens": [
"0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063"
],
"hasPermit": false,
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/DAI.svg"
},
Expand All @@ -753,7 +773,9 @@
"decimals": 6,
"symbol": "amUSDC",
"wrappingMethod": "Aave Matic Market",
"underlyingTokens": ["0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174"],
"underlyingTokens": [
"0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174"
],
"hasPermit": false,
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/USDC.svg"
},
Expand All @@ -779,7 +801,9 @@
"decimals": 6,
"symbol": "amUSDT",
"wrappingMethod": "Aave Matic Market",
"underlyingTokens": ["0xc2132D05D31c914a87C6611C10748AEb04B58e8F"],
"underlyingTokens": [
"0xc2132D05D31c914a87C6611C10748AEb04B58e8F"
],
"hasPermit": false,
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/USDT.svg"
},
Expand All @@ -799,7 +823,9 @@
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/cvxam3CRV.svg",
"name": "Angle Curve.fi amDAI/amUSDC/amUSDT Staker",
"symbol": "agstk-am3CRV",
"underlyingTokens": ["0xE7a24EF0C5e95Ffb0f6684b813A78F2a3AD7D171"],
"underlyingTokens": [
"0xE7a24EF0C5e95Ffb0f6684b813A78F2a3AD7D171"
],
"useInSwap": false
},
"0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174": {
Expand Down Expand Up @@ -1166,7 +1192,10 @@
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/2CRV.svg",
"name": "Curve.fi USDC/USDT",
"symbol": "2CRV",
"underlyingTokens": ["0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8", "0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9"],
"underlyingTokens": [
"0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8",
"0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9"
],
"useInSwap": false
},
"0xc8711B1206cD3e89799Ec32973f583e696Cb553C": {
Expand All @@ -1177,7 +1206,9 @@
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/sd-2CRV.svg",
"name": "Angle Curve.fi USDC/USDT Stake DAO Staker",
"symbol": "sd-crvUSDCUSDT",
"underlyingTokens": ["0x7f90122BF0700F9E7e1F688fe926940E8839F353"],
"underlyingTokens": [
"0x7f90122BF0700F9E7e1F688fe926940E8839F353"
],
"useInSwap": false,
"wrappingMethod": "BorrowStaker"
},
Expand All @@ -1189,7 +1220,9 @@
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/cvx-2CRV.svg",
"name": "Angle Curve.fi USDC/USDT Convex Staker",
"symbol": "cvx-crvUSDCUSDT",
"underlyingTokens": ["0x7f90122BF0700F9E7e1F688fe926940E8839F353"],
"underlyingTokens": [
"0x7f90122BF0700F9E7e1F688fe926940E8839F353"
],
"useInSwap": false,
"wrappingMethod": "BorrowStaker"
},
Expand Down Expand Up @@ -1722,6 +1755,29 @@
"useInSwap": true,
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/MNT.svg"
}
},
"1116": {
"0xC16B81Af351BA9e64C1a069E3Ab18c244A1E3049": {
"address": "0xC16B81Af351BA9e64C1a069E3Ab18c244A1E3049",
"name": "Angle Merkl",
"decimals": 18,
"symbol": "aglaMerkl",
"hasPermit": false,
"useInSwap": false,
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-assets/main/2_protocol-icon-only/4-colorback/PNG/angle-icon-colorback-black500.png"
}
},
"108": {
"0xC16B81Af351BA9e64C1a069E3Ab18c244A1E3049": {
"address": "0xC16B81Af351BA9e64C1a069E3Ab18c244A1E3049",
"name": "Angle Merkl",
"decimals": 18,
"symbol": "aglaMerkl",
"hasPermit": false,
"useInSwap": false,
"logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-assets/main/2_protocol-icon-only/4-colorback/PNG/angle-icon-colorback-black500.png"
}
}

}
]
]
Loading
Loading