update collateral and bump version

MeshJS · Aug 17, 2024 · 2afe2ac · 2afe2ac
1 parent 8e215a4
commit 2afe2ac
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 52 deletions.
diff --git a/apps/playground/src/pages/providers/submitters/submit-transaction.tsx b/apps/playground/src/pages/providers/submitters/submit-transaction.tsx
@@ -22,7 +22,7 @@ function Left() {
   return (
     <>
       <p>Submit a serialized transaction to the network.</p>
-      <Codeblock data={`await blockchainProvider.submitTx(signedTx`} />
+      <Codeblock data={`await blockchainProvider.submitTx(signedTx);`} />
     </>
   );
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/mesh-common/package.json b/packages/mesh-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/common",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

diff --git a/packages/mesh-contract/package.json b/packages/mesh-contract/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/contract",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

diff --git a/packages/mesh-core-csl/package.json b/packages/mesh-core-csl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/core-csl",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

diff --git a/packages/mesh-core-cst/package.json b/packages/mesh-core-cst/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/core-cst",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

diff --git a/packages/mesh-core/package.json b/packages/mesh-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/core",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

diff --git a/packages/mesh-provider/package.json b/packages/mesh-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/provider",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

diff --git a/packages/mesh-react/package.json b/packages/mesh-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/react",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

diff --git a/packages/mesh-transaction/package.json b/packages/mesh-transaction/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/transaction",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

diff --git a/packages/mesh-wallet/package.json b/packages/mesh-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/wallet",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

diff --git a/packages/mesh-wallet/src/browser/index.ts b/packages/mesh-wallet/src/browser/index.ts
@@ -232,21 +232,6 @@ export class BrowserWallet implements IInitiator, ISigner, ISubmitter {
     return usedAddresses.map((usa) => addressToBech32(deserializeAddress(usa)));
   }
 
-  /**
-   * Get a list of UTXOs to be used as collateral inputs for transactions with plutus script inputs.
-   *
-   * This is used in transaction building.
-   *
-   * @returns a list of UTXOs
-   */
-  async getUsedCollateral(
-    limit = DEFAULT_PROTOCOL_PARAMETERS.maxCollateralInputs,
-  ): Promise<TransactionUnspentOutput[]> {
-    const collateral =
-      (await this._walletInstance.experimental.getCollateral()) ?? [];
-    return collateral.map((c) => deserializeTxUnspentOutput(c)).slice(0, limit);
-  }
-
   /**
    * Return a list of all UTXOs (unspent transaction outputs) controlled by the wallet.
    *
@@ -335,7 +320,7 @@ export class BrowserWallet implements IInitiator, ISigner, ISubmitter {
       const unsignedTx = unsignedTxs[i]!;
       const cWitness = witnessSets[i]!;
       if (cWitness === "") {
-        // It's possible that txs are signed just to give 
+        // It's possible that txs are signed just to give
         // browser wallet the tx context
         signedTxs.push(unsignedTx);
       } else {
@@ -382,10 +367,21 @@ export class BrowserWallet implements IInitiator, ISigner, ISubmitter {
    *
    * @returns a list of UTXOs
    */
-  async getCollateralUnspentOutput(): Promise<TransactionUnspentOutput[]> {
-    const collateral =
-      (await this._walletInstance.experimental.getCollateral()) ?? [];
-    return collateral.map((c) => deserializeTxUnspentOutput(c));
+  async getCollateralUnspentOutput(
+    limit = DEFAULT_PROTOCOL_PARAMETERS.maxCollateralInputs,
+  ): Promise<TransactionUnspentOutput[]> {
+    let collateral: string[] = [];
+    try {
+      collateral = (await this._walletInstance.getCollateral()) ?? [];
+    } catch (e) {
+      try {
+        collateral =
+          (await this._walletInstance.experimental.getCollateral()) ?? [];
+      } catch (e) {
+        console.error(e);
+      }
+    }
+    return collateral.map((c) => deserializeTxUnspentOutput(c)).slice(0, limit);
   }
 
   /**

diff --git a/packages/mesh-wallet/src/mesh/index.ts b/packages/mesh-wallet/src/mesh/index.ts
@@ -283,23 +283,6 @@ export class MeshWallet implements IInitiator, ISigner, ISubmitter {
     return [this.getChangeAddress()];
   }
 
-  /**
-   * Get a list of UTXOs to be used as collateral inputs for transactions with plutus script inputs.
-   *
-   * This is used in transaction building.
-   *
-   * @returns a list of UTXOs
-   */
-  async getUsedCollateral(): Promise<TransactionUnspentOutput[]> {
-    const collateralUtxo = await this.getCollateral();
-
-    const unspentOutput = collateralUtxo.map((utxo) => {
-      return toTxUnspentOutput(utxo);
-    });
-
-    return unspentOutput;
-  }
-
   /**
    * Get a list of UTXOs to be used for transaction building.
    *

diff --git a/packages/mesh-wallet/src/types/index.ts b/packages/mesh-wallet/src/types/index.ts
@@ -23,6 +23,7 @@ export interface Cip30WalletApi {
   getBalance(): Promise<string>;
   getChangeAddress(): Promise<string>;
   getExtensions(): Promise<{ cip: number }[]>;
+  getCollateral(): Promise<string[] | undefined>;
   getNetworkId(): Promise<number>;
   getRewardAddresses(): Promise<string[]>;
   getUnusedAddresses(): Promise<string[]>;