Working for almost every test

3 files changed, 15 insertions, 2 deletions

diff --git a/packages/utils/src/abi_encoder/evm_data_types/int.ts b/packages/utils/src/abi_encoder/evm_data_types/int.ts
index f1dcf5ea1..c9f734799 100644
--- a/packages/utils/src/abi_encoder/evm_data_types/int.ts
+++ b/packages/utils/src/abi_encoder/evm_data_types/int.ts
@@ -47,9 +47,12 @@ export class IntDataType extends AbstractBlobDataType {
         return encodedValue;
     }
 
-    public decodeValue(calldata: RawCalldata): BigNumber {
+    public decodeValue(calldata: RawCalldata): BigNumber|number {
         const valueBuf = calldata.popWord();
         const value = EncoderMath.safeDecodeNumericValue(valueBuf, this._minValue, this._maxValue);
+        if (this._width === 8) {
+            return value.toNumber();
+        }
         return value;
     }
 
diff --git a/packages/utils/src/abi_encoder/evm_data_types/method.ts b/packages/utils/src/abi_encoder/evm_data_types/method.ts
index b1cd1377f..c777902e8 100644
--- a/packages/utils/src/abi_encoder/evm_data_types/method.ts
+++ b/packages/utils/src/abi_encoder/evm_data_types/method.ts
@@ -8,6 +8,7 @@ import { AbstractSetDataType } from '../abstract_data_types/types/set';
 import { constants } from '../utils/constants';
 import { DecodingRules, EncodingRules } from '../utils/rules';
 
+import { ArrayDataType } from './array';
 import { TupleDataType } from './tuple';
 
 export class MethodDataType extends AbstractSetDataType {
@@ -44,6 +45,12 @@ export class MethodDataType extends AbstractSetDataType {
         return returnValues;
     }
 
+    public decodeReturnValuesAsArray(returndata: string, rules?: DecodingRules): any {
+        const returnValues = this.decodeReturnValues(returndata, rules);
+        const returnValuesAsArray = _.isObject(returnValues) ? _.values(returnValues) : [returnValues];
+        return returnValuesAsArray;
+    }
+
     public getSignature(): string {
         return this._methodSignature;
     }
diff --git a/packages/utils/src/abi_encoder/evm_data_types/uint.ts b/packages/utils/src/abi_encoder/evm_data_types/uint.ts
index 5180f0cf3..06cde4eea 100644
--- a/packages/utils/src/abi_encoder/evm_data_types/uint.ts
+++ b/packages/utils/src/abi_encoder/evm_data_types/uint.ts
@@ -46,9 +46,12 @@ export class UIntDataType extends AbstractBlobDataType {
         return encodedValue;
     }
 
-    public decodeValue(calldata: RawCalldata): BigNumber {
+    public decodeValue(calldata: RawCalldata): BigNumber|number {
         const valueBuf = calldata.popWord();
         const value = EncoderMath.safeDecodeNumericValue(valueBuf, UIntDataType._MIN_VALUE, this._maxValue);
+        if (this._width === 8) {
+            return value.toNumber();
+        }
         return value;
     }