diff --git a/arb.db b/arb.db index e0b1cd1f4..f95336106 100644 Binary files a/arb.db and b/arb.db differ diff --git a/ethereum.db b/ethereum.db index 22423859c..6b5fafdd4 100644 Binary files a/ethereum.db and b/ethereum.db differ diff --git a/op.db b/op.db index 054ec67da..07c27e63f 100644 Binary files a/op.db and b/op.db differ diff --git a/packages/adapters-library/src/adapters/aave-v2/common/aaveBasePoolAdapter.ts b/packages/adapters-library/src/adapters/aave-v2/common/aaveBasePoolAdapter.ts index 72ab4457e..a4b53aede 100644 --- a/packages/adapters-library/src/adapters/aave-v2/common/aaveBasePoolAdapter.ts +++ b/packages/adapters-library/src/adapters/aave-v2/common/aaveBasePoolAdapter.ts @@ -176,18 +176,6 @@ export abstract class AaveBasePoolAdapter implements IProtocolAdapter { const metadataObject: ProtocolToken[] = [] const promises = reserveTokens.map(async ({ tokenAddress }) => { - const reserveConfigurationData = - await protocolDataProviderContract.getReserveConfigurationData( - tokenAddress, - ) - - if ( - !reserveConfigurationData.isActive || - reserveConfigurationData.isFrozen - ) { - return - } - const reserveTokenAddresses = await protocolDataProviderContract.getReserveTokensAddresses( tokenAddress, diff --git a/packages/adapters-library/src/adapters/aave-v3/products/a-token/tests/snapshots/ethereum.profits.json b/packages/adapters-library/src/adapters/aave-v3/products/a-token/tests/snapshots/ethereum.profits.json index 166fef470..266b63727 100644 --- a/packages/adapters-library/src/adapters/aave-v3/products/a-token/tests/snapshots/ethereum.profits.json +++ b/packages/adapters-library/src/adapters/aave-v3/products/a-token/tests/snapshots/ethereum.profits.json @@ -82,7 +82,7 @@ }, { "address": "0x23878914EFE38d27C4D67Ab83ed1b93A74D4086a", - "name": "aEthUSDT", + "name": "Aave Ethereum USDT", "symbol": "aEthUSDT", "decimals": 6, "type": "protocol", diff --git a/packages/adapters-library/src/adapters/beefy/products/moo-token/tests/snapshots/ethereum.deposits.moo-token.json b/packages/adapters-library/src/adapters/beefy/products/moo-token/tests/snapshots/ethereum.deposits.moo-token.json index 17b0dbc6e..fdae16dd7 100644 --- a/packages/adapters-library/src/adapters/beefy/products/moo-token/tests/snapshots/ethereum.deposits.moo-token.json +++ b/packages/adapters-library/src/adapters/beefy/products/moo-token/tests/snapshots/ethereum.deposits.moo-token.json @@ -44,7 +44,7 @@ }, { "address": "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497", - "name": "sUSDe", + "name": "Staked USDe", "symbol": "sUSDe", "decimals": 18, "type": "underlying", @@ -102,7 +102,7 @@ }, { "address": "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497", - "name": "sUSDe", + "name": "Staked USDe", "symbol": "sUSDe", "decimals": 18, "type": "underlying", diff --git a/packages/adapters-library/src/adapters/beefy/products/moo-token/tests/snapshots/ethereum.positions.moo-token.json b/packages/adapters-library/src/adapters/beefy/products/moo-token/tests/snapshots/ethereum.positions.moo-token.json index 1f7067431..dfc0956bb 100644 --- a/packages/adapters-library/src/adapters/beefy/products/moo-token/tests/snapshots/ethereum.positions.moo-token.json +++ b/packages/adapters-library/src/adapters/beefy/products/moo-token/tests/snapshots/ethereum.positions.moo-token.json @@ -35,7 +35,7 @@ }, { "address": "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110", - "name": "ezETH", + "name": "Renzo Restaked ETH", "symbol": "ezETH", "decimals": 18, "type": "underlying", @@ -59,7 +59,7 @@ }, { "address": "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee", - "name": "weETH", + "name": "Wrapped eETH", "symbol": "weETH", "decimals": 18, "type": "underlying", diff --git a/packages/adapters-library/src/adapters/beefy/products/moo-token/tests/snapshots/ethereum.withdrawals.moo-token.json b/packages/adapters-library/src/adapters/beefy/products/moo-token/tests/snapshots/ethereum.withdrawals.moo-token.json index b678779dd..e5196d214 100644 --- a/packages/adapters-library/src/adapters/beefy/products/moo-token/tests/snapshots/ethereum.withdrawals.moo-token.json +++ b/packages/adapters-library/src/adapters/beefy/products/moo-token/tests/snapshots/ethereum.withdrawals.moo-token.json @@ -44,7 +44,7 @@ }, { "address": "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497", - "name": "sUSDe", + "name": "Staked USDe", "symbol": "sUSDe", "decimals": 18, "type": "underlying", diff --git a/packages/adapters-library/src/adapters/ethena/products/lp-staking/tests/snapshots/ethereum.positions.lp-staking.json b/packages/adapters-library/src/adapters/ethena/products/lp-staking/tests/snapshots/ethereum.positions.lp-staking.json index 453a0325e..4f6867790 100644 --- a/packages/adapters-library/src/adapters/ethena/products/lp-staking/tests/snapshots/ethereum.positions.lp-staking.json +++ b/packages/adapters-library/src/adapters/ethena/products/lp-staking/tests/snapshots/ethereum.positions.lp-staking.json @@ -28,7 +28,7 @@ { "type": "protocol", "address": "0x8bE3460A480c80728a8C4D7a5D5303c85ba7B3b9", - "name": "sENA", + "name": "Staked ENA", "symbol": "sENA", "decimals": 18, "balanceRaw": "94650000000000000000n", diff --git a/packages/adapters-library/src/adapters/ethena/products/lp-staking/tests/snapshots/ethereum.tvl.json b/packages/adapters-library/src/adapters/ethena/products/lp-staking/tests/snapshots/ethereum.tvl.json index da30d10ea..e04f2a9bd 100644 --- a/packages/adapters-library/src/adapters/ethena/products/lp-staking/tests/snapshots/ethereum.tvl.json +++ b/packages/adapters-library/src/adapters/ethena/products/lp-staking/tests/snapshots/ethereum.tvl.json @@ -17,7 +17,7 @@ { "type": "protocol", "address": "0x8bE3460A480c80728a8C4D7a5D5303c85ba7B3b9", - "name": "sENA", + "name": "Staked ENA", "symbol": "sENA", "decimals": 18, "totalSupplyRaw": "387294739423437047879124231n", diff --git a/packages/adapters-library/src/adapters/ethena/products/staked-ena/tests/snapshots/ethereum.positions.sena.json b/packages/adapters-library/src/adapters/ethena/products/staked-ena/tests/snapshots/ethereum.positions.sena.json index 57a7a2740..b0e12dc7a 100644 --- a/packages/adapters-library/src/adapters/ethena/products/staked-ena/tests/snapshots/ethereum.positions.sena.json +++ b/packages/adapters-library/src/adapters/ethena/products/staked-ena/tests/snapshots/ethereum.positions.sena.json @@ -17,7 +17,7 @@ "tokens": [ { "address": "0x8bE3460A480c80728a8C4D7a5D5303c85ba7B3b9", - "name": "sENA", + "name": "Staked ENA", "symbol": "sENA", "decimals": 18, "balanceRaw": "148345860000000000000000n", diff --git a/packages/adapters-library/src/adapters/ethena/products/staked-ena/tests/snapshots/ethereum.tvl.json b/packages/adapters-library/src/adapters/ethena/products/staked-ena/tests/snapshots/ethereum.tvl.json index 966c2e767..c48b7ec6a 100644 --- a/packages/adapters-library/src/adapters/ethena/products/staked-ena/tests/snapshots/ethereum.tvl.json +++ b/packages/adapters-library/src/adapters/ethena/products/staked-ena/tests/snapshots/ethereum.tvl.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0x8bE3460A480c80728a8C4D7a5D5303c85ba7B3b9", - "name": "sENA", + "name": "Staked ENA", "symbol": "sENA", "decimals": 18, "type": "protocol", diff --git a/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.deposits.json b/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.deposits.json index 9f17cb8ff..7e86d43f3 100644 --- a/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.deposits.json +++ b/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.deposits.json @@ -17,14 +17,14 @@ "transactionHash": "0xdc1441a209ae39844cd1930093f2be0231e0c8f10ca6c66fb409cda8be0db7ba", "protocolToken": { "address": "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497", - "name": "sUSDe", + "name": "Staked USDe", "symbol": "sUSDe", "decimals": 18 }, "tokens": [ { "address": "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497", - "name": "sUSDe", + "name": "Staked USDe", "symbol": "sUSDe", "decimals": 18, "balanceRaw": "2100862289939429413866n", diff --git a/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.positions.susde.json b/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.positions.susde.json index 688045a49..24c89565e 100644 --- a/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.positions.susde.json +++ b/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.positions.susde.json @@ -17,7 +17,7 @@ "tokens": [ { "address": "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497", - "name": "sUSDe", + "name": "Staked USDe", "symbol": "sUSDe", "decimals": 18, "balanceRaw": "7870541785346265726254504n", diff --git a/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.prices.json b/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.prices.json index 7425caf1e..5ab6934c9 100644 --- a/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.prices.json +++ b/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.prices.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497", - "name": "sUSDe", + "name": "Staked USDe", "symbol": "sUSDe", "decimals": 18, "baseRate": 1, diff --git a/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.profits.json b/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.profits.json index 0e1a8bf86..a4f517fd6 100644 --- a/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.profits.json +++ b/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.profits.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497", - "name": "sUSDe", + "name": "Staked USDe", "symbol": "sUSDe", "decimals": 18, "type": "protocol", diff --git a/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.tvl.json b/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.tvl.json index 3dbbb11fc..6fdf14ccc 100644 --- a/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.tvl.json +++ b/packages/adapters-library/src/adapters/ethena/products/staked-usde/tests/snapshots/ethereum.tvl.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497", - "name": "sUSDe", + "name": "Staked USDe", "symbol": "sUSDe", "decimals": 18, "type": "protocol", diff --git a/packages/adapters-library/src/adapters/etherfi/products/liquid/tests/snapshots/ethereum.positions.user-2.json b/packages/adapters-library/src/adapters/etherfi/products/liquid/tests/snapshots/ethereum.positions.user-2.json index 08abda438..7b29930ef 100644 --- a/packages/adapters-library/src/adapters/etherfi/products/liquid/tests/snapshots/ethereum.positions.user-2.json +++ b/packages/adapters-library/src/adapters/etherfi/products/liquid/tests/snapshots/ethereum.positions.user-2.json @@ -17,7 +17,7 @@ "tokens": [ { "address": "0x7223442cad8e9cA474fC40109ab981608F8c4273", - "name": "weETHk", + "name": "King Karak LRT", "symbol": "weETHk", "decimals": 18, "balanceRaw": "440147724479119600782n", diff --git a/packages/adapters-library/src/adapters/etherfi/products/liquid/tests/snapshots/ethereum.profits.user-2.json b/packages/adapters-library/src/adapters/etherfi/products/liquid/tests/snapshots/ethereum.profits.user-2.json index a4b4775f5..76051d120 100644 --- a/packages/adapters-library/src/adapters/etherfi/products/liquid/tests/snapshots/ethereum.profits.user-2.json +++ b/packages/adapters-library/src/adapters/etherfi/products/liquid/tests/snapshots/ethereum.profits.user-2.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0x7223442cad8e9cA474fC40109ab981608F8c4273", - "name": "weETHk", + "name": "King Karak LRT", "symbol": "weETHk", "decimals": 18, "type": "protocol", diff --git a/packages/adapters-library/src/adapters/etherfi/products/we-eth/tests/snapshots/ethereum.positions.user-1.json b/packages/adapters-library/src/adapters/etherfi/products/we-eth/tests/snapshots/ethereum.positions.user-1.json index 2a9a61982..24f993248 100644 --- a/packages/adapters-library/src/adapters/etherfi/products/we-eth/tests/snapshots/ethereum.positions.user-1.json +++ b/packages/adapters-library/src/adapters/etherfi/products/we-eth/tests/snapshots/ethereum.positions.user-1.json @@ -17,7 +17,7 @@ "tokens": [ { "address": "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee", - "name": "weETH", + "name": "Wrapped eETH", "symbol": "weETH", "decimals": 18, "balanceRaw": "3818222812111817n", diff --git a/packages/adapters-library/src/adapters/etherfi/products/we-eth/tests/snapshots/ethereum.profits.user-1.json b/packages/adapters-library/src/adapters/etherfi/products/we-eth/tests/snapshots/ethereum.profits.user-1.json index 5eb2072aa..3e8e83498 100644 --- a/packages/adapters-library/src/adapters/etherfi/products/we-eth/tests/snapshots/ethereum.profits.user-1.json +++ b/packages/adapters-library/src/adapters/etherfi/products/we-eth/tests/snapshots/ethereum.profits.user-1.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee", - "name": "weETH", + "name": "Wrapped eETH", "symbol": "weETH", "decimals": 18, "type": "protocol", diff --git a/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.borrows.json b/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.borrows.json index ae620c8f1..f24f60c14 100644 --- a/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.borrows.json +++ b/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.borrows.json @@ -16,7 +16,7 @@ "transactionHash": "0x635de742e30c1db4ba80730667e99d9dc276fc072afc6cf3e1b7b76c2d2cbe8e", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, @@ -39,7 +39,7 @@ "transactionHash": "0x3cbad0364620c2591fd908a4b0fe9bbf7dda877f82829e7ee4ea992abfd0e2c3", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, @@ -62,7 +62,7 @@ "transactionHash": "0xf8607128306c74d91b9f6497dc774e1066b0751de459db1cca353816b09f63a3", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, @@ -85,7 +85,7 @@ "transactionHash": "0x18bcfaa29194f4b27048d4abd4f54d4e42d5d90cc57d1be3f7e07addb38513af", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, @@ -108,7 +108,7 @@ "transactionHash": "0xfdf55791033e15c53be84a6639f385b458c1418fcc436358726bde3352079cdf", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, diff --git a/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.positions.json b/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.positions.json index 25a938643..f1e0ddee1 100644 --- a/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.positions.json +++ b/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.positions.json @@ -17,7 +17,7 @@ "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "1n", diff --git a/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.profits.json b/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.profits.json index 14ac07f23..e07442507 100644 --- a/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.profits.json +++ b/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.profits.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "type": "protocol", diff --git a/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.repays.json b/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.repays.json index caffe0ff2..5afed7126 100644 --- a/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.repays.json +++ b/packages/adapters-library/src/adapters/flux/products/borrow-market/tests/snapshots/ethereum.repays.json @@ -16,7 +16,7 @@ "transactionHash": "0x773ee4439f7fd9660b54d8f2a6e185468bb7166ff8af41f26dded47a25143299", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, @@ -39,7 +39,7 @@ "transactionHash": "0x7b5c05754cedcbb033aeb06819b6d58b88441d17017a58ac27ba021d1bb1f767", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, @@ -62,7 +62,7 @@ "transactionHash": "0x01b2bfabe0ffdce94cb3df75a4276d908d7dba615f1ff541e4e62c5530b1ccda", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, @@ -85,7 +85,7 @@ "transactionHash": "0x9232de8bcb8c7b3b78484d108abc445b30e5d3b1818dff39e1cb0cbdd1eaef87", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, diff --git a/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.deposits.json b/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.deposits.json index 254e39834..59781c2e0 100644 --- a/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.deposits.json +++ b/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.deposits.json @@ -30,14 +30,14 @@ "transactionHash": "0x56f839e092fc8c5fd33ba57e7209406344f2aec4d83650cf3176e5deb0d8c60f", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "24995800999n", @@ -64,14 +64,14 @@ "transactionHash": "0xeb4e7ca1c2d4a86ccbf247481308a0f98659d7d3886665d39f5bf81df3eec97c", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "59568092n", @@ -98,14 +98,14 @@ "transactionHash": "0x3ad49dfa15fd0b061f7b7595176961a85e7e0543148c2d9e443f4ff4fbd93747", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "69992413n", @@ -132,14 +132,14 @@ "transactionHash": "0xc5b271fe8c6f5d9e7e3cc5fc884ee16d2d5bc1de662d27be1753196d97c55563", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "49609967n", @@ -166,14 +166,14 @@ "transactionHash": "0x4a86d1d6cbe553f6550a63e46aeed1a4f1c25056bedd6961b68876a44b34aea1", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "24666089270n", @@ -200,14 +200,14 @@ "transactionHash": "0x1c5c09b6fef002a8c25630061bf9f266a63ca49194ee6cad92414c4d2aba3528", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "5368495656n", @@ -235,14 +235,14 @@ "transactionHash": "0x8b3696d318e8f47390eefbe012c7a7d1d52638b7662181a1721724ad82093340", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "5855701227n", @@ -270,14 +270,14 @@ "transactionHash": "0x66b425cbd9de4f9ee1310ce91c586f8495306274766886f046635e161986376d", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "485651477n", @@ -305,14 +305,14 @@ "transactionHash": "0x45136c31e7e59cb6346ef73a142f2d51babb5a6edfdff3f5c2c5b0fab880ab16", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "48564179n", @@ -340,14 +340,14 @@ "transactionHash": "0xb2dc2b6301a2a7dd933217a757a31f391ae2c1b9dabbc66d3b4a9c84dbb64ecc", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "48564089n", @@ -375,14 +375,14 @@ "transactionHash": "0x8012ca1f732d8c510e598321e5c6c5c3f682928a7e2010ee1ee383e501deee37", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "970140809n", @@ -410,14 +410,14 @@ "transactionHash": "0x1ba8f6be599505e34eb2e0a6c8411cdaae5a6227c2796c4eb961f3fd28e90af5", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "48399929375n", diff --git a/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.positions.json b/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.positions.json index 07cdd090f..830f9a553 100644 --- a/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.positions.json +++ b/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.positions.json @@ -17,7 +17,7 @@ "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "49370070184n", diff --git a/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.profits.json b/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.profits.json index 23319b1a5..829640b26 100644 --- a/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.profits.json +++ b/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.profits.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "type": "protocol", diff --git a/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.tvl.json b/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.tvl.json index 52eaa89bf..a7b775f30 100644 --- a/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.tvl.json +++ b/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.tvl.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "type": "protocol", diff --git a/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.withdrawals.json b/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.withdrawals.json index fbb9410e6..be3d52793 100644 --- a/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.withdrawals.json +++ b/packages/adapters-library/src/adapters/flux/products/supply-market/tests/snapshots/ethereum.withdrawals.json @@ -17,14 +17,14 @@ "transactionHash": "0xa964ede1f669c0fbf1c97ab79f9af3b66659920ab2d013134951364d8da109c6", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "5904626346n", @@ -52,14 +52,14 @@ "transactionHash": "0xe49ee57f19cd296f4499cf6206fe1cc347c00a24047560af49a11fc4ea5c473b", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "485651552n", @@ -87,14 +87,14 @@ "transactionHash": "0x83e7e74bc6c64cf45820e5f2a49b6f876a5e6b1d1c5fff4c7c7a891ce4b0010e", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "86159087n", @@ -122,14 +122,14 @@ "transactionHash": "0xf405b10a34955bdb995e29e90788356d2d5818abebcbfb6d5124fd12de77ff88", "protocolToken": { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8 }, "tokens": [ { "address": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", - "name": "fUSDC", + "name": "Flux USDC", "symbol": "fUSDC", "decimals": 8, "balanceRaw": "55171600384n", diff --git a/packages/adapters-library/src/adapters/maker/products/s-dai/tests/snapshots/ethereum.positions.json b/packages/adapters-library/src/adapters/maker/products/s-dai/tests/snapshots/ethereum.positions.json index 685dedcdd..2ef799bdb 100644 --- a/packages/adapters-library/src/adapters/maker/products/s-dai/tests/snapshots/ethereum.positions.json +++ b/packages/adapters-library/src/adapters/maker/products/s-dai/tests/snapshots/ethereum.positions.json @@ -17,7 +17,7 @@ "tokens": [ { "address": "0x83F20F44975D03b1b09e64809B757c47f942BEeA", - "name": "sDAI", + "name": "Savings Dai", "symbol": "sDAI", "decimals": 18, "balanceRaw": "5382590015585050100580212n", diff --git a/packages/adapters-library/src/adapters/maker/products/s-dai/tests/snapshots/ethereum.prices.json b/packages/adapters-library/src/adapters/maker/products/s-dai/tests/snapshots/ethereum.prices.json index 98ad56923..33eed98bb 100644 --- a/packages/adapters-library/src/adapters/maker/products/s-dai/tests/snapshots/ethereum.prices.json +++ b/packages/adapters-library/src/adapters/maker/products/s-dai/tests/snapshots/ethereum.prices.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0x83F20F44975D03b1b09e64809B757c47f942BEeA", - "name": "sDAI", + "name": "Savings Dai", "decimals": 18, "symbol": "sDAI", "baseRate": 1, diff --git a/packages/adapters-library/src/adapters/maker/products/s-dai/tests/snapshots/ethereum.profits.json b/packages/adapters-library/src/adapters/maker/products/s-dai/tests/snapshots/ethereum.profits.json index 48e0baedc..6b6d28397 100644 --- a/packages/adapters-library/src/adapters/maker/products/s-dai/tests/snapshots/ethereum.profits.json +++ b/packages/adapters-library/src/adapters/maker/products/s-dai/tests/snapshots/ethereum.profits.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0x83F20F44975D03b1b09e64809B757c47f942BEeA", - "name": "sDAI", + "name": "Savings Dai", "symbol": "sDAI", "decimals": 18, "type": "protocol", diff --git a/packages/adapters-library/src/adapters/pendle/products/lp-token/pendleLpTokenAdapter.ts b/packages/adapters-library/src/adapters/pendle/products/lp-token/pendleLpTokenAdapter.ts index e0e102caa..7fd0ae879 100644 --- a/packages/adapters-library/src/adapters/pendle/products/lp-token/pendleLpTokenAdapter.ts +++ b/packages/adapters-library/src/adapters/pendle/products/lp-token/pendleLpTokenAdapter.ts @@ -86,28 +86,22 @@ export class PendleLpTokenAdapter implements IProtocolAdapter { async getProtocolTokens(): Promise[]> { const resp = await fetchAllMarkets(this.chainId) - return resp.results.map((value) => { - const marketAddress = getAddress(value.address) - - const lp: Erc20Metadata = { - address: getAddress(value.lp.address), - name: value.lp.name, - symbol: value.lp.symbol, - decimals: value.lp.decimals, - } - const underlyingAsset: Erc20Metadata = { - address: getAddress(value.underlyingAsset.address), - name: value.underlyingAsset.name, - symbol: value.underlyingAsset.symbol, - decimals: value.underlyingAsset.decimals, - } - - return { - ...lp, - underlyingTokens: [underlyingAsset], - marketAddress, - } - }) + return await Promise.all( + resp.results.map(async (value) => { + const marketAddress = getAddress(value.address) + + const [lp, underlyingAsset] = await Promise.all([ + this.helpers.getTokenMetadata(value.lp.address), + this.helpers.getTokenMetadata(value.underlyingAsset.address), + ]) + + return { + ...lp, + underlyingTokens: [underlyingAsset], + marketAddress, + } + }), + ) } async getPositions(input: GetPositionsInput): Promise { diff --git a/packages/adapters-library/src/adapters/pendle/products/lp-token/tests/snapshots/ethereum.positions.lp-pump-bts.json b/packages/adapters-library/src/adapters/pendle/products/lp-token/tests/snapshots/ethereum.positions.lp-pump-bts.json index 2105ae39b..4a793ad62 100644 --- a/packages/adapters-library/src/adapters/pendle/products/lp-token/tests/snapshots/ethereum.positions.lp-pump-bts.json +++ b/packages/adapters-library/src/adapters/pendle/products/lp-token/tests/snapshots/ethereum.positions.lp-pump-bts.json @@ -17,7 +17,7 @@ "tokens": [ { "address": "0xf8208fB52BA80075aF09840A683143C22DC5B4dd", - "name": "PENDLE-LPT", + "name": "Pendle Market", "symbol": "PENDLE-LPT", "decimals": 18, "balanceRaw": "1851547n", diff --git a/packages/adapters-library/src/adapters/pendle/products/lp-token/tests/snapshots/ethereum.positions.yt-lp.json b/packages/adapters-library/src/adapters/pendle/products/lp-token/tests/snapshots/ethereum.positions.yt-lp.json index e80363f3c..961421f60 100644 --- a/packages/adapters-library/src/adapters/pendle/products/lp-token/tests/snapshots/ethereum.positions.yt-lp.json +++ b/packages/adapters-library/src/adapters/pendle/products/lp-token/tests/snapshots/ethereum.positions.yt-lp.json @@ -17,7 +17,7 @@ "tokens": [ { "address": "0xA54FC268101c8b97DE19eF3141d34751a11996B2", - "name": "PENDLE-LPT", + "name": "Pendle Market", "symbol": "PENDLE-LPT", "decimals": 18, "balanceRaw": "16820168574096565605n", @@ -50,7 +50,7 @@ }, { "address": "0x038C1b03daB3B891AfbCa4371ec807eDAa3e6eB6", - "name": "PENDLE-LPT", + "name": "Pendle Market", "symbol": "PENDLE-LPT", "decimals": 18, "balanceRaw": "60693468569135036750n", diff --git a/packages/adapters-library/src/adapters/pendle/products/lp-token/tests/snapshots/ethereum.prices.lp-price.json b/packages/adapters-library/src/adapters/pendle/products/lp-token/tests/snapshots/ethereum.prices.lp-price.json index 88611c58e..439b93420 100644 --- a/packages/adapters-library/src/adapters/pendle/products/lp-token/tests/snapshots/ethereum.prices.lp-price.json +++ b/packages/adapters-library/src/adapters/pendle/products/lp-token/tests/snapshots/ethereum.prices.lp-price.json @@ -18,7 +18,7 @@ "baseRate": 1, "type": "protocol", "address": "0xf8208fB52BA80075aF09840A683143C22DC5B4dd", - "name": "PENDLE-LPT", + "name": "Pendle Market", "symbol": "PENDLE-LPT", "decimals": 18, "tokens": [ diff --git a/packages/adapters-library/src/adapters/pendle/products/principle-token/pendlePrincipleTokenAdapter.ts b/packages/adapters-library/src/adapters/pendle/products/principle-token/pendlePrincipleTokenAdapter.ts index ad4f84f25..366976938 100644 --- a/packages/adapters-library/src/adapters/pendle/products/principle-token/pendlePrincipleTokenAdapter.ts +++ b/packages/adapters-library/src/adapters/pendle/products/principle-token/pendlePrincipleTokenAdapter.ts @@ -78,29 +78,22 @@ export class PendlePrincipleTokenAdapter implements IProtocolAdapter { async getProtocolTokens(): Promise[]> { const resp = await fetchAllMarkets(this.chainId) - return resp.results.map((value) => { - const marketAddress = getAddress(value.address) - - const pt: Erc20Metadata = { - address: getAddress(value.pt.address), - name: value.pt.name, - symbol: value.pt.symbol, - decimals: value.pt.decimals, - } - - const sy: Erc20Metadata = { - address: getAddress(value.sy.address), - name: value.sy.name, - symbol: value.sy.symbol, - decimals: value.underlyingAsset.decimals, - } - - return { - ...pt, - underlyingTokens: [sy], - marketAddress, - } - }) + return await Promise.all( + resp.results.map(async (value) => { + const marketAddress = getAddress(value.address) + + const [pt, sy] = await Promise.all([ + this.helpers.getTokenMetadata(value.pt.address), + this.helpers.getTokenMetadata(value.sy.address), // TODO: Check if decimals need to be underlyingAsset.decimals + ]) + + return { + ...pt, + underlyingTokens: [sy], + marketAddress, + } + }), + ) } async getPositions(input: GetPositionsInput): Promise { diff --git a/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.deposits.json b/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.deposits.json index e7a2e2267..fff73fa4a 100644 --- a/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.deposits.json +++ b/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.deposits.json @@ -17,14 +17,14 @@ "transactionHash": "0x1332461b414753d3daf1e1c7d5294a4684d0bb14da461bb1b03c0e06590810c1", "protocolToken": { "address": "0xc69Ad9baB1dEE23F4605a82b3354F8E40d1E5966", - "name": "PT-weETH-27JUN2024", + "name": "PT ether.fi weETH 27JUN2024", "symbol": "PT-weETH-27JUN2024", "decimals": 18 }, "tokens": [ { "address": "0xc69Ad9baB1dEE23F4605a82b3354F8E40d1E5966", - "name": "PT-weETH-27JUN2024", + "name": "PT ether.fi weETH 27JUN2024", "symbol": "PT-weETH-27JUN2024", "decimals": 18, "balanceRaw": "301719975687554067n", @@ -33,7 +33,7 @@ "tokens": [ { "address": "0xAC0047886a985071476a1186bE89222659970d65", - "name": "SY-weETH", + "name": "SY ether.fi weETH", "symbol": "SY-weETH", "decimals": 18, "type": "underlying", @@ -41,7 +41,7 @@ "tokens": [ { "address": "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee", - "name": "weETH", + "name": "Wrapped eETH", "symbol": "weETH", "decimals": 18, "type": "underlying", diff --git a/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.positions.pt-sy.json b/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.positions.pt-sy.json index a553d8ef7..a174e516e 100644 --- a/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.positions.pt-sy.json +++ b/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.positions.pt-sy.json @@ -17,7 +17,7 @@ "tokens": [ { "address": "0xf99985822fb361117FCf3768D34a6353E6022F5F", - "name": "PT-stETH-25DEC2025", + "name": "PT stETH 25DEC2025", "symbol": "PT-stETH-25DEC2025", "decimals": 18, "balanceRaw": "4484888964612528795n", @@ -25,7 +25,7 @@ "tokens": [ { "address": "0xcbC72d92b2dc8187414F6734718563898740C0BC", - "name": "SY-stETH", + "name": "SY stETH", "symbol": "SY-stETH", "decimals": 18, "type": "underlying", diff --git a/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.prices.pt.json b/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.prices.pt.json index a81592d6e..97fe11eee 100644 --- a/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.prices.pt.json +++ b/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.prices.pt.json @@ -18,7 +18,7 @@ "baseRate": 1, "type": "protocol", "address": "0xF0574d8B9Dc3a9DE768eaa7DBB7bB0C68521b148", - "name": "PT-rswETH-26SEP2024", + "name": "PT rswETH 26SEP2024", "symbol": "PT-rswETH-26SEP2024", "decimals": 18, "tokens": [ @@ -26,7 +26,7 @@ "type": "underlying", "underlyingRateRaw": "975262482310168247n", "address": "0x7786729eEe8b9d30fE7d91fDFf23A0f1D0C615D9", - "name": "SY-rswETH", + "name": "SY rswETH", "symbol": "SY-rswETH", "decimals": 18, "underlyingRate": 0.9752624823101682, diff --git a/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.profits.json b/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.profits.json index 4016d9756..94ab5cccf 100644 --- a/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.profits.json +++ b/packages/adapters-library/src/adapters/pendle/products/principle-token/tests/snapshots/ethereum.profits.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0xc69Ad9baB1dEE23F4605a82b3354F8E40d1E5966", - "name": "PT-weETH-27JUN2024", + "name": "PT ether.fi weETH 27JUN2024", "symbol": "PT-weETH-27JUN2024", "decimals": 18, "type": "protocol", diff --git a/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/pendleStandardisedYieldTokenAdapter.ts b/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/pendleStandardisedYieldTokenAdapter.ts index 2bc392df0..f33ba3a17 100644 --- a/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/pendleStandardisedYieldTokenAdapter.ts +++ b/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/pendleStandardisedYieldTokenAdapter.ts @@ -81,28 +81,22 @@ export class PendleStandardisedYieldTokenAdapter implements IProtocolAdapter { async getProtocolTokens(): Promise[]> { const resp = await fetchAllMarkets(this.chainId) - return resp.results.map((value) => { - const marketAddress = getAddress(value.address) - - const underlyingAsset: Erc20Metadata = { - address: getAddress(value.underlyingAsset.address), - name: value.underlyingAsset.name, - symbol: value.underlyingAsset.symbol, - decimals: value.underlyingAsset.decimals, - } - const sy: Erc20Metadata = { - address: getAddress(value.sy.address), - name: value.sy.name, - symbol: value.sy.symbol, - decimals: value.underlyingAsset.decimals, - } - - return { - ...sy, - underlyingTokens: [underlyingAsset], - marketAddress, - } - }) + return await Promise.all( + resp.results.map(async (value) => { + const marketAddress = getAddress(value.address) + + const [underlyingAsset, sy] = await Promise.all([ + this.helpers.getTokenMetadata(value.underlyingAsset.address), + this.helpers.getTokenMetadata(value.sy.address), // TODO: Check if decimals need to be underlyingAsset.decimals + ]) + + return { + ...sy, + underlyingTokens: [underlyingAsset], + marketAddress, + } + }), + ) } async getPositions(input: GetPositionsInput): Promise { diff --git a/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/tests/snapshots/ethereum.positions.pt-sy.json b/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/tests/snapshots/ethereum.positions.pt-sy.json index 823e59291..62da05952 100644 --- a/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/tests/snapshots/ethereum.positions.pt-sy.json +++ b/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/tests/snapshots/ethereum.positions.pt-sy.json @@ -17,7 +17,7 @@ "tokens": [ { "address": "0xcbC72d92b2dc8187414F6734718563898740C0BC", - "name": "SY-stETH", + "name": "SY stETH", "symbol": "SY-stETH", "decimals": 18, "balanceRaw": "283748506312827456n", @@ -65,7 +65,7 @@ }, { "address": "0x253008ba4aE2f3E6488DC998a5321D4EB1a0c905", - "name": "SY pufETH", + "name": "SY Puffer ETH", "symbol": "SY pufETH", "decimals": 18, "balanceRaw": "618983117134711107n", @@ -87,7 +87,7 @@ }, { "address": "0xD7DF7E085214743530afF339aFC420c7c720BFa7", - "name": "SY-zs-weETH", + "name": "SY Zircuit Ether.fi weETH", "symbol": "SY-zs-weETH", "decimals": 18, "balanceRaw": "334265716886494658n", @@ -95,7 +95,7 @@ "tokens": [ { "address": "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee", - "name": "weETH", + "name": "Wrapped eETH", "symbol": "weETH", "decimals": 18, "type": "underlying", @@ -135,7 +135,7 @@ }, { "address": "0x7786729eEe8b9d30fE7d91fDFf23A0f1D0C615D9", - "name": "SY-rswETH", + "name": "SY rswETH", "symbol": "SY-rswETH", "decimals": 18, "balanceRaw": "237531096783559785n", diff --git a/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/tests/snapshots/ethereum.positions.yt-lp.json b/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/tests/snapshots/ethereum.positions.yt-lp.json index b32d13fe1..d1eed712b 100644 --- a/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/tests/snapshots/ethereum.positions.yt-lp.json +++ b/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/tests/snapshots/ethereum.positions.yt-lp.json @@ -17,7 +17,7 @@ "tokens": [ { "address": "0x730A5E2AcEbccAA5e9095723B3CB862739DA793c", - "name": "SY-rsETH", + "name": "SY Kelp rsETH", "symbol": "SY-rsETH", "decimals": 18, "balanceRaw": "889654725296176699n", @@ -39,7 +39,7 @@ }, { "address": "0x253008ba4aE2f3E6488DC998a5321D4EB1a0c905", - "name": "SY pufETH", + "name": "SY Puffer ETH", "symbol": "SY pufETH", "decimals": 18, "balanceRaw": "1638883915990475510n", @@ -61,7 +61,7 @@ }, { "address": "0x7786729eEe8b9d30fE7d91fDFf23A0f1D0C615D9", - "name": "SY-rswETH", + "name": "SY rswETH", "symbol": "SY-rswETH", "decimals": 18, "balanceRaw": "281149592989050119n", diff --git a/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/tests/snapshots/ethereum.prices.sy.json b/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/tests/snapshots/ethereum.prices.sy.json index 47cbf879f..df8058042 100644 --- a/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/tests/snapshots/ethereum.prices.sy.json +++ b/packages/adapters-library/src/adapters/pendle/products/standardised-yield-token/tests/snapshots/ethereum.prices.sy.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0x7786729eEe8b9d30fE7d91fDFf23A0f1D0C615D9", - "name": "SY-rswETH", + "name": "SY rswETH", "symbol": "SY-rswETH", "decimals": 18, "baseRate": 1, diff --git a/packages/adapters-library/src/adapters/pendle/products/yield-token/pendleYieldTokenAdapter.ts b/packages/adapters-library/src/adapters/pendle/products/yield-token/pendleYieldTokenAdapter.ts index 5d13b7ddd..d790faa22 100644 --- a/packages/adapters-library/src/adapters/pendle/products/yield-token/pendleYieldTokenAdapter.ts +++ b/packages/adapters-library/src/adapters/pendle/products/yield-token/pendleYieldTokenAdapter.ts @@ -1,9 +1,9 @@ -import { getAddress } from 'ethers' +import { Block, getAddress } from 'ethers' import { AdaptersController } from '../../../../core/adaptersController' import { Chain } from '../../../../core/constants/chains' import { CacheToDb } from '../../../../core/decorators/cacheToDb' import { CustomJsonRpcProvider } from '../../../../core/provider/CustomJsonRpcProvider' -import { filterMapAsync } from '../../../../core/utils/filters' +import { filterMapAsync, filterMapSync } from '../../../../core/utils/filters' import { getTokenMetadata } from '../../../../core/utils/getTokenMetadata' import { Helpers } from '../../../../scripts/helpers' import { @@ -34,6 +34,7 @@ import { RouterStatic__factory, YieldToken__factory } from '../../contracts' type AdditionalMetadata = { marketAddress: string + expiry: string } export class PendleYieldTokenAdapter implements IProtocolAdapter { @@ -78,39 +79,72 @@ export class PendleYieldTokenAdapter implements IProtocolAdapter { } } - @CacheToDb - async getProtocolTokens(): Promise[]> { - const resp = await fetchAllMarkets(this.chainId) + async isExpiredAtBlock( + expiry: string, + blockNumber: number | undefined, + ): Promise { + let comparisonDate: Date - return resp.results.map((value) => { - const marketAddress = getAddress(value.address) + if (blockNumber) { + // Get the block details if a block number is provided + const block = await this.provider.getBlock(blockNumber) - const yt: Erc20Metadata = { - address: getAddress(value.yt.address), - name: value.yt.name, - symbol: value.yt.symbol, - decimals: value.yt.decimals, + if (!block) { + throw new Error(`Block ${blockNumber} not found`) } - const sy: Erc20Metadata = { - address: getAddress(value.sy.address), - name: value.sy.name, - symbol: value.sy.symbol, - decimals: value.underlyingAsset.decimals, - } + comparisonDate = new Date(block.timestamp * 1000) // Convert seconds to milliseconds + } else { + // If no block number is provided, use today's date + comparisonDate = new Date() + } - return { - ...yt, - underlyingTokens: [sy], - marketAddress, - } - }) + const expiryDate = new Date(expiry) + + // Compare the expiry date with either the block date or today's date + return comparisonDate > expiryDate + } + + @CacheToDb + async getProtocolTokens(): Promise[]> { + const resp = await fetchAllMarkets(this.chainId) + + return await Promise.all( + resp.results.map(async (value) => { + const marketAddress = getAddress(value.address) + + const [yt, sy] = await Promise.all([ + this.helpers.getTokenMetadata(value.yt.address), + this.helpers.getTokenMetadata(value.sy.address), // TODO: Check if decimals need to be underlyingAsset.decimals + ]) + + return { + ...yt, + underlyingTokens: [sy], + marketAddress, + expiry: value.expiry, + } + }), + ) } async getPositions(input: GetPositionsInput): Promise { + const tokens = await filterMapAsync( + await this.getProtocolTokens(), + async (protocolToken) => { + if ( + await this.isExpiredAtBlock(protocolToken.expiry, input.blockNumber) + ) { + return undefined + } + + return protocolToken + }, + ) + return this.helpers.getBalanceOfTokens({ ...input, - protocolTokens: await this.getProtocolTokens(), + protocolTokens: tokens, }) } @@ -158,6 +192,7 @@ export class PendleYieldTokenAdapter implements IProtocolAdapter { const { underlyingTokens: [underlyingToken], marketAddress, + expiry, ...protocolToken } = await this.getProtocolTokenByAddress(protocolTokenAddress) diff --git a/packages/adapters-library/src/adapters/pendle/products/yield-token/tests/snapshots/ethereum.positions.pt-sy.json b/packages/adapters-library/src/adapters/pendle/products/yield-token/tests/snapshots/ethereum.positions.pt-sy.json index 70dc115f3..87f3e22e8 100644 --- a/packages/adapters-library/src/adapters/pendle/products/yield-token/tests/snapshots/ethereum.positions.pt-sy.json +++ b/packages/adapters-library/src/adapters/pendle/products/yield-token/tests/snapshots/ethereum.positions.pt-sy.json @@ -1,228 +1,238 @@ { "blockNumber": 20572021, "latency": "Latency: 1.699 seconds", - "aggregatedValues": ["USD0.00", "USD0.00", "USD0.00", "USD0.00"], - "snapshot": [ - { - "protocolId": "pendle", - "name": "Pendle", - "description": "Pendle Market adapter", - "siteUrl": "https://www.pendle.finance", - "iconUrl": "https://app.pendle.finance/favicon.ico", - "positionType": "supply", - "chainId": 1, - "productId": "yield-token", - "chainName": "ethereum", - "success": true, - "tokens": [ - { - "address": "0xED97f94dd94255637A054098604E0201C442a3FD", - "name": "YT-Silo crvUSD-28MAR2024", - "symbol": "YT-Silo crvUSD-28MAR2024", - "decimals": 18, - "balanceRaw": "202250048854396667027857n", - "type": "protocol", - "tokens": [ - { - "address": "0xE05082B184a34668CD8A904D85FA815802BBb04c", - "name": "SY-Silo crvUSD", - "symbol": "SY-Silo crvUSD", - "decimals": 18, - "type": "underlying", - "balanceRaw": "0n", - "tokens": [ - { - "address": "0xb27D1729489d04473631f0AFAca3c3A7389ac9F8", - "name": "scrvUSD-CRV", - "symbol": "scrvUSD-CRV", - "decimals": 18, - "type": "underlying", - "balanceRaw": "0n", - "balance": 0, - "iconUrl": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xb27D1729489d04473631f0AFAca3c3A7389ac9F8/logo.png" - } - ], - "balance": 0, - "iconUrl": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xE05082B184a34668CD8A904D85FA815802BBb04c/logo.png" - } - ], - "balance": 202250.04885439668 - }, - { - "address": "0x256Fb830945141f7927785c06b65dAbc3744213c", - "name": "YT-ezETH-25APR2024", - "symbol": "YT-ezETH-25APR2024", - "decimals": 18, - "balanceRaw": "70683206443933940248n", - "type": "protocol", - "tokens": [ - { - "address": "0x22E12A50e3ca49FB183074235cB1db84Fe4C716D", - "name": "SY-ezETH", - "symbol": "SY-ezETH", - "decimals": 18, - "type": "underlying", - "balanceRaw": "0n", - "tokens": [ - { - "address": "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110", - "name": "ezETH", - "symbol": "ezETH", - "decimals": 18, - "type": "underlying", - "balanceRaw": "0n", - "tokens": [ - { - "address": "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE", - "name": "Ethereum", - "symbol": "ETH", - "decimals": 18, - "type": "underlying", - "balanceRaw": "0n", - "balance": 0, - "price": 2594.3492, - "iconUrl": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/info/logo.png" - } - ], - "balance": 0, - "price": 0, - "iconUrl": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xbf5495Efe5DB9ce00f80364C8B423567e58d2110/logo.png" - } - ], - "balance": 0, - "price": 0, - "iconUrl": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x22E12A50e3ca49FB183074235cB1db84Fe4C716D/logo.png" - } - ], - "balance": 70.68320644393394 - }, - { - "address": "0x391B570e81e354a85a496952b66ADc831715f54f", - "name": "YT-pufETH-27JUN2024", - "symbol": "YT-pufETH-27JUN2024", - "decimals": 18, - "balanceRaw": "75003262169582936158n", - "type": "protocol", - "tokens": [ - { - "address": "0x253008ba4aE2f3E6488DC998a5321D4EB1a0c905", - "name": "SY pufETH", - "symbol": "SY pufETH", - "decimals": 18, - "type": "underlying", - "balanceRaw": "0n", - "tokens": [ - { - "address": "0xD9A442856C234a39a81a089C06451EBAa4306a72", - "name": "pufETH", - "symbol": "pufETH", - "decimals": 18, - "type": "underlying", - "balanceRaw": "0n", - "balance": 0, - "price": 2575.3391066874897, - "iconUrl": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xD9A442856C234a39a81a089C06451EBAa4306a72/logo.png" - } - ], - "balance": 0, - "price": 0, - "iconUrl": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x253008ba4aE2f3E6488DC998a5321D4EB1a0c905/logo.png" - } - ], - "balance": 75.00326216958294 - }, - { - "address": "0x4AfdB1B0f9A56922e398D29239453e6A06148eD0", - "name": "YT-rswETH-27JUN2024", - "symbol": "YT-rswETH-27JUN2024", - "decimals": 18, - "balanceRaw": "31456466209142219237n", - "type": "protocol", - "tokens": [ - { - "address": "0x7786729eEe8b9d30fE7d91fDFf23A0f1D0C615D9", - "name": "SY-rswETH", - "symbol": "SY-rswETH", - "decimals": 18, - "type": "underlying", - "balanceRaw": "0n", - "tokens": [ - { - "address": "0xFAe103DC9cf190eD75350761e95403b7b8aFa6c0", - "name": "rswETH", - "symbol": "rswETH", - "decimals": 18, - "type": "underlying", - "balanceRaw": "0n", - "balance": 0, - "price": 2632.664790860908, - "iconUrl": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xFAe103DC9cf190eD75350761e95403b7b8aFa6c0/logo.png" - } - ], - "balance": 0, - "price": 0, - "iconUrl": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x7786729eEe8b9d30fE7d91fDFf23A0f1D0C615D9/logo.png" - } - ], - "balance": 31.45646620914222 - } - ] - } - ], + "aggregatedValues": [], + "snapshot": [], "rpcResponses": { - "b19558d669114c8d2156a456c82503a5": { - "result": "0x000000000000000000000000000000000000000000002ad3ff431a63c0f5e191" - }, - "b9b8ef28e8378278f2f5d01b2e741f2f": { - "result": "0x000000000000000000000000000000000000000000000003d4ed31c3dc48ba18" - }, - "255c6218b7876138a9e85bc847506c99": { - "result": "0x00000000000000000000000000000000000000000000000410e11d8f157c205e" - }, - "5813d407c332db4402b1183b89f77d17": { - "result": "0x000000000000000000000000000000000000000000000001b48bd15a8d0021e5" - }, - "8cf3488cd8428d604290b2dbf438662a": { - "result": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" - }, - "c8db64a68a4f6f3ede0645ae4c9b6bc9": { - "result": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000" - }, - "34b4810939f0fc4a004546f6a17f87da": { - "result": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000" - }, - "525ee2668e9fa84f065c69043b005d7d": { - "result": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000" - }, - "14c97194d01f018dec47daaa1be8967c": { - "result": "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000d533a949740bb3306d119cc777fa900ba034cd52" - }, - "820e93ad3fd7762ea1e4b39c7d95a6a9": { - "result": "0x0000000000000000000000000000000000000000000000000000000000000000" - }, - "bd97a58b6ccd0078608355515773c44f": { - "result": "0x0000000000000000000000000000000000000000000000000000000000000000" - }, - "0e54584116727afe4be9f40e592fdf78": { - "result": "0x0000000000000000000000000000000000000000000000000000000000000000" - }, - "9870468ac1fb47b67ec3d5321dc7fc50": { - "result": "0x0000000000000000000000000000000000000000000000000000000000000000" - }, - "d6512b66e4c47ef0e20cec2f6493bd0f": { - "result": "0x00000000000000000000000000000000000000000000000600000000000055be0000000000000000000000000000000000000000000000000000003c6786b8400000000000000000000000000000000000000000000000000000000066c4e6b30000000000000000000000000000000000000000000000000000000066c4e6b300000000000000000000000000000000000000000000000600000000000055be" - }, - "e6362d62f4829ef76a0d6c06083c968e": { - "result": "0x0000000000000000000000000000000000000000000000000000000000000000" - }, - "476e3b53535fcb664b36101fc61655d2": { - "result": "0x0000000000000000000000000000000000000000000000000dc6ae6127261bac" - }, - "7d4458fa03390d8ad42472bbff2bd8c7": { - "result": "0x0000000000000000000000000000000000000000000000000e152ee7cc0ffc9d" - }, - "e5c506d817e8e9b0fa57b379a013445c": { - "result": "0x0000000000000000000000000000000000000000000000000e1dfce350c16d6c" + "d15c7064d5dc0ab0fb33ea45145438e8": { + "result": { + "baseFeePerGas": "0x37ec5386", + "blobGasUsed": "0xc0000", + "difficulty": "0x0", + "excessBlobGas": "0x0", + "extraData": "0x4e65746865726d696e64", + "gasLimit": "0x1c9c380", + "gasUsed": "0x6a611e", + "hash": "0xb9e9c30b59927e779eacc8eb57c61652839320c96f70150fdf66548f9cffdaa3", + "logsBloom": "0x16e00620208c00033681007ce0a16100159082884e40444020006813ec70294204e50d05d62012108302780020b203066a01810208232e2015453ab100324a081f400108440008680826051c82441028e501d00182400d0222552604ddc000101000020022c803880dc642d20000084f32030ca882b086200320d05c8009300291000a18048101483008246206003600614ea449c3a4010ac22180424ab1a82ad28895200cc261000a9858d009018504128c9044403003881048c2514000096095142043219401a10608ce60a2009ec0000f2206108c8c545021c462a6a8a0a40073284c11206505780401a4a4885a166302962001223a4019258ad014091c51", + "miner": "0x067846f9276a59cbe290396bc8f2469bd71b1428", + "mixHash": "0x1466bd52e86877ef281306dc56ca26d9836f4a27d0d97d01ab7a711188c8244f", + "nonce": "0x0000000000000000", + "number": "0x139e775", + "parentBeaconBlockRoot": "0xcfa7a578a3d104d55212cca7fb94bb72dad8c1323c76ec597483cca140a3794f", + "parentHash": "0x077d1edb5ae8ae77573b78abe98e200e5f642831181a86deac729bce620053e6", + "receiptsRoot": "0x1e0a1dcb4571034198702b5b14001c8056ccb34857500936790855f0d74525dc", + "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", + "size": "0x75e1", + "stateRoot": "0xb9664b0780e404ec911a109be1901fc1b7ad8ad0a1fcf1ce8a4de1574adbe655", + "timestamp": "0x66c4f313", + "totalDifficulty": "0xc70d815d562d3cfa955", + "transactions": [ + "0xf7fab140e49b2aaef70bf57c8e2c0b5448a660cff9de68f9a2557f861bac1271", + "0x8a822775c70d1b14ae34edd98aa114ff4beb9d65cd91e7f0b7e160f67216a694", + "0xb2f448975cb7c06d389ebcc918c557ae5207bd58a044f7e1314e0865864a28f7", + "0x2e48a510a02731a53cf9b5b29c6789fa5230e249a3d37a99ace044d88ad09940", + "0xa37905e0c86180d940cea5b03e45ef8f9489f54af1a06bb8ab7e9aed8e8c10e1", + "0x963be8af6cf3c0932b19f690907af7f5c71875815823cdd6537974f5aae1fcaf", + "0x0878133d17928e8d4e74d5831d944348a1a3fec3c640ea27c4fd3fab2c607985", + "0x83357b6908c5968ddedf420ec95a353f5ccb2c94970cb74ec310d9b46dffd063", + "0xa383fc07fbee6cfa1f9e14e7d5f5c87b99d189d52a7a9232ca76fdf9e623bfd0", + "0xe6701806fdcb75a009913ea59497540f96e45b4af324209938b8c1db84d8e41f", + "0x1554be065972b4b52f05617ef386fecacd1aa29a1dc761ffd5dcb7b559d1d598", + "0xdfef4e12b0ee1403a1bf0b63df9c3cd4b868adf62d2ef7a76331b68c2f2e27bd", + "0x189b48607e2f089034f2cd3251fa8eaee27cd86c9e82eff6429268994ee149db", + "0x7f33b80745c98fc4e0e3f95a595ef31738e0c5c5079ce3c28ee6192642692c8c", + "0x66339cfd03932488a06c07fb3b993cf28954b775f4a8b99374090fa1c1edc647", + "0xd06d556c8d07cb3f2b0b5e408cf4693768aa6d29747d135dc5de0692ec0dad82", + "0xeff64d14657371f21a4290408502e21621f9c7c496bec01129a7ab5de9fd9131", + "0xcb0bea63871ba4852df605faa86c52c192b12d179c59e4c827195cbf27a04388", + "0x43eaf8d15c0d38f6ed60be0a9736289d4d16927d0229dea84ed4ddf44d9bb993", + "0x998676fc72b447d6af1a95d0941c4ecb268138dc34bdd33aa23caea1a348eb3f", + "0xc9689e7672a7356f4f2d2b4bab12f1d41ed8e21e4fa6a5ccd1dbd102b4563740", + "0x5c1d05620f3e312964834cd3157d0d33bbbe0a910c80f7d0f40ea4c8b789d4d1", + "0xeae1ded9bb28a25eb8dbea4e7ca4d8047bcf66d4c03a377c4cb3e10e676edbc3", + "0x71182ea7459e2e45efaf1c2350115502432fca41d08bd3de527af9ff5062d2c3", + "0xe3787658a529954b04d28d138795340c9a68884a317a58626d42bb15b07cda0e", + "0xa67c056aab40d19f754445c877c119e115cc338f4dacec9f0ed0e7eac4c5a8bf", + "0x7b33c49232c3d71c96eda17e9eeab1949c4841961da221183cab1880b6468075", + "0x06a6b63b1e36dcc2484234d833cb4461f30d079abada214580a247d75556c3c1", + "0x325790ba091463b8495766847cf0d8816fdce297ddfa47e9618cbcd063a2b446", + "0x62880efe6bcee84eb49c3a4ae1277338f58810f29980b1577b8f9d2965a8d2cf", + "0x945fa2d7084df79739c0df9e414a1dae1040374ffcdf35dec889e9cb8bff0905", + "0x305d1d9fd31f1a6fe86ffa9ca7ccba04680a1fba31947bc70135ab428e4b9536", + "0xdfd8f8f16bf96c6a5080793d5220307bc9b132d2f92cc7cdf24a0a702f8bd314", + "0xbb5991d2d3eba8934cae1e37f463b504a5ce801a32832ce632dc6b8d851e65f2", + "0x1475e755e6af20e56be50c40489fb918fecc257038754c40c9bc8d1f2875b582", + "0x854c9215810de0b4f918b4a423bd8992e3feb4f7355f63e9cc5a9e1194c20acc", + "0xa352ba26167e3c394d624f4506fecc10c0ef05be99adcf4f8dda2b9ffee54b68", + "0xf4480783d31b35ff600c4f23910de2e93ed7ceed960270b35c34f9b0de627a2b", + "0xf406760286fc7c849313352dc2f0baa7afc637af46d32f79749548c32ef5e997", + "0x3a042bfabfe6255589355ed1159cce9213e9cd26f219ffbe20693b424f36aebc", + "0x2d2e2b39519109585657b9d7bc79fc6aafefe24c1c7b93173f8f75be753f8b6a", + "0x04401ec4445d40db411fd4230b743360668ebedeb456ee2ab09a378a540a6d45", + "0x119ca7b352742885dfcfc4f65d33c33cfedef413058d180b02dc543c45bda848", + "0xe3a1a969cee895c3142c5eb039bd89520252b37fcf260c15b437832973c7a6e3", + "0x0616905d46566e5c722a09c4b878fb443c42fb2dafec262264ba82a3d9c3832b", + "0xd9864fb38791042309f7bf85d37109c95c310e01a81f833c2f7e66b5fb329cde", + "0x09545ce0f998ffa10ff1475114bffa72dbd19f139fbe099e4af4445f817ff6bc", + "0x1dd41cd9935f9cd56d9b14c225b185377241090c9ea30678c75a87e6aff855f4", + "0xf473f2fb4a211ddb0072bf2be331b0d519fcc761862527e2c0ea428ae8fe09ab", + "0xe19f7f7df97027da13f8968ab5e7b37da166fdcc548009d4c58b7f673323d773", + "0x0465c368752cc776630b35aac91448c30245712a17351b3a856731febb18ca0e", + "0x3cd2674ec000e016f23c1020ad5897b1d23fcdf4f61516d07093964af76d1256", + "0xf1962ae20b3869e10e8c4b7f1a5223426de0595b378802fcfcee2c7f68b182ca", + "0xb25d4c4c0c0183adcabf7a9cc0e4ab3f43aa60ebf3593fc31b04110f7419865f", + "0x46539a53f46b27474f9247d771ffd99b81a30785a332b62cc2a0fd2458066cd8", + "0x5882621a91f79ff37d55b0f46004b1fca4fa515e35b0ab9064c25878a506d09e", + "0x696128fcb974b91aa1c9dd75ee07c9fed54b7d11826604683ac089ca5b1dedda", + "0xecb443a7284050f74120c2675f317e8af1ae2f4bf2f3428d5422b1916ac11654", + "0x8042bf593ae3efd5f880dc1319fbdbc2beced1b2b157d4aa0498d765547916eb", + "0x7edcd34d3a05d5af5c089e64bd71c3d7fb7670cadd9f7da45c1e7f8471b663f1", + "0x907aef5b351f1dcff2da04b16e66be2f3d3893ef707e1d45b81d3ece4f3c7130", + "0xf947ec294b014d059ea59ad1048db5a589fc557ec9f992112bd68f17b7e4c7db", + "0x7f8126b43b343588ba2ff665d7ea064e53087510fc097f76684c85f05fbefa78", + "0x36d237cbd57b953a95de438f1374c71ee35d77dc99f452020d4a733952e05783", + "0x09b50cbde88a77d04f097bad178894814f414e0bb223fa848cdfba68df9635c7", + "0x70b1270c82021f5eafebfda016356e33324f800f265a70e2802bedf5f3f51075", + "0x20fbb98a4d43edac7e3331dcb287499b570b87d240c88e7e8ac16dab01e8eb57", + "0x3bc8a88b6b9cb3e9bdc88abb12e74d97f8a434c974a2c9c6920b96e35514debc", + "0x2dc41489aeedb505c60ee70db40199a2fdadae998bd0ccb35bc28293084391c2", + "0x108ef6a20e2cb9ff215136472bda53e787626f9de555bbf886cb7170fb3fe987", + "0x17970bd875585716648e138529590f423516d784ca823332c34f6e92c58a0c4d", + "0xa49934191cc68689f95ea8180c2b4bffb9186044d17afa02b4bcc37823cc77f8", + "0x432e9d967ab071ed3ce49a061f6beb032c0ec51d3792fa81c6cfa74b62be4564", + "0xb7f88be511e356681c7ba320f3df38e0b97a05b080db3c5914323231f28c3cec", + "0x91193513e0d45623ca12b2f82573074e448dd98d1c4172f5836c0ab5a0c35c72", + "0x877b440fbd6e0780581fdb45dc0906108c0774407d8dd3fa76bd193dc68e689c", + "0x26696e12e94e2f95b5f93fe85504bf736d6f36e1b93d6b2efb7050904faac007", + "0xe460c314e98bb0561830e9707dab1a2abe8f6d2e0a6f54ef1c332dd00588b99a", + "0x1aa741df6bf5c0552edeb5f5cb3b8f1864723c3c3337055d5564b9097492d359", + "0xe7d7723cc8ffd7002d117daa692eb7b8698bf5dae62128800c546fd2983a4677", + "0xd2eb964a252e529c2b173e2b6db6f8530c87375c47527d9c7fb619d0c6f8ce49", + "0x5bed22385a4a783d8f266574fba67a73313351a9caa89be4948aed2e99122ee2", + "0xc63e6a241e943c09378279cbf6a752145b2798fb850c621de4258c2c624d06fa", + "0xa3eedbf40ae14110d5036b8e5d6211363a5c575d276916bf028213d456d36648", + "0x2c1b97c3c530fb25ebb262add0a285767f2b179a7a3c66108ed10602e56fa8a6", + "0xc1b1ea0b5b996f29774bb2985626e63ee123372364b39774abd3c9a5a6b336dd", + "0xe1e43691d4b12a54c94a7d002933bf886aadbdfea41185840b9fb4bc56a0b9b6", + "0x8d006b58ea28cd4be920b1a05428cda398479551a2c07f00427daccc8b5eaada", + "0x2729557b8cb247a21a201b9c84fdc88dbf9698985cbd9dea18d815ba94f20b70", + "0x10b8f9a1e05e8979b3cc0d25bd7f0dcb9bf7838e3c9e092f02990509eebad39b", + "0xf4d46eb6570a1fcd0a5cdfb6b4e980b5505f8daad17e17e3ef5cb3d71ee8e230", + "0xbe9205e46fe32323e2bc9e21b6405f764d83a4c22934fc4fdef1d1ef095db4b0", + "0x866cf21fd6c7ec93d3746224a090e939de83a973fa51ad78fa0d22bf9d49cb7d", + "0x9bf5b1d88ba309383672143508adf3a43a427e988b55251885340beaf5357959", + "0xd5a96fce15292a8a7ff0585724a4b2b99d7bdc911001ee1732799d244d57bae9", + "0x9b528f6a3e66c0e7b5b1b99a3621767fb59d35baf7df55f440119b76245e4054", + "0xa1c49585370a328e96ea6370c8b689a6c80277e12ea0d2154bd4284d77f57370", + "0x74fbf1a46416ba8ba903eae0987e10e1d1a50795cbd480c2ea574ef5f9ab91fe", + "0x08da92acebe106380e031b678e15eb848758a7c532f27fa6158b0fd5503bc7b9", + "0x0e0c7d8c282a68792a95f515dbcb24b65e423dafd1be3a80b4c3e49e1428eea7", + "0x1064fd21323fca93f368bf00ac2867194f6c585fd49c9280fdac1c3b7751e60f", + "0xefbf5700ef896d51dce0c82c605fb91324a3150ab6d47b6e1ddc13673087f623" + ], + "transactionsRoot": "0xe639c451de458f8dea21e11fe9959ad1aaff7c0f5db602c49525ab17137d1ca8", + "uncles": [], + "withdrawals": [ + { + "address": "0x94b1c625ef0fd077a7e4628639eb390e3fe9ddd4", + "amount": "0x1202ada", + "index": "0x35f8a3b", + "validatorIndex": "0x615a" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x116f384", + "index": "0x35f8a3c", + "validatorIndex": "0x615b" + }, + { + "address": "0x5675801e9346ea8165e7eb80dccd01dca65c0f3a", + "amount": "0x1257958", + "index": "0x35f8a3d", + "validatorIndex": "0x615c" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x116bf52", + "index": "0x35f8a3e", + "validatorIndex": "0x615d" + }, + { + "address": "0x94b1c625ef0fd077a7e4628639eb390e3fe9ddd4", + "amount": "0x11fcbe3", + "index": "0x35f8a3f", + "validatorIndex": "0x615e" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x116513a", + "index": "0x35f8a40", + "validatorIndex": "0x615f" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x1166b97", + "index": "0x35f8a41", + "validatorIndex": "0x6160" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x1167c0f", + "index": "0x35f8a42", + "validatorIndex": "0x6161" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x1167503", + "index": "0x35f8a43", + "validatorIndex": "0x6162" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x1164997", + "index": "0x35f8a44", + "validatorIndex": "0x6163" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x117291d", + "index": "0x35f8a45", + "validatorIndex": "0x6164" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x116002a", + "index": "0x35f8a46", + "validatorIndex": "0x6165" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x1166b17", + "index": "0x35f8a47", + "validatorIndex": "0x6166" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x115dbab", + "index": "0x35f8a48", + "validatorIndex": "0x6167" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x11631eb", + "index": "0x35f8a49", + "validatorIndex": "0x6168" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x116c52f", + "index": "0x35f8a4a", + "validatorIndex": "0x6169" + } + ], + "withdrawalsRoot": "0xd959101b1db825948d50dfd5cd1d608fe7f6129554031f2ff9fa355bef50a7f7" + } } } } diff --git a/packages/adapters-library/src/adapters/pendle/products/yield-token/tests/snapshots/ethereum.positions.yt-lp.json b/packages/adapters-library/src/adapters/pendle/products/yield-token/tests/snapshots/ethereum.positions.yt-lp.json index f67064f00..6e9416734 100644 --- a/packages/adapters-library/src/adapters/pendle/products/yield-token/tests/snapshots/ethereum.positions.yt-lp.json +++ b/packages/adapters-library/src/adapters/pendle/products/yield-token/tests/snapshots/ethereum.positions.yt-lp.json @@ -1,7 +1,7 @@ { "blockNumber": 20572021, "latency": "Latency: 1.179 seconds", - "aggregatedValues": ["USD0.00", "USD161.25", "USD785.23"], + "aggregatedValues": ["USD161.25", "USD785.23"], "snapshot": [ { "protocolId": "pendle", @@ -15,44 +15,9 @@ "chainName": "ethereum", "success": true, "tokens": [ - { - "address": "0x4AfdB1B0f9A56922e398D29239453e6A06148eD0", - "name": "YT-rswETH-27JUN2024", - "symbol": "YT-rswETH-27JUN2024", - "decimals": 18, - "balanceRaw": "55833719459134401463n", - "type": "protocol", - "tokens": [ - { - "address": "0x7786729eEe8b9d30fE7d91fDFf23A0f1D0C615D9", - "name": "SY-rswETH", - "symbol": "SY-rswETH", - "decimals": 18, - "type": "underlying", - "balanceRaw": "0n", - "tokens": [ - { - "address": "0xFAe103DC9cf190eD75350761e95403b7b8aFa6c0", - "name": "rswETH", - "symbol": "rswETH", - "decimals": 18, - "type": "underlying", - "balanceRaw": "0n", - "balance": 0, - "price": 2632.664790860908, - "iconUrl": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xFAe103DC9cf190eD75350761e95403b7b8aFa6c0/logo.png" - } - ], - "balance": 0, - "price": 0, - "iconUrl": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x7786729eEe8b9d30fE7d91fDFf23A0f1D0C615D9/logo.png" - } - ], - "balance": 55.8337194591344 - }, { "address": "0x1a65eB80a2ac3ea6E41D456DdD6E9cC5728BEf7C", - "name": "YT-pufETH-26SEP2024", + "name": "YT Puffer ETH 26SEP2024", "symbol": "YT-pufETH-26SEP2024", "decimals": 18, "balanceRaw": "4988698980780507707n", @@ -60,7 +25,7 @@ "tokens": [ { "address": "0x253008ba4aE2f3E6488DC998a5321D4EB1a0c905", - "name": "SY pufETH", + "name": "SY Puffer ETH", "symbol": "SY pufETH", "decimals": 18, "type": "underlying-claimable", @@ -84,7 +49,7 @@ }, { "address": "0x253008ba4aE2f3E6488DC998a5321D4EB1a0c905", - "name": "SY pufETH", + "name": "SY Puffer ETH", "symbol": "SY pufETH", "decimals": 18, "type": "underlying", @@ -111,7 +76,7 @@ }, { "address": "0xD66b560f4e3e85f22C192d91dA847886d5C5Fd00", - "name": "YT-rswETH-26SEP2024", + "name": "YT rswETH 26SEP2024", "symbol": "YT-rswETH-26SEP2024", "decimals": 18, "balanceRaw": "23841277552309606499n", @@ -119,7 +84,7 @@ "tokens": [ { "address": "0x7786729eEe8b9d30fE7d91fDFf23A0f1D0C615D9", - "name": "SY-rswETH", + "name": "SY rswETH", "symbol": "SY-rswETH", "decimals": 18, "type": "underlying-claimable", @@ -143,7 +108,7 @@ }, { "address": "0x7786729eEe8b9d30fE7d91fDFf23A0f1D0C615D9", - "name": "SY-rswETH", + "name": "SY rswETH", "symbol": "SY-rswETH", "decimals": 18, "type": "underlying", @@ -172,8 +137,235 @@ } ], "rpcResponses": { - "0c51e720ac676d9311c81cbbaca5b7a6": { - "result": "0x00000000000000000000000000000000000000000000000306d9380742856bb7" + "d15c7064d5dc0ab0fb33ea45145438e8": { + "result": { + "baseFeePerGas": "0x37ec5386", + "blobGasUsed": "0xc0000", + "difficulty": "0x0", + "excessBlobGas": "0x0", + "extraData": "0x4e65746865726d696e64", + "gasLimit": "0x1c9c380", + "gasUsed": "0x6a611e", + "hash": "0xb9e9c30b59927e779eacc8eb57c61652839320c96f70150fdf66548f9cffdaa3", + "logsBloom": "0x16e00620208c00033681007ce0a16100159082884e40444020006813ec70294204e50d05d62012108302780020b203066a01810208232e2015453ab100324a081f400108440008680826051c82441028e501d00182400d0222552604ddc000101000020022c803880dc642d20000084f32030ca882b086200320d05c8009300291000a18048101483008246206003600614ea449c3a4010ac22180424ab1a82ad28895200cc261000a9858d009018504128c9044403003881048c2514000096095142043219401a10608ce60a2009ec0000f2206108c8c545021c462a6a8a0a40073284c11206505780401a4a4885a166302962001223a4019258ad014091c51", + "miner": "0x067846f9276a59cbe290396bc8f2469bd71b1428", + "mixHash": "0x1466bd52e86877ef281306dc56ca26d9836f4a27d0d97d01ab7a711188c8244f", + "nonce": "0x0000000000000000", + "number": "0x139e775", + "parentBeaconBlockRoot": "0xcfa7a578a3d104d55212cca7fb94bb72dad8c1323c76ec597483cca140a3794f", + "parentHash": "0x077d1edb5ae8ae77573b78abe98e200e5f642831181a86deac729bce620053e6", + "receiptsRoot": "0x1e0a1dcb4571034198702b5b14001c8056ccb34857500936790855f0d74525dc", + "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", + "size": "0x75e1", + "stateRoot": "0xb9664b0780e404ec911a109be1901fc1b7ad8ad0a1fcf1ce8a4de1574adbe655", + "timestamp": "0x66c4f313", + "totalDifficulty": "0xc70d815d562d3cfa955", + "transactions": [ + "0xf7fab140e49b2aaef70bf57c8e2c0b5448a660cff9de68f9a2557f861bac1271", + "0x8a822775c70d1b14ae34edd98aa114ff4beb9d65cd91e7f0b7e160f67216a694", + "0xb2f448975cb7c06d389ebcc918c557ae5207bd58a044f7e1314e0865864a28f7", + "0x2e48a510a02731a53cf9b5b29c6789fa5230e249a3d37a99ace044d88ad09940", + "0xa37905e0c86180d940cea5b03e45ef8f9489f54af1a06bb8ab7e9aed8e8c10e1", + "0x963be8af6cf3c0932b19f690907af7f5c71875815823cdd6537974f5aae1fcaf", + "0x0878133d17928e8d4e74d5831d944348a1a3fec3c640ea27c4fd3fab2c607985", + "0x83357b6908c5968ddedf420ec95a353f5ccb2c94970cb74ec310d9b46dffd063", + "0xa383fc07fbee6cfa1f9e14e7d5f5c87b99d189d52a7a9232ca76fdf9e623bfd0", + "0xe6701806fdcb75a009913ea59497540f96e45b4af324209938b8c1db84d8e41f", + "0x1554be065972b4b52f05617ef386fecacd1aa29a1dc761ffd5dcb7b559d1d598", + "0xdfef4e12b0ee1403a1bf0b63df9c3cd4b868adf62d2ef7a76331b68c2f2e27bd", + "0x189b48607e2f089034f2cd3251fa8eaee27cd86c9e82eff6429268994ee149db", + "0x7f33b80745c98fc4e0e3f95a595ef31738e0c5c5079ce3c28ee6192642692c8c", + "0x66339cfd03932488a06c07fb3b993cf28954b775f4a8b99374090fa1c1edc647", + "0xd06d556c8d07cb3f2b0b5e408cf4693768aa6d29747d135dc5de0692ec0dad82", + "0xeff64d14657371f21a4290408502e21621f9c7c496bec01129a7ab5de9fd9131", + "0xcb0bea63871ba4852df605faa86c52c192b12d179c59e4c827195cbf27a04388", + "0x43eaf8d15c0d38f6ed60be0a9736289d4d16927d0229dea84ed4ddf44d9bb993", + "0x998676fc72b447d6af1a95d0941c4ecb268138dc34bdd33aa23caea1a348eb3f", + "0xc9689e7672a7356f4f2d2b4bab12f1d41ed8e21e4fa6a5ccd1dbd102b4563740", + "0x5c1d05620f3e312964834cd3157d0d33bbbe0a910c80f7d0f40ea4c8b789d4d1", + "0xeae1ded9bb28a25eb8dbea4e7ca4d8047bcf66d4c03a377c4cb3e10e676edbc3", + "0x71182ea7459e2e45efaf1c2350115502432fca41d08bd3de527af9ff5062d2c3", + "0xe3787658a529954b04d28d138795340c9a68884a317a58626d42bb15b07cda0e", + "0xa67c056aab40d19f754445c877c119e115cc338f4dacec9f0ed0e7eac4c5a8bf", + "0x7b33c49232c3d71c96eda17e9eeab1949c4841961da221183cab1880b6468075", + "0x06a6b63b1e36dcc2484234d833cb4461f30d079abada214580a247d75556c3c1", + "0x325790ba091463b8495766847cf0d8816fdce297ddfa47e9618cbcd063a2b446", + "0x62880efe6bcee84eb49c3a4ae1277338f58810f29980b1577b8f9d2965a8d2cf", + "0x945fa2d7084df79739c0df9e414a1dae1040374ffcdf35dec889e9cb8bff0905", + "0x305d1d9fd31f1a6fe86ffa9ca7ccba04680a1fba31947bc70135ab428e4b9536", + "0xdfd8f8f16bf96c6a5080793d5220307bc9b132d2f92cc7cdf24a0a702f8bd314", + "0xbb5991d2d3eba8934cae1e37f463b504a5ce801a32832ce632dc6b8d851e65f2", + "0x1475e755e6af20e56be50c40489fb918fecc257038754c40c9bc8d1f2875b582", + "0x854c9215810de0b4f918b4a423bd8992e3feb4f7355f63e9cc5a9e1194c20acc", + "0xa352ba26167e3c394d624f4506fecc10c0ef05be99adcf4f8dda2b9ffee54b68", + "0xf4480783d31b35ff600c4f23910de2e93ed7ceed960270b35c34f9b0de627a2b", + "0xf406760286fc7c849313352dc2f0baa7afc637af46d32f79749548c32ef5e997", + "0x3a042bfabfe6255589355ed1159cce9213e9cd26f219ffbe20693b424f36aebc", + "0x2d2e2b39519109585657b9d7bc79fc6aafefe24c1c7b93173f8f75be753f8b6a", + "0x04401ec4445d40db411fd4230b743360668ebedeb456ee2ab09a378a540a6d45", + "0x119ca7b352742885dfcfc4f65d33c33cfedef413058d180b02dc543c45bda848", + "0xe3a1a969cee895c3142c5eb039bd89520252b37fcf260c15b437832973c7a6e3", + "0x0616905d46566e5c722a09c4b878fb443c42fb2dafec262264ba82a3d9c3832b", + "0xd9864fb38791042309f7bf85d37109c95c310e01a81f833c2f7e66b5fb329cde", + "0x09545ce0f998ffa10ff1475114bffa72dbd19f139fbe099e4af4445f817ff6bc", + "0x1dd41cd9935f9cd56d9b14c225b185377241090c9ea30678c75a87e6aff855f4", + "0xf473f2fb4a211ddb0072bf2be331b0d519fcc761862527e2c0ea428ae8fe09ab", + "0xe19f7f7df97027da13f8968ab5e7b37da166fdcc548009d4c58b7f673323d773", + "0x0465c368752cc776630b35aac91448c30245712a17351b3a856731febb18ca0e", + "0x3cd2674ec000e016f23c1020ad5897b1d23fcdf4f61516d07093964af76d1256", + "0xf1962ae20b3869e10e8c4b7f1a5223426de0595b378802fcfcee2c7f68b182ca", + "0xb25d4c4c0c0183adcabf7a9cc0e4ab3f43aa60ebf3593fc31b04110f7419865f", + "0x46539a53f46b27474f9247d771ffd99b81a30785a332b62cc2a0fd2458066cd8", + "0x5882621a91f79ff37d55b0f46004b1fca4fa515e35b0ab9064c25878a506d09e", + "0x696128fcb974b91aa1c9dd75ee07c9fed54b7d11826604683ac089ca5b1dedda", + "0xecb443a7284050f74120c2675f317e8af1ae2f4bf2f3428d5422b1916ac11654", + "0x8042bf593ae3efd5f880dc1319fbdbc2beced1b2b157d4aa0498d765547916eb", + "0x7edcd34d3a05d5af5c089e64bd71c3d7fb7670cadd9f7da45c1e7f8471b663f1", + "0x907aef5b351f1dcff2da04b16e66be2f3d3893ef707e1d45b81d3ece4f3c7130", + "0xf947ec294b014d059ea59ad1048db5a589fc557ec9f992112bd68f17b7e4c7db", + "0x7f8126b43b343588ba2ff665d7ea064e53087510fc097f76684c85f05fbefa78", + "0x36d237cbd57b953a95de438f1374c71ee35d77dc99f452020d4a733952e05783", + "0x09b50cbde88a77d04f097bad178894814f414e0bb223fa848cdfba68df9635c7", + "0x70b1270c82021f5eafebfda016356e33324f800f265a70e2802bedf5f3f51075", + "0x20fbb98a4d43edac7e3331dcb287499b570b87d240c88e7e8ac16dab01e8eb57", + "0x3bc8a88b6b9cb3e9bdc88abb12e74d97f8a434c974a2c9c6920b96e35514debc", + "0x2dc41489aeedb505c60ee70db40199a2fdadae998bd0ccb35bc28293084391c2", + "0x108ef6a20e2cb9ff215136472bda53e787626f9de555bbf886cb7170fb3fe987", + "0x17970bd875585716648e138529590f423516d784ca823332c34f6e92c58a0c4d", + "0xa49934191cc68689f95ea8180c2b4bffb9186044d17afa02b4bcc37823cc77f8", + "0x432e9d967ab071ed3ce49a061f6beb032c0ec51d3792fa81c6cfa74b62be4564", + "0xb7f88be511e356681c7ba320f3df38e0b97a05b080db3c5914323231f28c3cec", + "0x91193513e0d45623ca12b2f82573074e448dd98d1c4172f5836c0ab5a0c35c72", + "0x877b440fbd6e0780581fdb45dc0906108c0774407d8dd3fa76bd193dc68e689c", + "0x26696e12e94e2f95b5f93fe85504bf736d6f36e1b93d6b2efb7050904faac007", + "0xe460c314e98bb0561830e9707dab1a2abe8f6d2e0a6f54ef1c332dd00588b99a", + "0x1aa741df6bf5c0552edeb5f5cb3b8f1864723c3c3337055d5564b9097492d359", + "0xe7d7723cc8ffd7002d117daa692eb7b8698bf5dae62128800c546fd2983a4677", + "0xd2eb964a252e529c2b173e2b6db6f8530c87375c47527d9c7fb619d0c6f8ce49", + "0x5bed22385a4a783d8f266574fba67a73313351a9caa89be4948aed2e99122ee2", + "0xc63e6a241e943c09378279cbf6a752145b2798fb850c621de4258c2c624d06fa", + "0xa3eedbf40ae14110d5036b8e5d6211363a5c575d276916bf028213d456d36648", + "0x2c1b97c3c530fb25ebb262add0a285767f2b179a7a3c66108ed10602e56fa8a6", + "0xc1b1ea0b5b996f29774bb2985626e63ee123372364b39774abd3c9a5a6b336dd", + "0xe1e43691d4b12a54c94a7d002933bf886aadbdfea41185840b9fb4bc56a0b9b6", + "0x8d006b58ea28cd4be920b1a05428cda398479551a2c07f00427daccc8b5eaada", + "0x2729557b8cb247a21a201b9c84fdc88dbf9698985cbd9dea18d815ba94f20b70", + "0x10b8f9a1e05e8979b3cc0d25bd7f0dcb9bf7838e3c9e092f02990509eebad39b", + "0xf4d46eb6570a1fcd0a5cdfb6b4e980b5505f8daad17e17e3ef5cb3d71ee8e230", + "0xbe9205e46fe32323e2bc9e21b6405f764d83a4c22934fc4fdef1d1ef095db4b0", + "0x866cf21fd6c7ec93d3746224a090e939de83a973fa51ad78fa0d22bf9d49cb7d", + "0x9bf5b1d88ba309383672143508adf3a43a427e988b55251885340beaf5357959", + "0xd5a96fce15292a8a7ff0585724a4b2b99d7bdc911001ee1732799d244d57bae9", + "0x9b528f6a3e66c0e7b5b1b99a3621767fb59d35baf7df55f440119b76245e4054", + "0xa1c49585370a328e96ea6370c8b689a6c80277e12ea0d2154bd4284d77f57370", + "0x74fbf1a46416ba8ba903eae0987e10e1d1a50795cbd480c2ea574ef5f9ab91fe", + "0x08da92acebe106380e031b678e15eb848758a7c532f27fa6158b0fd5503bc7b9", + "0x0e0c7d8c282a68792a95f515dbcb24b65e423dafd1be3a80b4c3e49e1428eea7", + "0x1064fd21323fca93f368bf00ac2867194f6c585fd49c9280fdac1c3b7751e60f", + "0xefbf5700ef896d51dce0c82c605fb91324a3150ab6d47b6e1ddc13673087f623" + ], + "transactionsRoot": "0xe639c451de458f8dea21e11fe9959ad1aaff7c0f5db602c49525ab17137d1ca8", + "uncles": [], + "withdrawals": [ + { + "address": "0x94b1c625ef0fd077a7e4628639eb390e3fe9ddd4", + "amount": "0x1202ada", + "index": "0x35f8a3b", + "validatorIndex": "0x615a" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x116f384", + "index": "0x35f8a3c", + "validatorIndex": "0x615b" + }, + { + "address": "0x5675801e9346ea8165e7eb80dccd01dca65c0f3a", + "amount": "0x1257958", + "index": "0x35f8a3d", + "validatorIndex": "0x615c" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x116bf52", + "index": "0x35f8a3e", + "validatorIndex": "0x615d" + }, + { + "address": "0x94b1c625ef0fd077a7e4628639eb390e3fe9ddd4", + "amount": "0x11fcbe3", + "index": "0x35f8a3f", + "validatorIndex": "0x615e" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x116513a", + "index": "0x35f8a40", + "validatorIndex": "0x615f" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x1166b97", + "index": "0x35f8a41", + "validatorIndex": "0x6160" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x1167c0f", + "index": "0x35f8a42", + "validatorIndex": "0x6161" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x1167503", + "index": "0x35f8a43", + "validatorIndex": "0x6162" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x1164997", + "index": "0x35f8a44", + "validatorIndex": "0x6163" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x117291d", + "index": "0x35f8a45", + "validatorIndex": "0x6164" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x116002a", + "index": "0x35f8a46", + "validatorIndex": "0x6165" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x1166b17", + "index": "0x35f8a47", + "validatorIndex": "0x6166" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x115dbab", + "index": "0x35f8a48", + "validatorIndex": "0x6167" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x11631eb", + "index": "0x35f8a49", + "validatorIndex": "0x6168" + }, + { + "address": "0xc436eb8aed128275c8f224de2f1dd202c0ab5830", + "amount": "0x116c52f", + "index": "0x35f8a4a", + "validatorIndex": "0x6169" + } + ], + "withdrawalsRoot": "0xd959101b1db825948d50dfd5cd1d608fe7f6129554031f2ff9fa355bef50a7f7" + } }, "ebb1b8dca0a32111968139e3bd91dd6a": { "result": "0x000000000000000000000000000000000000000000000000453b6b4ab0c6823b" @@ -181,32 +373,26 @@ "764a91cffd751b099869bbc7a628a68f": { "result": "0x0000000000000000000000000000000000000000000000014add3b9e08e89863" }, - "016ddd519799e1ac4c6dd3a12cd8951a": { - "result": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000" + "120f1dbca5d4d5c4fc8928bb6d004474": { + "result": "0x00000000000000000000000000000000000000000000000001765bd7e6b2953300000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000" }, "c0556d3a8b591e54115b23af079ddcb7": { "result": "0x00000000000000000000000000000000000000000000000000304f9b10971aa600000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000" }, - "120f1dbca5d4d5c4fc8928bb6d004474": { - "result": "0x00000000000000000000000000000000000000000000000001765bd7e6b2953300000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000" - }, - "9870468ac1fb47b67ec3d5321dc7fc50": { - "result": "0x0000000000000000000000000000000000000000000000000000000000000000" + "5da6e6770bf50e1d79f6a828b2cc8e6a": { + "result": "0x000000000000000000000000000000000000000000000000001cbe798c02eab2" }, "cb5943f407f6ae40223d02525a6da05b": { "result": "0x0000000000000000000000000000000000000000000000000022e81058b99777" }, - "5da6e6770bf50e1d79f6a828b2cc8e6a": { - "result": "0x000000000000000000000000000000000000000000000000001cbe798c02eab2" - }, "d6512b66e4c47ef0e20cec2f6493bd0f": { "result": "0x00000000000000000000000000000000000000000000000600000000000055be0000000000000000000000000000000000000000000000000000003c6786b8400000000000000000000000000000000000000000000000000000000066c4e6b30000000000000000000000000000000000000000000000000000000066c4e6b300000000000000000000000000000000000000000000000600000000000055be" }, - "7d4458fa03390d8ad42472bbff2bd8c7": { - "result": "0x0000000000000000000000000000000000000000000000000e152ee7cc0ffc9d" - }, "476e3b53535fcb664b36101fc61655d2": { "result": "0x0000000000000000000000000000000000000000000000000dc6ae6127261bac" + }, + "7d4458fa03390d8ad42472bbff2bd8c7": { + "result": "0x0000000000000000000000000000000000000000000000000e152ee7cc0ffc9d" } } } diff --git a/packages/adapters-library/src/adapters/pendle/products/yield-token/tests/snapshots/ethereum.prices.yt.json b/packages/adapters-library/src/adapters/pendle/products/yield-token/tests/snapshots/ethereum.prices.yt.json index 89bc64d66..3352bd2de 100644 --- a/packages/adapters-library/src/adapters/pendle/products/yield-token/tests/snapshots/ethereum.prices.yt.json +++ b/packages/adapters-library/src/adapters/pendle/products/yield-token/tests/snapshots/ethereum.prices.yt.json @@ -18,7 +18,7 @@ "baseRate": 1, "type": "protocol", "address": "0xD66b560f4e3e85f22C192d91dA847886d5C5Fd00", - "name": "YT-rswETH-26SEP2024", + "name": "YT rswETH 26SEP2024", "symbol": "YT-rswETH-26SEP2024", "decimals": 18, "tokens": [ @@ -26,7 +26,7 @@ "type": "underlying", "underlyingRateRaw": "8089831469223860n", "address": "0x7786729eEe8b9d30fE7d91fDFf23A0f1D0C615D9", - "name": "SY-rswETH", + "name": "SY rswETH", "symbol": "SY-rswETH", "decimals": 18, "underlyingRate": 0.00808983146922386, diff --git a/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.deposits.json b/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.deposits.json index f2bd61392..1346dbd65 100644 --- a/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.deposits.json +++ b/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.deposits.json @@ -17,14 +17,14 @@ "transactionHash": "0x4771ea9eee1fe63b5702371cccf767c44b9630bc0b61b9a8aeb9935448835cc6", "protocolToken": { "address": "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110", - "name": "ezETH", + "name": "Renzo Restaked ETH", "symbol": "ezETH", "decimals": 18 }, "tokens": [ { "address": "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110", - "name": "ezETH", + "name": "Renzo Restaked ETH", "symbol": "ezETH", "decimals": 18, "balanceRaw": "156100995664536937n", diff --git a/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.positions.json b/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.positions.json index 6388e934e..197d912f9 100644 --- a/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.positions.json +++ b/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.positions.json @@ -17,7 +17,7 @@ "tokens": [ { "address": "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110", - "name": "ezETH", + "name": "Renzo Restaked ETH", "symbol": "ezETH", "decimals": 18, "balanceRaw": "2499606512389029946991n", diff --git a/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.prices.json b/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.prices.json index 9ea1125c2..d1b2aa9a4 100644 --- a/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.prices.json +++ b/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.prices.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110", - "name": "ezETH", + "name": "Renzo Restaked ETH", "symbol": "ezETH", "decimals": 18, "baseRate": 1, diff --git a/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.profits.json b/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.profits.json index 75782606d..58fd62f2a 100644 --- a/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.profits.json +++ b/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.profits.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110", - "name": "ezETH", + "name": "Renzo Restaked ETH", "symbol": "ezETH", "decimals": 18, "type": "protocol", diff --git a/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.tvl.json b/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.tvl.json index dd5986c5e..4979fab69 100644 --- a/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.tvl.json +++ b/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.tvl.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110", - "name": "ezETH", + "name": "Renzo Restaked ETH", "symbol": "ezETH", "decimals": 18, "type": "protocol", diff --git a/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.withdrawals.json b/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.withdrawals.json index 59adb0b86..f94d3cb82 100644 --- a/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.withdrawals.json +++ b/packages/adapters-library/src/adapters/renzo/products/ez-eth/tests/snapshots/ethereum.withdrawals.json @@ -17,14 +17,14 @@ "transactionHash": "0x3c1554801014cd6d56c1f95b4007d7ee424c5259d4c4bfd1ff9464bc7631e726", "protocolToken": { "address": "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110", - "name": "ezETH", + "name": "Renzo Restaked ETH", "symbol": "ezETH", "decimals": 18 }, "tokens": [ { "address": "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110", - "name": "ezETH", + "name": "Renzo Restaked ETH", "symbol": "ezETH", "decimals": 18, "balanceRaw": "2267764738252909312n", diff --git a/packages/adapters-library/src/adapters/solv/products/solv-btc/tests/snapshots/ethereum.positions.user-2.json b/packages/adapters-library/src/adapters/solv/products/solv-btc/tests/snapshots/ethereum.positions.user-2.json index 21b77370c..7c871ca29 100644 --- a/packages/adapters-library/src/adapters/solv/products/solv-btc/tests/snapshots/ethereum.positions.user-2.json +++ b/packages/adapters-library/src/adapters/solv/products/solv-btc/tests/snapshots/ethereum.positions.user-2.json @@ -17,7 +17,7 @@ "tokens": [ { "address": "0xd9D920AA40f578ab794426F5C90F6C731D159DEf", - "name": "SolvBTC.BBN", + "name": "SolvBTC Babylon", "symbol": "SolvBTC.BBN", "decimals": 18, "balanceRaw": "6215687507000000n", diff --git a/packages/adapters-library/src/adapters/solv/products/solv-btc/tests/snapshots/ethereum.profits.user-2.json b/packages/adapters-library/src/adapters/solv/products/solv-btc/tests/snapshots/ethereum.profits.user-2.json index 1f841fb40..6d182cf40 100644 --- a/packages/adapters-library/src/adapters/solv/products/solv-btc/tests/snapshots/ethereum.profits.user-2.json +++ b/packages/adapters-library/src/adapters/solv/products/solv-btc/tests/snapshots/ethereum.profits.user-2.json @@ -16,7 +16,7 @@ "tokens": [ { "address": "0xd9D920AA40f578ab794426F5C90F6C731D159DEf", - "name": "SolvBTC.BBN", + "name": "SolvBTC Babylon", "symbol": "SolvBTC.BBN", "decimals": 18, "type": "protocol", diff --git a/packages/adapters-library/src/adapters/stargate/products/farm/tests/snapshots/ethereum.positions.farm-v1.json b/packages/adapters-library/src/adapters/stargate/products/farm/tests/snapshots/ethereum.positions.farm-v1.json index 33c743449..df732940f 100644 --- a/packages/adapters-library/src/adapters/stargate/products/farm/tests/snapshots/ethereum.positions.farm-v1.json +++ b/packages/adapters-library/src/adapters/stargate/products/farm/tests/snapshots/ethereum.positions.farm-v1.json @@ -19,7 +19,7 @@ "type": "protocol", "address": "0x38EA452219524Bb87e18dE1C24D3bB59510BD783", "symbol": "S*USDT", - "name": "S*USDT", + "name": "Tether USD-LP", "decimals": 6, "balanceRaw": "1000000000n", "tokens": [ diff --git a/packages/adapters-library/src/adapters/stargate/products/farm/tests/snapshots/ethereum.withdrawals.farm-v1.json b/packages/adapters-library/src/adapters/stargate/products/farm/tests/snapshots/ethereum.withdrawals.farm-v1.json index 5b31df79a..a2dc5f33e 100644 --- a/packages/adapters-library/src/adapters/stargate/products/farm/tests/snapshots/ethereum.withdrawals.farm-v1.json +++ b/packages/adapters-library/src/adapters/stargate/products/farm/tests/snapshots/ethereum.withdrawals.farm-v1.json @@ -16,7 +16,7 @@ { "protocolToken": { "address": "0x38EA452219524Bb87e18dE1C24D3bB59510BD783", - "name": "S*USDT", + "name": "Tether USD-LP", "symbol": "S*USDT", "decimals": 6 },