@sundaeswap/wallet-lite 0.0.20 → 0.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sundaeswap/wallet-lite",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "license": "MIT",
   "type": "module",
   "main": "./dist/cjs/index.js",

package/src/classes/WalletObserver.class.ts

@@ -1,5 +1,8 @@
 import type { TransactionUnspentOutput } from "@cardano-sdk/core/dist/cjs/Serialization/index.js";
-import type { Cip30WalletApi } from "@cardano-sdk/dapp-connector";
+import type {
+  Cip30WalletApi,
+  GetCollateral,
+} from "@cardano-sdk/dapp-connector";
 import { AssetAmount, type IAssetAmountMetadata } from "@sundaeswap/asset";
 import merge from "lodash/merge.js";
 
@@ -138,50 +141,55 @@ export class WalletObserver<
       );
     }
 
-    this._performingSync = true;
-    this.dispatch(EWalletObserverEvents.SYNCING_WALLET_START);
-
-    let newNetwork: number;
     try {
-      newNetwork = await this.getNetwork();
-    } catch (e) {
+      this._performingSync = true;
+      this.dispatch(EWalletObserverEvents.SYNCING_WALLET_START);
+
+      let newNetwork: number;
       try {
-        await this.syncApi();
         newNetwork = await this.getNetwork();
       } catch (e) {
-        this.dispatch(EWalletObserverEvents.SYNCING_WALLET_END);
-        this._performingSync = false;
-        throw e;
+        try {
+          await this.syncApi();
+          newNetwork = await this.getNetwork();
+        } catch (e) {
+          this.dispatch(EWalletObserverEvents.SYNCING_WALLET_END);
+          this._performingSync = false;
+          throw e;
+        }
       }
-    }
-
-    const [
-      newBalanceMap,
-      newUsedAddresses,
-      newUnusedAddresses,
-      newOutputs,
-      newCollateral,
-    ] = await Promise.all([
-      this.getBalanceMap(),
-      this.getUsedAddresses(),
-      this.getUnusedAddresses(),
-      this.getUtxos(),
-      this.getCollateral(),
-    ]);
 
-    const result = {
-      balanceMap: newBalanceMap,
-      usedAddresses: newUsedAddresses,
-      unusedAddresses: newUnusedAddresses,
-      utxos: newOutputs,
-      collateral: newCollateral,
-      network: newNetwork,
-    };
+      const [
+        newBalanceMap,
+        newUsedAddresses,
+        newUnusedAddresses,
+        newOutputs,
+        newCollateral,
+      ] = await Promise.all([
+        this.getBalanceMap(),
+        this.getUsedAddresses(),
+        this.getUnusedAddresses(),
+        this.getUtxos(),
+        this.getCollateral(),
+      ]);
+
+      const result = {
+        balanceMap: newBalanceMap,
+        usedAddresses: newUsedAddresses,
+        unusedAddresses: newUnusedAddresses,
+        utxos: newOutputs,
+        collateral: newCollateral,
+        network: newNetwork,
+      };
 
-    this.dispatch(EWalletObserverEvents.SYNCING_WALLET_END, result);
-    this._performingSync = false;
+      this.dispatch(EWalletObserverEvents.SYNCING_WALLET_END, result);
+      this._performingSync = false;
 
-    return result;
+      return result;
+    } catch (e) {
+      this._performingSync = false;
+      throw e;
+    }
   };
 
   /**
@@ -512,7 +520,16 @@ export class WalletObserver<
     }
 
     const [cbor, { Serialization }, { typedHex }] = await Promise.all([
-      this.api.getCollateral(),
+      (async () => {
+        const funcCall =
+          this.api?.getCollateral ||
+          (this.api?.experimental.getCollateral as GetCollateral);
+        if (typeof funcCall !== "function") {
+          return [];
+        }
+
+        return await funcCall();
+      })(),
       getCardanoCore(),
       getCardanoUtil(),
     ]);