update estimate overrides to throw error when decimal values are bein…

…g passed as well as update tests

integration-tests/contract-override-estimate.spec.ts

@@ -0,0 +1,56 @@
+import { CONFIGS } from "./config";
+import { InvalidEstimateValueError } from '@taquito/taquito';
+
+CONFIGS().forEach(({ lib, rpc, setup, createAddress }) => {
+  const Tezos = lib;
+
+  describe(`Test contract API operations with overridden estimate values ${rpc}`, () => {
+    let pkh: string;
+
+    beforeAll(async (done) => {
+      await setup();
+
+      try {
+        const account = await createAddress();
+        pkh = await account.signer.publicKeyHash();
+      } catch(e) {
+        console.log(JSON.stringify(e));
+      }
+
+      done();
+    });
+
+    it('should throw an error when overriding origination estimate values with decimals', async (done) => {
+      expect(async () => {
+        const op = await Tezos.contract.originate({
+          balance: "1",
+          code: `parameter string;
+          storage string;
+          code {CAR;
+                PUSH string "Hello ";
+                CONCAT;
+                NIL operation; PAIR};
+          `,
+          init: `"test"`,
+          storageLimit: 100.22
+        });
+        await op.confirmation();
+      }).rejects.toThrowError(InvalidEstimateValueError);
+
+      done();
+    });
+
+    it('should throw an error when overriding transfer/transaction estimate values with decimal', async (done) => {
+      expect(async () => {
+        const op = await Tezos.contract.transfer({
+          to: pkh,
+          amount: 1,
+          fee: 10.5
+        });
+        await op.confirmation();
+      }).rejects.toThrowError(InvalidEstimateValueError);
+
+      done();
+    });
+  });
+});

integration-tests/contract-simple-origination.spec.ts

@@ -6,9 +6,10 @@ CONFIGS().forEach(({ lib, rpc, setup }) => {
   describe(`Test contract origination of a simple contract through contract api using: ${rpc}`, () => {
 
     beforeEach(async (done) => {
-      await setup()
-      done()
-    })
+      await setup();
+      done();
+    });
+
     test('Verify contract.originate for a simple contract', async (done) => {
       const op = await Tezos.contract.originate({
         balance: "1",
@@ -32,4 +33,4 @@ CONFIGS().forEach(({ lib, rpc, setup }) => {
       done();
     });
   });
-})
+});

packages/taquito/src/operations/index.ts

@@ -31,6 +31,7 @@ export {
   TezosOperationError,
   TezosOperationErrorWithMessage,
   TezosPreapplyFailureError,
+  InvalidEstimateValueError,
 } from './operation-errors';
 export { BatchOperation } from './batch-operation';
 export { DelegateOperation } from './delegate-operation';

packages/taquito/src/operations/operation-emitter.ts

@@ -10,7 +10,12 @@ import { Protocols } from '../constants';
 import { Context } from '../context';
 import { Estimate } from '../estimate/estimate';
 import { RPCResponseError } from '../error';
-import { flattenErrors, TezosOperationError, TezosPreapplyFailureError } from './operation-errors';
+import {
+  flattenErrors,
+  TezosOperationError,
+  TezosPreapplyFailureError,
+  InvalidEstimateValueError,
+} from './operation-errors';
 import { InvalidOperationKindError, DeprecationError } from '@taquito/utils';
 import {
   ForgedBytes,
@@ -251,6 +256,20 @@ export abstract class OperationEmitter {
     let calculatedGas = gasLimit;
     let calculatedStorage = storageLimit;
 
+    if (calculatedFee && calculatedFee % 1 !== 0) {
+      throw new InvalidEstimateValueError(`Fee value must not be a decimal: ${calculatedFee}`);
+    }
+    if (calculatedGas && calculatedGas % 1 !== 0) {
+      throw new InvalidEstimateValueError(
+        `Gas Limit value must not be a decimal: ${calculatedGas}`
+      );
+    }
+    if (calculatedStorage && calculatedStorage % 1 !== 0) {
+      throw new InvalidEstimateValueError(
+        `Storage Limit value must not be a decimal: ${calculatedStorage}`
+      );
+    }
+
     if (fee === undefined || gasLimit === undefined || storageLimit === undefined) {
       const estimation = await estimator({ fee, gasLimit, storageLimit, ...(rest as any) });
 

packages/taquito/src/operations/operation-errors.ts

@@ -153,3 +153,14 @@ export class OriginationOperationError extends Error {
     super(message);
   }
 }
+
+/**
+ *  @category Error
+ *  @description Error that indicates a general failure happening during an origination operation
+ */
+export class InvalidEstimateValueError extends Error {
+  public name = 'InvalidEstimateValueError';
+  constructor(public message: string) {
+    super(message);
+  }
+}

packages/taquito/test/estimate/rpc-estimate-provider.spec.ts

@@ -567,6 +567,7 @@ describe('RPCEstimateProvider test signer', () => {
 
       done();
     });
+
     it('should throw an error with invalid source', async (done) => {
       const params: TransferTicketParams = {
         source: 'tz1iedjFYksExq8snZK9MNo4AvXHG',
@@ -587,6 +588,7 @@ describe('RPCEstimateProvider test signer', () => {
 
       done();
     });
+
     it('should throw an error with invalid destination', async (done) => {
       const params: TransferTicketParams = {
         source: 'tz1iedjFYksExq8snZK9MNo4AvXHBdXfTsGX',