@across-protocol/contracts 4.0.12 → 4.0.14-alpha.1

package/dist/test/svm/SvmSpoke.Deposit.js

@@ -411,7 +411,11 @@ describe("svm_spoke.deposit", () => {
         });
         // Create wSOL user account.
         const createIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(depositor.publicKey, depositorTA, depositor.publicKey, inputToken);
-        const nativeDepositData = { ...depositData, inputAmount: new anchor_1.BN(nativeAmount), outputAmount: new anchor_1.BN(nativeAmount) };
+        const nativeDepositData = {
+            ...depositData,
+            inputAmount: new anchor_1.BN(nativeAmount),
+            outputAmount: (0, web3_v1_1.intToU8Array32)(nativeAmount),
+        };
         const depositDataValues = Object.values(nativeDepositData);
         const delegate = (0, web3_v1_1.getDepositPda)(nativeDepositData, program.programId);
         const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(depositAccounts.depositorTokenAccount, depositAccounts.mint, delegate, depositor.publicKey, BigInt(nativeAmount), nativeDecimals, undefined, tokenProgram);
@@ -443,7 +447,11 @@ describe("svm_spoke.deposit", () => {
         });
         // Sync the user token account with the native balance.
         const syncIx = (0, spl_token_1.createSyncNativeInstruction)(depositorTA);
-        const nativeDepositData = { ...depositData, inputAmount: new anchor_1.BN(nativeAmount), outputAmount: new anchor_1.BN(nativeAmount) };
+        const nativeDepositData = {
+            ...depositData,
+            inputAmount: new anchor_1.BN(nativeAmount),
+            outputAmount: (0, web3_v1_1.intToU8Array32)(nativeAmount),
+        };
         const depositDataValues = Object.values(nativeDepositData);
         const delegate = (0, web3_v1_1.getDepositPda)(nativeDepositData, program.programId);
         const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(depositAccounts.depositorTokenAccount, depositAccounts.mint, delegate, depositor.publicKey, BigInt(nativeAmount), nativeDecimals, undefined, tokenProgram);
@@ -480,6 +488,16 @@ describe("svm_spoke.deposit", () => {
         const vaultAccount = await (0, spl_token_1.getAccount)(connection, vault);
         assertSE(vaultAccount.amount, depositData.inputAmount, "Vault balance should equal the deposited amount");
     });
+    it("Output token cannot be zero address", async () => {
+        const invalidDepositData = { ...depositData, outputToken: new web3_js_1.PublicKey("11111111111111111111111111111111") };
+        try {
+            await approvedDeposit(invalidDepositData);
+            assert.fail("Should not be able to process deposit with zero output token address");
+        }
+        catch (err) {
+            assert.include(err.toString(), "Error Code: InvalidOutputToken", "Expected InvalidOutputToken error");
+        }
+    });
     describe("codama client and solana kit", () => {
         it("Deposit with with solana kit and codama client", async () => {
             // typescript is not happy with the depositData object
@@ -512,7 +530,7 @@ describe("svm_spoke.deposit", () => {
                 inputToken: (0, kit_1.address)(depositData.inputToken.toString()),
                 outputToken: (0, kit_1.address)(depositData.outputToken.toString()),
                 inputAmount: BigInt(depositData.inputAmount.toString()),
-                outputAmount: BigInt(depositData.outputAmount.toString()),
+                outputAmount: new Uint8Array(depositData.outputAmount),
                 destinationChainId: depositData.destinationChainId.toNumber(),
                 exclusiveRelayer: (0, kit_1.address)(depositData.exclusiveRelayer.toString()),
                 quoteTimestamp: depositData.quoteTimestamp.toNumber(),

package/dist/test/svm/SvmSpoke.Fill.AcrossPlus.js

@@ -103,7 +103,7 @@ describe("svm_spoke.fill.across_plus", () => {
             exclusiveRelayer: relayer.publicKey,
             inputToken: mint, // This is lazy. it should be an encoded token from a separate domain most likely.
             outputToken: mint,
-            inputAmount: new anchor_1.BN(relayAmount),
+            inputAmount: (0, web3_v1_1.intToU8Array32)(relayAmount),
             outputAmount: new anchor_1.BN(relayAmount),
             originChainId: new anchor_1.BN(1),
             depositId: (0, web3_v1_1.intToU8Array32)(Math.floor(Math.random() * 1000000)), // force that we always have a new deposit id.
@@ -188,7 +188,7 @@ describe("svm_spoke.fill.across_plus", () => {
         };
         it("Max token distributions within invoked message call, regular params", async () => {
             // Larger distribution would exceed message size limits.
-            const numberOfDistributions = 7;
+            const numberOfDistributions = 6;
             await fillTokenDistributions(numberOfDistributions);
         });
         it("Max token distributions within invoked message call, buffer account params", async () => {
@@ -305,7 +305,7 @@ describe("svm_spoke.fill.across_plus", () => {
                     exclusiveRelayer: (0, kit_1.address)(relayData.exclusiveRelayer.toString()),
                     inputToken: (0, kit_1.address)(relayData.inputToken.toString()),
                     outputToken: (0, kit_1.address)(relayData.outputToken.toString()),
-                    inputAmount: relayData.inputAmount.toNumber(),
+                    inputAmount: new Uint8Array(relayData.inputAmount),
                     outputAmount: relayData.outputAmount.toNumber(),
                     originChainId: relayData.originChainId.toNumber(),
                     depositId: new Uint8Array(relayData.depositId),

package/dist/test/svm/SvmSpoke.Fill.js

@@ -99,7 +99,7 @@ describe("svm_spoke.fill", () => {
             exclusiveRelayer: relayer.publicKey,
             inputToken: mint, // This is lazy. it should be an encoded token from a separate domain most likely.
             outputToken: mint,
-            inputAmount: new anchor_1.BN(relayAmount),
+            inputAmount: (0, web3_v1_1.intToU8Array32)(relayAmount),
             outputAmount: new anchor_1.BN(relayAmount),
             originChainId: new anchor_1.BN(1),
             depositId: (0, web3_v1_1.intToU8Array32)(Math.floor(Math.random() * 1000000)), // force that we always have a new deposit id.
@@ -493,7 +493,7 @@ describe("svm_spoke.fill", () => {
                     exclusiveRelayer: (0, kit_1.address)(relayData.exclusiveRelayer.toString()),
                     inputToken: (0, kit_1.address)(relayData.inputToken.toString()),
                     outputToken: (0, kit_1.address)(relayData.outputToken.toString()),
-                    inputAmount: relayData.inputAmount.toNumber(),
+                    inputAmount: new Uint8Array(relayData.inputAmount),
                     outputAmount: relayData.outputAmount.toNumber(),
                     originChainId: relayData.originChainId.toNumber(),
                     depositId: new Uint8Array(relayData.depositId),
@@ -572,7 +572,7 @@ describe("svm_spoke.fill", () => {
                     exclusiveRelayer: (0, kit_1.address)(relayData.exclusiveRelayer.toString()),
                     inputToken: (0, kit_1.address)(relayData.inputToken.toString()),
                     outputToken: (0, kit_1.address)(relayData.outputToken.toString()),
-                    inputAmount: relayData.inputAmount.toNumber(),
+                    inputAmount: new Uint8Array(relayData.inputAmount),
                     outputAmount: relayData.outputAmount.toNumber(),
                     originChainId: relayData.originChainId.toNumber(),
                     depositId: new Uint8Array(relayData.depositId),

package/dist/test/svm/SvmSpoke.SlowFill.AcrossPlus.js

@@ -167,7 +167,7 @@ describe("svm_spoke.slow_fill.across_plus", () => {
             exclusiveRelayer: relayer.publicKey,
             inputToken: mint, // This is lazy. it should be an encoded token from a separate domain most likely.
             outputToken: mint,
-            inputAmount: new anchor_1.BN(relayAmount),
+            inputAmount: (0, web3_v1_1.intToU8Array32)(relayAmount),
             outputAmount: new anchor_1.BN(relayAmount),
             originChainId: new anchor_1.BN(1),
             depositId: (0, web3_v1_1.intToU8Array32)(Math.floor(Math.random() * 1000000)), // Unique ID for each test.
@@ -197,7 +197,7 @@ describe("svm_spoke.slow_fill.across_plus", () => {
         // Request and execute slow fill.
         const { requestIx, executeIx } = await createSlowFillIx(multicallHandlerCoder);
         await (0, web3_js_1.sendAndConfirmTransaction)(connection, new web3_js_1.Transaction().add(requestIx), [relayer]);
-        await (0, web3_js_1.sendAndConfirmTransaction)(connection, new web3_js_1.Transaction().add(executeIx), [relayer]);
+        await (0, web3_v1_1.sendTransactionWithLookupTable)(connection, [executeIx], relayer);
         // Verify vault's balance after the fill
         const fVaultBal = (await (0, spl_token_1.getAccount)(connection, vault)).amount;
         assertSE(fVaultBal, iVaultBal - BigInt(relayAmount), "Vault's balance should be reduced by the relay amount");
@@ -266,7 +266,7 @@ describe("svm_spoke.slow_fill.across_plus", () => {
         };
         it("Max token distributions within invoked message call, regular params", async () => {
             // Larger distribution would exceed message size limits.
-            const numberOfDistributions = 6;
+            const numberOfDistributions = 5;
             await fillTokenDistributions(numberOfDistributions);
         });
         it("Max token distributions within invoked message call, buffer account params", async () => {

package/dist/test/svm/SvmSpoke.SlowFill.js

@@ -86,7 +86,7 @@ describe("svm_spoke.slow_fill", () => {
                 exclusiveRelayer: relayer.publicKey,
                 inputToken: mint,
                 outputToken: mint,
-                inputAmount: new anchor_1.BN(relayAmount),
+                inputAmount: (0, web3_v1_1.intToU8Array32)(relayAmount),
                 outputAmount: new anchor_1.BN(relayAmount),
                 originChainId: new anchor_1.BN(1),
                 depositId: (0, web3_v1_1.intToU8Array32)(Math.floor(Math.random() * 1000000)), // Unique ID for each test.
@@ -142,7 +142,7 @@ describe("svm_spoke.slow_fill", () => {
             exclusiveRelayer: relayer.publicKey,
             inputToken: mint, // This is lazy. it should be an encoded token from a separate domain most likely.
             outputToken: mint,
-            inputAmount: new anchor_1.BN(relayAmount),
+            inputAmount: (0, web3_v1_1.intToU8Array32)(relayAmount),
             outputAmount: new anchor_1.BN(relayAmount),
             originChainId: new anchor_1.BN(1),
             depositId: (0, web3_v1_1.intToU8Array32)(1),

package/dist/test/svm/SvmSpoke.common.js

@@ -128,7 +128,7 @@ exports.common = {
         inputToken: null, // Placeholder, to be assigned in the test file
         outputToken,
         inputAmount,
-        outputAmount,
+        outputAmount: (0, web3_v1_1.intToU8Array32)(outputAmount),
         destinationChainId,
         exclusiveRelayer,
         quoteTimestamp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@across-protocol/contracts",
-  "version": "4.0.12",
+  "version": "4.0.14-alpha.1",
   "author": "UMA Team",
   "license": "AGPL-3.0-only",
   "repository": {
@@ -46,7 +46,7 @@
     "pre-commit-hook": "sh scripts/preCommitHook.sh"
   },
   "dependencies": {
-    "@across-protocol/constants": "^3.1.63",
+    "@across-protocol/constants": "^3.1.66",
     "@coral-xyz/anchor": "^0.31.1",
     "@defi-wonderland/smock": "^2.3.4",
     "@eth-optimism/contracts": "^0.5.40",