@interest-protocol/xswap-sdk 1.0.2 → 1.0.4

package/dist/index.mjs

@@ -1,18 +1,19 @@
 import invariant from 'tiny-invariant';
 import { z } from 'zod';
 
-const MAINNET_PACKAGE_ID = '0x90db0c50c4e1de33ce47efad1b66268697e3cc7c6e078408b73706b9800e8029';
-const ENCLAVE_CAP_OBJECT_ID = '0x77603cae7a47a0b626849a693881ce388b06cfe4064e078593e59dd9c30dcb73';
-const ENCLAVE_OBJECT_ID = '0x6a3114a47361653001fdaf82c2bd8a2fe05e1f1a04f00ccc0761663827b1362f';
-const ENCLAVE_INITIAL_SHARED_VERSION = '782601414';
+const ORIGINAL_PACKAGE_ID = '0xb188334e53f795fe12f0b516716d5b0b8024ddf51482df23525fd599c875edfa';
+const MAINNET_PACKAGE_ID = '0xb188334e53f795fe12f0b516716d5b0b8024ddf51482df23525fd599c875edfa';
+const ENCLAVE_CAP_OBJECT_ID = '0xe0f1b062c6ce742b8659e59ca29f8ebed7a926c292b4f8fc479ed82c04997abf';
+const ENCLAVE_OBJECT_ID = '0x73ed1600688bde2ffaaf8669ed0292809ae86c6945f076daa369c093060f7f04';
+const ENCLAVE_INITIAL_SHARED_VERSION = '788631979';
 const ENCLAVE_SHARED_OBJECT_DATA = {
     objectId: ENCLAVE_OBJECT_ID,
     initialSharedVersion: ENCLAVE_INITIAL_SHARED_VERSION,
 };
-const ADMIN_CAP_OBJECT_ID = '0xf7ab8d9fe74d1879ca16c4e789c10e06db91aa16de432c62dc979c8c7a7c4ae6';
-const UPGRADE_CAP_OBJECT_ID = '0xb8b11297b8d15f2a654eb9825f0ef78a4d231af3cfd289ac6182a64e59690124';
-const XSWAP_OBJECT_ID = '0xf1c5200b411c1ddc496a442bf4bfdf656072dde47338fa6cd5f6ef9e896a4250';
-const XSWAP_INITIAL_SHARED_VERSION = '781617911';
+const ADMIN_CAP_OBJECT_ID = '0xbab05412dc7b3eeb9ae441d73c86f1f3442b49cf6ca4f34c5ca59c3c0dded688';
+const UPGRADE_CAP_OBJECT_ID = '0xa4e1aaf8a79289e097ffb3f7ac3ea7882fddf81329596fc25645b1e3d68dd1fc';
+const XSWAP_OBJECT_ID = '0xcbc04da0c892ca1f9d170976e84ff45dc6ae3439f01cbc93b3f06855c6c3e8a7';
+const XSWAP_INITIAL_SHARED_VERSION = '788588232';
 const XSWAP_SHARED_OBJECT_DATA = {
     objectId: XSWAP_OBJECT_ID,
     initialSharedVersion: XSWAP_INITIAL_SHARED_VERSION,
@@ -27,8 +28,8 @@ const Modules = {
     XSwap: 'xswap',
     Structs: 'structs',
 };
-const WITNESS_TYPE = `${MAINNET_PACKAGE_ID}::${Modules.XSwap}::Witness`;
-const XSWAP_TYPE = `${MAINNET_PACKAGE_ID}::${Modules.XSwap}::XSWAP`;
+const WITNESS_TYPE = `${ORIGINAL_PACKAGE_ID}::${Modules.XSwap}::Witness`;
+const XSWAP_TYPE = `${ORIGINAL_PACKAGE_ID}::${Modules.XSwap}::XSWAP`;
 const Functions = {
     InitApp: 'init_app',
     NewRequest: 'new_request',
@@ -46,7 +47,8 @@ const Functions = {
     Unpause: 'unpause',
     AddWallet: 'add_wallet',
     MintPresign: 'mint_presign',
-    SetPresignFee: 'set_presign_fee',
+    TakePresign: 'take_presign',
+    SetRequestFee: 'set_request_fee',
     CollectFees: 'collect_fees',
     NewRequestParams: 'new_request_params',
     NewSettleParams: 'new_settle_params',
@@ -76,19 +78,19 @@ const WalletKey = {
     [ChainId.Solana]: 0n,
 };
 const DWalletAddress = {
-    [ChainId.Sui]: '0xf77b45be3624ed93009ad76b8fea4b2d075f32db03472f279c5462a532ae9f93',
-    [ChainId.Solana]: 'Bnvdx32q42RA2wXHx2uagmkCuBgqpp7ZpXhSKdpdejHL',
+    [ChainId.Sui]: '0x0d6d396862af7cd10d235069fee9580545e7fc0a9e74cf7a92ec1a6a1996313b',
+    [ChainId.Solana]: 'HmBJM5kjvCRE4iBd4kakGFRoaAyUfkq9xivMZgVzqGGC',
 };
 const DWalletId = {
-    [ChainId.Sui]: '0xba527a47bdc39b38bcb35b50457649f03998f77e7c806c517f10ca8e19769058',
-    [ChainId.Solana]: '0xee7f0f00f9684c870a74146feef10ec90e019e6d13c63cb433c53f18f8e38efd',
+    [ChainId.Sui]: '0x66b32816bff596b27b7ae99ec2e0bc69e63035a0e087006fe4937b6b09e30b95',
+    [ChainId.Solana]: '0x3ca05691123a358e6793946ba38595d0925c68b656efe91ad08bbee430bfb26b',
 };
 const XCoreWalletId = {
-    [ChainId.Sui]: '0x3a994a05e57f7e30c9bdf554610117f1386032870d67f2d411c0a4616c513554',
-    [ChainId.Solana]: '0xc5185b39a5800d31916a3087c860bd36a1fe8738764a2f261f5b9eed65b9d655',
+    [ChainId.Sui]: '0xb15f12512da8f21d853dcb549e2029f49e0a5dd0f56e88fc7b45d91d703ace0f',
+    [ChainId.Solana]: '0xc1b88839208b334cefbe141304a70fc51364069f7051a6b6b86fd0c3e9816144',
 };
-const XCORE_PACKAGE_ID = '0x0966345c144f5c8daec0560b2d8ed054ed704db5d0d75fb29801aca7ac88977d';
-const PRESIGN_CAP_TYPE = `${XCORE_PACKAGE_ID}::presign_cap::PresignCap`;
+const XCORE_PACKAGE_ID = '0x1f9ded5e071cc9cb59dc1c4a0249e5674b82af44241092a0f40fc7a9bf6ea251';
+const PRESIGN_CAP_TYPE = `${XCORE_PACKAGE_ID}::presign_cap::PresignCap<${ORIGINAL_PACKAGE_ID}::xswap::Witness>`;
 const PCR_LENGTH = 48;
 const EMPTY_PCR = new Uint8Array(PCR_LENGTH).fill(0);
 const SOLANA_WALLET_CONFIG = {
@@ -2748,11 +2750,6 @@ const WithdrawRequestProofRawSchema = z.object({
     tx_bytes: numberArray,
 });
 const PresignCapFieldsRawSchema = z.object({
-    app_type_name: z.object({
-        fields: z.object({
-            name: z.string(),
-        }),
-    }),
     wallet_key: z.string(),
     cap: z.object({
         fields: z.object({
@@ -2763,7 +2760,7 @@ const PresignCapFieldsRawSchema = z.object({
 const PresignSessionFieldsRawSchema = z.object({
     state: z.object({
         fields: z.object({
-            presign: numberArray,
+            presign: numberArray.optional(),
         }),
     }),
 });
@@ -6222,44 +6219,16 @@ const parseU256LittleEndian = (bytes) => {
     }
     return result;
 };
-/**
- * Extract the ed25519 public key from a dWallet's public_output.
- *
- * The public_output format is: [count, length, ...pubkey]
- * - Byte 0: count (typically 1)
- * - Byte 1: key length (32 for ed25519)
- * - Bytes 2-33: the 32-byte public key
- */
 const extractEd25519PublicKey = (publicOutput) => {
     const keyLength = publicOutput[1];
     invariant(keyLength === ED25519_PUBKEY_LENGTH, `Expected ed25519 key length ${ED25519_PUBKEY_LENGTH}, got ${keyLength}`);
     return publicOutput.slice(2, 2 + ED25519_PUBKEY_LENGTH);
 };
-/**
- * Extract the compressed secp256k1 public key from a dWallet's public_output.
- *
- * The public_output format is: [count, length, ...compressed_pubkey]
- * - Byte 0: count (typically 1)
- * - Byte 1: key length (33 for secp256k1 compressed)
- * - Bytes 2-34: the 33-byte compressed public key
- */
 const extractSecp256k1PublicKey = (publicOutput) => {
     const keyLength = publicOutput[1];
     invariant(keyLength === SECP256K1_COMPRESSED_PUBKEY_LENGTH, `Expected secp256k1 compressed key length ${SECP256K1_COMPRESSED_PUBKEY_LENGTH}, got ${keyLength}`);
     return publicOutput.slice(2, 2 + SECP256K1_COMPRESSED_PUBKEY_LENGTH);
 };
-/**
- * Serialize a secp256k1 signature for Sui transaction execution.
- *
- * Sui signature format: [flag byte] + [64-byte signature] + [33-byte compressed pubkey]
- * - Flag byte 0x01 indicates secp256k1
- * - Signature is 64 bytes (r || s)
- * - Public key is 33 bytes (compressed secp256k1)
- *
- * @param signature - 64-byte secp256k1 signature from IKA dWallet signing
- * @param publicKey - 33-byte compressed secp256k1 public key
- * @returns Serialized signature ready for Sui executeTransactionBlock
- */
 const serializeSuiSecp256k1Signature = (signature, publicKey) => {
     invariant(signature.length === SECP256K1_SIGNATURE_LENGTH, `Expected signature length ${SECP256K1_SIGNATURE_LENGTH}, got ${signature.length}`);
     invariant(publicKey.length === SECP256K1_COMPRESSED_PUBKEY_LENGTH, `Expected public key length ${SECP256K1_COMPRESSED_PUBKEY_LENGTH}, got ${publicKey.length}`);
@@ -6275,7 +6244,7 @@ const TxBytesKind = {
     SuiTransaction: 'sui_transaction',
 };
 
-var _XSwap_suiClient, _XSwap_packageId, _XSwap_xswapSharedObjectData, _XSwap_xcoreSharedObjectData, _XSwap_registrySharedObjectData, _XSwap_dwalletCoordinatorSharedObjectData, _XSwap_enclaveSharedObjectData;
+var _XSwap_suiClient, _XSwap_packageId, _XSwap_originalPackageId, _XSwap_xswapSharedObjectData, _XSwap_xcoreSharedObjectData, _XSwap_registrySharedObjectData, _XSwap_dwalletCoordinatorSharedObjectData, _XSwap_enclaveSharedObjectData;
 const bcsBytes = suiBcs.vector(suiBcs.u8());
 class XSwap {
     static parseTxBytes(sourceChain, txBytes) {
@@ -6336,9 +6305,10 @@ class XSwap {
     static parseWithdrawProof(raw) {
         return XSwap.parseWithdrawRequestProof(raw);
     }
-    constructor({ suiClient, packageId, xswapSharedObjectData, xcoreSharedObjectData, registrySharedObjectData, dwalletCoordinatorSharedObjectData, enclaveSharedObjectData, }) {
+    constructor({ suiClient, packageId, originalPackageId, xswapSharedObjectData, xcoreSharedObjectData, registrySharedObjectData, dwalletCoordinatorSharedObjectData, enclaveSharedObjectData, }) {
         _XSwap_suiClient.set(this, void 0);
         _XSwap_packageId.set(this, void 0);
+        _XSwap_originalPackageId.set(this, void 0);
         _XSwap_xswapSharedObjectData.set(this, void 0);
         _XSwap_xcoreSharedObjectData.set(this, void 0);
         _XSwap_registrySharedObjectData.set(this, void 0);
@@ -6346,13 +6316,13 @@ class XSwap {
         _XSwap_enclaveSharedObjectData.set(this, void 0);
         __classPrivateFieldSet(this, _XSwap_suiClient, suiClient, "f");
         __classPrivateFieldSet(this, _XSwap_packageId, packageId ?? MAINNET_PACKAGE_ID, "f");
+        __classPrivateFieldSet(this, _XSwap_originalPackageId, originalPackageId ?? ORIGINAL_PACKAGE_ID, "f");
         __classPrivateFieldSet(this, _XSwap_xswapSharedObjectData, xswapSharedObjectData, "f");
         __classPrivateFieldSet(this, _XSwap_xcoreSharedObjectData, xcoreSharedObjectData, "f");
         __classPrivateFieldSet(this, _XSwap_registrySharedObjectData, registrySharedObjectData, "f");
         __classPrivateFieldSet(this, _XSwap_dwalletCoordinatorSharedObjectData, dwalletCoordinatorSharedObjectData, "f");
         __classPrivateFieldSet(this, _XSwap_enclaveSharedObjectData, enclaveSharedObjectData, "f");
     }
-    // === Params Builders ===
     newRequestParams(tx, params) {
         return tx.moveCall({
             target: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.Structs}::${Functions.NewRequestParams}`,
@@ -6405,7 +6375,6 @@ class XSwap {
             ],
         });
     }
-    // === Transaction Builders ===
     initApp({ tx = new Transaction() } = {}) {
         tx.moveCall({
             target: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.XSwap}::${Functions.InitApp}`,
@@ -6413,7 +6382,7 @@ class XSwap {
         });
         return tx;
     }
-    newRequest({ tx = new Transaction(), params }) {
+    newRequest({ tx = new Transaction(), params, fee }) {
         const requestParams = this.newRequestParams(tx, params);
         const result = tx.moveCall({
             target: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.XSwap}::${Functions.NewRequest}`,
@@ -6424,6 +6393,7 @@ class XSwap {
                 this.immutableRegistryRef(tx),
                 this.immutableEnclaveRef(tx),
                 requestParams,
+                fee,
             ],
         });
         return { tx, result };
@@ -6448,11 +6418,11 @@ class XSwap {
             target: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.XSwap}::${Functions.SettleRequest}`,
             arguments: [
                 this.mutableXSwapRef(tx),
-                tx.object.clock(),
                 this.mutableXCoreRef(tx),
                 this.mutableDwalletCoordinatorRef(tx),
-                this.immutableRegistryRef(tx),
                 requestRef,
+                tx.object.clock(),
+                this.immutableRegistryRef(tx),
                 this.immutableEnclaveRef(tx),
                 tx.object(presignCapId),
                 settleParams,
@@ -6495,20 +6465,31 @@ class XSwap {
         });
         return { tx, result };
     }
-    mintPresign({ tx = new Transaction(), walletKey, fee }) {
-        const result = tx.moveCall({
+    mintPresign({ tx = new Transaction(), walletKey }) {
+        tx.moveCall({
             target: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.XSwap}::${Functions.MintPresign}`,
             arguments: [
                 this.mutableXSwapRef(tx),
                 this.mutableXCoreRef(tx),
                 this.mutableDwalletCoordinatorRef(tx),
-                fee,
                 tx.pure.u64(walletKey),
             ],
         });
+        return tx;
+    }
+    takePresign({ tx = new Transaction(), walletKey, fee }) {
+        const result = tx.moveCall({
+            target: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.XSwap}::${Functions.TakePresign}`,
+            arguments: [
+                this.mutableXSwapRef(tx),
+                this.mutableXCoreRef(tx),
+                this.mutableDwalletCoordinatorRef(tx),
+                tx.pure.u64(walletKey),
+                fee,
+            ],
+        });
         return { tx, result };
     }
-    // === Manager ===
     addManager({ tx = new Transaction(), manager }) {
         tx.moveCall({
             target: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.XSwap}::${Functions.AddManager}`,
@@ -6523,10 +6504,9 @@ class XSwap {
         });
         return tx;
     }
-    // === Admin ===
-    setPresignFee({ tx = new Transaction(), adminCapId, fee }) {
+    setRequestFee({ tx = new Transaction(), adminCapId, fee }) {
         tx.moveCall({
-            target: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.XSwap}::${Functions.SetPresignFee}`,
+            target: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.XSwap}::${Functions.SetRequestFee}`,
             arguments: [this.mutableXSwapRef(tx), tx.object(adminCapId), tx.pure.u64(fee)],
         });
         return tx;
@@ -6620,7 +6600,6 @@ class XSwap {
         });
         return tx;
     }
-    // === Getters ===
     async getRequest({ requestId }) {
         const [obj, dynamicFields] = await Promise.all([
             __classPrivateFieldGet(this, _XSwap_suiClient, "f").getObject({
@@ -6637,7 +6616,7 @@ class XSwap {
         return XSwap.parseRequestFields(fields, txBytes);
     }
     async resolveTxBytes(dynamicFieldsData, sourceChain) {
-        const txBytesField = dynamicFieldsData.find((field) => field.name.type === `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.XSwap}::TxBytesKey`);
+        const txBytesField = dynamicFieldsData.find((field) => field.name.type === `${__classPrivateFieldGet(this, _XSwap_originalPackageId, "f")}::${Modules.XSwap}::TxBytesKey`);
         if (!txBytesField) {
             return null;
         }
@@ -6680,13 +6659,33 @@ class XSwap {
             txBytes,
         };
     }
-    async getFirstPresign({ owner, walletKey, appTypeName, }) {
-        const caps = await this.getPresignCaps({ owner, walletKey, appTypeName });
+    async getFirstPresign({ owner, walletKey }) {
+        const caps = await this.getPresignCaps({ owner, walletKey });
         const first = caps[0];
-        invariant(first, `getFirstPresign: no PresignCap found for owner ${owner} with walletKey ${walletKey} and appTypeName ${appTypeName}`);
+        invariant(first, `getFirstPresign: no PresignCap found for owner ${owner} with walletKey ${walletKey}`);
         return first;
     }
-    async getPresignCaps({ owner, walletKey, appTypeName, }) {
+    async getPresignData({ presignCapId }) {
+        const obj = await __classPrivateFieldGet(this, _XSwap_suiClient, "f").getObject({
+            id: presignCapId,
+            options: { showContent: true },
+        });
+        invariant(obj.data?.content?.dataType === 'moveObject', `getPresignData: failed to fetch PresignCap ${presignCapId}`);
+        const fields = PresignCapFieldsRawSchema.parse(obj.data.content.fields);
+        const presignSessionId = fields.cap.fields.presign_id;
+        const sessionObj = await __classPrivateFieldGet(this, _XSwap_suiClient, "f").getObject({
+            id: presignSessionId,
+            options: { showContent: true },
+        });
+        invariant(sessionObj.data?.content?.dataType === 'moveObject', `getPresignData: failed to fetch presign session ${presignSessionId}`);
+        const sessionFields = PresignSessionFieldsRawSchema.parse(sessionObj.data.content.fields);
+        invariant(sessionFields.state.fields.presign, `getPresignData: presign session ${presignSessionId} has no presign data`);
+        return {
+            presignCapId,
+            presign: new Uint8Array(sessionFields.state.fields.presign),
+        };
+    }
+    async getPresignCaps({ owner, walletKey }) {
         const ownedObjects = await __classPrivateFieldGet(this, _XSwap_suiClient, "f").getOwnedObjects({
             owner,
             filter: { StructType: PRESIGN_CAP_TYPE },
@@ -6697,14 +6696,9 @@ class XSwap {
             invariant(obj.data?.content?.dataType === 'moveObject', `getPresignCaps: unexpected content type for ${obj.data?.objectId}`);
             const fields = PresignCapFieldsRawSchema.parse(obj.data.content.fields);
             const objWalletKey = BigInt(fields.wallet_key);
-            const objAppTypeName = fields.app_type_name.fields.name;
             if (walletKey !== undefined && objWalletKey !== walletKey) {
                 continue;
             }
-            if (appTypeName !== undefined &&
-                normalizeStructTag(objAppTypeName) !== normalizeStructTag(appTypeName)) {
-                continue;
-            }
             const presignSessionId = fields.cap.fields.presign_id;
             const sessionObj = await __classPrivateFieldGet(this, _XSwap_suiClient, "f").getObject({
                 id: presignSessionId,
@@ -6712,6 +6706,8 @@ class XSwap {
             });
             invariant(sessionObj.data?.content?.dataType === 'moveObject', `getPresignCaps: failed to fetch presign session ${presignSessionId}`);
             const sessionFields = PresignSessionFieldsRawSchema.parse(sessionObj.data.content.fields);
+            if (!sessionFields.state.fields.presign)
+                continue;
             results.push({
                 presignCapId: obj.data.objectId,
                 presign: new Uint8Array(sessionFields.state.fields.presign),
@@ -6752,24 +6748,22 @@ class XSwap {
         const [rawBytes] = result.results[0].returnValues[0];
         return suiBcs.bool().parse(new Uint8Array(rawBytes));
     }
-    // === Events ===
     getEventTypes() {
         return {
-            requestCreated: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.Structs}::RequestCreated`,
-            requestSettled: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.Structs}::RequestSettled`,
-            requestCancelled: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.Structs}::RequestCancelled`,
-            requestExpired: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.Structs}::RequestExpired`,
-            requestWithdrawn: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.Structs}::RequestWithdrawn`,
-            chainAdded: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.Structs}::ChainAdded`,
-            chainRemoved: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.Structs}::ChainRemoved`,
-            paused: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.Structs}::Paused`,
-            unpaused: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.Structs}::Unpaused`,
-            solverAdded: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.Structs}::SolverAdded`,
-            solverRemoved: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.Structs}::SolverRemoved`,
-            walletAdded: `${__classPrivateFieldGet(this, _XSwap_packageId, "f")}::${Modules.Structs}::WalletAdded`,
+            requestCreated: `${__classPrivateFieldGet(this, _XSwap_originalPackageId, "f")}::${Modules.Structs}::RequestCreated`,
+            requestSettled: `${__classPrivateFieldGet(this, _XSwap_originalPackageId, "f")}::${Modules.Structs}::RequestSettled`,
+            requestCancelled: `${__classPrivateFieldGet(this, _XSwap_originalPackageId, "f")}::${Modules.Structs}::RequestCancelled`,
+            requestExpired: `${__classPrivateFieldGet(this, _XSwap_originalPackageId, "f")}::${Modules.Structs}::RequestExpired`,
+            requestWithdrawn: `${__classPrivateFieldGet(this, _XSwap_originalPackageId, "f")}::${Modules.Structs}::RequestWithdrawn`,
+            chainAdded: `${__classPrivateFieldGet(this, _XSwap_originalPackageId, "f")}::${Modules.Structs}::ChainAdded`,
+            chainRemoved: `${__classPrivateFieldGet(this, _XSwap_originalPackageId, "f")}::${Modules.Structs}::ChainRemoved`,
+            paused: `${__classPrivateFieldGet(this, _XSwap_originalPackageId, "f")}::${Modules.Structs}::Paused`,
+            unpaused: `${__classPrivateFieldGet(this, _XSwap_originalPackageId, "f")}::${Modules.Structs}::Unpaused`,
+            solverAdded: `${__classPrivateFieldGet(this, _XSwap_originalPackageId, "f")}::${Modules.Structs}::SolverAdded`,
+            solverRemoved: `${__classPrivateFieldGet(this, _XSwap_originalPackageId, "f")}::${Modules.Structs}::SolverRemoved`,
+            walletAdded: `${__classPrivateFieldGet(this, _XSwap_originalPackageId, "f")}::${Modules.Structs}::WalletAdded`,
         };
     }
-    // === Helpers ===
     immutableXSwapRef(tx) {
         return tx.sharedObjectRef({
             objectId: __classPrivateFieldGet(this, _XSwap_xswapSharedObjectData, "f").objectId,
@@ -6837,9 +6831,19 @@ class XSwap {
         return __classPrivateFieldGet(this, _XSwap_suiClient, "f");
     }
 }
-_XSwap_suiClient = new WeakMap(), _XSwap_packageId = new WeakMap(), _XSwap_xswapSharedObjectData = new WeakMap(), _XSwap_xcoreSharedObjectData = new WeakMap(), _XSwap_registrySharedObjectData = new WeakMap(), _XSwap_dwalletCoordinatorSharedObjectData = new WeakMap(), _XSwap_enclaveSharedObjectData = new WeakMap();
+_XSwap_suiClient = new WeakMap(), _XSwap_packageId = new WeakMap(), _XSwap_originalPackageId = new WeakMap(), _XSwap_xswapSharedObjectData = new WeakMap(), _XSwap_xcoreSharedObjectData = new WeakMap(), _XSwap_registrySharedObjectData = new WeakMap(), _XSwap_dwalletCoordinatorSharedObjectData = new WeakMap(), _XSwap_enclaveSharedObjectData = new WeakMap();
 
 var _EnclaveClient_instances, _EnclaveClient_baseUrl, _EnclaveClient_apiKey, _EnclaveClient_fetchFromEnclave, _EnclaveClient_validateDigest;
+const TEXT_DECODER = new TextDecoder();
+const TEXT_ENCODER = new TextEncoder();
+const encodeTokenForEnclave = (tokenBytes, chainId) => {
+    if (chainId === ChainId.Sui) {
+        const structTag = TEXT_DECODER.decode(tokenBytes);
+        const normalized = normalizeStructTag(structTag);
+        return toHex(TEXT_ENCODER.encode(normalized)).replace(/^0x/, '');
+    }
+    return toHex(tokenBytes).replace(/^0x/, '');
+};
 class EnclaveClient {
     constructor({ baseUrl, apiKey }) {
         _EnclaveClient_instances.add(this);
@@ -6868,9 +6872,9 @@ class EnclaveClient {
             source_chain: args.sourceChain,
             destination_chain: args.destinationChain,
             destination_address: toHex(args.destinationAddress).replace(/^0x/, ''),
-            destination_token: toHex(args.destinationToken).replace(/^0x/, ''),
+            destination_token: encodeTokenForEnclave(args.destinationToken, args.destinationChain),
             solver_recipient: args.solverRecipient.replace(/^0x/, ''),
-            source_token: toHex(args.sourceToken),
+            source_token: encodeTokenForEnclave(args.sourceToken, args.sourceChain),
             source_amount: args.sourceAmount.toString(),
             nonce_account: nonceAccount,
             sui_gas_price_multiplier: suiGasPriceMultiplier,
@@ -6883,7 +6887,7 @@ class EnclaveClient {
         const raw = await __classPrivateFieldGet(this, _EnclaveClient_instances, "m", _EnclaveClient_fetchFromEnclave).call(this, '/withdraw_request', {
             chain_id: args.chainId,
             user: toHex(args.user).replace(/^0x/, ''),
-            token: toHex(args.token).replace(/^0x/, ''),
+            token: encodeTokenForEnclave(args.token, args.chainId),
             amount: args.amount.toString(),
             recipient: toHex(args.recipient).replace(/^0x/, ''),
             nonce_account: nonceAccount,
@@ -6928,5 +6932,5 @@ _EnclaveClient_baseUrl = new WeakMap(), _EnclaveClient_apiKey = new WeakMap(), _
     }
 };
 
-export { ADMIN_CAP_OBJECT_ID, ChainId, DWALLET_COORDINATOR_INITIAL_SHARED_VERSION, DWALLET_COORDINATOR_OBJECT_ID, DWALLET_COORDINATOR_SHARED_OBJECT_DATA, DWalletAddress, DWalletId, EMPTY_PCR, ENCLAVE_CAP_OBJECT_ID, ENCLAVE_INITIAL_SHARED_VERSION, ENCLAVE_OBJECT_ID, ENCLAVE_SHARED_OBJECT_DATA, EnclaveClient, Functions, Intent$1 as Intent, MAINNET_PACKAGE_ID, Modules, PCR_LENGTH, PRESIGN_CAP_TYPE, RequestStatus, SOLANA_WALLET_CONFIG, SUI_WALLET_CONFIG, TxBytesKind, UPGRADE_CAP_OBJECT_ID, WITNESS_TYPE, WalletKey, XCORE_PACKAGE_ID, XCoreWalletId, XSWAP_INITIAL_SHARED_VERSION, XSWAP_OBJECT_ID, XSWAP_SHARED_OBJECT_DATA, XSWAP_TYPE, XSwap, extractEd25519PublicKey, extractSecp256k1PublicKey, parseU256LittleEndian, serializeSuiSecp256k1Signature };
+export { ADMIN_CAP_OBJECT_ID, ChainId, DWALLET_COORDINATOR_INITIAL_SHARED_VERSION, DWALLET_COORDINATOR_OBJECT_ID, DWALLET_COORDINATOR_SHARED_OBJECT_DATA, DWalletAddress, DWalletId, EMPTY_PCR, ENCLAVE_CAP_OBJECT_ID, ENCLAVE_INITIAL_SHARED_VERSION, ENCLAVE_OBJECT_ID, ENCLAVE_SHARED_OBJECT_DATA, EnclaveClient, Functions, Intent$1 as Intent, MAINNET_PACKAGE_ID, Modules, ORIGINAL_PACKAGE_ID, PCR_LENGTH, PRESIGN_CAP_TYPE, RequestStatus, SOLANA_WALLET_CONFIG, SUI_WALLET_CONFIG, TxBytesKind, UPGRADE_CAP_OBJECT_ID, WITNESS_TYPE, WalletKey, XCORE_PACKAGE_ID, XCoreWalletId, XSWAP_INITIAL_SHARED_VERSION, XSWAP_OBJECT_ID, XSWAP_SHARED_OBJECT_DATA, XSWAP_TYPE, XSwap, extractEd25519PublicKey, extractSecp256k1PublicKey, parseU256LittleEndian, serializeSuiSecp256k1Signature };
 //# sourceMappingURL=index.mjs.map