Skip to content

Commit 1a5a4a4

Browse files
authored
Merge pull request #92 from morpho-org/feature/integ-1974-apostro-a-new-market-requirements-for-market-address
feat(apostro): clearing markets
2 parents cb45ef9 + 6131074 commit 1a5a4a4

4 files changed

Lines changed: 97 additions & 4 deletions

File tree

data/oracle-prices.json

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"assetAddress": "0xA8c8861b5ccF8CCe0ade6811CD2A7A7d3222B0B8",
2222
"contractAddress": "0xf9C7c25FE58AAA494EE7ff1f6Cf0b70d7C7ce88c",
2323
"order": 1,
24-
"type": "api3",
24+
"type": "redstone_without_logs",
2525
"data": "{\"decimals\": 8, \"first_block_number\": 21587766}",
2626
"assetChainId": 1,
2727
"contractChainId": 1
@@ -62,6 +62,42 @@
6262
"assetChainId": 8453,
6363
"contractChainId": 8453
6464
},
65+
{
66+
"assetAddress": "0xae4bE3acD95B6a4Ac5A0524ab95dA90c721f6C83",
67+
"contractAddress": "0x35a18CD59a214c9e797e14b1191b700EEa251f6A",
68+
"order": 0,
69+
"type": "pendle_asset_rate",
70+
"data": "{\"decimals\": 18, \"first_block_number\": 22136993}",
71+
"assetChainId": 1,
72+
"contractChainId": 1
73+
},
74+
{
75+
"assetAddress": "0xae4bE3acD95B6a4Ac5A0524ab95dA90c721f6C83",
76+
"contractAddress": "0xf9C7c25FE58AAA494EE7ff1f6Cf0b70d7C7ce88c",
77+
"order": 1,
78+
"type": "redstone_without_logs",
79+
"data": "{\"decimals\": 8, \"first_block_number\": 22136993}",
80+
"assetChainId": 1,
81+
"contractChainId": 1
82+
},
83+
{
84+
"assetAddress": "0x23E60d1488525bf4685f53b3aa8E676c30321066",
85+
"contractAddress": "0x09fA04Aac9c6d1c6131352EE950CD67ecC6d4fB9",
86+
"order": 0,
87+
"type": "pendle_asset_rate",
88+
"data": "{\"decimals\": 18, \"first_block_number\": 22136993}",
89+
"assetChainId": 1,
90+
"contractChainId": 1
91+
},
92+
{
93+
"assetAddress": "0x23E60d1488525bf4685f53b3aa8E676c30321066",
94+
"contractAddress": "0xf9C7c25FE58AAA494EE7ff1f6Cf0b70d7C7ce88c",
95+
"order": 1,
96+
"type": "redstone_without_logs",
97+
"data": "{\"decimals\": 8, \"first_block_number\": 22136993}",
98+
"assetChainId": 1,
99+
"contractChainId": 1
100+
},
65101
{
66102
"assetAddress": "0x386AE941D4262B0Ee96354499dF2ab8442734EC0",
67103
"contractAddress": "0xd3c29550D12A5234e6AEb5aea7c841134cd6ddd5",
@@ -2866,7 +2902,7 @@
28662902
"assetAddress": "0x66a1E37c9b0eAddca17d3662D6c05F4DECf3e110",
28672903
"contractAddress": "0xf9C7c25FE58AAA494EE7ff1f6Cf0b70d7C7ce88c",
28682904
"order": 0,
2869-
"type": "api3",
2905+
"type": "redstone_without_logs",
28702906
"data": "{\"decimals\": 8, \"first_block_number\": 21564013}",
28712907
"assetChainId": 1,
28722908
"contractChainId": 1
@@ -2893,7 +2929,7 @@
28932929
"assetAddress": "0x1202F5C7b4B9E47a1A484E8B270be34dbbC75055",
28942930
"contractAddress": "0xf9C7c25FE58AAA494EE7ff1f6Cf0b70d7C7ce88c",
28952931
"order": 1,
2896-
"type": "api3",
2932+
"type": "redstone_without_logs",
28972933
"data": "{\"decimals\": 8, \"first_block_number\": 21564013}",
28982934
"assetChainId": 1,
28992935
"contractChainId": 1
@@ -2956,7 +2992,7 @@
29562992
"assetAddress": "0x1F7Aa7104db822987E1F44A66dF709A8C4Fb301a",
29572993
"contractAddress": "0xf9C7c25FE58AAA494EE7ff1f6Cf0b70d7C7ce88c",
29582994
"order": 1,
2959-
"type": "api3",
2995+
"type": "redstone_without_logs",
29602996
"data": "{\"decimals\": 8, \"first_block_number\": 22032207}",
29612997
"assetChainId": 1,
29622998
"contractChainId": 1

data/price-feeds.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4675,6 +4675,36 @@
46754675
"chainId": 8453
46764676
}
46774677
},
4678+
{
4679+
"chainId": 1,
4680+
"address": "0x75d0c87D6da8C6eA07888b41504c15A5B216d8B1",
4681+
"vendor": "Pendle",
4682+
"description": "PT-USR-29MAY2025 / USR PtToAssetRate adapter",
4683+
"pair": ["PT-USR-29MAY2025", "USR"],
4684+
"tokenIn": {
4685+
"address": "0xae4bE3acD95B6a4Ac5A0524ab95dA90c721f6C83",
4686+
"chainId": 1
4687+
},
4688+
"tokenOut": {
4689+
"address": "0x66a1E37c9b0eAddca17d3662D6c05F4DECf3e110",
4690+
"chainId": 1
4691+
}
4692+
},
4693+
{
4694+
"chainId": 1,
4695+
"address": "0xEb19da535617aCBAA05F1C1eaF6018BDF3519952",
4696+
"vendor": "Pendle",
4697+
"description": "PT-wstUSR-25SEP2025 / USR PtToAssetRate adapter",
4698+
"pair": ["PT-wstUSR-25SEP2025", "USR"],
4699+
"tokenIn": {
4700+
"address": "0x23E60d1488525bf4685f53b3aa8E676c30321066",
4701+
"chainId": 1
4702+
},
4703+
"tokenOut": {
4704+
"address": "0x66a1E37c9b0eAddca17d3662D6c05F4DECf3e110",
4705+
"chainId": 1
4706+
}
4707+
},
46784708
{
46794709
"chainId": 8453,
46804710
"address": "0x75d0c87D6da8C6eA07888b41504c15A5B216d8B1",

data/tokens.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2477,6 +2477,28 @@
24772477
},
24782478
"isWhitelisted": true
24792479
},
2480+
{
2481+
"chainId": 1,
2482+
"address": "0xae4bE3acD95B6a4Ac5A0524ab95dA90c721f6C83",
2483+
"name": "PT Resolv USD 29MAY2025",
2484+
"symbol": "PT-USR-29MAY2025",
2485+
"decimals": 18,
2486+
"metadata": {
2487+
"logoURI": "https://cdn.morpho.org/assets/logos/pt-usr.svg"
2488+
},
2489+
"isWhitelisted": true
2490+
},
2491+
{
2492+
"chainId": 1,
2493+
"address": "0x23E60d1488525bf4685f53b3aa8E676c30321066",
2494+
"name": "PT Wrapped stUSR 25SEP2025",
2495+
"symbol": "PT-wstUSR-25SEP2025",
2496+
"decimals": 18,
2497+
"metadata": {
2498+
"logoURI": "https://cdn.morpho.org/assets/logos/pt-wstusr.svg"
2499+
},
2500+
"isWhitelisted": true
2501+
},
24802502
{
24812503
"chainId": 1,
24822504
"address": "0x9D028B8497F42FCF14FA4E7E79FF5b4Dcb3EC99E",

docs/pricing/oracle-prices.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,3 +293,8 @@ Exhaustive list of assets that are not supported:
293293
7. 0xE15578523937ed7F08E8F7a1Fa8a021E07025a08 // LP-USR-24APR2025 - Base
294294
8. 0x1F7Aa7104db822987E1F44A66dF709A8C4Fb301a // PT-sw-RLP-1750896023 - Spectra - Mainnet
295295
9. 0x5feDe9d65714907381A76AA9bF949219dD1c5023 // Stable AMM - USDC/cUSDO - Aerodrome - Clearstar - Base
296+
10. 0x1202F5C7b4B9E47a1A484E8B270be34dbbC75055 // wstUSR - mainnet
297+
11. 0x66a1E37c9b0eAddca17d3662D6c05F4DECf3e110 // USR - mainnet
298+
12. 0xA8c8861b5ccF8CCe0ade6811CD2A7A7d3222B0B8 // PT-wstUSR-27MAR2025 - mainnet
299+
13. 0xae4bE3acD95B6a4Ac5A0524ab95dA90c721f6C83 // PT-USR-29MAY2025 - mainnet
300+
14. 0x23E60d1488525bf4685f53b3aa8E676c30321066 // PT-wstUSR-25SEP2025 - mainnet

0 commit comments

Comments
 (0)