@across-protocol/contracts 3.0.21 → 3.0.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/dist/deployments/deployments.json +0 -5
  2. package/dist/index.d.ts +0 -1
  3. package/dist/index.js +0 -1
  4. package/dist/scripts/svm/bridgeLiabilityToHubPool.js +6 -4
  5. package/dist/scripts/svm/closeRelayerPdas.js +2 -1
  6. package/dist/scripts/svm/enableRoute.js +3 -3
  7. package/dist/scripts/svm/executeRebalanceToHubPool.js +4 -2
  8. package/dist/scripts/svm/executeRebalanceToSpokePool.js +11 -7
  9. package/dist/scripts/svm/fakeFillWithRandomDistribution.js +3 -2
  10. package/dist/scripts/svm/initialize.js +2 -1
  11. package/dist/scripts/svm/queryDeposits.js +2 -1
  12. package/dist/scripts/svm/queryFills.js +2 -1
  13. package/dist/scripts/svm/queryRoute.js +3 -3
  14. package/dist/scripts/svm/queryState.js +2 -2
  15. package/dist/scripts/svm/remoteHubPoolPauseDeposits.js +4 -2
  16. package/dist/scripts/svm/remoteHubPoolSetDepositRoute.js +4 -2
  17. package/dist/scripts/svm/remotePauseDeposits.js +4 -2
  18. package/dist/scripts/svm/simpleDeposit.js +3 -3
  19. package/dist/scripts/svm/simpleFakeRelayerRepayment.js +4 -3
  20. package/dist/scripts/svm/simpleFill.js +3 -2
  21. package/dist/src/DeploymentUtils.d.ts +1 -1
  22. package/dist/src/svm/index.d.ts +0 -2
  23. package/dist/src/svm/index.js +0 -2
  24. package/dist/src/types/svm.d.ts +0 -4
  25. package/package.json +4 -5
  26. package/dist/src/svm/assets/idl/index.d.ts +0 -6
  27. package/dist/src/svm/assets/idl/index.js +0 -15
  28. package/dist/src/svm/assets/index.d.ts +0 -6
  29. package/dist/src/svm/assets/index.js +0 -19
  30. package/dist/src/svm/assets/message_transmitter.d.ts +0 -1681
  31. package/dist/src/svm/assets/message_transmitter.js +0 -2
  32. package/dist/src/svm/assets/multicall_handler.d.ts +0 -37
  33. package/dist/src/svm/assets/multicall_handler.js +0 -2
  34. package/dist/src/svm/assets/svm_spoke.d.ts +0 -6012
  35. package/dist/src/svm/assets/svm_spoke.js +0 -2
  36. package/dist/src/svm/assets/test.d.ts +0 -249
  37. package/dist/src/svm/assets/test.js +0 -2
  38. package/dist/src/svm/assets/token_messenger_minter.d.ts +0 -2055
  39. package/dist/src/svm/assets/token_messenger_minter.js +0 -2
  40. package/dist/src/svm/programConnectors.d.ts +0 -13
  41. package/dist/src/svm/programConnectors.js +0 -46
@@ -170,11 +170,6 @@
170
170
  "SpokePoolVerifier": { "address": "0xB4A8d45647445EA9FC3E1058096142390683dBC2", "blockNumber": 1152853 },
171
171
  "MulticallHandler": { "address": "0x924a9f036260DdD5808007E1AA95f08eD08aA569", "blockNumber": 1145284 }
172
172
  },
173
- "1810017368444177321": {
174
- "SvmSpoke": { "address": "YVMQN27RnCNt23NRxzJPumXRd8iovEfKtzkqyMc5vDt", "blockNumber": 0 },
175
- "MessageTransmitter": { "address": "CCTPmbSD7gX1bxKPAmg77w8oFzNFpaQiQUWD43TKaecd", "blockNumber": 0 },
176
- "TokenMessengerMinter": { "address": "CCTPiPYPc6AsJuwueEnWgSgucamXDZwBd53dQ11YiKX3", "blockNumber": 0 }
177
- },
178
173
  "1868": {
179
174
  "SpokePool": { "address": "0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96", "blockNumber": 1709997 },
180
175
  "MulticallHandler": { "address": "0x924a9f036260DdD5808007E1AA95f08eD08aA569", "blockNumber": 1711482 }
package/dist/index.d.ts CHANGED
@@ -1,4 +1,3 @@
1
1
  export * from "./typechain";
2
2
  export * from "./src/DeploymentUtils";
3
3
  export * from "./utils";
4
- export * from "./src/svm";
package/dist/index.js CHANGED
@@ -17,4 +17,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./typechain"), exports);
18
18
  __exportStar(require("./src/DeploymentUtils"), exports);
19
19
  __exportStar(require("./utils"), exports);
20
- __exportStar(require("./src/svm"), exports);
@@ -56,14 +56,16 @@ const svm_1 = require("../../src/svm");
56
56
  const constants_1 = require("@across-protocol/constants");
57
57
  const common_1 = require("@uma/common");
58
58
  const ethers_1 = require("ethers");
59
- const svm_2 = require("../../src/svm");
60
59
  const typechain_1 = require("../../typechain");
61
60
  const helpers_1 = require("./utils/helpers");
62
61
  // Set up Solana provider.
63
62
  const provider = anchor_1.AnchorProvider.env();
64
63
  anchor.setProvider(provider);
65
64
  // Get Solana programs and IDLs.
66
- const svmSpokeProgram = (0, svm_2.getSpokePoolProgram)(provider);
65
+ const svmSpokeIdl = require("../../target/idl/svm_spoke.json");
66
+ const svmSpokeProgram = new anchor_1.Program(svmSpokeIdl, provider);
67
+ const messageTransmitterIdl = require("../../target/idl/message_transmitter.json");
68
+ const tokenMessengerMinterIdl = require("../../target/idl/token_messenger_minter.json");
67
69
  // CCTP domains.
68
70
  const ethereumDomain = 0; // Ethereum
69
71
  const solanaDomain = 5; // Solana
@@ -169,11 +171,11 @@ async function bridgeLiabilityToHubPool() {
169
171
  console.log("✅ Bridge liability to hub pool completed successfully.");
170
172
  }
171
173
  async function bridgeTokensToHubPool(amount, signer, statePda, inputToken) {
172
- const messageTransmitterProgram = (0, svm_2.getMessageTransmitterProgram)(provider);
174
+ const messageTransmitterProgram = new anchor_1.Program(messageTransmitterIdl, provider);
173
175
  const vault = (0, spl_token_1.getAssociatedTokenAddressSync)(inputToken, statePda, true, spl_token_1.TOKEN_PROGRAM_ID, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
174
176
  // Derive the transferLiability PDA
175
177
  const [transferLiability] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("transfer_liability"), inputToken.toBuffer()], svmSpokeProgram.programId);
176
- const tokenMessengerMinterProgram = (0, svm_2.getTokenMessengerMinterProgram)(provider);
178
+ const tokenMessengerMinterProgram = new anchor_1.Program(tokenMessengerMinterIdl, provider);
177
179
  const [tokenMessengerMinterSenderAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("sender_authority")], tokenMessengerMinterProgram.programId);
178
180
  const [messageTransmitter] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter")], messageTransmitterProgram.programId);
179
181
  const [tokenMessenger] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_messenger")], tokenMessengerMinterProgram.programId);
@@ -37,7 +37,8 @@ const svm_1 = require("../../src/svm");
37
37
  // Set up the provider
38
38
  const provider = anchor_1.AnchorProvider.env();
39
39
  anchor.setProvider(provider);
40
- const program = (0, svm_1.getSpokePoolProgram)(provider);
40
+ const idl = require("../../target/idl/svm_spoke.json");
41
+ const program = new anchor_1.Program(idl, provider);
41
42
  const programId = program.programId;
42
43
  // Parse arguments
43
44
  const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
@@ -29,15 +29,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
29
29
  Object.defineProperty(exports, "__esModule", { value: true });
30
30
  const anchor = __importStar(require("@coral-xyz/anchor"));
31
31
  const anchor_1 = require("@coral-xyz/anchor");
32
- const spl_token_1 = require("@solana/spl-token");
33
32
  const web3_js_1 = require("@solana/web3.js");
33
+ const spl_token_1 = require("@solana/spl-token");
34
34
  const yargs_1 = __importDefault(require("yargs"));
35
35
  const helpers_1 = require("yargs/helpers");
36
- const svm_1 = require("../../src/svm");
37
36
  // Set up the provider
38
37
  const provider = anchor_1.AnchorProvider.env();
39
38
  anchor.setProvider(provider);
40
- const program = (0, svm_1.getSpokePoolProgram)(provider);
39
+ const idl = require("../../target/idl/svm_spoke.json");
40
+ const program = new anchor_1.Program(idl, provider);
41
41
  const programId = program.programId;
42
42
  console.log("SVM-Spoke Program ID:", programId.toString());
43
43
  // Parse arguments
@@ -72,8 +72,10 @@ const svm_1 = require("../../src/svm");
72
72
  const provider = anchor_1.AnchorProvider.env();
73
73
  anchor.setProvider(provider);
74
74
  // Get Solana programs.
75
- const svmSpokeProgram = (0, svm_1.getSpokePoolProgram)(provider);
76
- const messageTransmitterProgram = (0, svm_1.getMessageTransmitterProgram)(provider);
75
+ const svmSpokeIdl = require("../../target/idl/svm_spoke.json");
76
+ const svmSpokeProgram = new anchor_1.Program(svmSpokeIdl, provider);
77
+ const messageTransmitterIdl = require("../../target/idl/message_transmitter.json");
78
+ const messageTransmitterProgram = new anchor_1.Program(messageTransmitterIdl, provider);
77
79
  const [messageTransmitterState] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter")], messageTransmitterProgram.programId);
78
80
  const [authorityPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter_authority"), svmSpokeProgram.programId.toBuffer()], messageTransmitterProgram.programId);
79
81
  const [selfAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("self_authority")], svmSpokeProgram.programId);
@@ -32,25 +32,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
32
32
  Object.defineProperty(exports, "__esModule", { value: true });
33
33
  const anchor = __importStar(require("@coral-xyz/anchor"));
34
34
  const anchor_1 = require("@coral-xyz/anchor");
35
- const spl_token_1 = require("@solana/spl-token");
36
35
  const web3_js_1 = require("@solana/web3.js");
36
+ const spl_token_1 = require("@solana/spl-token");
37
37
  const common_1 = require("@uma/common");
38
38
  // eslint-disable-next-line camelcase
39
- const constants_1 = require("@across-protocol/constants");
40
- const ethers_1 = require("ethers");
39
+ const constants_1 = require("../../utils/constants");
41
40
  const yargs_1 = __importDefault(require("yargs"));
42
41
  const helpers_1 = require("yargs/helpers");
43
42
  const svm_1 = require("../../src/svm");
43
+ const ethers_1 = require("ethers");
44
+ // eslint-disable-next-line camelcase
44
45
  const typechain_1 = require("../../typechain");
45
- const helpers_2 = require("./utils/helpers");
46
46
  const poolRebalanceTree_1 = require("./utils/poolRebalanceTree");
47
+ const helpers_2 = require("./utils/helpers");
47
48
  // Set up Solana provider.
48
49
  const provider = anchor_1.AnchorProvider.env();
49
50
  anchor.setProvider(provider);
50
51
  // Get Solana programs.
51
- const svmSpokeProgram = (0, svm_1.getSpokePoolProgram)(provider);
52
- const messageTransmitterProgram = (0, svm_1.getMessageTransmitterProgram)(provider);
53
- const tokenMessengerMinterProgram = (0, svm_1.getTokenMessengerMinterProgram)(provider);
52
+ const svmSpokeIdl = require("../../target/idl/svm_spoke.json");
53
+ const svmSpokeProgram = new anchor_1.Program(svmSpokeIdl, provider);
54
+ const messageTransmitterIdl = require("../../target/idl/message_transmitter.json");
55
+ const messageTransmitterProgram = new anchor_1.Program(messageTransmitterIdl, provider);
56
+ const tokenMessengerMinterIdl = require("../../target/idl/token_messenger_minter.json");
57
+ const tokenMessengerMinterProgram = new anchor_1.Program(tokenMessengerMinterIdl, provider);
54
58
  // Set up Ethereum provider and signer.
55
59
  const isDevnet = (0, svm_1.isSolanaDevnet)(provider);
56
60
  const nodeURL = isDevnet ? (0, common_1.getNodeUrl)("sepolia", true) : (0, common_1.getNodeUrl)("mainnet", true);
@@ -30,8 +30,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
30
30
  // Note that this should be run only on devnet as this is fake fill and all filled tokens are sent to random recipients.
31
31
  const anchor = __importStar(require("@coral-xyz/anchor"));
32
32
  const anchor_1 = require("@coral-xyz/anchor");
33
- const spl_token_1 = require("@solana/spl-token");
34
33
  const web3_js_1 = require("@solana/web3.js");
34
+ const spl_token_1 = require("@solana/spl-token");
35
35
  const yargs_1 = __importDefault(require("yargs"));
36
36
  const helpers_1 = require("yargs/helpers");
37
37
  const svm_1 = require("../../src/svm");
@@ -39,7 +39,8 @@ const svm_1 = require("../../src/svm");
39
39
  const provider = anchor_1.AnchorProvider.env();
40
40
  anchor.setProvider(provider);
41
41
  const signer = anchor.AnchorProvider.env().wallet.payer;
42
- const program = (0, svm_1.getSpokePoolProgram)(provider);
42
+ const idl = require("../../target/idl/svm_spoke.json");
43
+ const program = new anchor_1.Program(idl, provider);
43
44
  const programId = program.programId;
44
45
  // Parse arguments
45
46
  const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
@@ -36,7 +36,8 @@ const svm_1 = require("../../src/svm");
36
36
  // Set up the provider
37
37
  const provider = anchor_1.AnchorProvider.env();
38
38
  anchor.setProvider(provider);
39
- const program = (0, svm_1.getSpokePoolProgram)(provider);
39
+ const idl = require("../../target/idl/svm_spoke.json");
40
+ const program = new anchor_1.Program(idl, provider);
40
41
  const programId = program.programId;
41
42
  // Parse arguments
42
43
  const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
@@ -36,7 +36,8 @@ const svm_1 = require("../../src/svm");
36
36
  // Set up the provider
37
37
  const provider = anchor_1.AnchorProvider.env();
38
38
  anchor.setProvider(provider);
39
- const program = (0, svm_1.getSpokePoolProgram)(provider);
39
+ const idl = require("../../target/idl/svm_spoke.json");
40
+ const program = new anchor_1.Program(idl, provider);
40
41
  const programId = program.programId;
41
42
  console.log("SVM-Spoke Program ID:", programId.toString());
42
43
  // Parse arguments
@@ -36,7 +36,8 @@ const svm_1 = require("../../src/svm");
36
36
  // Set up the provider
37
37
  const provider = anchor_1.AnchorProvider.env();
38
38
  anchor.setProvider(provider);
39
- const program = (0, svm_1.getSpokePoolProgram)(provider);
39
+ const idl = require("../../target/idl/svm_spoke.json");
40
+ const program = new anchor_1.Program(idl, provider);
40
41
  const programId = program.programId;
41
42
  // Parse arguments
42
43
  const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv)).option("seed", {
@@ -29,15 +29,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
29
29
  Object.defineProperty(exports, "__esModule", { value: true });
30
30
  const anchor = __importStar(require("@coral-xyz/anchor"));
31
31
  const anchor_1 = require("@coral-xyz/anchor");
32
- const spl_token_1 = require("@solana/spl-token");
33
32
  const web3_js_1 = require("@solana/web3.js");
33
+ const spl_token_1 = require("@solana/spl-token");
34
34
  const yargs_1 = __importDefault(require("yargs"));
35
35
  const helpers_1 = require("yargs/helpers");
36
- const svm_1 = require("../../src/svm");
37
36
  // Set up the provider
38
37
  const provider = anchor_1.AnchorProvider.env();
39
38
  anchor.setProvider(provider);
40
- const program = (0, svm_1.getSpokePoolProgram)(provider);
39
+ const idl = require("../../target/idl/svm_spoke.json");
40
+ const program = new anchor_1.Program(idl, provider);
41
41
  const programId = program.programId;
42
42
  console.log("SVM-Spoke Program ID:", programId.toString());
43
43
  // Parse arguments
@@ -32,11 +32,11 @@ const anchor_1 = require("@coral-xyz/anchor");
32
32
  const web3_js_1 = require("@solana/web3.js");
33
33
  const yargs_1 = __importDefault(require("yargs"));
34
34
  const helpers_1 = require("yargs/helpers");
35
- const svm_1 = require("../../src/svm");
36
35
  // Set up the provider
37
36
  const provider = anchor_1.AnchorProvider.env();
38
37
  anchor.setProvider(provider);
39
- const program = (0, svm_1.getSpokePoolProgram)(provider);
38
+ const idl = require("../../target/idl/svm_spoke.json");
39
+ const program = new anchor_1.Program(idl, provider);
40
40
  const programId = program.programId;
41
41
  console.log("SVM-Spoke Program ID:", programId.toString());
42
42
  // Parse arguments
@@ -64,9 +64,11 @@ async function remoteHubPoolPauseDeposit() {
64
64
  // CCTP domains.
65
65
  const remoteDomain = 0; // Ethereum
66
66
  // Get Solana programs and accounts.
67
- const svmSpokeProgram = (0, svm_1.getSpokePoolProgram)(provider);
67
+ const svmSpokeIdl = require("../../target/idl/svm_spoke.json");
68
+ const svmSpokeProgram = new anchor_1.Program(svmSpokeIdl, provider);
68
69
  const [statePda, _] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("state"), seed.toArrayLike(Buffer, "le", 8)], svmSpokeProgram.programId);
69
- const messageTransmitterProgram = (0, svm_1.getMessageTransmitterProgram)(provider);
70
+ const messageTransmitterIdl = require("../../target/idl/message_transmitter.json");
71
+ const messageTransmitterProgram = new anchor_1.Program(messageTransmitterIdl, provider);
70
72
  const [messageTransmitterState] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter")], messageTransmitterProgram.programId);
71
73
  const [authorityPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter_authority"), svmSpokeProgram.programId.toBuffer()], messageTransmitterProgram.programId);
72
74
  const [selfAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("self_authority")], svmSpokeProgram.programId);
@@ -71,7 +71,8 @@ async function remoteHubPoolSetDepositRoute() {
71
71
  // CCTP domains.
72
72
  const remoteDomain = 0; // Ethereum
73
73
  // Get Solana programs and accounts.
74
- const svmSpokeProgram = (0, svm_1.getSpokePoolProgram)(provider);
74
+ const svmSpokeIdl = require("../../target/idl/svm_spoke.json");
75
+ const svmSpokeProgram = new anchor_1.Program(svmSpokeIdl, provider);
75
76
  const [statePda, _] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("state"), seed.toArrayLike(Buffer, "le", 8)], svmSpokeProgram.programId);
76
77
  const [routePda] = web3_js_1.PublicKey.findProgramAddressSync([
77
78
  Buffer.from("route"),
@@ -80,7 +81,8 @@ async function remoteHubPoolSetDepositRoute() {
80
81
  new anchor_1.BN(destinationChainId).toArrayLike(Buffer, "le", 8),
81
82
  ], svmSpokeProgram.programId);
82
83
  const vault = (0, spl_token_1.getAssociatedTokenAddressSync)(originToken, statePda, true, spl_token_1.TOKEN_PROGRAM_ID, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
83
- const messageTransmitterProgram = (0, svm_1.getMessageTransmitterProgram)(provider);
84
+ const messageTransmitterIdl = require("../../target/idl/message_transmitter.json");
85
+ const messageTransmitterProgram = new anchor_1.Program(messageTransmitterIdl, provider);
84
86
  const [messageTransmitterState] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter")], messageTransmitterProgram.programId);
85
87
  const [authorityPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter_authority"), svmSpokeProgram.programId.toBuffer()], messageTransmitterProgram.programId);
86
88
  const [selfAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("self_authority")], svmSpokeProgram.programId);
@@ -71,9 +71,11 @@ async function remotePauseDeposits() {
71
71
  const remoteDomain = 0; // Ethereum
72
72
  const localDomain = 5; // Solana
73
73
  // Get Solana programs and accounts.
74
- const svmSpokeProgram = (0, svm_1.getSpokePoolProgram)(provider);
74
+ const svmSpokeIdl = require("../../target/idl/svm_spoke.json");
75
+ const svmSpokeProgram = new anchor_1.Program(svmSpokeIdl, provider);
75
76
  const [statePda, _] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("state"), seed.toArrayLike(Buffer, "le", 8)], svmSpokeProgram.programId);
76
- const messageTransmitterProgram = (0, svm_1.getMessageTransmitterProgram)(provider);
77
+ const messageTransmitterIdl = require("../../target/idl/message_transmitter.json");
78
+ const messageTransmitterProgram = new anchor_1.Program(messageTransmitterIdl, provider);
77
79
  const [messageTransmitterState] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter")], messageTransmitterProgram.programId);
78
80
  const [authorityPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("message_transmitter_authority"), svmSpokeProgram.programId.toBuffer()], messageTransmitterProgram.programId);
79
81
  const [selfAuthority] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("self_authority")], svmSpokeProgram.programId);
@@ -29,15 +29,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
29
29
  Object.defineProperty(exports, "__esModule", { value: true });
30
30
  const anchor = __importStar(require("@coral-xyz/anchor"));
31
31
  const anchor_1 = require("@coral-xyz/anchor");
32
- const spl_token_1 = require("@solana/spl-token");
33
32
  const web3_js_1 = require("@solana/web3.js");
33
+ const spl_token_1 = require("@solana/spl-token");
34
34
  const yargs_1 = __importDefault(require("yargs"));
35
35
  const helpers_1 = require("yargs/helpers");
36
- const svm_1 = require("../../src/svm");
37
36
  // Set up the provider
38
37
  const provider = anchor_1.AnchorProvider.env();
39
38
  anchor.setProvider(provider);
40
- const program = (0, svm_1.getSpokePoolProgram)(provider);
39
+ const idl = require("../../target/idl/svm_spoke.json");
40
+ const program = new anchor_1.Program(idl, provider);
41
41
  const programId = program.programId;
42
42
  console.log("SVM-Spoke Program ID:", programId.toString());
43
43
  // Parse arguments
@@ -29,16 +29,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
29
29
  Object.defineProperty(exports, "__esModule", { value: true });
30
30
  const anchor = __importStar(require("@coral-xyz/anchor"));
31
31
  const anchor_1 = require("@coral-xyz/anchor");
32
- const spl_token_1 = require("@solana/spl-token");
33
32
  const web3_js_1 = require("@solana/web3.js");
34
- const MerkleTree_1 = require("@uma/common/dist/MerkleTree");
33
+ const spl_token_1 = require("@solana/spl-token");
35
34
  const yargs_1 = __importDefault(require("yargs"));
36
35
  const helpers_1 = require("yargs/helpers");
36
+ const MerkleTree_1 = require("@uma/common/dist/MerkleTree");
37
37
  const svm_1 = require("../../src/svm");
38
38
  // Set up the provider
39
39
  const provider = anchor_1.AnchorProvider.env();
40
40
  anchor.setProvider(provider);
41
- const program = (0, svm_1.getSpokePoolProgram)(provider);
41
+ const idl = require("../../target/idl/svm_spoke.json");
42
+ const program = new anchor_1.Program(idl, provider);
42
43
  const programId = program.programId;
43
44
  // Parse arguments
44
45
  const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
@@ -30,15 +30,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
30
30
  Object.defineProperty(exports, "__esModule", { value: true });
31
31
  const anchor = __importStar(require("@coral-xyz/anchor"));
32
32
  const anchor_1 = require("@coral-xyz/anchor");
33
- const spl_token_1 = require("@solana/spl-token");
34
33
  const web3_js_1 = require("@solana/web3.js");
34
+ const spl_token_1 = require("@solana/spl-token");
35
35
  const yargs_1 = __importDefault(require("yargs"));
36
36
  const helpers_1 = require("yargs/helpers");
37
37
  const svm_1 = require("../../src/svm");
38
38
  // Set up the provider
39
39
  const provider = anchor_1.AnchorProvider.env();
40
40
  anchor.setProvider(provider);
41
- const program = (0, svm_1.getSpokePoolProgram)(provider);
41
+ const idl = require("../../target/idl/svm_spoke.json");
42
+ const program = new anchor_1.Program(idl, provider);
42
43
  const programId = program.programId;
43
44
  // Parse arguments
44
45
  const argv = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
@@ -1,4 +1,4 @@
1
- export declare function getDeployedAddress(contractName: string, networkId: number | string, throwOnError?: boolean): string | undefined;
1
+ export declare function getDeployedAddress(contractName: string, networkId: number, throwOnError?: boolean): string | undefined;
2
2
  export declare function getDeployedBlockNumber(contractName: string, networkId: number): number;
3
3
  export declare function getContractInfoFromAddress(contractAddress: string): {
4
4
  chainId: Number;
@@ -4,8 +4,6 @@ export * from "./conversionUtils";
4
4
  export * from "./transactionUtils";
5
5
  export * from "./solanaProgramUtils";
6
6
  export * from "./coders";
7
- export * from "./programConnectors";
8
- export * from "./assets";
9
7
  export * from "./constants";
10
8
  export * from "./helpers";
11
9
  export * from "./cctpHelpers";
@@ -20,8 +20,6 @@ __exportStar(require("./conversionUtils"), exports);
20
20
  __exportStar(require("./transactionUtils"), exports);
21
21
  __exportStar(require("./solanaProgramUtils"), exports);
22
22
  __exportStar(require("./coders"), exports);
23
- __exportStar(require("./programConnectors"), exports);
24
- __exportStar(require("./assets"), exports);
25
23
  __exportStar(require("./constants"), exports);
26
24
  __exportStar(require("./helpers"), exports);
27
25
  __exportStar(require("./cctpHelpers"), exports);
@@ -116,7 +116,3 @@ export interface EventType {
116
116
  blockTime: number;
117
117
  signature: string;
118
118
  }
119
- /**
120
- * Supported Networks
121
- */
122
- export type SupportedNetworks = "mainnet" | "devnet";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@across-protocol/contracts",
3
- "version": "3.0.21",
3
+ "version": "3.0.23",
4
4
  "author": "UMA Team",
5
5
  "license": "AGPL-3.0-only",
6
6
  "repository": {
@@ -26,17 +26,16 @@
26
26
  "lint-fix": "yarn prettier --write **/*.js **/*.ts ./programs/**/*.rs ./contracts**/*.sol && cargo +nightly fmt --all && cargo clippy",
27
27
  "clean-fast": "for dir in node_modules cache cache-zk artifacts artifacts-zk dist typechain; do mv \"${dir}\" \"_${dir}\"; rm -rf \"_${dir}\" &; done",
28
28
  "clean": "rm -rf node_modules cache cache-zk artifacts artifacts-zk dist typechain",
29
- "generate-svm-assets": "sh ./scripts/generate-svm-assets.sh",
30
29
  "build-evm": "hardhat compile",
31
30
  "build-svm": "echo 'Generating IDLs...' && anchor build > /dev/null 2>&1 || true && anchor run generateExternalTypes && anchor build",
32
31
  "build-ts": "tsc && rsync -a --include '*/' --include '*.d.ts' --exclude '*' ./typechain ./dist/",
33
- "build": "yarn build-evm && yarn build-svm && yarn generate-svm-assets && yarn build-ts",
32
+ "build": "yarn build-evm && yarn build-svm && yarn build-ts",
34
33
  "test-evm": "IS_TEST=true hardhat test",
35
34
  "test-svm": "anchor test -- --features test",
36
35
  "test": "yarn test-evm && yarn test-svm",
37
36
  "test:report-gas": "IS_TEST=true REPORT_GAS=true hardhat test",
38
- "generate-evm-assets": "rm -rf typechain && TYPECHAIN=ethers yarn hardhat typechain",
39
- "prepublish": "yarn build && hardhat export --export-all ./cache/massExport.json && ts-node ./scripts/processHardhatExport.ts && prettier --write ./deployments/deployments.json && yarn generate-evm-assets",
37
+ "generate-contract-types": "rm -rf typechain && TYPECHAIN=ethers yarn hardhat typechain",
38
+ "prepublish": "yarn build && hardhat export --export-all ./cache/massExport.json && ts-node ./scripts/processHardhatExport.ts && prettier --write ./deployments/deployments.json && yarn generate-contract-types",
40
39
  "pre-commit-hook": "sh scripts/preCommitHook.sh"
41
40
  },
42
41
  "dependencies": {
@@ -1,6 +0,0 @@
1
- declare const MessageTransmitterIdl: any;
2
- declare const MulticallHandlerIdl: any;
3
- declare const SvmSpokeIdl: any;
4
- declare const TestIdl: any;
5
- declare const TokenMessengerMinterIdl: any;
6
- export { MessageTransmitterIdl, MulticallHandlerIdl, SvmSpokeIdl, TestIdl, TokenMessengerMinterIdl };
@@ -1,15 +0,0 @@
1
- "use strict";
2
- // This file has been autogenerated. Do not edit manually.
3
- // Generated by a script.
4
- Object.defineProperty(exports, "__esModule", { value: true });
5
- exports.TokenMessengerMinterIdl = exports.TestIdl = exports.SvmSpokeIdl = exports.MulticallHandlerIdl = exports.MessageTransmitterIdl = void 0;
6
- const MessageTransmitterIdl = require("./message_transmitter.json");
7
- exports.MessageTransmitterIdl = MessageTransmitterIdl;
8
- const MulticallHandlerIdl = require("./multicall_handler.json");
9
- exports.MulticallHandlerIdl = MulticallHandlerIdl;
10
- const SvmSpokeIdl = require("./svm_spoke.json");
11
- exports.SvmSpokeIdl = SvmSpokeIdl;
12
- const TestIdl = require("./test.json");
13
- exports.TestIdl = TestIdl;
14
- const TokenMessengerMinterIdl = require("./token_messenger_minter.json");
15
- exports.TokenMessengerMinterIdl = TokenMessengerMinterIdl;
@@ -1,6 +0,0 @@
1
- export * from "./idl";
2
- export { MessageTransmitter as MessageTransmitterAnchor } from "./message_transmitter";
3
- export { MulticallHandler as MulticallHandlerAnchor } from "./multicall_handler";
4
- export { SvmSpoke as SvmSpokeAnchor } from "./svm_spoke";
5
- export { Test as TestAnchor } from "./test";
6
- export { TokenMessengerMinter as TokenMessengerMinterAnchor } from "./token_messenger_minter";
@@ -1,19 +0,0 @@
1
- "use strict";
2
- // This file has been autogenerated. Do not edit manually.
3
- // Generated by a script.
4
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
5
- if (k2 === undefined) k2 = k;
6
- var desc = Object.getOwnPropertyDescriptor(m, k);
7
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
8
- desc = { enumerable: true, get: function() { return m[k]; } };
9
- }
10
- Object.defineProperty(o, k2, desc);
11
- }) : (function(o, m, k, k2) {
12
- if (k2 === undefined) k2 = k;
13
- o[k2] = m[k];
14
- }));
15
- var __exportStar = (this && this.__exportStar) || function(m, exports) {
16
- for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
17
- };
18
- Object.defineProperty(exports, "__esModule", { value: true });
19
- __exportStar(require("./idl"), exports);