Skip to content

Commit df24c4d

Browse files
committed
fix: merge conflict
2 parents 2bf8c3d + 06e4207 commit df24c4d

File tree

3 files changed

+80
-69
lines changed

3 files changed

+80
-69
lines changed

deployed-contracts/markets.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,11 @@
245245
* LBTC: [`0x8236a87084f8B84306f72007F36F2618A5634494`](https://etherscan.io/address/0x8236a87084f8B84306f72007F36F2618A5634494)
246246
* sFRAX: [`0xA663B02CF0a4b149d2aD41910CB81e23e1c41c32`](https://etherscan.io/address/0xA663B02CF0a4b149d2aD41910CB81e23e1c41c32)
247247
* SUSDS: [`0xa3931d71877C0E7a3148CB7Eb4463524FEc27fbD`](https://etherscan.io/address/0xa3931d71877C0E7a3148CB7Eb4463524FEc27fbD)
248+
* sUSDe: [`0x9D39A5DE30e57443BfF2A8307A4256c8797A3497`](https://etherscan.io/address/0x9D39A5DE30e57443BfF2A8307A4256c8797A3497)
248249
* tBTC: [`0x18084fbA666a33d37592fA2633fD49a74DD93a88`](https://etherscan.io/address/0x18084fbA666a33d37592fA2633fD49a74DD93a88)
249250
* TUSD: [`0x0000000000085d4780B73119b644AE5ecd22b376`](https://etherscan.io/address/0x0000000000085d4780B73119b644AE5ecd22b376)
250251
* USDC: [`0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48`](https://etherscan.io/address/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48)
252+
* USDe: [`0x4c9EDD5852cd905f086C759E8383e09bff1E68B3`](https://etherscan.io/address/0x4c9EDD5852cd905f086C759E8383e09bff1E68B3)
251253
* USDS: [`0xdC035D45d973E3EC169d2276DDab16f1e407384F`](https://etherscan.io/address/0xdC035D45d973E3EC169d2276DDab16f1e407384F)
252254
* USDT: [`0xdAC17F958D2ee523a2206206994597C13D831ec7`](https://etherscan.io/address/0xdAC17F958D2ee523a2206206994597C13D831ec7)
253255
* WBTC: [`0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599`](https://etherscan.io/address/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599)
@@ -267,9 +269,11 @@
267269
* vLBTC\_Core: [`0x25C20e6e110A1cE3FEbaCC8b7E48368c7b2F0C91`](https://etherscan.io/address/0x25C20e6e110A1cE3FEbaCC8b7E48368c7b2F0C91)
268270
* vsFRAX\_Core: [`0x17142a05fe678e9584FA1d88EfAC1bF181bF7ABe`](https://etherscan.io/address/0x17142a05fe678e9584FA1d88EfAC1bF181bF7ABe)
269271
* vsUSDS\_Core: [`0xE36Ae842DbbD7aE372ebA02C8239cd431cC063d6`](https://etherscan.io/address/0xE36Ae842DbbD7aE372ebA02C8239cd431cC063d6)
272+
* vsUSDe\_Core: [`0xa836ce315b7A6Bb19397Ee996551659B1D92298e`](https://etherscan.io/address/0xa836ce315b7A6Bb19397Ee996551659B1D92298e)
270273
* vtBTC\_Core: [`0x5e35C312862d53FD566737892aDCf010cb4928F7`](https://etherscan.io/address/0x5e35C312862d53FD566737892aDCf010cb4928F7)
271274
* vTUSD\_Core: [`0x13eB80FDBe5C5f4a7039728E258A6f05fb3B912b`](https://etherscan.io/address/0x13eB80FDBe5C5f4a7039728E258A6f05fb3B912b)
272275
* vUSDC\_Core: [`0x17C07e0c232f2f80DfDbd7a95b942D893A4C5ACb`](https://etherscan.io/address/0x17C07e0c232f2f80DfDbd7a95b942D893A4C5ACb)
276+
* vUSDe\_Core: [`0xa0EE2bAA024cC3AA1BC9395522D07B7970Ca75b3`](https://etherscan.io/address/0xa0EE2bAA024cC3AA1BC9395522D07B7970Ca75b3)
273277
* vUSDS\_Core: [`0x0c6B19287999f1e31a5c0a44393b24B62D2C0468`](https://etherscan.io/address/0x0c6B19287999f1e31a5c0a44393b24B62D2C0468)
274278
* vUSDT\_Core: [`0x8C3e3821259B82fFb32B2450A95d2dcbf161C24E`](https://etherscan.io/address/0x8C3e3821259B82fFb32B2450A95d2dcbf161C24E)
275279
* vWBTC\_Core: [`0x8716554364f20BCA783cb2BAA744d39361fd1D8d`](https://etherscan.io/address/0x8716554364f20BCA783cb2BAA744d39361fd1D8d)
@@ -310,7 +314,6 @@
310314
* NativeTokenGateway: [`0xBC1471308eb2287eBE137420Eb1664A964895D21`](https://etherscan.io/address/0xBC1471308eb2287eBE137420Eb1664A964895D21)
311315
* Underlying tokens:
312316
* ezETH [`0xbf5495Efe5DB9ce00f80364C8B423567e58d2110`](https://etherscan.io/address/0xbf5495Efe5DB9ce00f80364C8B423567e58d2110)
313-
* PTweETH-26DEC2024 [`0x6ee2b5E19ECBa773a352E5B21415Dc419A700d1d`](https://etherscan.io/address/0x6ee2b5E19ECBa773a352E5B21415Dc419A700d1d)
314317
* pufETH: [`0xD9A442856C234a39a81a089C06451EBAa4306a72`](https://etherscan.io/address/0xD9A442856C234a39a81a089C06451EBAa4306a72)
315318
* rsETH [`0xA1290d69c65A6Fe4DF752f95823fae25cB99e5A7`](https://etherscan.io/address/0xA1290d69c65A6Fe4DF752f95823fae25cB99e5A7)
316319
* sfrxETH: [`0xac3E018457B222d93114458476f3E3416Abbe38F`](https://etherscan.io/address/0xac3E018457B222d93114458476f3E3416Abbe38F)
@@ -320,7 +323,6 @@
320323
* wstETH: [`0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0`](https://etherscan.io/address/0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0)
321324
* Markets:
322325
* vezETH\_LiquidStakedETH: [`0xA854D35664c658280fFf27B6eDC6C4195c3229B3`](https://etherscan.io/address/0xA854D35664c658280fFf27B6eDC6C4195c3229B3)
323-
* vPT-weETH-26DEC2024\_LiquidStakedETH: [`0x76697f8eaeA4bE01C678376aAb97498Ee8f80D5C`](https://etherscan.io/address/0x76697f8eaeA4bE01C678376aAb97498Ee8f80D5C)
324326
* vpufETH\_LiquidStakedETH: [`0xE0ee5dDeBFe0abe0a4Af50299D68b74Cec31668e`](https://etherscan.io/address/0xE0ee5dDeBFe0abe0a4Af50299D68b74Cec31668e)
325327
* vrsETH\_LiquidStakedETH: [`0xDB6C345f864883a8F4cae87852Ac342589E76D1B`](https://etherscan.io/address/0xDB6C345f864883a8F4cae87852Ac342589E76D1B)
326328
* vsfrxETH\_LiquidStakedETH: [`0xF9E9Fe17C00a8B96a8ac20c4E344C8688D7b947E`](https://etherscan.io/address/0xF9E9Fe17C00a8B96a8ac20c4E344C8688D7b947E)
@@ -708,9 +710,11 @@
708710
* vLBTC\_Core: [`0x315F064cF5B5968fE1655436e1856F3ca558d395`](https://sepolia.etherscan.io/address/0x315F064cF5B5968fE1655436e1856F3ca558d395)
709711
* vsFRAX\_Core: [`0x18995825f033F33fa30CF59c117aD21ff6BdB48c`](https://sepolia.etherscan.io/address/0x18995825f033F33fa30CF59c117aD21ff6BdB48c)
710712
* vsUSDS\_Core: [`0x083a24648614df4b72EFD4e4C81141C044dBB253`](https://sepolia.etherscan.io/address/0x083a24648614df4b72EFD4e4C81141C044dBB253)
713+
* vsUSDe\_Core: [`0x33e4C9227b8Fca017739419119BbBA33A089D4a0`](https://sepolia.etherscan.io/address/0x33e4C9227b8Fca017739419119BbBA33A089D4a0)
711714
* vtBTC\_Core: [`0x834078D691d431aAdC80197f7a61239F9F89547b`](https://sepolia.etherscan.io/address/0x834078D691d431aAdC80197f7a61239F9F89547b)
712715
* vTUSD\_Core: [`0xE23A1fC1545F1b072308c846a38447b23d322Ee2`](https://sepolia.etherscan.io/address/0xE23A1fC1545F1b072308c846a38447b23d322Ee2)
713716
* vUSDC\_Core: [`0xF87bceab8DD37489015B426bA931e08A4D787616`](https://sepolia.etherscan.io/address/0xF87bceab8DD37489015B426bA931e08A4D787616)
717+
* vUSDe\_Core: [`0x36e8955c305aa48A99e4c953C9883989a7364a42`](https://sepolia.etherscan.io/address/0x36e8955c305aa48A99e4c953C9883989a7364a42)
714718
* vUSDS\_Core: [`0x459C6a6036e2094d1764a9ca32939b9820b2C8e0`](https://sepolia.etherscan.io/address/0x459C6a6036e2094d1764a9ca32939b9820b2C8e0)
715719
* vUSDT\_Core: [`0x19252AFD0B2F539C400aEab7d460CBFbf74c17ff`](https://sepolia.etherscan.io/address/0x19252AFD0B2F539C400aEab7d460CBFbf74c17ff)
716720
* vWBTC\_Core: [`0x74E708A7F5486ed73CCCAe54B63e71B1988F1383`](https://sepolia.etherscan.io/address/0x74E708A7F5486ed73CCCAe54B63e71B1988F1383)
@@ -743,7 +747,6 @@
743747
* NativeTokenGateway: [`0x1FD30e761C3296fE36D9067b1e398FD97B4C0407`](https://sepolia.etherscan.io/address/0x1FD30e761C3296fE36D9067b1e398FD97B4C0407)
744748
* Markets:
745749
* vezETH\_LiquidStakedETH: [`0xF4C1B7528f8B266D8ADf1a85c91d93114FeDbA2A`](https://sepolia.etherscan.io/address/0xF4C1B7528f8B266D8ADf1a85c91d93114FeDbA2A)
746-
* vPT-weETH-26DEC2024\_LiquidStakedETH: [`0x3AF2bE7AbEF0f840b196D99d79F4B803a5dB14a1`](https://sepolia.etherscan.io/address/0x3AF2bE7AbEF0f840b196D99d79F4B803a5dB14a1)
747750
* vpufETH\_LiquidStakedETH: [`0x1E4d64B7c6f1F71969E5137B5Ee8cBa9Ab9c9356`](https://sepolia.etherscan.io/address/0x1E4d64B7c6f1F71969E5137B5Ee8cBa9Ab9c9356)
748751
* vrsETH\_LiquidStakedETH: [`0x20a83DE526F2CF2fCec2131E07b11F956d8f3Cdf`](https://sepolia.etherscan.io/address/0x20a83DE526F2CF2fCec2131E07b11F956d8f3Cdf)
749752
* vsfrxETH\_Core: [`0x83F63118dcAAdAACBFF36D78ffB88dd474309e70`](https://sepolia.etherscan.io/address/0x83F63118dcAAdAACBFF36D78ffB88dd474309e70)

0 commit comments

Comments
 (0)