Skip to content

chore: Support typechain foundry migration #2134

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.

Sign up for GitHub

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

Draft
fusmanii wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

chore: Support typechain foundry migration #2134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc74216
chore: Support typechain foundry migration
fusmanii Dec 18, 2025
2c1b89a
one more fix
fusmanii Dec 18, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/utils/deposits.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
18 changes: 9 additions & 9 deletions src/utils/typechain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading