@movebridge/core 0.2.0 → 0.2.1

package/dist/index.d.mts

@@ -288,6 +288,9 @@ declare class TransactionBuilder {
      * @returns Transaction hash
      * @throws MovementError with code WALLET_NOT_CONNECTED if no wallet connected
      * @throws MovementError with code TRANSACTION_FAILED if submission fails
+     *
+     * Note: Transaction failures do NOT affect wallet connection state.
+     * The wallet remains connected even if a transaction fails.
      */
     signAndSubmit(payload: TransactionPayload): Promise<string>;
     /**
@@ -489,6 +492,17 @@ declare class EventListener {
      * ```
      */
     subscribe(subscription: EventSubscriptionConfig | LegacyEventSubscription): string;
+    /**
+     * Parses a legacy event handle into account address and event type
+     * @internal
+     */
+    private parseEventHandle;
+    /**
+     * Validates event type format
+     * Expected format: address::module::EventType
+     * @internal
+     */
+    private isValidEventType;
     /**
      * Unsubscribes from events
      * @param subscriptionId - Subscription ID to remove
@@ -514,6 +528,48 @@ declare class EventListener {
      * @internal
      */
     private pollEvents;
+    /**
+     * Fetches events from the blockchain
+     * Handles different API response formats and fallback methods
+     * @internal
+     */
+    private fetchEvents;
+    /**
+     * Fetches events using the event handle API
+     * @internal
+     */
+    private fetchEventsViaEventHandle;
+    /**
+     * Fetches events by checking account resources
+     * This is a fallback method when indexer is not available
+     * @internal
+     */
+    private fetchEventsViaResources;
+    /**
+     * Gets the fullnode URL from the Aptos client config
+     * @internal
+     */
+    private getFullnodeUrl;
+    /**
+     * Sorts events by sequence number in ascending order
+     * @internal
+     */
+    private sortEventsBySequence;
+    /**
+     * Parses sequence number from various formats
+     * @internal
+     */
+    private parseSequenceNumber;
+    /**
+     * Normalizes event data to a consistent format
+     * @internal
+     */
+    private normalizeEventData;
+    /**
+     * Safely invokes a callback without letting errors propagate
+     * @internal
+     */
+    private safeInvokeCallback;
 }
 
 /**

package/dist/index.d.ts

@@ -288,6 +288,9 @@ declare class TransactionBuilder {
      * @returns Transaction hash
      * @throws MovementError with code WALLET_NOT_CONNECTED if no wallet connected
      * @throws MovementError with code TRANSACTION_FAILED if submission fails
+     *
+     * Note: Transaction failures do NOT affect wallet connection state.
+     * The wallet remains connected even if a transaction fails.
      */
     signAndSubmit(payload: TransactionPayload): Promise<string>;
     /**
@@ -489,6 +492,17 @@ declare class EventListener {
      * ```
      */
     subscribe(subscription: EventSubscriptionConfig | LegacyEventSubscription): string;
+    /**
+     * Parses a legacy event handle into account address and event type
+     * @internal
+     */
+    private parseEventHandle;
+    /**
+     * Validates event type format
+     * Expected format: address::module::EventType
+     * @internal
+     */
+    private isValidEventType;
     /**
      * Unsubscribes from events
      * @param subscriptionId - Subscription ID to remove
@@ -514,6 +528,48 @@ declare class EventListener {
      * @internal
      */
     private pollEvents;
+    /**
+     * Fetches events from the blockchain
+     * Handles different API response formats and fallback methods
+     * @internal
+     */
+    private fetchEvents;
+    /**
+     * Fetches events using the event handle API
+     * @internal
+     */
+    private fetchEventsViaEventHandle;
+    /**
+     * Fetches events by checking account resources
+     * This is a fallback method when indexer is not available
+     * @internal
+     */
+    private fetchEventsViaResources;
+    /**
+     * Gets the fullnode URL from the Aptos client config
+     * @internal
+     */
+    private getFullnodeUrl;
+    /**
+     * Sorts events by sequence number in ascending order
+     * @internal
+     */
+    private sortEventsBySequence;
+    /**
+     * Parses sequence number from various formats
+     * @internal
+     */
+    private parseSequenceNumber;
+    /**
+     * Normalizes event data to a consistent format
+     * @internal
+     */
+    private normalizeEventData;
+    /**
+     * Safely invokes a callback without letting errors propagate
+     * @internal
+     */
+    private safeInvokeCallback;
 }
 
 /**

package/dist/index.js

@@ -63,7 +63,7 @@ var NETWORK_CONFIG = {
   testnet: {
     chainId: 250,
     rpcUrl: "https://testnet.movementnetwork.xyz/v1",
-    indexerUrl: null,
+    indexerUrl: "https://hasura.testnet.movementnetwork.xyz/v1/graphql",
     explorerUrl: "https://explorer.movementnetwork.xyz/?network=bardock+testnet",
     faucetUrl: "https://faucet.testnet.movementnetwork.xyz/"
   }
@@ -281,20 +281,54 @@ var SUPPORTED_WALLETS = {
 };
 var STORAGE_KEY = "movebridge:lastWallet";
 function normalizeHash(data) {
+  if (data === null || data === void 0) {
+    throw new Error("Invalid hash: received null or undefined");
+  }
   if (typeof data === "string") {
-    return data.startsWith("0x") ? data : `0x${data}`;
+    const trimmed = data.trim();
+    if (!trimmed) {
+      throw new Error("Invalid hash: received empty string");
+    }
+    return trimmed.startsWith("0x") ? trimmed : `0x${trimmed}`;
   }
   if (data instanceof Uint8Array) {
+    if (data.length === 0) {
+      throw new Error("Invalid hash: received empty Uint8Array");
+    }
     return "0x" + Array.from(data).map((b) => b.toString(16).padStart(2, "0")).join("");
   }
-  if (data && typeof data === "object" && "hash" in data) {
-    return normalizeHash(data.hash);
+  if (data instanceof ArrayBuffer) {
+    const arr = new Uint8Array(data);
+    if (arr.length === 0) {
+      throw new Error("Invalid hash: received empty ArrayBuffer");
+    }
+    return "0x" + Array.from(arr).map((b) => b.toString(16).padStart(2, "0")).join("");
   }
-  if (data && typeof data.toString === "function") {
-    const str = data.toString();
-    return str.startsWith("0x") ? str : `0x${str}`;
+  if (data && typeof data === "object") {
+    if ("hash" in data) {
+      return normalizeHash(data.hash);
+    }
+    if ("txnHash" in data) {
+      return normalizeHash(data.txnHash);
+    }
+    if ("transactionHash" in data) {
+      return normalizeHash(data.transactionHash);
+    }
+    if ("output" in data) {
+      return normalizeHash(data.output);
+    }
+    if (typeof data.toString === "function") {
+      const str = data.toString();
+      if (str !== "[object Object]") {
+        return str.startsWith("0x") ? str : `0x${str}`;
+      }
+    }
   }
-  return String(data);
+  const strValue = String(data);
+  if (strValue === "[object Object]" || !strValue) {
+    throw new Error("Invalid hash: could not extract hash from response");
+  }
+  return strValue.startsWith("0x") ? strValue : `0x${strValue}`;
 }
 function toHexString(data) {
   if (typeof data === "string") return data;
@@ -310,13 +344,32 @@ function extractUserResponse(response) {
   if (!response) {
     throw new Error("Empty response from wallet");
   }
+  if (typeof response === "string" || typeof response === "number") {
+    return response;
+  }
+  if (response instanceof Uint8Array) {
+    return response;
+  }
   const resp = response;
-  if (resp.status === "rejected") {
+  if (resp.status === "rejected" || resp.status === "Rejected") {
     throw new Error("User rejected the request");
   }
+  if (resp.status === "error" || resp.error) {
+    const errorMsg = resp.error || resp.message || "Transaction failed";
+    throw new Error(String(errorMsg));
+  }
   if (resp.args !== void 0) {
     return resp.args;
   }
+  if (resp.status === "approved" && resp.output !== void 0) {
+    return resp.output;
+  }
+  if (resp.result !== void 0) {
+    return resp.result;
+  }
+  if (resp.data !== void 0) {
+    return resp.data;
+  }
   return response;
 }
 function createStandardAdapter(wallet) {
@@ -350,15 +403,67 @@ function createStandardAdapter(wallet) {
       if (!signTxFeature) {
         throw new Error("Wallet does not support signAndSubmitTransaction");
       }
-      const response = await signTxFeature.signAndSubmitTransaction(payload);
-      const result = extractUserResponse(response);
-      let hash;
-      if (result && typeof result === "object" && "hash" in result) {
-        hash = normalizeHash(result.hash);
+      const walletName = wallet.name.toLowerCase();
+      const isOKX = walletName.includes("okx");
+      let txPayload;
+      if (isOKX) {
+        txPayload = {
+          type: "entry_function_payload",
+          function: payload.payload.function,
+          type_arguments: payload.payload.typeArguments,
+          arguments: payload.payload.functionArguments
+        };
       } else {
-        hash = normalizeHash(result);
+        txPayload = payload;
+      }
+      let response;
+      try {
+        response = await signTxFeature.signAndSubmitTransaction(txPayload);
+      } catch (firstError) {
+        if (isOKX) {
+          try {
+            response = await signTxFeature.signAndSubmitTransaction(payload);
+          } catch {
+            throw firstError;
+          }
+        } else {
+          try {
+            const legacyPayload = {
+              type: "entry_function_payload",
+              function: payload.payload.function,
+              type_arguments: payload.payload.typeArguments,
+              arguments: payload.payload.functionArguments
+            };
+            response = await signTxFeature.signAndSubmitTransaction(legacyPayload);
+          } catch {
+            throw firstError;
+          }
+        }
+      }
+      const result = extractUserResponse(response);
+      try {
+        if (typeof result === "string") {
+          return { hash: normalizeHash(result) };
+        }
+        if (result && typeof result === "object") {
+          const hashObj = result;
+          if (hashObj.hash !== void 0) {
+            return { hash: normalizeHash(hashObj.hash) };
+          }
+          if (hashObj.txnHash !== void 0) {
+            return { hash: normalizeHash(hashObj.txnHash) };
+          }
+          if (hashObj.transactionHash !== void 0) {
+            return { hash: normalizeHash(hashObj.transactionHash) };
+          }
+          return { hash: normalizeHash(result) };
+        }
+        return { hash: normalizeHash(result) };
+      } catch (error) {
+        throw new Error(
+          `Failed to extract transaction hash from wallet response: ${error instanceof Error ? error.message : "Unknown error"}`
+        );
       }
-      return { hash };
     },
     async signTransaction(payload) {
       if (!signOnlyFeature) {
@@ -633,11 +738,14 @@ var TransactionBuilder = class {
    * @returns Transaction hash
    * @throws MovementError with code WALLET_NOT_CONNECTED if no wallet connected
    * @throws MovementError with code TRANSACTION_FAILED if submission fails
+   * 
+   * Note: Transaction failures do NOT affect wallet connection state.
+   * The wallet remains connected even if a transaction fails.
    */
   async signAndSubmit(payload) {
     const adapter = this.walletManager.getAdapter();
-    const state = this.walletManager.getState();
-    if (!adapter || !state.connected) {
+    const stateBefore = this.walletManager.getState();
+    if (!adapter || !stateBefore.connected) {
       throw Errors.walletNotConnected();
     }
     try {
@@ -650,7 +758,13 @@ var TransactionBuilder = class {
       });
       return result.hash;
     } catch (error) {
-      throw wrapError(error, "TRANSACTION_FAILED", "Failed to sign and submit transaction");
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      const isUserRejection = errorMessage.toLowerCase().includes("rejected") || errorMessage.toLowerCase().includes("cancelled") || errorMessage.toLowerCase().includes("canceled") || errorMessage.toLowerCase().includes("denied");
+      throw wrapError(
+        error,
+        "TRANSACTION_FAILED",
+        isUserRejection ? "Transaction was rejected by user" : "Failed to sign and submit transaction"
+      );
     }
   }
   /**
@@ -876,13 +990,15 @@ var EventListener = class {
       accountAddress = subscription.accountAddress;
       eventType = subscription.eventType;
     } else {
-      const parts = subscription.eventHandle.split("::");
-      if (parts.length >= 3 && parts[0]) {
-        accountAddress = parts[0];
-        eventType = subscription.eventHandle;
-      } else {
-        accountAddress = subscription.eventHandle;
-        eventType = subscription.eventHandle;
+      const parsed = this.parseEventHandle(subscription.eventHandle);
+      accountAddress = parsed.accountAddress;
+      eventType = parsed.eventType;
+    }
+    if (!this.isValidEventType(eventType)) {
+      if (process.env.NODE_ENV === "development") {
+        console.warn(
+          `[EventListener] Event type "${eventType}" may not be in the expected format (address::module::EventType). Subscription will proceed but may not receive events.`
+        );
       }
     }
     const internalSub = {
@@ -902,6 +1018,41 @@ var EventListener = class {
     });
     return subscriptionId;
   }
+  /**
+   * Parses a legacy event handle into account address and event type
+   * @internal
+   */
+  parseEventHandle(eventHandle) {
+    const parts = eventHandle.split("::");
+    if (parts.length >= 3 && parts[0]) {
+      return {
+        accountAddress: parts[0],
+        eventType: eventHandle
+      };
+    }
+    return {
+      accountAddress: eventHandle,
+      eventType: eventHandle
+    };
+  }
+  /**
+   * Validates event type format
+   * Expected format: address::module::EventType
+   * @internal
+   */
+  isValidEventType(eventType) {
+    const parts = eventType.split("::");
+    if (parts.length < 3) {
+      return false;
+    }
+    const address = parts[0];
+    if (!address || !address.startsWith("0x")) {
+      return false;
+    }
+    const module2 = parts[1];
+    const eventName = parts.slice(2).join("::");
+    return Boolean(module2 && eventName);
+  }
   /**
    * Unsubscribes from events
    * @param subscriptionId - Subscription ID to remove
@@ -948,36 +1099,200 @@ var EventListener = class {
     if (!subscription) {
       return;
     }
+    try {
+      const events = await this.fetchEvents(
+        subscription.accountAddress,
+        subscription.eventType
+      );
+      const sortedEvents = this.sortEventsBySequence(events);
+      for (const event of sortedEvents) {
+        const sequenceNumber = this.parseSequenceNumber(event.sequence_number);
+        if (sequenceNumber > subscription.lastSequenceNumber) {
+          const contractEvent = {
+            type: event.type || subscription.eventType,
+            sequenceNumber: String(event.sequence_number),
+            data: this.normalizeEventData(event.data)
+          };
+          this.safeInvokeCallback(subscription.callback, contractEvent);
+          subscription.lastSequenceNumber = sequenceNumber;
+        }
+      }
+    } catch (error) {
+      if (process.env.NODE_ENV === "development") {
+        console.warn(`[EventListener] Polling error for ${subscriptionId}:`, error);
+      }
+    }
+  }
+  /**
+   * Fetches events from the blockchain
+   * Handles different API response formats and fallback methods
+   * @internal
+   */
+  async fetchEvents(accountAddress, eventType) {
     try {
       const events = await this.aptosClient.getAccountEventsByEventType({
-        accountAddress: subscription.accountAddress,
-        eventType: subscription.eventType,
+        accountAddress,
+        eventType,
         options: {
           limit: 25,
           orderBy: [{ sequence_number: "desc" }]
         }
       });
-      const sortedEvents = [...events].sort((a, b) => {
-        const seqA = BigInt(a.sequence_number);
-        const seqB = BigInt(b.sequence_number);
-        return seqA < seqB ? -1 : seqA > seqB ? 1 : 0;
-      });
-      for (const event of sortedEvents) {
-        const sequenceNumber = BigInt(event.sequence_number);
-        if (sequenceNumber > subscription.lastSequenceNumber) {
-          const contractEvent = {
-            type: event.type,
-            sequenceNumber: String(event.sequence_number),
-            data: event.data
-          };
-          try {
-            subscription.callback(contractEvent);
-          } catch {
+      return events.map((e) => ({
+        type: e.type,
+        sequence_number: e.sequence_number,
+        data: e.data
+      }));
+    } catch (indexerError) {
+      try {
+        const events = await this.fetchEventsViaEventHandle(accountAddress, eventType);
+        return events;
+      } catch (handleError) {
+        try {
+          const events = await this.fetchEventsViaResources(accountAddress, eventType);
+          return events;
+        } catch (resourceError) {
+          if (process.env.NODE_ENV === "development") {
+            console.warn(
+              `[EventListener] Failed to fetch events for ${eventType}:`,
+              { indexerError, handleError, resourceError }
+            );
           }
-          subscription.lastSequenceNumber = sequenceNumber;
+          return [];
         }
       }
+    }
+  }
+  /**
+   * Fetches events using the event handle API
+   * @internal
+   */
+  async fetchEventsViaEventHandle(accountAddress, eventType) {
+    const parts = eventType.split("::");
+    if (parts.length < 3) {
+      throw new Error("Invalid event type format");
+    }
+    const structName = parts.slice(2).join("::");
+    const eventHandleMappings = {
+      "DepositEvent": { resource: "0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>", field: "deposit_events" },
+      "WithdrawEvent": { resource: "0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>", field: "withdraw_events" }
+    };
+    const mapping = eventHandleMappings[structName];
+    if (!mapping) {
+      throw new Error(`Unknown event type: ${structName}`);
+    }
+    const events = await this.aptosClient.getEventsByEventHandle({
+      accountAddress,
+      eventHandleStruct: mapping.resource,
+      fieldName: mapping.field,
+      options: { limit: 25 }
+    });
+    return events.map((e) => ({
+      type: e.type || eventType,
+      sequence_number: e.sequence_number,
+      data: e.data
+    }));
+  }
+  /**
+   * Fetches events by checking account resources
+   * This is a fallback method when indexer is not available
+   * @internal
+   */
+  async fetchEventsViaResources(accountAddress, eventType) {
+    const resources = await this.aptosClient.getAccountResources({
+      accountAddress
+    });
+    const coinStore = resources.find(
+      (r) => r.type === "0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>"
+    );
+    if (!coinStore) {
+      return [];
+    }
+    const data = coinStore.data;
+    const isDeposit = eventType.includes("Deposit");
+    const eventHandle = isDeposit ? data.deposit_events : data.withdraw_events;
+    if (!eventHandle) {
+      return [];
+    }
+    try {
+      const creationNum = eventHandle.guid.id.creation_num;
+      const addr = eventHandle.guid.id.addr;
+      const response = await fetch(
+        `${this.getFullnodeUrl()}/accounts/${accountAddress}/events/${addr}/${creationNum}?limit=25`
+      );
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}`);
+      }
+      const events = await response.json();
+      return events.map((e) => ({
+        type: e.type || eventType,
+        sequence_number: e.sequence_number,
+        data: e.data
+      }));
     } catch {
+      return [];
+    }
+  }
+  /**
+   * Gets the fullnode URL from the Aptos client config
+   * @internal
+   */
+  getFullnodeUrl() {
+    const config = this.aptosClient.config;
+    return config?.fullnode || "https://testnet.movementnetwork.xyz/v1";
+  }
+  /**
+   * Sorts events by sequence number in ascending order
+   * @internal
+   */
+  sortEventsBySequence(events) {
+    return [...events].sort((a, b) => {
+      const seqA = this.parseSequenceNumber(a.sequence_number);
+      const seqB = this.parseSequenceNumber(b.sequence_number);
+      return seqA < seqB ? -1 : seqA > seqB ? 1 : 0;
+    });
+  }
+  /**
+   * Parses sequence number from various formats
+   * @internal
+   */
+  parseSequenceNumber(value) {
+    if (typeof value === "bigint") {
+      return value;
+    }
+    if (typeof value === "number") {
+      return BigInt(value);
+    }
+    try {
+      return BigInt(value);
+    } catch {
+      return BigInt(0);
+    }
+  }
+  /**
+   * Normalizes event data to a consistent format
+   * @internal
+   */
+  normalizeEventData(data) {
+    if (data === null || data === void 0) {
+      return {};
+    }
+    if (typeof data === "object") {
+      return data;
+    }
+    return { value: data };
+  }
+  /**
+   * Safely invokes a callback without letting errors propagate
+   * @internal
+   */
+  safeInvokeCallback(callback, event) {
+    try {
+      callback(event);
+    } catch (error) {
+      if (process.env.NODE_ENV === "development") {
+        console.warn("[EventListener] Callback error:", error);
+      }
     }
   }
 };

package/dist/index.mjs

@@ -12,7 +12,7 @@ var NETWORK_CONFIG = {
   testnet: {
     chainId: 250,
     rpcUrl: "https://testnet.movementnetwork.xyz/v1",
-    indexerUrl: null,
+    indexerUrl: "https://hasura.testnet.movementnetwork.xyz/v1/graphql",
     explorerUrl: "https://explorer.movementnetwork.xyz/?network=bardock+testnet",
     faucetUrl: "https://faucet.testnet.movementnetwork.xyz/"
   }
@@ -230,20 +230,54 @@ var SUPPORTED_WALLETS = {
 };
 var STORAGE_KEY = "movebridge:lastWallet";
 function normalizeHash(data) {
+  if (data === null || data === void 0) {
+    throw new Error("Invalid hash: received null or undefined");
+  }
   if (typeof data === "string") {
-    return data.startsWith("0x") ? data : `0x${data}`;
+    const trimmed = data.trim();
+    if (!trimmed) {
+      throw new Error("Invalid hash: received empty string");
+    }
+    return trimmed.startsWith("0x") ? trimmed : `0x${trimmed}`;
   }
   if (data instanceof Uint8Array) {
+    if (data.length === 0) {
+      throw new Error("Invalid hash: received empty Uint8Array");
+    }
     return "0x" + Array.from(data).map((b) => b.toString(16).padStart(2, "0")).join("");
   }
-  if (data && typeof data === "object" && "hash" in data) {
-    return normalizeHash(data.hash);
+  if (data instanceof ArrayBuffer) {
+    const arr = new Uint8Array(data);
+    if (arr.length === 0) {
+      throw new Error("Invalid hash: received empty ArrayBuffer");
+    }
+    return "0x" + Array.from(arr).map((b) => b.toString(16).padStart(2, "0")).join("");
   }
-  if (data && typeof data.toString === "function") {
-    const str = data.toString();
-    return str.startsWith("0x") ? str : `0x${str}`;
+  if (data && typeof data === "object") {
+    if ("hash" in data) {
+      return normalizeHash(data.hash);
+    }
+    if ("txnHash" in data) {
+      return normalizeHash(data.txnHash);
+    }
+    if ("transactionHash" in data) {
+      return normalizeHash(data.transactionHash);
+    }
+    if ("output" in data) {
+      return normalizeHash(data.output);
+    }
+    if (typeof data.toString === "function") {
+      const str = data.toString();
+      if (str !== "[object Object]") {
+        return str.startsWith("0x") ? str : `0x${str}`;
+      }
+    }
   }
-  return String(data);
+  const strValue = String(data);
+  if (strValue === "[object Object]" || !strValue) {
+    throw new Error("Invalid hash: could not extract hash from response");
+  }
+  return strValue.startsWith("0x") ? strValue : `0x${strValue}`;
 }
 function toHexString(data) {
   if (typeof data === "string") return data;
@@ -259,13 +293,32 @@ function extractUserResponse(response) {
   if (!response) {
     throw new Error("Empty response from wallet");
   }
+  if (typeof response === "string" || typeof response === "number") {
+    return response;
+  }
+  if (response instanceof Uint8Array) {
+    return response;
+  }
   const resp = response;
-  if (resp.status === "rejected") {
+  if (resp.status === "rejected" || resp.status === "Rejected") {
     throw new Error("User rejected the request");
   }
+  if (resp.status === "error" || resp.error) {
+    const errorMsg = resp.error || resp.message || "Transaction failed";
+    throw new Error(String(errorMsg));
+  }
   if (resp.args !== void 0) {
     return resp.args;
   }
+  if (resp.status === "approved" && resp.output !== void 0) {
+    return resp.output;
+  }
+  if (resp.result !== void 0) {
+    return resp.result;
+  }
+  if (resp.data !== void 0) {
+    return resp.data;
+  }
   return response;
 }
 function createStandardAdapter(wallet) {
@@ -299,15 +352,67 @@ function createStandardAdapter(wallet) {
       if (!signTxFeature) {
         throw new Error("Wallet does not support signAndSubmitTransaction");
       }
-      const response = await signTxFeature.signAndSubmitTransaction(payload);
-      const result = extractUserResponse(response);
-      let hash;
-      if (result && typeof result === "object" && "hash" in result) {
-        hash = normalizeHash(result.hash);
+      const walletName = wallet.name.toLowerCase();
+      const isOKX = walletName.includes("okx");
+      let txPayload;
+      if (isOKX) {
+        txPayload = {
+          type: "entry_function_payload",
+          function: payload.payload.function,
+          type_arguments: payload.payload.typeArguments,
+          arguments: payload.payload.functionArguments
+        };
       } else {
-        hash = normalizeHash(result);
+        txPayload = payload;
+      }
+      let response;
+      try {
+        response = await signTxFeature.signAndSubmitTransaction(txPayload);
+      } catch (firstError) {
+        if (isOKX) {
+          try {
+            response = await signTxFeature.signAndSubmitTransaction(payload);
+          } catch {
+            throw firstError;
+          }
+        } else {
+          try {
+            const legacyPayload = {
+              type: "entry_function_payload",
+              function: payload.payload.function,
+              type_arguments: payload.payload.typeArguments,
+              arguments: payload.payload.functionArguments
+            };
+            response = await signTxFeature.signAndSubmitTransaction(legacyPayload);
+          } catch {
+            throw firstError;
+          }
+        }
+      }
+      const result = extractUserResponse(response);
+      try {
+        if (typeof result === "string") {
+          return { hash: normalizeHash(result) };
+        }
+        if (result && typeof result === "object") {
+          const hashObj = result;
+          if (hashObj.hash !== void 0) {
+            return { hash: normalizeHash(hashObj.hash) };
+          }
+          if (hashObj.txnHash !== void 0) {
+            return { hash: normalizeHash(hashObj.txnHash) };
+          }
+          if (hashObj.transactionHash !== void 0) {
+            return { hash: normalizeHash(hashObj.transactionHash) };
+          }
+          return { hash: normalizeHash(result) };
+        }
+        return { hash: normalizeHash(result) };
+      } catch (error) {
+        throw new Error(
+          `Failed to extract transaction hash from wallet response: ${error instanceof Error ? error.message : "Unknown error"}`
+        );
       }
-      return { hash };
     },
     async signTransaction(payload) {
       if (!signOnlyFeature) {
@@ -582,11 +687,14 @@ var TransactionBuilder = class {
    * @returns Transaction hash
    * @throws MovementError with code WALLET_NOT_CONNECTED if no wallet connected
    * @throws MovementError with code TRANSACTION_FAILED if submission fails
+   * 
+   * Note: Transaction failures do NOT affect wallet connection state.
+   * The wallet remains connected even if a transaction fails.
    */
   async signAndSubmit(payload) {
     const adapter = this.walletManager.getAdapter();
-    const state = this.walletManager.getState();
-    if (!adapter || !state.connected) {
+    const stateBefore = this.walletManager.getState();
+    if (!adapter || !stateBefore.connected) {
       throw Errors.walletNotConnected();
     }
     try {
@@ -599,7 +707,13 @@ var TransactionBuilder = class {
       });
       return result.hash;
     } catch (error) {
-      throw wrapError(error, "TRANSACTION_FAILED", "Failed to sign and submit transaction");
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      const isUserRejection = errorMessage.toLowerCase().includes("rejected") || errorMessage.toLowerCase().includes("cancelled") || errorMessage.toLowerCase().includes("canceled") || errorMessage.toLowerCase().includes("denied");
+      throw wrapError(
+        error,
+        "TRANSACTION_FAILED",
+        isUserRejection ? "Transaction was rejected by user" : "Failed to sign and submit transaction"
+      );
     }
   }
   /**
@@ -825,13 +939,15 @@ var EventListener = class {
       accountAddress = subscription.accountAddress;
       eventType = subscription.eventType;
     } else {
-      const parts = subscription.eventHandle.split("::");
-      if (parts.length >= 3 && parts[0]) {
-        accountAddress = parts[0];
-        eventType = subscription.eventHandle;
-      } else {
-        accountAddress = subscription.eventHandle;
-        eventType = subscription.eventHandle;
+      const parsed = this.parseEventHandle(subscription.eventHandle);
+      accountAddress = parsed.accountAddress;
+      eventType = parsed.eventType;
+    }
+    if (!this.isValidEventType(eventType)) {
+      if (process.env.NODE_ENV === "development") {
+        console.warn(
+          `[EventListener] Event type "${eventType}" may not be in the expected format (address::module::EventType). Subscription will proceed but may not receive events.`
+        );
       }
     }
     const internalSub = {
@@ -851,6 +967,41 @@ var EventListener = class {
     });
     return subscriptionId;
   }
+  /**
+   * Parses a legacy event handle into account address and event type
+   * @internal
+   */
+  parseEventHandle(eventHandle) {
+    const parts = eventHandle.split("::");
+    if (parts.length >= 3 && parts[0]) {
+      return {
+        accountAddress: parts[0],
+        eventType: eventHandle
+      };
+    }
+    return {
+      accountAddress: eventHandle,
+      eventType: eventHandle
+    };
+  }
+  /**
+   * Validates event type format
+   * Expected format: address::module::EventType
+   * @internal
+   */
+  isValidEventType(eventType) {
+    const parts = eventType.split("::");
+    if (parts.length < 3) {
+      return false;
+    }
+    const address = parts[0];
+    if (!address || !address.startsWith("0x")) {
+      return false;
+    }
+    const module = parts[1];
+    const eventName = parts.slice(2).join("::");
+    return Boolean(module && eventName);
+  }
   /**
    * Unsubscribes from events
    * @param subscriptionId - Subscription ID to remove
@@ -897,36 +1048,200 @@ var EventListener = class {
     if (!subscription) {
       return;
     }
+    try {
+      const events = await this.fetchEvents(
+        subscription.accountAddress,
+        subscription.eventType
+      );
+      const sortedEvents = this.sortEventsBySequence(events);
+      for (const event of sortedEvents) {
+        const sequenceNumber = this.parseSequenceNumber(event.sequence_number);
+        if (sequenceNumber > subscription.lastSequenceNumber) {
+          const contractEvent = {
+            type: event.type || subscription.eventType,
+            sequenceNumber: String(event.sequence_number),
+            data: this.normalizeEventData(event.data)
+          };
+          this.safeInvokeCallback(subscription.callback, contractEvent);
+          subscription.lastSequenceNumber = sequenceNumber;
+        }
+      }
+    } catch (error) {
+      if (process.env.NODE_ENV === "development") {
+        console.warn(`[EventListener] Polling error for ${subscriptionId}:`, error);
+      }
+    }
+  }
+  /**
+   * Fetches events from the blockchain
+   * Handles different API response formats and fallback methods
+   * @internal
+   */
+  async fetchEvents(accountAddress, eventType) {
     try {
       const events = await this.aptosClient.getAccountEventsByEventType({
-        accountAddress: subscription.accountAddress,
-        eventType: subscription.eventType,
+        accountAddress,
+        eventType,
         options: {
           limit: 25,
           orderBy: [{ sequence_number: "desc" }]
         }
       });
-      const sortedEvents = [...events].sort((a, b) => {
-        const seqA = BigInt(a.sequence_number);
-        const seqB = BigInt(b.sequence_number);
-        return seqA < seqB ? -1 : seqA > seqB ? 1 : 0;
-      });
-      for (const event of sortedEvents) {
-        const sequenceNumber = BigInt(event.sequence_number);
-        if (sequenceNumber > subscription.lastSequenceNumber) {
-          const contractEvent = {
-            type: event.type,
-            sequenceNumber: String(event.sequence_number),
-            data: event.data
-          };
-          try {
-            subscription.callback(contractEvent);
-          } catch {
+      return events.map((e) => ({
+        type: e.type,
+        sequence_number: e.sequence_number,
+        data: e.data
+      }));
+    } catch (indexerError) {
+      try {
+        const events = await this.fetchEventsViaEventHandle(accountAddress, eventType);
+        return events;
+      } catch (handleError) {
+        try {
+          const events = await this.fetchEventsViaResources(accountAddress, eventType);
+          return events;
+        } catch (resourceError) {
+          if (process.env.NODE_ENV === "development") {
+            console.warn(
+              `[EventListener] Failed to fetch events for ${eventType}:`,
+              { indexerError, handleError, resourceError }
+            );
           }
-          subscription.lastSequenceNumber = sequenceNumber;
+          return [];
         }
       }
+    }
+  }
+  /**
+   * Fetches events using the event handle API
+   * @internal
+   */
+  async fetchEventsViaEventHandle(accountAddress, eventType) {
+    const parts = eventType.split("::");
+    if (parts.length < 3) {
+      throw new Error("Invalid event type format");
+    }
+    const structName = parts.slice(2).join("::");
+    const eventHandleMappings = {
+      "DepositEvent": { resource: "0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>", field: "deposit_events" },
+      "WithdrawEvent": { resource: "0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>", field: "withdraw_events" }
+    };
+    const mapping = eventHandleMappings[structName];
+    if (!mapping) {
+      throw new Error(`Unknown event type: ${structName}`);
+    }
+    const events = await this.aptosClient.getEventsByEventHandle({
+      accountAddress,
+      eventHandleStruct: mapping.resource,
+      fieldName: mapping.field,
+      options: { limit: 25 }
+    });
+    return events.map((e) => ({
+      type: e.type || eventType,
+      sequence_number: e.sequence_number,
+      data: e.data
+    }));
+  }
+  /**
+   * Fetches events by checking account resources
+   * This is a fallback method when indexer is not available
+   * @internal
+   */
+  async fetchEventsViaResources(accountAddress, eventType) {
+    const resources = await this.aptosClient.getAccountResources({
+      accountAddress
+    });
+    const coinStore = resources.find(
+      (r) => r.type === "0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>"
+    );
+    if (!coinStore) {
+      return [];
+    }
+    const data = coinStore.data;
+    const isDeposit = eventType.includes("Deposit");
+    const eventHandle = isDeposit ? data.deposit_events : data.withdraw_events;
+    if (!eventHandle) {
+      return [];
+    }
+    try {
+      const creationNum = eventHandle.guid.id.creation_num;
+      const addr = eventHandle.guid.id.addr;
+      const response = await fetch(
+        `${this.getFullnodeUrl()}/accounts/${accountAddress}/events/${addr}/${creationNum}?limit=25`
+      );
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}`);
+      }
+      const events = await response.json();
+      return events.map((e) => ({
+        type: e.type || eventType,
+        sequence_number: e.sequence_number,
+        data: e.data
+      }));
     } catch {
+      return [];
+    }
+  }
+  /**
+   * Gets the fullnode URL from the Aptos client config
+   * @internal
+   */
+  getFullnodeUrl() {
+    const config = this.aptosClient.config;
+    return config?.fullnode || "https://testnet.movementnetwork.xyz/v1";
+  }
+  /**
+   * Sorts events by sequence number in ascending order
+   * @internal
+   */
+  sortEventsBySequence(events) {
+    return [...events].sort((a, b) => {
+      const seqA = this.parseSequenceNumber(a.sequence_number);
+      const seqB = this.parseSequenceNumber(b.sequence_number);
+      return seqA < seqB ? -1 : seqA > seqB ? 1 : 0;
+    });
+  }
+  /**
+   * Parses sequence number from various formats
+   * @internal
+   */
+  parseSequenceNumber(value) {
+    if (typeof value === "bigint") {
+      return value;
+    }
+    if (typeof value === "number") {
+      return BigInt(value);
+    }
+    try {
+      return BigInt(value);
+    } catch {
+      return BigInt(0);
+    }
+  }
+  /**
+   * Normalizes event data to a consistent format
+   * @internal
+   */
+  normalizeEventData(data) {
+    if (data === null || data === void 0) {
+      return {};
+    }
+    if (typeof data === "object") {
+      return data;
+    }
+    return { value: data };
+  }
+  /**
+   * Safely invokes a callback without letting errors propagate
+   * @internal
+   */
+  safeInvokeCallback(callback, event) {
+    try {
+      callback(event);
+    } catch (error) {
+      if (process.env.NODE_ENV === "development") {
+        console.warn("[EventListener] Callback error:", error);
+      }
     }
   }
 };

package/package.json

@@ -1,55 +1,55 @@
 {
-  "name": "@movebridge/core",
-  "version": "0.2.0",
-  "description": "Core SDK for Movement Network - wallet management, transactions, and contract interactions",
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+    "name": "@movebridge/core",
+    "version": "0.2.1",
+    "description": "Core SDK for Movement Network - wallet management, transactions, and contract interactions",
+    "main": "./dist/index.js",
+    "module": "./dist/index.mjs",
+    "types": "./dist/index.d.ts",
+    "exports": {
+        ".": {
+            "types": "./dist/index.d.ts",
+            "import": "./dist/index.mjs",
+            "require": "./dist/index.js"
+        }
+    },
+    "files": [
+        "dist"
+    ],
+    "scripts": {
+        "build": "tsup src/index.ts --format cjs,esm --dts --clean",
+        "dev": "tsup src/index.ts --format cjs,esm --dts --watch",
+        "clean": "rm -rf dist",
+        "typecheck": "tsc --noEmit",
+        "test": "vitest run",
+        "test:watch": "vitest"
+    },
+    "dependencies": {
+        "@aptos-labs/ts-sdk": "^1.26.0",
+        "@aptos-labs/wallet-standard": "^0.2.0",
+        "eventemitter3": "^5.0.1"
+    },
+    "devDependencies": {
+        "tsup": "^8.0.1",
+        "typescript": "^5.3.2"
+    },
+    "peerDependencies": {},
+    "keywords": [
+        "movement",
+        "aptos",
+        "blockchain",
+        "sdk",
+        "wallet",
+        "web3"
+    ],
+    "author": "Aqila Rifti",
+    "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/AqilaRifti/MoveBridge",
+        "directory": "packages/core"
+    },
+    "homepage": "https://github.com/AqilaRifti/MoveBridge#readme",
+    "bugs": {
+        "url": "https://github.com/AqilaRifti/MoveBridge/issues"
     }
-  },
-  "files": [
-    "dist"
-  ],
-  "dependencies": {
-    "@aptos-labs/ts-sdk": "^1.26.0",
-    "@aptos-labs/wallet-standard": "^0.2.0",
-    "eventemitter3": "^5.0.1"
-  },
-  "devDependencies": {
-    "tsup": "^8.0.1",
-    "typescript": "^5.3.2"
-  },
-  "peerDependencies": {},
-  "keywords": [
-    "movement",
-    "aptos",
-    "blockchain",
-    "sdk",
-    "wallet",
-    "web3"
-  ],
-  "author": "Aqila Rifti",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/AqilaRifti/MoveBridge",
-    "directory": "packages/core"
-  },
-  "homepage": "https://github.com/AqilaRifti/MoveBridge#readme",
-  "bugs": {
-    "url": "https://github.com/AqilaRifti/MoveBridge/issues"
-  },
-  "scripts": {
-    "build": "tsup src/index.ts --format cjs,esm --dts --clean",
-    "dev": "tsup src/index.ts --format cjs,esm --dts --watch",
-    "clean": "rm -rf dist",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run",
-    "test:watch": "vitest"
-  }
 }