@shogun-sdk/intents-sdk 1.2.31 → 1.4.0

package/src/core/solana/generated/single-chain/instructions/setCancelAuthorities.ts

@@ -0,0 +1,326 @@
+/**
+ * This code was AUTOGENERATED using the codama library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun codama to update it.
+ *
+ * @see https://github.com/codama-idl/codama
+ */
+
+import {
+  getAddressDecoder,
+  getAddressEncoder,
+  getProgramDerivedAddress,
+  type Address,
+} from '@solana/addresses';
+import {
+  combineCodec,
+  fixDecoderSize,
+  fixEncoderSize,
+  getArrayDecoder,
+  getArrayEncoder,
+  getBytesDecoder,
+  getBytesEncoder,
+  getStructDecoder,
+  getStructEncoder,
+  transformEncoder,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type ReadonlyUint8Array,
+} from '@solana/codecs';
+import {
+  type AccountMeta,
+  type Instruction,
+  type InstructionWithAccounts,
+  type InstructionWithData,
+  type ReadonlyAccount,
+  type WritableAccount,
+  type WritableSignerAccount,
+} from '@solana/instructions';
+import { type AccountSignerMeta, type TransactionSigner } from '@solana/signers';
+import { SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS } from '../programs/index.js';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared/index.js';
+
+export const SET_CANCEL_AUTHORITIES_DISCRIMINATOR = new Uint8Array([
+  14, 52, 221, 74, 176, 141, 238, 71,
+]);
+
+export function getSetCancelAuthoritiesDiscriminatorBytes() {
+  return fixEncoderSize(getBytesEncoder(), 8).encode(SET_CANCEL_AUTHORITIES_DISCRIMINATOR);
+}
+
+export type SetCancelAuthoritiesInstruction<
+  TProgram extends string = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
+  TAccountAdmin extends string | AccountMeta<string> = string,
+  TAccountAdminSingleton extends string | AccountMeta<string> = string,
+  TAccountGuard extends string | AccountMeta<string> = string,
+  TAccountSystemProgram extends string | AccountMeta<string> = '11111111111111111111111111111111',
+  TRemainingAccounts extends readonly AccountMeta<string>[] = [],
+> = Instruction<TProgram> &
+  InstructionWithData<ReadonlyUint8Array> &
+  InstructionWithAccounts<
+    [
+      TAccountAdmin extends string
+        ? WritableSignerAccount<TAccountAdmin> & AccountSignerMeta<TAccountAdmin>
+        : TAccountAdmin,
+      TAccountAdminSingleton extends string
+        ? WritableAccount<TAccountAdminSingleton>
+        : TAccountAdminSingleton,
+      TAccountGuard extends string ? WritableAccount<TAccountGuard> : TAccountGuard,
+      TAccountSystemProgram extends string
+        ? ReadonlyAccount<TAccountSystemProgram>
+        : TAccountSystemProgram,
+      ...TRemainingAccounts,
+    ]
+  >;
+
+export type SetCancelAuthoritiesInstructionData = {
+  discriminator: ReadonlyUint8Array;
+  newCancelAuthorities: Array<Address>;
+};
+
+export type SetCancelAuthoritiesInstructionDataArgs = { newCancelAuthorities: Array<Address> };
+
+export function getSetCancelAuthoritiesInstructionDataEncoder(): Encoder<SetCancelAuthoritiesInstructionDataArgs> {
+  return transformEncoder(
+    getStructEncoder([
+      ['discriminator', fixEncoderSize(getBytesEncoder(), 8)],
+      ['newCancelAuthorities', getArrayEncoder(getAddressEncoder())],
+    ]),
+    (value) => ({ ...value, discriminator: SET_CANCEL_AUTHORITIES_DISCRIMINATOR })
+  );
+}
+
+export function getSetCancelAuthoritiesInstructionDataDecoder(): Decoder<SetCancelAuthoritiesInstructionData> {
+  return getStructDecoder([
+    ['discriminator', fixDecoderSize(getBytesDecoder(), 8)],
+    ['newCancelAuthorities', getArrayDecoder(getAddressDecoder())],
+  ]);
+}
+
+export function getSetCancelAuthoritiesInstructionDataCodec(): Codec<
+  SetCancelAuthoritiesInstructionDataArgs,
+  SetCancelAuthoritiesInstructionData
+> {
+  return combineCodec(
+    getSetCancelAuthoritiesInstructionDataEncoder(),
+    getSetCancelAuthoritiesInstructionDataDecoder()
+  );
+}
+
+export type SetCancelAuthoritiesAsyncInput<
+  TAccountAdmin extends string = string,
+  TAccountAdminSingleton extends string = string,
+  TAccountGuard extends string = string,
+  TAccountSystemProgram extends string = string,
+> = {
+  /** Admin signer */
+  admin: TransactionSigner<TAccountAdmin>;
+  /** Admin singleton account that grants access to admin functions */
+  adminSingleton?: Address<TAccountAdminSingleton>;
+  /** Guard account data */
+  guard: Address<TAccountGuard>;
+  systemProgram?: Address<TAccountSystemProgram>;
+  newCancelAuthorities: SetCancelAuthoritiesInstructionDataArgs['newCancelAuthorities'];
+};
+
+export async function getSetCancelAuthoritiesInstructionAsync<
+  TAccountAdmin extends string,
+  TAccountAdminSingleton extends string,
+  TAccountGuard extends string,
+  TAccountSystemProgram extends string,
+  TProgramAddress extends Address = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
+>(
+  input: SetCancelAuthoritiesAsyncInput<
+    TAccountAdmin,
+    TAccountAdminSingleton,
+    TAccountGuard,
+    TAccountSystemProgram
+  >,
+  config?: { programAddress?: TProgramAddress }
+): Promise<
+  SetCancelAuthoritiesInstruction<
+    TProgramAddress,
+    TAccountAdmin,
+    TAccountAdminSingleton,
+    TAccountGuard,
+    TAccountSystemProgram
+  >
+> {
+  // Program address.
+  const programAddress = config?.programAddress ?? SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS;
+
+  // Original accounts.
+  const originalAccounts = {
+    admin: { value: input.admin ?? null, isWritable: true },
+    adminSingleton: { value: input.adminSingleton ?? null, isWritable: true },
+    guard: { value: input.guard ?? null, isWritable: true },
+    systemProgram: { value: input.systemProgram ?? null, isWritable: false },
+  };
+  const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedAccount>;
+
+  // Original args.
+  const args = { ...input };
+
+  // Resolve default values.
+  if (!accounts.adminSingleton.value) {
+    accounts.adminSingleton.value = await getProgramDerivedAddress({
+      programAddress,
+      seeds: [getBytesEncoder().encode(new Uint8Array([97, 100, 109, 105, 110]))],
+    });
+  }
+  if (!accounts.systemProgram.value) {
+    accounts.systemProgram.value =
+      '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
+  }
+
+  const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
+  const instruction = {
+    accounts: [
+      getAccountMeta(accounts.admin),
+      getAccountMeta(accounts.adminSingleton),
+      getAccountMeta(accounts.guard),
+      getAccountMeta(accounts.systemProgram),
+    ],
+    programAddress,
+    data: getSetCancelAuthoritiesInstructionDataEncoder().encode(
+      args as SetCancelAuthoritiesInstructionDataArgs
+    ),
+  } as SetCancelAuthoritiesInstruction<
+    TProgramAddress,
+    TAccountAdmin,
+    TAccountAdminSingleton,
+    TAccountGuard,
+    TAccountSystemProgram
+  >;
+
+  return instruction;
+}
+
+export type SetCancelAuthoritiesInput<
+  TAccountAdmin extends string = string,
+  TAccountAdminSingleton extends string = string,
+  TAccountGuard extends string = string,
+  TAccountSystemProgram extends string = string,
+> = {
+  /** Admin signer */
+  admin: TransactionSigner<TAccountAdmin>;
+  /** Admin singleton account that grants access to admin functions */
+  adminSingleton: Address<TAccountAdminSingleton>;
+  /** Guard account data */
+  guard: Address<TAccountGuard>;
+  systemProgram?: Address<TAccountSystemProgram>;
+  newCancelAuthorities: SetCancelAuthoritiesInstructionDataArgs['newCancelAuthorities'];
+};
+
+export function getSetCancelAuthoritiesInstruction<
+  TAccountAdmin extends string,
+  TAccountAdminSingleton extends string,
+  TAccountGuard extends string,
+  TAccountSystemProgram extends string,
+  TProgramAddress extends Address = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
+>(
+  input: SetCancelAuthoritiesInput<
+    TAccountAdmin,
+    TAccountAdminSingleton,
+    TAccountGuard,
+    TAccountSystemProgram
+  >,
+  config?: { programAddress?: TProgramAddress }
+): SetCancelAuthoritiesInstruction<
+  TProgramAddress,
+  TAccountAdmin,
+  TAccountAdminSingleton,
+  TAccountGuard,
+  TAccountSystemProgram
+> {
+  // Program address.
+  const programAddress = config?.programAddress ?? SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS;
+
+  // Original accounts.
+  const originalAccounts = {
+    admin: { value: input.admin ?? null, isWritable: true },
+    adminSingleton: { value: input.adminSingleton ?? null, isWritable: true },
+    guard: { value: input.guard ?? null, isWritable: true },
+    systemProgram: { value: input.systemProgram ?? null, isWritable: false },
+  };
+  const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedAccount>;
+
+  // Original args.
+  const args = { ...input };
+
+  // Resolve default values.
+  if (!accounts.systemProgram.value) {
+    accounts.systemProgram.value =
+      '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
+  }
+
+  const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
+  const instruction = {
+    accounts: [
+      getAccountMeta(accounts.admin),
+      getAccountMeta(accounts.adminSingleton),
+      getAccountMeta(accounts.guard),
+      getAccountMeta(accounts.systemProgram),
+    ],
+    programAddress,
+    data: getSetCancelAuthoritiesInstructionDataEncoder().encode(
+      args as SetCancelAuthoritiesInstructionDataArgs
+    ),
+  } as SetCancelAuthoritiesInstruction<
+    TProgramAddress,
+    TAccountAdmin,
+    TAccountAdminSingleton,
+    TAccountGuard,
+    TAccountSystemProgram
+  >;
+
+  return instruction;
+}
+
+export type ParsedSetCancelAuthoritiesInstruction<
+  TProgram extends string = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
+  TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[],
+> = {
+  programAddress: Address<TProgram>;
+  accounts: {
+    /** Admin signer */
+    admin: TAccountMetas[0];
+    /** Admin singleton account that grants access to admin functions */
+    adminSingleton: TAccountMetas[1];
+    /** Guard account data */
+    guard: TAccountMetas[2];
+    systemProgram: TAccountMetas[3];
+  };
+  data: SetCancelAuthoritiesInstructionData;
+};
+
+export function parseSetCancelAuthoritiesInstruction<
+  TProgram extends string,
+  TAccountMetas extends readonly AccountMeta[],
+>(
+  instruction: Instruction<TProgram> &
+    InstructionWithAccounts<TAccountMetas> &
+    InstructionWithData<ReadonlyUint8Array>
+): ParsedSetCancelAuthoritiesInstruction<TProgram, TAccountMetas> {
+  if (instruction.accounts.length < 4) {
+    // TODO: Coded error.
+    throw new Error('Not enough accounts');
+  }
+  let accountIndex = 0;
+  const getNextAccount = () => {
+    const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!;
+    accountIndex += 1;
+    return accountMeta;
+  };
+  return {
+    programAddress: instruction.programAddress,
+    accounts: {
+      admin: getNextAccount(),
+      adminSingleton: getNextAccount(),
+      guard: getNextAccount(),
+      systemProgram: getNextAccount(),
+    },
+    data: getSetCancelAuthoritiesInstructionDataDecoder().decode(instruction.data),
+  };
+}

package/src/core/solana/generated/single-chain/programs/singleChainGuard.ts

@@ -26,6 +26,7 @@ import {
   type ParsedInitializeInstruction,
   type ParsedSetAdminInstruction,
   type ParsedSetAuctioneerPubKeyInstruction,
+  type ParsedSetCancelAuthoritiesInstruction,
 } from '../instructions/index.js';
 
 export const SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS =
@@ -102,6 +103,7 @@ export enum SingleChainGuardInstruction {
   Initialize,
   SetAdmin,
   SetAuctioneerPubKey,
+  SetCancelAuthorities,
 }
 
 export function identifySingleChainGuardInstruction(
@@ -240,6 +242,17 @@ export function identifySingleChainGuardInstruction(
   ) {
     return SingleChainGuardInstruction.SetAuctioneerPubKey;
   }
+  if (
+    containsBytes(
+      data,
+      fixEncoderSize(getBytesEncoder(), 8).encode(
+        new Uint8Array([14, 52, 221, 74, 176, 141, 238, 71])
+      ),
+      0
+    )
+  ) {
+    return SingleChainGuardInstruction.SetCancelAuthorities;
+  }
   throw new Error(
     'The provided instruction could not be identified as a singleChainGuard instruction.'
   );
@@ -283,4 +296,7 @@ export type ParsedSingleChainGuardInstruction<
     } & ParsedSetAdminInstruction<TProgram>)
   | ({
       instructionType: SingleChainGuardInstruction.SetAuctioneerPubKey;
-    } & ParsedSetAuctioneerPubKeyInstruction<TProgram>);
+    } & ParsedSetAuctioneerPubKeyInstruction<TProgram>)
+  | ({
+      instructionType: SingleChainGuardInstruction.SetCancelAuthorities;
+    } & ParsedSetCancelAuthoritiesInstruction<TProgram>);

package/src/core/solana/generated/single-chain/types/cancelAuthoritiesUpdated.ts

@@ -0,0 +1,40 @@
+/**
+ * This code was AUTOGENERATED using the codama library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun codama to update it.
+ *
+ * @see https://github.com/codama-idl/codama
+ */
+
+import {
+  combineCodec,
+  getAddressDecoder,
+  getAddressEncoder,
+  getArrayDecoder,
+  getArrayEncoder,
+  getStructDecoder,
+  getStructEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+} from '@solana/kit';
+
+export type CancelAuthoritiesUpdated = { newCancelAuthorities: Array<Address> };
+
+export type CancelAuthoritiesUpdatedArgs = CancelAuthoritiesUpdated;
+
+export function getCancelAuthoritiesUpdatedEncoder(): Encoder<CancelAuthoritiesUpdatedArgs> {
+  return getStructEncoder([['newCancelAuthorities', getArrayEncoder(getAddressEncoder())]]);
+}
+
+export function getCancelAuthoritiesUpdatedDecoder(): Decoder<CancelAuthoritiesUpdated> {
+  return getStructDecoder([['newCancelAuthorities', getArrayDecoder(getAddressDecoder())]]);
+}
+
+export function getCancelAuthoritiesUpdatedCodec(): Codec<
+  CancelAuthoritiesUpdatedArgs,
+  CancelAuthoritiesUpdated
+> {
+  return combineCodec(getCancelAuthoritiesUpdatedEncoder(), getCancelAuthoritiesUpdatedDecoder());
+}

package/src/core/solana/generated/single-chain/types/index.ts

@@ -9,6 +9,7 @@
 export * from './adminUpdated.js';
 export * from './adminUpdateStarted.js';
 export * from './auctioneerPubkeyUpdated.js';
+export * from './cancelAuthoritiesUpdated.js';
 export * from './dcaOrderCreated.js';
 export * from './dcaOrderFulfilled.js';
 export * from './dcaOrderIntervalFulfilled.js';

package/src/core/solana/intent-helpers.ts

@@ -1,13 +1,19 @@
 import { ChainID } from '../../chains.js';
-import type { SingleChainUserIntentRequest, CrossChainUserIntentRequest, DcaSingleChainUserIntentRequest } from '../../types/intent.js';
+import type {
+  SingleChainUserIntentRequest,
+  CrossChainUserIntentRequest,
+  DcaSingleChainUserIntentRequest,
+} from '../../types/intent.js';
 import type { SingleChainOrder } from '../orders/single-chain.js';
 import type { CrossChainOrder } from '../orders/cross-chain.js';
 import type { DcaSingleChainOrder } from '../orders/dca-single-chain.js';
-import type { ExtraTransfer } from '../orders/common.js';
+import type { ExtraTransfer, StopLossType } from '../orders/common.js';
 import { getSolanaCrossChainOrderInstructions, getSolanaSingleChainOrderInstructions } from './order-instructions.js';
 import { getSolanaDcaSingleChainOrderInstructions } from './dca/create-order.js';
 import { prepareDcaSecretData } from './dca/single-chain-dca-order.js';
 import { prepareSecretData } from './dca/single-chain-limit-order.js';
+import { generateExecutionDetailsHash } from '../../utils/generate-execution-details-hash.js';
+import { Parsers } from '../../utils/parsers.js';
 
 export type CreateSolanaSingleChainLimitOrderIntentParams = {
   user: string;
@@ -20,7 +26,8 @@ export type CreateSolanaSingleChainLimitOrderIntentParams = {
   deadline: number;
   orderPubkey?: string;
   secretNumber?: string;
-  stopLossMaxOut?: bigint;
+  stopLossType?: StopLossType;
+  stopLossTriggerPrice?: string;
   takeProfitMinOut?: bigint;
 };
 
@@ -53,7 +60,8 @@ export type CreateSolanaCrossChainOrderIntentParams = {
   deadline: number;
   extraTransfers?: ExtraTransfer[];
   orderPubkey?: string;
-  stopLossMaxOut?: bigint;
+  stopLossType?: StopLossType;
+  stopLossTriggerPrice?: string;
   takeProfitMinOut?: bigint;
 };
 
@@ -63,10 +71,10 @@ export type CreateSolanaCrossChainOrderIntentParams = {
  * @returns Formatted intent request ready to send to auctioneer
  */
 export function createSolanaSingleChainLimitOrderIntentRequest(
-  params: CreateSolanaSingleChainLimitOrderIntentParams
+  params: CreateSolanaSingleChainLimitOrderIntentParams,
 ): SingleChainUserIntentRequest {
   const secretNumber = params.secretNumber || generateSolanaRandomSecretNumber();
-  
+
   const order: SingleChainOrder = {
     user: params.user,
     chainId: ChainID.Solana,
@@ -77,8 +85,9 @@ export function createSolanaSingleChainLimitOrderIntentRequest(
     destinationAddress: params.destinationAddress,
     extraTransfers: params.extraTransfers,
     deadline: params.deadline,
-    stopLossMaxOut: params.stopLossMaxOut,
     takeProfitMinOut: params.takeProfitMinOut,
+    stopLossType: params.stopLossType,
+    stopLossTriggerPrice: params.stopLossTriggerPrice,
   } as SingleChainOrder;
 
   return {
@@ -98,10 +107,10 @@ export function createSolanaSingleChainLimitOrderIntentRequest(
  * @returns Formatted intent request ready to send to auctioneer
  */
 export function createSolanaSingleChainDcaOrderIntentRequest(
-  params: CreateSolanaSingleChainDcaOrderIntentParams
+  params: CreateSolanaSingleChainDcaOrderIntentParams,
 ): DcaSingleChainUserIntentRequest {
   const secretNumber = params.secretNumber || generateSolanaRandomSecretNumber();
-  
+
   const order: DcaSingleChainOrder = {
     user: params.user,
     chainId: ChainID.Solana,
@@ -134,18 +143,22 @@ export function createSolanaSingleChainDcaOrderIntentRequest(
  * @returns Formatted intent request ready to send to auctioneer
  */
 export function createSolanaCrossChainOrderIntentRequest(
-  params: CreateSolanaCrossChainOrderIntentParams
+  params: CreateSolanaCrossChainOrderIntentParams,
 ): CrossChainUserIntentRequest {
-  const executionDetails = JSON.stringify({
+  const executionDetails = {
     destChainId: params.destinationChainId,
     tokenOut: params.destinationTokenAddress,
-    amountOutMin: params.destinationTokenMinAmount || 1n,
+    amountOutMin: params.destinationTokenMinAmount?.toString() || '1',
     destinationAddress: params.destinationAddress,
     extraTransfers: params.extraTransfers,
-  });
+    stopLossType: params.stopLossType,
+    stopLossTriggerPrice: params.stopLossTriggerPrice,
+    takeProfitMinOut: params.takeProfitMinOut?.toString(),
+  };
+  const executionDetailsString = JSON.stringify(executionDetails, Parsers.bigIntReplacer);
 
-  // Calculate execution details hash
-  const executionDetailsHash = `0x${require('crypto').createHash('sha256').update(executionDetails).digest('hex')}` as `0x${string}`;
+  // Hash the exact string we send; the auctioneer recomputes sha256 over it and rejects on mismatch
+  const executionDetailsHash = generateExecutionDetailsHash(executionDetailsString);
 
   const genericData = {
     user: params.user,
@@ -154,15 +167,13 @@ export function createSolanaCrossChainOrderIntentRequest(
     amountIn: params.sourceTokenAmount,
     minStablecoinsAmount: params.minStablecoinAmount || 1n,
     deadline: params.deadline,
-    executionDetailsHash,
+    executionDetailsHash: executionDetailsHash as `0x${string}`,
     extraTransfers: params.extraTransfers,
-    stopLossMaxOut: params.stopLossMaxOut,
-    takeProfitMinOut: params.takeProfitMinOut,
   };
 
   return {
     genericData,
-    executionDetails,
+    executionDetails: executionDetailsString,
     chainSpecificData: {
       Solana: {
         orderPubkey: params.orderPubkey || 'DFNAjFAvS4GF98Tp1kiyLvEHM3wjGXibCfF86nnmhuVc',
@@ -210,19 +221,19 @@ export function generateSolanaLimitOrderSecretData(
   tokenOut: string,
   receiver: string,
   secretNumber?: string,
-  extraTransfers?: ExtraTransfer[]
+  extraTransfers?: ExtraTransfer[],
 ): { secretNumber: string; secretData: any } {
   const secret = secretNumber || generateSolanaRandomSecretNumber();
-  
+
   const { PublicKey } = require('@solana/web3.js');
   const secretData = prepareSecretData(
     new PublicKey(tokenOut),
     new PublicKey(receiver),
-    extraTransfers?.map(t => ({
+    extraTransfers?.map((t) => ({
       token: new PublicKey(t.token),
       receiver: new PublicKey(t.receiver),
       amount: t.amount.toString(),
-    })) || []
+    })) || [],
   );
 
   return {
@@ -243,19 +254,19 @@ export function generateSolanaDcaOrderSecretData(
   tokenOut: string,
   receiver: string,
   secretNumber?: string,
-  extraTransfers?: ExtraTransfer[]
+  extraTransfers?: ExtraTransfer[],
 ): { secretNumber: string; secretData: any } {
   const secret = secretNumber || generateSolanaRandomSecretNumber();
-  
+
   const { PublicKey } = require('@solana/web3.js');
   const secretData = prepareDcaSecretData(
     new PublicKey(tokenOut),
     new PublicKey(receiver),
-    extraTransfers?.map(t => ({
+    extraTransfers?.map((t) => ({
       token: new PublicKey(t.token),
       receiver: new PublicKey(t.receiver),
       amount: t.amount.toString(),
-    })) || []
+    })) || [],
   );
 
   return {

package/src/core/solana/sdk.ts

@@ -98,7 +98,7 @@ export class SolanaSDK extends BaseSDK {
     const myTx = compileTransaction(transactionMessage);
 
     const signature = await signTransaction([signerKeyPair], myTx);
-    
+
     assertIsSendableTransaction(signature);
 
     await this.client.sendAndConfirmTransaction(signature, {

package/src/core/solana/utils.ts

@@ -8,7 +8,8 @@ export function genSecretHashAndNumber(order: SingleChainOrder | DcaSingleChainO
   secretHash: number[];
   secretNumber: string;
 } {
-  const tokenOut = new PublicKey(order.tokenOut);
+  const rawTokenOut = new PublicKey(order.tokenOut);
+  const tokenOut = formatTokenPubkey(rawTokenOut);
   const receiver = new PublicKey(order.destinationAddress);
 
   const extraTransfers = order.extraTransfers ?? [];
@@ -30,3 +31,11 @@ export function genSecretHashAndNumber(order: SingleChainOrder | DcaSingleChainO
 
   return { secretHash, secretNumber: secretNumber.toString() };
 }
+
+export function formatTokenPubkey(token: PublicKey) {
+  if (token.equals(new PublicKey('So11111111111111111111111111111111111111111'))) {
+    return PublicKey.default;
+  }
+
+  return token;
+}

package/src/core/sui/cross-chain-limit-order.ts

@@ -1,34 +1,6 @@
-import { createHash } from "crypto";
-import type { Hex } from "viem";
-
 /**
  * Generates random U64 number
  */
 export function getRandomU64Number() {
-  return BigInt("0x" + [...crypto.getRandomValues(new Uint8Array(8))]
-      .map(n => n.toString(16))
-      .join("")).toString();
-}
-
-/**
- * Generate execution details hash for cross-chain orders
- * @param destChainId Destination chain ID
- * @param destinationAddress Destination address on target chain
- * @param tokenOut Token address on destination chain
- * @param amountOutMin Minimum amount out
- */
-export function generateExecutionDetailsHash(
-  destChainId: number,
-  destinationAddress: string,
-  tokenOut: string,
-  amountOutMin: string,
-): Hex {
-  const executionDetails = JSON.stringify({
-    destChainId,
-    destinationAddress,
-    tokenOut,
-    amountOutMin,
-  });
-  
-  return ("0x" + createHash('sha256').update(executionDetails).digest('hex')) as `0x${string}`;
+  return BigInt('0x' + [...crypto.getRandomValues(new Uint8Array(8))].map((n) => n.toString(16)).join('')).toString();
 }