Upgrade taquito; fix fee, limits passing

package.json

@@ -31,14 +31,14 @@
     "nanoid": "^3.1.10"
   },
   "devDependencies": {
-    "@taquito/taquito": "^8.0.0-beta.2",
+    "@taquito/taquito": "^9.1.1",
     "microbundle": "^0.12.2",
     "typedoc": "^0.17.8",
     "typedoc-plugin-markdown": "^2.3.1",
-    "typescript": "^3.9.6"
+    "typescript": "^4.3.4"
   },
   "peerDependencies": {
-    "@taquito/taquito": "^7.0.0 || ^7.0.0-beta || ^8.0.0-beta"
+    "@taquito/taquito": "^9.0.0"
   },
   "publishConfig": {
     "access": "public"

src/taquito-wallet.ts

@@ -5,8 +5,8 @@ import {
   createSetDelegateOperation,
   createTransferOperation,
   WalletDelegateParams,
-  WalletOriginateParams,
   WalletTransferParams,
+  WalletOriginateParams,
 } from "@taquito/taquito";
 
 import {
@@ -70,15 +70,24 @@ export class TempleWallet implements WalletProvider {
   }
 
   async mapTransferParamsToWalletParams(params: WalletTransferParams) {
-    return createTransferOperation(params);
+    return this.removeDefaultParams(
+      params,
+      await createTransferOperation(this.formatParameters(params))
+    );
   }
 
   async mapOriginateParamsToWalletParams(params: WalletOriginateParams) {
-    return createOriginationOperation(params as any);
+    return this.removeDefaultParams(
+      params,
+      await createOriginationOperation(this.formatParameters(params))
+    );
   }
 
   async mapDelegateParamsToWalletParams(params: WalletDelegateParams) {
-    return createSetDelegateOperation(params as any);
+    return this.removeDefaultParams(
+      params,
+      await createSetDelegateOperation(this.formatParameters(params))
+    );
   }
 
   async sendOperations(opParams: any[]) {
@@ -95,6 +104,38 @@ export class TempleWallet implements WalletProvider {
     assertConnected(this.permission);
     return requestBroadcast(signedOpBytes);
   }
+
+  private formatParameters(params: any) {
+    if (params.fee) {
+      params.fee = params.fee.toString();
+    }
+    if (params.storageLimit) {
+      params.storageLimit = params.storageLimit.toString();
+    }
+    if (params.gasLimit) {
+      params.gasLimit = params.gasLimit.toString();
+    }
+    return params;
+  }
+
+  private removeDefaultParams(
+    params: WalletTransferParams | WalletOriginateParams | WalletDelegateParams,
+    operatedParams: any
+  ) {
+    // If fee, storageLimit or gasLimit is undefined by user
+    // in case of beacon wallet, dont override it by
+    // defaults.
+    if (!params.fee) {
+      delete operatedParams.fee;
+    }
+    if (!params.storageLimit) {
+      delete operatedParams.storage_limit;
+    }
+    if (!params.gasLimit) {
+      delete operatedParams.gas_limit;
+    }
+    return operatedParams;
+  }
 }
 
 export class NotConnectedTempleWalletError extends TempleWalletError {
@@ -117,6 +158,8 @@ function formatOpParams(op: any) {
       return {
         ...rest,
         mutez: true, // The balance was already converted from Tez (ꜩ) to Mutez (uꜩ)
+        fee,
+        gasLimit: gas_limit,
         storageLimit: storage_limit,
       };
 
@@ -128,12 +171,16 @@ function formatOpParams(op: any) {
         amount: +amount,
         mutez: true,
         parameter: parameters,
+        fee,
+        gasLimit: gas_limit,
         storageLimit: storage_limit,
       };
 
     default:
       return {
         ...rest,
+        fee,
+        gasLimit: gas_limit,
         storageLimit: storage_limit,
       };
   }

tsconfig.json

@@ -64,7 +64,8 @@
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
 
     /* Advanced Options */
-    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
+    "forceConsistentCasingInFileNames": true, /* Disallow inconsistently-cased references to the same file. */
+    "skipLibCheck": true
   },
   "include": ["src"]
 }