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
7 changes: 2 additions & 5 deletions deploy/028_deploy_linea_adapter.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { L1_ADDRESS_MAP, WETH, USDCe } from "./consts";
import { L1_ADDRESS_MAP, WETH, USDC } from "./consts";
import { DeployFunction } from "hardhat-deploy/types";
import { HardhatRuntimeEnvironment } from "hardhat/types";

Expand All @@ -14,14 +14,11 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
WETH[chainId],
L1_ADDRESS_MAP[chainId].lineaMessageService,
L1_ADDRESS_MAP[chainId].lineaTokenBridge,
// TODO: USDC.e on Linea will be upgraded to USDC so eventually we should add a USDC entry for Linea in consts
// and read from there instead of using the L1 USDC.e address.
USDCe[chainId],
USDC[chainId],
L1_ADDRESS_MAP[chainId].cctpV2TokenMessenger,
],
});
};

module.exports = func;
func.dependencies = ["HubPool"];
func.tags = ["LineaAdapter", "mainnet"];
6 changes: 2 additions & 4 deletions deploy/029_deploy_linea_spokepool.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { DeployFunction } from "hardhat-deploy/types";
import { HardhatRuntimeEnvironment } from "hardhat/types";
import { deployNewProxy, getSpokePoolDeploymentInfo } from "../utils/utils.hre";
import { FILL_DEADLINE_BUFFER, L2_ADDRESS_MAP, QUOTE_TIME_BUFFER, WETH, USDCe } from "./consts";
import { FILL_DEADLINE_BUFFER, L2_ADDRESS_MAP, QUOTE_TIME_BUFFER, WETH, USDC } from "./consts";

const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
const { hubPool } = await getSpokePoolDeploymentInfo(hre);
Expand All @@ -21,9 +21,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
WETH[chainId],
QUOTE_TIME_BUFFER,
FILL_DEADLINE_BUFFER,
// TODO: USDC.e on Linea will be upgraded to USDC so eventually we should add a USDC entry for Linea in consts
// and read from there instead of using the L1 USDC.e address.
USDCe[chainId],
USDC[chainId],
L2_ADDRESS_MAP[chainId].cctpV2TokenMessenger,
];

Expand Down
2 changes: 1 addition & 1 deletion deploy/consts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ export const L2_ADDRESS_MAP: { [key: number]: { [contractName: string]: string }
},
[CHAIN_IDs.LINEA]: {
lineaMessageService: "0x508Ca82Df566dCD1B0DE8296e70a96332cD644ec",
cctpV2TokenMessenger: "0xunknown", // No official address from Circle yet.
cctpV2TokenMessenger: "0x28b5a0e9C621a5BadaA536219b3a228C8168cf5d",
lineaTokenBridge: "0x353012dc4a9A6cF55c941bADC267f82004A8ceB9",
},
[CHAIN_IDs.SCROLL_SEPOLIA]: {
Expand Down
2 changes: 1 addition & 1 deletion deployments/deployments.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"Polygon_Adapter": { "address": "0xb4AeF0178f5725392A26eE18684C2aB62adc912e", "blockNumber": 19915066 },
"ZkSync_Adapter": { "address": "0x3155A91D2EBAe69443B45556e1DE5ed8eB79C90D", "blockNumber": 22031982 },
"Base_Adapter": { "address": "0xE1421233BF7158A19f89F17c9735F9cbd3D9529c", "blockNumber": 19915087 },
"Linea_Adapter": { "address": "0x7Ea0D1882D610095A45E512B0113f79cA98a8EfE", "blockNumber": 19402413 },
"Linea_Adapter": { "address": "0x5A44A32c13e2C43416bFDE5dDF5DCb3880c42787", "blockNumber": 22169879 },
"BondToken": { "address": "0xee1dc6bcf1ee967a350e9ac6caaaa236109002ea", "blockNumber": 17980554 },
"SpokePoolVerifier": { "address": "0xB4A8d45647445EA9FC3E1058096142390683dBC2", "blockNumber": 19510875 },
"Mode_Adapter": { "address": "0xf1B59868697f3925b72889ede818B9E7ba0316d0", "blockNumber": 19914094 },
Expand Down
124 changes: 68 additions & 56 deletions deployments/linea/Linea_SpokePool.json

Large diffs are not rendered by default.

156 changes: 156 additions & 0 deletions deployments/linea/solcInputs/5a7ad36e5409ab17acc3f1613e73658c.json

Large diffs are not rendered by default.

90 changes: 68 additions & 22 deletions deployments/mainnet/Linea_Adapter.json

Large diffs are not rendered by default.

622 changes: 622 additions & 0 deletions deployments/mainnet/solcInputs/0e331ee112563bf9d8d36add0a15fd56.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"pre-commit-hook": "sh scripts/preCommitHook.sh"
},
"dependencies": {
"@across-protocol/constants": "^3.1.46",
"@across-protocol/constants": "^3.1.47-beta.0",
"@coral-xyz/anchor": "^0.30.1",
"@defi-wonderland/smock": "^2.3.4",
"@eth-optimism/contracts": "^0.5.40",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# yarn lockfile v1


"@across-protocol/constants@^3.1.46":
version "3.1.46"
resolved "https://registry.yarnpkg.com/@across-protocol/constants/-/constants-3.1.46.tgz#9f567eecd47eaa5035460193c49307f413623167"
integrity sha512-EHwFVLlSfwIOOQsqnL53UUPtjw9GUN1Y7PDEXUDttPxuqcc/IRDSp7xBnYgn7OWhrEg3404SzBKmc2A1l3Sqhw==
"@across-protocol/constants@^3.1.47-beta.0":
version "3.1.47-beta.0"
resolved "https://registry.yarnpkg.com/@across-protocol/constants/-/constants-3.1.47-beta.0.tgz#f12646526156013b23b4df59a21f99aa264bd819"
integrity sha512-f4MOI1NPLSMk5iri0h++m0IEMiGT9f8cifMGkGaM5L+StA8FfiVevezcipXmKUekTAztQ5QqzrKh/L3QJ50rXw==

"@across-protocol/contracts@^0.1.4":
version "0.1.4"
Expand Down
Loading