Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"dependencies": {
"@aave/contract-helpers": "1.30.5",
"@aave/math-utils": "1.30.5",
"@bgd-labs/aave-address-book": "4.8.1",
"@bgd-labs/aave-address-book": "4.10.0",
"@emotion/cache": "11.10.3",
"@emotion/react": "11.10.4",
"@emotion/server": "latest",
Expand Down
69 changes: 61 additions & 8 deletions src/components/transactions/Bridge/BridgeConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@ import { ChainId } from '@aave/contract-helpers';
import {
AaveV3Arbitrum,
AaveV3ArbitrumSepolia,
AaveV3Base,
AaveV3BaseSepolia,
AaveV3Ethereum,
AaveV3Sepolia,
GhoArbitrum,
GhoBase,
GhoEthereum,
} from '@bgd-labs/aave-address-book';
import { constants } from 'ethers';
import { TokenInfoWithBalance } from 'src/hooks/generic/useTokensBalance';
Expand Down Expand Up @@ -39,9 +44,9 @@ const prodConfig: Config[] = [
{
sourceChainId: ChainId.mainnet,
chainSelector: '5009297550715157269',
lockReleaseTokenPool: '0x06179f7C1be40863405f374E7f5F8806c728660A', // TODO: address book
lockReleaseTokenPool: GhoEthereum.GHO_CCIP_TOKEN_POOL,
router: '0x80226fc0ee2b096224eeac085bb9a8cba1146f7d',
tokenOracle: '0x3f12643d3f6f874d39c2a4c9f2cd6f2dbac877fc',
tokenOracle: '0x3f12643d3f6f874d39c2a4c9f2cd6f2dbac877fc', // CL Feed
wrappedNativeOracle: AaveV3Ethereum.ASSETS.WETH.ORACLE,
subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${process.env.NEXT_PUBLIC_SUBGRAPH_API_KEY}/subgraphs/id/E11p8T4Ff1DHZbwSUC527hkUb5innVMdTuP6A2s1xtm1`,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this URL correct?

feeTokens: [
Expand All @@ -50,7 +55,7 @@ const prodConfig: Config[] = [
address: AaveV3Ethereum.ASSETS.GHO.UNDERLYING,
symbol: 'GHO',
decimals: 18,
chainId: 1,
chainId: ChainId.mainnet,
logoURI:
'https://assets.coingecko.com/coins/images/30663/standard/gho-token-logo.png?1720517092',
oracle: AaveV3Ethereum.ASSETS.GHO.ORACLE,
Expand All @@ -64,7 +69,7 @@ const prodConfig: Config[] = [
symbol: 'ETH',
decimals: 18,
address: constants.AddressZero, // Use zero address for network token ccip
chainId: 1,
chainId: ChainId.mainnet,
logoURI:
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
extensions: {
Expand All @@ -77,9 +82,9 @@ const prodConfig: Config[] = [
{
sourceChainId: ChainId.arbitrum_one,
chainSelector: '4949039107694359620',
burnMintTokenPool: '0xB94Ab28c6869466a46a42abA834ca2B3cECCA5eB', // TODO: address book
burnMintTokenPool: GhoArbitrum.GHO_CCIP_TOKEN_POOL,
router: '0x141fa059441e0ca23ce184b6a78bafd2a517dde8',
tokenOracle: '0xb05984ad83c20b3ade7bf97a9a0cb539dde28dbb',
tokenOracle: AaveV3Arbitrum.ASSETS.GHO.ORACLE,
wrappedNativeOracle: AaveV3Arbitrum.ASSETS.WETH.ORACLE,
subgraphUrl: `https://gateway-arbitrum.network.thegraph.com/api/${process.env.NEXT_PUBLIC_SUBGRAPH_API_KEY}/subgraphs/id/GPpZfiGoDChLsiWoMG5fxXdRNEYrsVDrKJ39moGcbz6i`,
feeTokens: [
Expand All @@ -88,7 +93,7 @@ const prodConfig: Config[] = [
address: AaveV3Arbitrum.ASSETS.GHO.UNDERLYING,
symbol: 'GHO',
decimals: 18,
chainId: 42161,
chainId: ChainId.arbitrum_one,
logoURI:
'https://assets.coingecko.com/coins/images/30663/standard/gho-token-logo.png?1720517092',
oracle: AaveV3Arbitrum.ASSETS.GHO.ORACLE,
Expand All @@ -102,7 +107,31 @@ const prodConfig: Config[] = [
symbol: 'ETH',
decimals: 18,
address: constants.AddressZero, // Use zero address for network token ccip
chainId: 42161, // Arb
chainId: ChainId.arbitrum_one,
logoURI:
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
extensions: {
isNative: true,
},
balance: '0',
},
],
},
{
sourceChainId: ChainId.base,
chainSelector: '15971525489660198786',
burnMintTokenPool: GhoBase.GHO_CCIP_TOKEN_POOL,
router: '0x881e3A65B4d4a04dD529061dd0071cf975F58bCD',
tokenOracle: '0x42868EFcee13C0E71af89c04fF7d96f5bec479b0',
wrappedNativeOracle: AaveV3Base.ASSETS.WETH.ORACLE,
subgraphUrl: `https://gateway.thegraph.com/api/${process.env.NEXT_PUBLIC_SUBGRAPH_API_KEY}/subgraphs/id/7RqaLvSMWBv4Z3xmv4kb6Jq3t59ikYG3wpcsTnLgBWzt`,
feeTokens: [
{
name: 'Ethereum',
symbol: 'ETH',
decimals: 18,
address: constants.AddressZero, // Use zero address for network token ccip
chainId: ChainId.base,
logoURI:
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
extensions: {
Expand Down Expand Up @@ -191,6 +220,30 @@ const testnetConfig: Config[] = [
},
],
},
{
sourceChainId: ChainId.base_sepolia,
burnMintTokenPool: '0x2a33945f942913b730aB36A24150A96c3D0CC9E9',
chainSelector: '10344971235874465080',
router: '0xD3b06cEbF099CE7DA4AcCf578aaebFDBd6e88a93',
tokenOracle: '0xFD5ea2e57CDC98D371D8eA899d1F2C24bfFb39BD',
wrappedNativeOracle: AaveV3BaseSepolia.ASSETS.WETH.ORACLE,
subgraphUrl: `https://gateway.thegraph.com/api/${process.env.NEXT_PUBLIC_SUBGRAPH_API_KEY}/subgraphs/id/8bpqvL6XBCVhN4heE9rdEwgTketeZ2U5vVGEh5fDoUEH`,
feeTokens: [
{
name: 'Ethereum',
symbol: 'ETH',
decimals: 18,
address: constants.AddressZero,
chainId: ChainId.base_sepolia,
logoURI:
'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
extensions: {
isNative: true,
},
balance: '0',
},
],
},
];

export const laneConfig = ENABLE_TESTNET ? testnetConfig : prodConfig;
Expand Down
1 change: 1 addition & 0 deletions src/services/WalletBalanceService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ export class WalletBalanceService {
marketData.chainId,
marketData.addresses.WALLET_BALANCE_PROVIDER
);

const balances = await walletBalanceService.batchBalanceOf(
[user],
[marketData.addresses.GHO_TOKEN_ADDRESS?.toLowerCase() as string] // GHO UNDERLYING
Expand Down
9 changes: 9 additions & 0 deletions src/ui-config/TokenList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12723,6 +12723,15 @@ export const TOKEN_LIST: TokenList = {
logoURI:
'https://assets.coingecko.com/coins/images/30663/standard/gho-token-logo.png?1720517092',
},
{
name: 'Gho Token',
address: '0x6bb7a212910682dcfdbd5bcbb3e28fb4e8da10ee',
symbol: 'GHO',
decimals: 18,
chainId: 8453,
logoURI:
'https://assets.coingecko.com/coins/images/30663/standard/gho-token-logo.png?1720517092',
},
{
name: 'stk GHO',
address: '0x1a88Df1cFe15Af22B3c4c783D4e6F7F9e0C1885d',
Expand Down
1 change: 1 addition & 0 deletions src/ui-config/marketsConfig.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ export const marketsData: {
SWAP_COLLATERAL_ADAPTER: AaveV3Base.SWAP_COLLATERAL_ADAPTER,
WITHDRAW_SWITCH_ADAPTER: AaveV3Base.WITHDRAW_SWAP_ADAPTER,
DEBT_SWITCH_ADAPTER: AaveV3Base.DEBT_SWAP_ADAPTER,
GHO_TOKEN_ADDRESS: '0x6bb7a212910682dcfdbd5bcbb3e28fb4e8da10ee',
},
},
[CustomMarket.proto_arbitrum_sepolia_v3]: {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1066,10 +1066,10 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==

"@bgd-labs/aave-address-book@4.8.1":
version "4.8.1"
resolved "https://registry.yarnpkg.com/@bgd-labs/aave-address-book/-/aave-address-book-4.8.1.tgz#3c8b97c24770df3e3e965e58932b7f0a40e3b706"
integrity sha512-t0Qz6lycoxVgoa9Jhx3t80CpZfQJD9yIH1tY22eGeN0Li2nFG9Y+XX3i3UQrzqZH613RymtyLHS4WXqVpZu4LA==
"@bgd-labs/aave-address-book@4.10.0":
version "4.10.0"
resolved "https://registry.yarnpkg.com/@bgd-labs/aave-address-book/-/aave-address-book-4.10.0.tgz#3df9b6afda47d779f39b78aa48c4f0982a18c6e1"
integrity sha512-+WtMRtXLFpic/PLhNn32FIFzNFIgqlgC5Z9RLOsPgbdkvDDAW83w1emoxqxbW0jYGGNcYJUTTrtXqlhDeQGwkg==

"@coinbase/wallet-sdk@4.2.3":
version "4.2.3"
Expand Down
Loading