crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed abstract Number class.

Browse Source
This commit is contained in:
Greg Hysen
2018-11-25 17:25:04 -08:00
parent d2d89adbdd
commit ebaf9dd275
3 changed files with 67 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
packages/utils/src/abi_encoder/evm_data_types/int.ts
View File

@@ -2,29 +2,53 @@
import { DataItem } from 'ethereum-types';
import { BigNumber } from '../../configured_bignumber';
import { DataTypeFactory } from '../abstract_data_types';
import { DataTypeFactory, PayloadDataType } from '../abstract_data_types';
import { RawCalldata } from '../calldata';
import * as Constants from '../utils/constants';
import * as EncoderMath from '../utils/math';
import { Number } from './number';
export class Int extends Number {
export class Int extends PayloadDataType {
private static readonly _MATCHER = RegExp(
'^int(8|16|24|32|40|48|56|64|72|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256){0,1}$',
);
private static readonly _SIZE_KNOWN_AT_COMPILE_TIME: boolean = true;
private static readonly _MAX_WIDTH: number = 256;
private static readonly _DEFAULT_WIDTH: number = Int._MAX_WIDTH;
private _width: number;
private _minValue: BigNumber;
private _maxValue: BigNumber;
public static matchType(type: string): boolean {
return Int._MATCHER.test(type);
}
private static _decodeWidthFromType(type: string): number {
const matches = Int._MATCHER.exec(type);
const width = (matches !== null && matches.length === 2 && matches[1] !== undefined)
? parseInt(matches[1], Constants.DEC_BASE)
: Int._DEFAULT_WIDTH;
return width;
}
public constructor(dataItem: DataItem, dataTypeFactory: DataTypeFactory) {
super(dataItem, Int._MATCHER, dataTypeFactory);
super(dataItem, dataTypeFactory, Int._SIZE_KNOWN_AT_COMPILE_TIME);
if (!Int.matchType(dataItem.type)) {
throw new Error(`Tried to instantiate Int with bad input: ${dataItem}`);
}
this._width = Int._decodeWidthFromType(dataItem.type);
this._minValue = new BigNumber(2).toPower(this._width - 1).times(-1);
this._maxValue = new BigNumber(2).toPower(this._width - 1).sub(1);
}
public getMaxValue(): BigNumber {
return new BigNumber(2).toPower(this._width - 1).sub(1);
public encodeValue(value: BigNumber | string | number): Buffer {
const encodedValue = EncoderMath.safeEncodeNumericValue(value, this._minValue, this._maxValue);
return encodedValue;
}
public getMinValue(): BigNumber {
return new BigNumber(2).toPower(this._width - 1).times(-1);
public decodeValue(calldata: RawCalldata): BigNumber {
const valueBuf = calldata.popWord();
const value = EncoderMath.safeDecodeNumericValue(valueBuf, this._minValue, this._maxValue);
return value;
}
public getSignature(): string {

41
packages/utils/src/abi_encoder/evm_data_types/number.ts
View File

@@ -1,41 +0,0 @@
import { DataItem } from 'ethereum-types';
import * as _ from 'lodash';
import { BigNumber } from '../../configured_bignumber';
import { DataTypeFactory, PayloadDataType } from '../abstract_data_types';
import { RawCalldata } from '../calldata';
import * as Constants from '../utils/constants';
import * as EncoderMath from '../utils/math';
export abstract class Number extends PayloadDataType {
private static readonly _SIZE_KNOWN_AT_COMPILE_TIME: boolean = true;
private static readonly _MAX_WIDTH: number = 256;
private static readonly _DEFAULT_WIDTH: number = Number._MAX_WIDTH;
protected _width: number;
constructor(dataItem: DataItem, matcher: RegExp, dataTypeFactory: DataTypeFactory) {
super(dataItem, dataTypeFactory, Number._SIZE_KNOWN_AT_COMPILE_TIME);
const matches = matcher.exec(dataItem.type);
if (matches === null) {
throw new Error(`Tried to instantiate Number with bad input: ${dataItem}`);
}
this._width =
matches !== null && matches.length === 2 && matches[1] !== undefined
? parseInt(matches[1], Constants.DEC_BASE)
: (this._width = Number._DEFAULT_WIDTH);
}
public encodeValue(value: BigNumber | string | number): Buffer {
const encodedValue = EncoderMath.safeEncodeNumericValue(value, this.getMinValue(), this.getMaxValue());
return encodedValue;
}
public decodeValue(calldata: RawCalldata): BigNumber {
const valueBuf = calldata.popWord();
const value = EncoderMath.safeDecodeNumericValue(valueBuf, this.getMinValue(), this.getMaxValue());
return value;
}
public abstract getMaxValue(): BigNumber;
public abstract getMinValue(): BigNumber;
}

43
packages/utils/src/abi_encoder/evm_data_types/uint.ts
View File

@@ -2,32 +2,57 @@
import { DataItem } from 'ethereum-types';
import { BigNumber } from '../../configured_bignumber';
import { DataTypeFactory } from '../abstract_data_types';
import { DataTypeFactory, PayloadDataType } from '../abstract_data_types';
import { RawCalldata } from '../calldata';
import * as Constants from '../utils/constants';
import * as EncoderMath from '../utils/math';
import { Number } from './number';
export class UInt extends Number {
export class UInt extends PayloadDataType {
private static readonly _MATCHER = RegExp(
'^uint(8|16|24|32|40|48|56|64|72|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256){0,1}$',
);
private static readonly _SIZE_KNOWN_AT_COMPILE_TIME: boolean = true;
private static readonly _MAX_WIDTH: number = 256;
private static readonly _DEFAULT_WIDTH: number = UInt._MAX_WIDTH;
private _width: number;
private _minValue: BigNumber;
private _maxValue: BigNumber;
public static matchType(type: string): boolean {
return UInt._MATCHER.test(type);
}
private static _decodeWidthFromType(type: string): number {
const matches = UInt._MATCHER.exec(type);
const width = (matches !== null && matches.length === 2 && matches[1] !== undefined)
? parseInt(matches[1], Constants.DEC_BASE)
: UInt._DEFAULT_WIDTH;
return width;
}
public constructor(dataItem: DataItem, dataTypeFactory: DataTypeFactory) {
super(dataItem, UInt._MATCHER, dataTypeFactory);
super(dataItem, dataTypeFactory, UInt._SIZE_KNOWN_AT_COMPILE_TIME);
if (!UInt.matchType(dataItem.type)) {
throw new Error(`Tried to instantiate UInt with bad input: ${dataItem}`);
}
this._width = UInt._decodeWidthFromType(dataItem.type);
this._minValue = new BigNumber(0);
this._maxValue = new BigNumber(2).toPower(this._width).sub(1);
}
public getMaxValue(): BigNumber {
return new BigNumber(2).toPower(this._width).sub(1);
public encodeValue(value: BigNumber | string | number): Buffer {
const encodedValue = EncoderMath.safeEncodeNumericValue(value, this._minValue, this._maxValue);
return encodedValue;
}
public getMinValue(): BigNumber {
return new BigNumber(0);
public decodeValue(calldata: RawCalldata): BigNumber {
const valueBuf = calldata.popWord();
const value = EncoderMath.safeDecodeNumericValue(valueBuf, this._minValue, this._maxValue);
return value;
}
public getSignature(): string {
return `uint${this._width}`;
}
}