aboutsummaryrefslogtreecommitdiffstats
path: root/packages/utils/src
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-12-24 11:27:38 +0800
committerGreg Hysen <greg.hysen@gmail.com>2019-01-15 02:49:44 +0800
commitd1fd4421be0a7639b99b374bf04e57fac4e8a486 (patch)
treea97d00cbea579864f23803fa391e169814d93f6e /packages/utils/src
parentb06f8239e1fe75703f88d34c0d225701406e28c2 (diff)
downloaddexon-sol-tools-d1fd4421be0a7639b99b374bf04e57fac4e8a486.tar
dexon-sol-tools-d1fd4421be0a7639b99b374bf04e57fac4e8a486.tar.gz
dexon-sol-tools-d1fd4421be0a7639b99b374bf04e57fac4e8a486.tar.bz2
dexon-sol-tools-d1fd4421be0a7639b99b374bf04e57fac4e8a486.tar.lz
dexon-sol-tools-d1fd4421be0a7639b99b374bf04e57fac4e8a486.tar.xz
dexon-sol-tools-d1fd4421be0a7639b99b374bf04e57fac4e8a486.tar.zst
dexon-sol-tools-d1fd4421be0a7639b99b374bf04e57fac4e8a486.zip
Use string argument encoding with new encoder
Diffstat (limited to 'packages/utils/src')
-rw-r--r--packages/utils/src/abi_encoder/abstract_data_types/data_type.ts6
-rw-r--r--packages/utils/src/abi_encoder/evm_data_type_factory.ts28
-rw-r--r--packages/utils/src/abi_encoder/evm_data_types/method.ts6
-rw-r--r--packages/utils/src/abi_encoder/index.ts2
4 files changed, 22 insertions, 20 deletions
diff --git a/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts b/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts
index 5bd6aae03..dc897d810 100644
--- a/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts
+++ b/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts
@@ -51,6 +51,12 @@ export abstract class DataType {
return value;
}
+ public decodeAsArray(returndata: string, rules?: DecodingRules): any {
+ const value = this.decode(returndata, rules);
+ const valuesAsArray = _.isObject(value) ? _.values(value) : [value];
+ return valuesAsArray;
+ }
+
public getSignature(detailed?: boolean): string {
if (_.isEmpty(this._dataItem.name) || !detailed) return this.getSignatureType();
const name = this.getDataItem().name;
diff --git a/packages/utils/src/abi_encoder/evm_data_type_factory.ts b/packages/utils/src/abi_encoder/evm_data_type_factory.ts
index 5ff7366d6..fdd4f0fde 100644
--- a/packages/utils/src/abi_encoder/evm_data_type_factory.ts
+++ b/packages/utils/src/abi_encoder/evm_data_type_factory.ts
@@ -135,21 +135,23 @@ export class EvmDataTypeFactory implements DataTypeFactory {
// Convenience function
export function create(input: DataItem | DataItem[] | string): DataType {
// Handle different types of input
- let dataItems: DataItem[] = [];
- if (typeof(input) === 'string') {
- dataItems = generateDataItemsFromSignature(input);
- } else if(input instanceof Array) {
- dataItems = input as DataItem[];
+ const isSignature = typeof(input) === 'string';
+ const isTupleSignature = isSignature && (input as string).startsWith('(');
+ const parseAsTuple = isTupleSignature || _.isArray(input);
+ // Create input `dataItem`
+ let dataItem: DataItem;
+ if(parseAsTuple) {
+ const dataItems = isSignature ? generateDataItemsFromSignature(input as string) : input as DataItem[];
+ dataItem = {
+ name: '',
+ type: 'tuple',
+ components: dataItems
+ };
} else {
- dataItems = [input as DataItem];
+ dataItem = isSignature ? generateDataItemsFromSignature(input as string)[0] : input as DataItem;
}
- // Create single data item from input
- let dataItem: DataItem = dataItems.length === 1 ? dataItems[0] : {
- name: '',
- type: 'tuple',
- components: dataItems
- };
// Create data type
- return EvmDataTypeFactory.getInstance().create(dataItem);
+ const dataType = EvmDataTypeFactory.getInstance().create(dataItem);
+ return dataType;
}
/* tslint:enable no-construct */
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 212e2ca6b..44456cd0a 100644
--- a/packages/utils/src/abi_encoder/evm_data_types/method.ts
+++ b/packages/utils/src/abi_encoder/evm_data_types/method.ts
@@ -35,12 +35,6 @@ export class MethodDataType extends AbstractSetDataType {
return value;
}
- public decodeAsArray(returndata: string, rules?: DecodingRules): any {
- const value = this.decode(returndata, rules);
- const valuesAsArray = _.isObject(value) ? _.values(value) : [value];
- return valuesAsArray;
- }
-
public encodeReturnValues(value: any, rules?: EncodingRules): string {
const returnData = this._returnDataType.encode(value, rules);
return returnData;
diff --git a/packages/utils/src/abi_encoder/index.ts b/packages/utils/src/abi_encoder/index.ts
index f7f1ceedc..cfacfe075 100644
--- a/packages/utils/src/abi_encoder/index.ts
+++ b/packages/utils/src/abi_encoder/index.ts
@@ -13,4 +13,4 @@ export {
UInt,
create,
} from './evm_data_type_factory';
-//export { fromSignature } from './utils/signatureParser';
+export { DataType } from './abstract_data_types/data_type';