@gala-chain/gswap-sdk 0.0.6 → 0.0.7

package/dist/index.d.cts

@@ -195,7 +195,11 @@ declare class PendingTransaction {
     readonly message: string;
     readonly error: boolean;
     private readonly waitDelegate;
-    constructor(transactionId: string, message: string, error: boolean, waitDelegate: () => Promise<void>);
+    constructor(transactionId: string, message: string, error: boolean, waitDelegate: () => Promise<{
+        txId: string;
+        transactionHash: string;
+        Data: Record<string, unknown>;
+    }>);
     /**
      * Waits for the transaction to be confirmed.
      * This should be called immediately after receiving the PendingTransaction
@@ -204,7 +208,11 @@ declare class PendingTransaction {
      *
      * @returns A promise that resolves when the transaction is confirmed.
      */
-    wait(): Promise<void>;
+    wait(): Promise<{
+        txId: string;
+        transactionHash: string;
+        Data: Record<string, unknown>;
+    }>;
 }
 
 /**
@@ -251,11 +259,24 @@ declare class Bundler {
     hasSigner(): boolean;
 }
 
-interface BundlerResponse {
-    status: 'PROCESSED' | 'FAILED' | 'PENDING';
-    data?: string;
-    error?: string;
-}
+type BundlerResponse = {
+    status: 'FAILED';
+    transactionHash: string;
+    data: {
+        ErrorCode: number;
+        ErrorKey: string;
+        ErrorPayload: Record<string, unknown>;
+        Message: string;
+        transactionId: string;
+    };
+} | {
+    status: 'PROCESSED';
+    transactionHash: string;
+    data: {
+        Data: Record<string, unknown>;
+        transactionId: string;
+    };
+};
 interface BundlerRequest {
     data: string;
     message: string;
@@ -318,7 +339,11 @@ declare class Events {
      * @param txId - The transaction ID to wait for.
      * @returns Promise that resolves when the transaction completes.
      */
-    wait(txId: string): Promise<void>;
+    wait(txId: string): Promise<{
+        txId: string;
+        transactionHash: string;
+        Data: Record<string, unknown>;
+    }>;
     /**
      * Internal handler for socket messages.
      * @param response - The bundler response.

package/dist/index.d.ts

@@ -195,7 +195,11 @@ declare class PendingTransaction {
     readonly message: string;
     readonly error: boolean;
     private readonly waitDelegate;
-    constructor(transactionId: string, message: string, error: boolean, waitDelegate: () => Promise<void>);
+    constructor(transactionId: string, message: string, error: boolean, waitDelegate: () => Promise<{
+        txId: string;
+        transactionHash: string;
+        Data: Record<string, unknown>;
+    }>);
     /**
      * Waits for the transaction to be confirmed.
      * This should be called immediately after receiving the PendingTransaction
@@ -204,7 +208,11 @@ declare class PendingTransaction {
      *
      * @returns A promise that resolves when the transaction is confirmed.
      */
-    wait(): Promise<void>;
+    wait(): Promise<{
+        txId: string;
+        transactionHash: string;
+        Data: Record<string, unknown>;
+    }>;
 }
 
 /**
@@ -251,11 +259,24 @@ declare class Bundler {
     hasSigner(): boolean;
 }
 
-interface BundlerResponse {
-    status: 'PROCESSED' | 'FAILED' | 'PENDING';
-    data?: string;
-    error?: string;
-}
+type BundlerResponse = {
+    status: 'FAILED';
+    transactionHash: string;
+    data: {
+        ErrorCode: number;
+        ErrorKey: string;
+        ErrorPayload: Record<string, unknown>;
+        Message: string;
+        transactionId: string;
+    };
+} | {
+    status: 'PROCESSED';
+    transactionHash: string;
+    data: {
+        Data: Record<string, unknown>;
+        transactionId: string;
+    };
+};
 interface BundlerRequest {
     data: string;
     message: string;
@@ -318,7 +339,11 @@ declare class Events {
      * @param txId - The transaction ID to wait for.
      * @returns Promise that resolves when the transaction completes.
      */
-    wait(txId: string): Promise<void>;
+    wait(txId: string): Promise<{
+        txId: string;
+        transactionHash: string;
+        Data: Record<string, unknown>;
+    }>;
     /**
      * Internal handler for socket messages.
      * @param response - The bundler response.

package/dist/index.mjs

@@ -57,9 +57,12 @@ var GSwapSDKError = class _GSwapSDKError extends Error {
     });
   }
   static transactionWaitFailedError(txId, detail) {
+    const transactionHash = "transactionId" in detail && typeof detail.transactionId === "string" ? detail.transactionId : void 0;
+    const { transactionId, ...rest } = detail;
     return new _GSwapSDKError("Transaction wait failed.", "TRANSACTION_WAIT_FAILED", {
       txId,
-      ...detail
+      transactionHash,
+      ...rest
     });
   }
   static socketConnectionRequiredError() {
@@ -321,9 +324,13 @@ var EventSocketClient = class extends TradeEventEmitter {
         this.emit("disconnect", reason);
       });
       this.socket.onAny((eventName, ...args) => {
+        var _a2;
         if (typeof eventName === "string") {
           const [responseData] = args;
-          this.emit("transaction", eventName, responseData);
+          this.emit("transaction", eventName, {
+            ...responseData,
+            transactionHash: (_a2 = responseData.data) == null ? void 0 : _a2.transactionId
+          });
         }
       });
     });
@@ -381,7 +388,7 @@ var TransactionWaiter = class {
         if (promiseInfo.waited) {
           promiseInfo.reject(GSwapSDKError.transactionWaitTimeoutError(txId));
         } else {
-          promiseInfo.resolve();
+          promiseInfo.resolve({ txId, transactionHash: txId, Data: {} });
         }
         this.promiseInfoForTxId.delete(txId);
       }
@@ -408,13 +415,17 @@ var TransactionWaiter = class {
     promise.waited = true;
     return promise.promise;
   }
-  notifySuccess(txId) {
+  notifySuccess(txId, data) {
     const promiseInfo = this.promiseInfoForTxId.get(txId);
     if (!promiseInfo) {
       return;
     }
     clearTimeout(promiseInfo.timeoutId);
-    promiseInfo.resolve();
+    promiseInfo.resolve({
+      txId,
+      transactionHash: data.transactionId,
+      Data: data.Data
+    });
     this.promiseInfoForTxId.delete(txId);
   }
   notifyFailure(txId, detail) {
@@ -426,7 +437,7 @@ var TransactionWaiter = class {
     if (promiseInfo.waited) {
       promiseInfo.reject(GSwapSDKError.transactionWaitFailedError(txId, detail));
     } else {
-      promiseInfo.resolve();
+      promiseInfo.resolve({ txId, transactionHash: txId, Data: {} });
     }
     this.promiseInfoForTxId.delete(txId);
   }
@@ -459,7 +470,7 @@ var Events = class _Events {
     if ((_a = this.globalSocketClient) == null ? void 0 : _a.isConnected()) {
       return this.globalSocketClient;
     }
-    const url = bundlerBaseUrl ?? "https://bundle-backend-test1.defi.gala.com";
+    const url = bundlerBaseUrl ?? "https://bundle-backend-prod1.defi.gala.com";
     this.connectionPromise = (async () => {
       const client = new _Events.tradeEventEmitterConstructor(url);
       await client.connect();
@@ -510,7 +521,7 @@ var Events = class _Events {
     if (!this.eventSocketConnected()) {
       throw GSwapSDKError.socketConnectionRequiredError();
     }
-    await this.globalWaitHelper.wait(txId);
+    return this.globalWaitHelper.wait(txId);
   }
   /**
    * Internal handler for socket messages.
@@ -519,14 +530,9 @@ var Events = class _Events {
    */
   internalHandleSocketMessage(txId, response) {
     if (response.status === "PROCESSED") {
-      this.globalWaitHelper.notifySuccess(txId);
+      this.globalWaitHelper.notifySuccess(txId, response.data);
     } else if (response.status === "FAILED") {
-      this.globalWaitHelper.notifyFailure(txId, {
-        error: response.error,
-        status: response.status,
-        data: response.data
-      });
-    } else if (response.status === "PENDING") {
+      this.globalWaitHelper.notifyFailure(txId, response.data);
     } else {
       debugLog(`Unknown response status for transaction ${txId}:`, response.status);
     }