@across-protocol/sdk 4.2.14 → 4.2.16-alpha.0

package/src/arch/svm/SpokeUtils.ts

@@ -19,6 +19,7 @@ import {
   getU32Encoder,
   getU64Encoder,
   pipe,
+  ReadonlyUint8Array,
   some,
   type TransactionSigner,
 } from "@solana/kit";
@@ -31,6 +32,7 @@ import { Deposit, DepositWithBlock, FillStatus, FillWithBlock, RelayData } from
 import { BigNumber, SvmAddress, chainIsSvm, chunk, isUnsafeDepositId, keccak256, toAddressType } from "../../utils";
 import {
   SvmCpiEventsClient,
+  bigToU8a32,
   createDefaultTransaction,
   getEventAuthority,
   getFillStatusPda,
@@ -398,7 +400,7 @@ export async function fillRelayInstruction(
       exclusiveRelayer: exclusiveRelayer.toV2Address(),
       inputToken: inputToken.toV2Address(),
       outputToken: outputToken.toV2Address(),
-      inputAmount: deposit.inputAmount.toBigInt(),
+      inputAmount: bigToU8a32(deposit.inputAmount),
       outputAmount: deposit.outputAmount.toBigInt(),
       originChainId: BigInt(deposit.originChainId),
       fillDeadline: deposit.fillDeadline,
@@ -596,7 +598,7 @@ export function getRelayDataHash(relayData: RelayData, destinationChainId: numbe
     Uint8Array.from(addressEncoder.encode(SvmAddress.from(relayData.exclusiveRelayer, "base16").toV2Address())),
     Uint8Array.from(addressEncoder.encode(SvmAddress.from(relayData.inputToken, "base16").toV2Address())),
     Uint8Array.from(addressEncoder.encode(SvmAddress.from(relayData.outputToken, "base16").toV2Address())),
-    Uint8Array.from(uint64Encoder.encode(BigInt(relayData.inputAmount.toString()))),
+    arrayify(hexZeroPad(hexlify(relayData.inputAmount), 32)),
     Uint8Array.from(uint64Encoder.encode(BigInt(relayData.outputAmount.toString()))),
     Uint8Array.from(uint64Encoder.encode(BigInt(relayData.originChainId.toString()))),
     arrayify(hexZeroPad(hexlify(relayData.depositId), 32)),
@@ -704,7 +706,7 @@ export async function getDepositDelegatePda(
     inputToken: Address<string>;
     outputToken: Address<string>;
     inputAmount: bigint;
-    outputAmount: bigint;
+    outputAmount: ReadonlyUint8Array;
     destinationChainId: bigint;
     exclusiveRelayer: Address<string>;
     quoteTimestamp: bigint;
@@ -724,7 +726,7 @@ export async function getDepositDelegatePda(
     Uint8Array.from(addrEnc.encode(depositData.inputToken)),
     Uint8Array.from(addrEnc.encode(depositData.outputToken)),
     Uint8Array.from(u64.encode(depositData.inputAmount)),
-    Uint8Array.from(u64.encode(depositData.outputAmount)),
+    Uint8Array.from(depositData.outputAmount),
     Uint8Array.from(u64.encode(depositData.destinationChainId)),
     Uint8Array.from(addrEnc.encode(depositData.exclusiveRelayer)),
     Uint8Array.from(u32.encode(depositData.quoteTimestamp)),
@@ -754,7 +756,7 @@ export async function getDepositNowDelegatePda(
     inputToken: Address<string>;
     outputToken: Address<string>;
     inputAmount: bigint;
-    outputAmount: bigint;
+    outputAmount: ReadonlyUint8Array;
     destinationChainId: bigint;
     exclusiveRelayer: Address<string>;
     fillDeadlineOffset: bigint;
@@ -773,7 +775,7 @@ export async function getDepositNowDelegatePda(
     Uint8Array.from(addrEnc.encode(depositData.inputToken)),
     Uint8Array.from(addrEnc.encode(depositData.outputToken)),
     Uint8Array.from(u64.encode(depositData.inputAmount)),
-    Uint8Array.from(u64.encode(depositData.outputAmount)),
+    Uint8Array.from(depositData.outputAmount),
     Uint8Array.from(u64.encode(depositData.destinationChainId)),
     Uint8Array.from(addrEnc.encode(depositData.exclusiveRelayer)),
     Uint8Array.from(u32.encode(depositData.fillDeadlineOffset)),

package/src/arch/svm/utils.ts

@@ -304,3 +304,19 @@ export const createDefaultTransaction = async (rpcClient: SVMProvider, signer: T
     (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx)
   );
 };
+
+/**
+ * Convert a bigint (0 ≤ n < 2^256) to a 32-byte Uint8Array (big-endian).
+ */
+export function bigintToU8a32(n: bigint): Uint8Array {
+  if (n < BigInt(0) || n > ethers.constants.MaxUint256.toBigInt()) {
+    throw new RangeError("Value must fit in 256 bits");
+  }
+  const hexPadded = ethers.utils.hexZeroPad("0x" + n.toString(16), 32);
+  return ethers.utils.arrayify(hexPadded);
+}
+
+export const bigToU8a32 = (bn: bigint | BigNumber) =>
+  bigintToU8a32(typeof bn === "bigint" ? bn : BigInt(bn.toString()));
+
+export const numberToU8a32 = (n: number) => bigintToU8a32(BigInt(n));

package/src/clients/SpokePoolClient/SpokePoolClient.ts

@@ -70,6 +70,7 @@ export const knownEventNames = [
   "RequestedSlowFill",
   "FilledV3Relay",
   "FilledRelay",
+  "BridgedToHubPool",
   "ClaimedRelayerRefund",
 ];
 

package/src/clients/mocks/MockSvmCpiEventsClient.ts

@@ -16,6 +16,7 @@ import {
   SVMEventNames,
   SVMProvider,
   getRandomSvmAddress,
+  bigToU8a32,
 } from "../../arch/svm";
 import { bnZero, bnOne, bs58, getCurrentTime, randomAddress, EvmAddress } from "../../utils";
 import { FillType } from "../../interfaces";
@@ -79,7 +80,7 @@ export class MockSvmCpiEventsClient extends SvmCpiEventsClient {
     const inputToken = deposit.inputToken ?? getRandomSvmAddress();
     const outputToken = deposit.outputToken ?? EvmAddress.from(randomAddress()).toBase58();
     inputAmount ??= BigInt(random(1, 1000, false));
-    outputAmount ??= (inputAmount * BigInt(95)) / BigInt(100);
+    outputAmount ??= bigToU8a32((inputAmount * BigInt(95)) / BigInt(100));
     const message = deposit.message ?? new Uint8Array(32);
     const quoteTimestamp = deposit.quoteTimestamp ?? getCurrentTime();
 
@@ -111,8 +112,9 @@ export class MockSvmCpiEventsClient extends SvmCpiEventsClient {
     const { slot } = fill;
     let { depositId, inputAmount, outputAmount, fillDeadline } = fill;
     depositId ??= arrayify(hexZeroPad(hexlify(random(1, 100_000, false)), 32));
-    inputAmount ??= BigInt(random(1, 1000, false));
-    outputAmount ??= (inputAmount * BigInt(95)) / BigInt(100);
+    const inputAmountBigInt = BigInt(random(1, 1000, false));
+    inputAmount ??= bigToU8a32(inputAmountBigInt);
+    outputAmount ??= (inputAmountBigInt * BigInt(95)) / BigInt(100);
     fillDeadline ??= getCurrentTime() + 60;
 
     const depositor = fill.depositor ?? EvmAddress.from(randomAddress()).toBase58();

package/src/relayFeeCalculator/chain-queries/svmQuery.ts

@@ -6,6 +6,7 @@ import { getComputeUnitEstimateForTransactionMessageFactory } from "@solana/kit"
 import {
   SVMProvider,
   SolanaVoidSigner,
+  bigToU8a32,
   createFillInstruction,
   getAssociatedTokenAddress,
   getEventAuthority,
@@ -166,7 +167,7 @@ export class SvmQuery implements QueryInterface {
       exclusiveRelayer: toSvmAddress(deposit.exclusiveRelayer),
       inputToken: toSvmAddress(deposit.inputToken),
       outputToken: mint.toV2Address(),
-      inputAmount: deposit.inputAmount.toBigInt(),
+      inputAmount: bigToU8a32(deposit.inputAmount),
       outputAmount: deposit.outputAmount.toBigInt(),
       originChainId: deposit.originChainId,
       depositId: new Uint8Array(intToU8Array32(deposit.depositId.toNumber())),