Skip to content

Commit 7f40a05

Browse files
grothemgrothem
authored
feat: v3.6 (#2817)
1 parent d725715 commit 7f40a05

File tree

10 files changed

+74
-100
lines changed

10 files changed

+74
-100
lines changed

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
"test:coverage": "jest --coverage"
3232
},
3333
"dependencies": {
34-
"@aave/contract-helpers": "1.36.1",
35-
"@aave/graphql": "^0.10.0",
36-
"@aave/math-utils": "1.36.1",
37-
"@aave/react": "^0.8.1",
34+
"@aave/contract-helpers": "1.37.0",
35+
"@aave/graphql": "^0.11.0",
36+
"@aave/math-utils": "1.37.0",
37+
"@aave/react": "^0.8.2",
3838
"@amplitude/analytics-browser": "^2.13.0",
39-
"@bgd-labs/aave-address-book": "^4.36.3",
39+
"@bgd-labs/aave-address-book": "^4.38.0",
4040
"@cowprotocol/cow-sdk": "7.2.4",
4141
"@cowprotocol/sdk-ethers-v5-adapter": "0.3.0",
4242
"@cowprotocol/sdk-flash-loans": "1.6.0",

‎pages/api/rpc-proxy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ const NETWORK_CONFIG: Record<number, { network: string; apiKey: string }> = {
2525
[ChainId.sonic]: { network: 'sonic-mainnet', apiKey: process.env.SONIC_RPC_API_KEY || '' },
2626
[ChainId.celo]: { network: 'celo-mainnet', apiKey: process.env.CELO_RPC_API_KEY || '' },
2727
[ChainId.soneium]: { network: 'soneium-mainnet', apiKey: process.env.SONEIUM_RPC_API_KEY || '' },
28-
[57073]: { network: 'ink-mainnet', apiKey: process.env.INK_RPC_API_KEY || '' },
29-
[9745]: { network: 'plasma-mainnet', apiKey: process.env.PLASMA_RPC_API_KEY || '' },
28+
[ChainId.ink]: { network: 'ink-mainnet', apiKey: process.env.INK_RPC_API_KEY || '' },
29+
[ChainId.plasma]: { network: 'plasma-mainnet', apiKey: process.env.PLASMA_RPC_API_KEY || '' },
3030

3131
// Testnets
3232
[ChainId.sepolia]: { network: 'eth-sepolia', apiKey: process.env.MAINNET_RPC_API_KEY || '' },

‎src/components/transactions/Bridge/BridgeConfig.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ const prodConfig: Config[] = [
203203
],
204204
},
205205
{
206-
sourceChainId: 57073,
206+
sourceChainId: ChainId.ink,
207207
chainSelector: '3461204551265785888',
208208
burnMintTokenPool: '0xDe6539018B095353A40753Dc54C91C68c9487D4E',
209209
router: '0xca7c90A52B44E301AC01Cb5EB99b2fD99339433A',
@@ -216,7 +216,7 @@ const prodConfig: Config[] = [
216216
symbol: 'ETH',
217217
decimals: 18,
218218
address: constants.AddressZero, // Use zero address for network token ccip
219-
chainId: 57073,
219+
chainId: ChainId.ink,
220220
extensions: {
221221
isNative: true,
222222
},

‎src/components/transactions/Bridge/BridgeModalContent.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { ChainId } from '@aave/contract-helpers';
12
import { AaveV3InkWhitelabel } from '@bgd-labs/aave-address-book';
23
import { SwitchVerticalIcon } from '@heroicons/react/outline';
34
import { Trans } from '@lingui/macro';
@@ -58,11 +59,11 @@ const defaultNetwork = supportedNetworksWithBridge[0];
5859
function getUseBridgeTokensParams(chainId: number): UseBridgeTokensParams {
5960
const tokenOracle = getConfigFor(chainId).tokenOracle;
6061

61-
if (chainId === 57073) {
62+
if (chainId === ChainId.ink) {
6263
// no market config available yet for ink, so values are set here
6364
return {
6465
chainId,
65-
ghoTokenAddress: '0xfc421aD3C883Bf9E7C4f42dE845C4e4405799e73',
66+
ghoTokenAddress: AaveV3InkWhitelabel.ASSETS.GHO.UNDERLYING,
6667
tokenOracle,
6768
walletBalanceProviderAddress: AaveV3InkWhitelabel.WALLET_BALANCE_PROVIDER,
6869
};
@@ -324,7 +325,7 @@ export const BridgeModalContent = () => {
324325
);
325326

326327
// There's no market config available for ink yet, so skip showing gas station since it relies on having a market
327-
const showGasStation = sourceNetworkObj.chainId !== 57073;
328+
const showGasStation = sourceNetworkObj.chainId !== ChainId.ink;
328329

329330
return (
330331
<>

‎src/hooks/useMeritIncentives.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -632,21 +632,21 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
632632
CELO: [
633633
{
634634
action: MeritAction.CELO_SUPPLY_CELO,
635-
rewardTokenAddress: AaveV3Celo.ASSETS.cUSD.A_TOKEN,
635+
rewardTokenAddress: AaveV3Celo.ASSETS.USDm.A_TOKEN,
636636
rewardTokenSymbol: 'aCelUSDm',
637637
protocolAction: ProtocolAction.supply,
638638
customMessage: antiLoopMessage,
639639
},
640640
{
641641
action: MeritAction.CELO_SUPPLY_MULTIPLE_BORROW_USDT,
642-
rewardTokenAddress: AaveV3Celo.ASSETS.cUSD.A_TOKEN,
642+
rewardTokenAddress: AaveV3Celo.ASSETS.USDm.A_TOKEN,
643643
rewardTokenSymbol: 'aCelUSDm',
644644
protocolAction: ProtocolAction.supply,
645645
customMessage: celoSupplyMultipleBorrowUsdtMessage,
646646
},
647647
{
648648
action: MeritAction.CELO_BORROW_CELO,
649-
rewardTokenAddress: AaveV3Celo.ASSETS.cUSD.A_TOKEN,
649+
rewardTokenAddress: AaveV3Celo.ASSETS.USDm.A_TOKEN,
650650
rewardTokenSymbol: 'aCelUSDm',
651651
protocolAction: ProtocolAction.borrow,
652652
customMessage: antiLoopBorrowMessage,
@@ -655,21 +655,21 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
655655
['USD₮']: [
656656
{
657657
action: MeritAction.CELO_SUPPLY_USDT,
658-
rewardTokenAddress: AaveV3Celo.ASSETS.cUSD.A_TOKEN,
658+
rewardTokenAddress: AaveV3Celo.ASSETS.USDm.A_TOKEN,
659659
rewardTokenSymbol: 'aCelUSDm',
660660
protocolAction: ProtocolAction.supply,
661661
customMessage: antiLoopMessage,
662662
},
663663
{
664664
action: MeritAction.CELO_BORROW_USDT,
665-
rewardTokenAddress: AaveV3Celo.ASSETS.cUSD.A_TOKEN,
665+
rewardTokenAddress: AaveV3Celo.ASSETS.USDm.A_TOKEN,
666666
rewardTokenSymbol: 'aCelUSDm',
667667
protocolAction: ProtocolAction.borrow,
668668
customMessage: antiLoopBorrowMessage,
669669
},
670670
{
671671
action: MeritAction.CELO_SUPPLY_MULTIPLE_BORROW_USDT,
672-
rewardTokenAddress: AaveV3Celo.ASSETS.cUSD.A_TOKEN,
672+
rewardTokenAddress: AaveV3Celo.ASSETS.USDm.A_TOKEN,
673673
rewardTokenSymbol: 'aCelUSDm',
674674
protocolAction: ProtocolAction.borrow,
675675
customMessage: celoSupplyMultipleBorrowUsdtMessage,
@@ -678,14 +678,14 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
678678
USDC: [
679679
{
680680
action: MeritAction.CELO_SUPPLY_USDC,
681-
rewardTokenAddress: AaveV3Celo.ASSETS.cUSD.A_TOKEN,
681+
rewardTokenAddress: AaveV3Celo.ASSETS.USDm.A_TOKEN,
682682
rewardTokenSymbol: 'aCelUSDm',
683683
protocolAction: ProtocolAction.supply,
684684
customMessage: antiLoopMessage,
685685
},
686686
{
687687
action: MeritAction.CELO_BORROW_USDC,
688-
rewardTokenAddress: AaveV3Celo.ASSETS.cUSD.A_TOKEN,
688+
rewardTokenAddress: AaveV3Celo.ASSETS.USDm.A_TOKEN,
689689
rewardTokenSymbol: 'aCelUSDm',
690690
protocolAction: ProtocolAction.borrow,
691691
customMessage: antiLoopBorrowMessage,
@@ -694,21 +694,21 @@ export const MERIT_DATA_MAP: Record<string, Record<string, MeritReserveIncentive
694694
WETH: [
695695
{
696696
action: MeritAction.CELO_SUPPLY_WETH,
697-
rewardTokenAddress: AaveV3Celo.ASSETS.cUSD.A_TOKEN,
697+
rewardTokenAddress: AaveV3Celo.ASSETS.USDm.A_TOKEN,
698698
rewardTokenSymbol: 'aCelUSDm',
699699
protocolAction: ProtocolAction.supply,
700700
customMessage: antiLoopMessage,
701701
},
702702
{
703703
action: MeritAction.CELO_SUPPLY_MULTIPLE_BORROW_USDT,
704-
rewardTokenAddress: AaveV3Celo.ASSETS.cUSD.A_TOKEN,
704+
rewardTokenAddress: AaveV3Celo.ASSETS.USDm.A_TOKEN,
705705
rewardTokenSymbol: 'aCelUSDm',
706706
protocolAction: ProtocolAction.supply,
707707
customMessage: celoSupplyMultipleBorrowUsdtMessage,
708708
},
709709
{
710710
action: MeritAction.CELO_BORROW_WETH,
711-
rewardTokenAddress: AaveV3Celo.ASSETS.cUSD.A_TOKEN,
711+
rewardTokenAddress: AaveV3Celo.ASSETS.USDm.A_TOKEN,
712712
rewardTokenSymbol: 'aCelUSDm',
713713
protocolAction: ProtocolAction.borrow,
714714
customMessage: antiLoopBorrowMessage,

‎src/services/UIPoolService.ts‎

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
import {
22
EmodeDataHumanized,
3-
LegacyUiPoolDataProvider,
43
ReservesDataHumanized,
54
UiPoolDataProvider,
65
UserReserveDataHumanized,
76
} from '@aave/contract-helpers';
87
import { Provider } from '@ethersproject/providers';
9-
import { CustomMarket, MarketDataType } from 'src/ui-config/marketsConfig';
10-
import { ENABLE_TESTNET } from 'src/utils/marketsAndNetworksConfig';
8+
import { MarketDataType } from 'src/ui-config/marketsConfig';
119

1210
export type UserReservesDataHumanized = {
1311
userReserves: UserReserveDataHumanized[];
@@ -19,32 +17,11 @@ export class UiPoolService {
1917

2018
private async getUiPoolDataService(marketData: MarketDataType) {
2119
const provider = this.getProvider(marketData.chainId);
22-
if (this.useLegacyUiPoolDataProvider(marketData)) {
23-
return new LegacyUiPoolDataProvider({
24-
uiPoolDataProviderAddress: marketData.addresses.UI_POOL_DATA_PROVIDER,
25-
provider,
26-
chainId: marketData.chainId,
27-
});
28-
} else {
29-
return new UiPoolDataProvider({
30-
uiPoolDataProviderAddress: marketData.addresses.UI_POOL_DATA_PROVIDER as string,
31-
provider,
32-
chainId: marketData.chainId,
33-
});
34-
}
35-
}
36-
37-
private useLegacyUiPoolDataProvider(marketData: MarketDataType) {
38-
if (marketData.market === CustomMarket.proto_base_sepolia_v3) {
39-
return false;
40-
}
41-
42-
if (ENABLE_TESTNET || !marketData.v3) {
43-
// it's a v2 market, or it does not have v3.1 upgrade
44-
return true;
45-
}
46-
47-
return false;
20+
return new UiPoolDataProvider({
21+
uiPoolDataProviderAddress: marketData.addresses.UI_POOL_DATA_PROVIDER,
22+
provider,
23+
chainId: marketData.chainId,
24+
});
4825
}
4926

5027
async getReservesHumanized(marketData: MarketDataType): Promise<ReservesDataHumanized> {

‎src/ui-config/governanceConfig.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ export const governanceChainConfig: GovernanceChainConfig = {
144144
[ChainId.sonic]: GovernanceV3Sonic.PC_DATA_HELPER,
145145
[ChainId.celo]: GovernanceV3Celo.PC_DATA_HELPER,
146146
[ChainId.soneium]: GovernanceV3Soneium.PC_DATA_HELPER,
147-
[9745]: GovernanceV3Plasma.PC_DATA_HELPER,
148-
[57073]: GovernanceV3Ink.PC_DATA_HELPER,
147+
[ChainId.plasma]: GovernanceV3Plasma.PC_DATA_HELPER,
148+
[ChainId.ink]: GovernanceV3Ink.PC_DATA_HELPER,
149149
},
150150
votingAssets: {
151151
aaveTokenAddress: AaveV3Ethereum.ASSETS.AAVE.UNDERLYING,

‎src/ui-config/marketsConfig.tsx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ export const marketsData: {
274274
SWAP_COLLATERAL_ADAPTER: AaveV3Base.SWAP_COLLATERAL_ADAPTER,
275275
WITHDRAW_SWITCH_ADAPTER: AaveV3Base.WITHDRAW_SWAP_ADAPTER,
276276
DEBT_SWITCH_ADAPTER: AaveV3Base.DEBT_SWAP_ADAPTER,
277-
GHO_TOKEN_ADDRESS: '0x6bb7a212910682dcfdbd5bcbb3e28fb4e8da10ee',
277+
GHO_TOKEN_ADDRESS: AaveV3Base.ASSETS.GHO.UNDERLYING,
278278
},
279279
},
280280

@@ -315,12 +315,12 @@ export const marketsData: {
315315
permitDisabled: true,
316316
chainId: ChainId.base_sepolia,
317317
addresses: {
318-
LENDING_POOL_ADDRESS_PROVIDER: '0xE4C23309117Aa30342BFaae6c95c6478e0A4Ad00', // AaveV3BaseSepolia.POOL_ADDRESSES_PROVIDER,
319-
LENDING_POOL: '0x8bAB6d1b75f19e9eD9fCe8b9BD338844fF79aE27', // AaveV3BaseSepolia.POOL,
320-
WETH_GATEWAY: '0x0568130e794429D2eEBC4dafE18f25Ff1a1ed8b6', // AaveV3BaseSepolia.WETH_GATEWAY,
321-
WALLET_BALANCE_PROVIDER: '0x2c4D1F4EC7F4FfA09a5E1C9e74fD3A10f21Bd811', // AaveV3BaseSepolia.WALLET_BALANCE_PROVIDER,
322-
UI_POOL_DATA_PROVIDER: '0x6a9D64f93DB660EaCB2b6E9424792c630CdA87d8', // AaveV3BaseSepolia.UI_POOL_DATA_PROVIDER,
323-
UI_INCENTIVE_DATA_PROVIDER: '0xDB1412acf288D5bE057f8e90fd7b1BF4f84bB3B1', // AaveV3BaseSepolia.UI_INCENTIVE_DATA_PROVIDER,
318+
LENDING_POOL_ADDRESS_PROVIDER: AaveV3BaseSepolia.POOL_ADDRESSES_PROVIDER,
319+
LENDING_POOL: AaveV3BaseSepolia.POOL,
320+
WETH_GATEWAY: AaveV3BaseSepolia.WETH_GATEWAY,
321+
WALLET_BALANCE_PROVIDER: AaveV3BaseSepolia.WALLET_BALANCE_PROVIDER,
322+
UI_POOL_DATA_PROVIDER: '0xd3815B9f70E0cD7F17F7d5e4A8bc8dd7e53CAe44', // AaveV3BaseSepolia.UI_POOL_DATA_PROVIDER,
323+
UI_INCENTIVE_DATA_PROVIDER: AaveV3BaseSepolia.UI_INCENTIVE_DATA_PROVIDER,
324324
L2_ENCODER: AaveV3BaseSepolia.L2_ENCODER,
325325
FAUCET: '0xD9145b5F45Ad4519c7ACcD6E0A4A82e83bB8A6Dc',
326326
},
@@ -436,7 +436,7 @@ export const marketsData: {
436436
// REPAY_WITH_COLLATERAL_ADAPTER: AaveV3EthereumLido.REPAY_WITH_COLLATERAL_ADAPTER,
437437
// SWAP_COLLATERAL_ADAPTER: AaveV3EthereumLido.SWAP_COLLATERAL_ADAPTER,
438438
WALLET_BALANCE_PROVIDER: '0xd8F7829ceB2692C90e418e0963b5Cbcbafc260Bd',
439-
UI_POOL_DATA_PROVIDER: '0x2581d1f2Ce3860b651bF84AF416e7d28d9500D7F',
439+
UI_POOL_DATA_PROVIDER: AaveV3Ethereum.UI_POOL_DATA_PROVIDER,
440440
UI_INCENTIVE_DATA_PROVIDER: '0xC5E1717BEafC680E0148DD561591410b69650a5F',
441441
COLLECTOR: '0x8b8d44751a933f190dde25A69E8cC6F9101b5435',
442442
// WITHDRAW_SWITCH_ADAPTER: AaveV3EthereumLido.WITHDRAW_SWAP_ADAPTER,
@@ -446,15 +446,15 @@ export const marketsData: {
446446
[CustomMarket.proto_plasma_v3]: {
447447
marketTitle: 'Plasma',
448448
market: CustomMarket.proto_plasma_v3,
449-
chainId: 9745 as ChainId,
449+
chainId: ChainId.plasma,
450450
v3: true,
451451
logo: '/icons/networks/plasma.svg',
452452
addresses: {
453453
LENDING_POOL_ADDRESS_PROVIDER: AaveV3Plasma.POOL_ADDRESSES_PROVIDER,
454454
LENDING_POOL: AaveV3Plasma.POOL,
455455
WETH_GATEWAY: AaveV3Plasma.WETH_GATEWAY,
456456
WALLET_BALANCE_PROVIDER: AaveV3Plasma.WALLET_BALANCE_PROVIDER,
457-
UI_POOL_DATA_PROVIDER: '0xc851e6147dcE6A469CC33BE3121b6B2D4CaD2763', //AaveV3Plasma.UI_POOL_DATA_PROVIDER,
457+
UI_POOL_DATA_PROVIDER: AaveV3Plasma.UI_POOL_DATA_PROVIDER,
458458
UI_INCENTIVE_DATA_PROVIDER: AaveV3Plasma.UI_INCENTIVE_DATA_PROVIDER,
459459
COLLECTOR: AaveV3Plasma.COLLECTOR,
460460
},
@@ -490,15 +490,15 @@ export const marketsData: {
490490
[CustomMarket.proto_ink_v3]: {
491491
marketTitle: 'Ink',
492492
market: CustomMarket.proto_ink_v3,
493-
chainId: 57073 as ChainId,
493+
chainId: ChainId.ink,
494494
v3: true,
495495
logo: '/icons/networks/ink.svg',
496496
addresses: {
497497
LENDING_POOL_ADDRESS_PROVIDER: AaveV3InkWhitelabel.POOL_ADDRESSES_PROVIDER,
498498
LENDING_POOL: AaveV3InkWhitelabel.POOL,
499499
WETH_GATEWAY: AaveV3InkWhitelabel.WETH_GATEWAY,
500500
WALLET_BALANCE_PROVIDER: AaveV3InkWhitelabel.WALLET_BALANCE_PROVIDER,
501-
UI_POOL_DATA_PROVIDER: '0xc851e6147dcE6A469CC33BE3121b6B2D4CaD2763', // custom as doesnt work utils
501+
UI_POOL_DATA_PROVIDER: AaveV3InkWhitelabel.UI_POOL_DATA_PROVIDER,
502502
UI_INCENTIVE_DATA_PROVIDER: AaveV3InkWhitelabel.UI_INCENTIVE_DATA_PROVIDER,
503503
// COLLECTOR: AaveV3InkWhitelabel.COLLECTOR,
504504
},

‎src/ui-config/networksConfig.ts‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,7 @@ export const testnetConfig: Record<string, BaseNetworkConfig> = {
127127
},
128128
[ChainId.base_sepolia]: {
129129
name: 'Base Sepolia',
130-
publicJsonRPCUrl: [
131-
'https://base-sepolia.blockpi.network/v1/rpc/public',
132-
'https://sepolia.base.org',
133-
'https://base-sepolia.gateway.tenderly.co',
134-
],
130+
publicJsonRPCUrl: ['https://sepolia.base.org', 'https://base-sepolia.gateway.tenderly.co'],
135131
baseUniswapAdapter: '0x0',
136132
baseAssetSymbol: 'ETH',
137133
wrappedBaseAssetSymbol: 'WETH',
@@ -431,7 +427,7 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
431427
},
432428
wagmiChain: soneium,
433429
},
434-
[9745]: {
430+
[ChainId.plasma]: {
435431
name: 'Plasma',
436432
publicJsonRPCUrl: ['https://rpc.plasma.to'],
437433
baseAssetSymbol: 'XPL',
@@ -446,7 +442,7 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
446442
url: 'https://stargate.finance/bridge?srcChain=ethereum&srcToken=0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE&dstChain=plasma&dstToken=0x9895D81bB462A195b4922ED7De0e3ACD007c32CB',
447443
},
448444
},
449-
[57073]: {
445+
[ChainId.ink]: {
450446
name: 'Ink',
451447
publicJsonRPCUrl: ['https://ink.drpc.org'],
452448
baseAssetSymbol: 'ETH',

0 commit comments

Comments
 (0)