diff --git a/package.json b/package.json index a6d970ad8..022f808fd 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "license": "AGPL-3.0-only", "dependencies": { "@across-protocol/constants": "^3.1.90", - "@across-protocol/contracts": "^4.1.17-beta.4", + "@across-protocol/contracts": "^4.1.19-alpha.3", "@across-protocol/contracts-v4.1.1": "npm:@across-protocol/contracts@4.1.1", "@across-protocol/sdk": "^4.3.99", "@amplitude/analytics-browser": "^2.3.5", diff --git a/src/utils/deposits.ts b/src/utils/deposits.ts index 9d563fb4e..2644156cf 100644 --- a/src/utils/deposits.ts +++ b/src/utils/deposits.ts @@ -9,7 +9,7 @@ import { TransactionReceipt, Log } from "@ethersproject/providers"; import { FundsDepositedEvent, FilledRelayEvent, -} from "@across-protocol/contracts/dist/typechain/contracts/SpokePool"; +} from "@across-protocol/contracts/dist/typechain/SpokePool"; import { getMessageHash, toAddressType } from "./sdk"; import { parseDepositForBurnLog } from "./cctp"; import { Signature } from "@solana/kit"; diff --git a/src/utils/typechain.ts b/src/utils/typechain.ts index 1d2fc7eba..d805ac930 100644 --- a/src/utils/typechain.ts +++ b/src/utils/typechain.ts @@ -3,11 +3,11 @@ * Currently, the packages `@across-protocol/contracts` and `@across-protocol/across-token` are not optimized for tree-shaking. * This is a temporary solution until we can fix the issue upstream. */ -export { AcrossMerkleDistributor__factory } from "@across-protocol/contracts/dist/typechain/factories/contracts/merkle-distributor/AcrossMerkleDistributor__factory"; -export { HubPool__factory } from "@across-protocol/contracts/dist/typechain/factories/contracts/HubPool__factory"; -export { SpokePool__factory } from "@across-protocol/contracts/dist/typechain/factories/contracts/SpokePool__factory"; -export { SpokePoolVerifier__factory } from "@across-protocol/contracts/dist/typechain/factories/contracts/SpokePoolVerifier__factory"; -export { ERC20__factory } from "@across-protocol/contracts/dist/typechain/factories/@openzeppelin/contracts-v4/token/ERC20/ERC20__factory"; +export { AcrossMerkleDistributor__factory } from "@across-protocol/contracts/dist/typechain/factories/AcrossMerkleDistributor__factory"; +export { HubPool__factory } from "@across-protocol/contracts/dist/typechain/factories/HubPool__factory"; +export { SpokePool__factory } from "@across-protocol/contracts/dist/typechain/factories/SpokePool__factory"; +export { SpokePoolVerifier__factory } from "@across-protocol/contracts/dist/typechain/factories/SpokePoolVerifier__factory"; +export { ERC20__factory } from "@across-protocol/contracts/dist/typechain/factories/ERC20__factory"; export { AcceleratingDistributor__factory } from "@across-protocol/across-token/dist/typechain/factories/AcceleratingDistributor__factory"; export { ClaimAndStake__factory } from "@across-protocol/across-token/dist/typechain/factories/ClaimAndStake__factory"; @@ -20,14 +20,14 @@ export type { SwapAndBridge, } from "@across-protocol/contracts-v4.1.1/dist/typechain/contracts/SwapAndBridge.sol"; -export type { AcrossMerkleDistributor } from "@across-protocol/contracts/dist/typechain/contracts/merkle-distributor/AcrossMerkleDistributor"; -export type { HubPool } from "@across-protocol/contracts/dist/typechain/contracts/HubPool"; +export type { AcrossMerkleDistributor } from "@across-protocol/contracts/dist/typechain/AcrossMerkleDistributor"; +export type { HubPool } from "@across-protocol/contracts/dist/typechain/HubPool"; export type { SpokePool, FilledV3RelayEvent, FilledRelayEvent, -} from "@across-protocol/contracts/dist/typechain/contracts/SpokePool"; -export type { SpokePoolVerifier } from "@across-protocol/contracts/dist/typechain/contracts/SpokePoolVerifier"; +} from "@across-protocol/contracts/dist/typechain/SpokePool"; +export type { SpokePoolVerifier } from "@across-protocol/contracts/dist/typechain/SpokePoolVerifier"; export type { AcceleratingDistributor } from "@across-protocol/across-token/dist/typechain/AcceleratingDistributor"; export type { ClaimAndStake } from "@across-protocol/across-token/dist/typechain/ClaimAndStake"; export type { diff --git a/yarn.lock b/yarn.lock index ac0ffe6da..ac51daac2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -95,10 +95,10 @@ yargs "^17.7.2" zksync-web3 "^0.14.3" -"@across-protocol/contracts@^4.1.17-beta.4": - version "4.1.17-beta.4" - resolved "https://registry.yarnpkg.com/@across-protocol/contracts/-/contracts-4.1.17-beta.4.tgz#8309c1a12e6e2f33330270b1820462acb9bd3bed" - integrity sha512-cho9p+ffuPNhLRIr+xUGwy//3YOy8BAEYCwje1FP/As++iJ7QHA78adYPmLs2/7V4a3/iIvvVESQb4WRO8X4zA== +"@across-protocol/contracts@^4.1.19-alpha.3": + version "4.1.19-alpha.3" + resolved "https://registry.yarnpkg.com/@across-protocol/contracts/-/contracts-4.1.19-alpha.3.tgz#2ddbbd4f87e7b846392540e885f47bfe8d7dfcf3" + integrity sha512-2cr1KqEpZF4H/kYxSkojSVno81AF23i+/MmGOD2LXsV36MFFUr2VzZXf2wdiU/uuPUxPwCGQJmZd5SRf+Vx1/A== dependencies: "@across-protocol/constants" "^3.1.88" "@coral-xyz/anchor" "^0.31.1"