status-im/web3.js
2
0
Fork 0
mirror of https://github.com/status-im/web3.js.git synced 2025-02-23 19:48:13 +00:00
Code Issues Projects Releases Wiki Activity

fixed #194

Browse Source
This commit is contained in:
Marek Kotewicz 2015-05-08 09:55:14 +02:00
parent 22ca9b02e7
commit 860ad2c48b
11 changed files with 160 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
dist/web3-light.js vendored
View File

@ -215,7 +215,7 @@ SolidityType.prototype.formatInput = function (param, arrayType) {
}).reduce(function (acc, current) {
acc.appendArrayElement(current);
return acc;
}, new SolidityParam(f.formatInputInt(param.length).value));
}, f.formatInputInt(param.length).swap());
}
return this._inputFormatter(param);
};
@ -232,9 +232,9 @@ SolidityType.prototype.formatOutput = function (param, arrayType) {
if (arrayType) {
// let's assume, that we solidity will never return long arrays :P
var result = [];
var length = new BigNumber(param.value, 16);
var length = new BigNumber(param.prefix, 16);
for (var i = 0; i < length * 64; i += 64) {
result.push(this._outputFormatter(new SolidityParam(param.suffix.slice(i, i + 64))));
result.push(this._outputFormatter(new SolidityParam('', param.suffix.slice(i, i + 64))));
}
return result;
}
@ -263,7 +263,7 @@ SolidityType.prototype.shiftParam = function (type, param) {
if (this._mode === 'bytes') {
return param.shiftBytes();
} else if (isArrayType(type)) {
var length = new BigNumber(param.value.slice(0, 64), 16);
var length = new BigNumber(param.prefix.slice(0, 64), 16);
return param.shiftArray(length);
}
return param.shiftValue();
@ -305,9 +305,14 @@ SolidityCoder.prototype._requireType = function (type) {
* @return {SolidityParam} SolidityParam for this group of params
*/
SolidityCoder.prototype._bytesToParam = function (types, bytes) {
var value = bytes.slice(0, types.length * 64);
var suffix = bytes.slice(types.length * 64);
return new SolidityParam(value, suffix);
var self = this;
var prefixLength = types.filter(function (type) {
return self._requireType(type).isVariadicType(type);
}).length;
var prefix = bytes.slice(0, prefixLength * 64);
var suffix = bytes.slice(prefixLength * 64);
return new SolidityParam(prefix, suffix);
};
/**
@ -498,7 +503,7 @@ var formatInputInt = function (value) {
var padding = c.ETH_PADDING * 2;
BigNumber.config(c.ETH_BIGNUMBER_ROUNDING_MODE);
var result = utils.padLeft(utils.toTwosComplement(value).round().toString(16), padding);
return new SolidityParam(result);
return new SolidityParam('', result);
};
/**
@ -510,7 +515,7 @@ var formatInputInt = function (value) {
*/
var formatInputBytes = function (value) {
var result = utils.fromAscii(value, c.ETH_PADDING).substr(2);
return new SolidityParam(result);
return new SolidityParam('', result);
};
/**
@ -522,7 +527,7 @@ var formatInputBytes = function (value) {
*/
var formatInputDynamicBytes = function (value) {
var result = utils.fromAscii(value, c.ETH_PADDING).substr(2);
return new SolidityParam(formatInputInt(value.length).value, result);
return new SolidityParam(formatInputInt(value.length).suffix, result);
};
/**
@ -534,7 +539,7 @@ var formatInputDynamicBytes = function (value) {
*/
var formatInputBool = function (value) {
var result = '000000000000000000000000000000000000000000000000000000000000000' + (value ? '1' : '0');
return new SolidityParam(result);
return new SolidityParam('', result);
};
/**
@ -568,7 +573,7 @@ var signedIsNegative = function (value) {
* @returns {BigNumber} right-aligned output bytes formatted to big number
*/
var formatOutputInt = function (param) {
var value = param.value || "0";
var value = param.suffix || "0";
// check if it's negative number
// it it is, return two's complement
@ -586,7 +591,7 @@ var formatOutputInt = function (param) {
* @returns {BigNumeber} right-aligned output bytes formatted to uint
*/
var formatOutputUInt = function (param) {
var value = param.value || "0";
var value = param.suffix || "0";
return new BigNumber(value, 16);
};
@ -620,7 +625,7 @@ var formatOutputUReal = function (param) {
* @returns {Boolean} right-aligned input bytes formatted to bool
*/
var formatOutputBool = function (param) {
return param.value === '0000000000000000000000000000000000000000000000000000000000000001' ? true : false;
return param.suffix === '0000000000000000000000000000000000000000000000000000000000000001' ? true : false;
};
/**
@ -632,7 +637,7 @@ var formatOutputBool = function (param) {
*/
var formatOutputBytes = function (param) {
// length might also be important!
return utils.toAscii(param.value);
return utils.toAscii(param.suffix);
};
/**
@ -655,7 +660,7 @@ var formatOutputDynamicBytes = function (param) {
* @returns {String} address
*/
var formatOutputAddress = function (param) {
var value = param.value;
var value = param.suffix;
return "0x" + value.slice(value.length - 40, value.length);
};
@ -703,8 +708,8 @@ module.exports = {
* SolidityParam object prototype.
* Should be used when encoding, decoding solidity bytes
*/
var SolidityParam = function (value, suffix) {
this.value = value || '';
var SolidityParam = function (prefix, suffix) {
this.prefix = prefix || '';
this.suffix = suffix || '';
};
@ -715,7 +720,7 @@ var SolidityParam = function (value, suffix) {
* @param {SolidityParam} param that it appended after this
*/
SolidityParam.prototype.append = function (param) {
this.value += param.value;
this.prefix += param.prefix;
this.suffix += param.suffix;
};
@ -726,8 +731,8 @@ SolidityParam.prototype.append = function (param) {
* @param {SolidityParam} param that is appended to an array
*/
SolidityParam.prototype.appendArrayElement = function (param) {
this.suffix += param.value;
//this.suffix += param.suffix; // we do not support nested dynamic types
this.suffix += param.suffix;
//this.prefix += param.prefix; // we do not support nested dynamic types
};
/**
@ -737,19 +742,19 @@ SolidityParam.prototype.appendArrayElement = function (param) {
* @return {String} encoded param(s)
*/
SolidityParam.prototype.encode = function () {
return this.value + this.suffix;
return this.prefix + this.suffix;
};
/**
* This method should be used to shift first param from group of params
*
* @method shiftValue
* @return {SolidityParam} first value param
* @return {SolidityParam} first prefix param
*/
SolidityParam.prototype.shiftValue = function () {
var value = this.value.slice(0, 64);
this.value = this.value.slice(64);
return new SolidityParam(value);
var suffix = this.suffix.slice(0, 64);
this.suffix = this.suffix.slice(64);
return new SolidityParam('', suffix);
};
/**
@ -770,11 +775,21 @@ SolidityParam.prototype.shiftBytes = function () {
* @return {SolidityParam} first array param
*/
SolidityParam.prototype.shiftArray = function (length) {
var value = this.value.slice(0, 64);
this.value = this.value.slice(64);
var prefix = this.prefix.slice(0, 64);
this.prefix = this.prefix.slice(64);
var suffix = this.suffix.slice(0, 64 * length);
this.suffix = this.suffix.slice(64 * length);
return new SolidityParam(value, suffix);
return new SolidityParam(prefix, suffix);
};
/**
* This method should be used to create new parram by swapping it's prefix and suffix
*
* @method swap
* @return {SolidityParam} param with swaped bytes
*/
SolidityParam.prototype.swap = function () {
return new SolidityParam(this.suffix, this.prefix);
};
module.exports = SolidityParam;
@ -2441,7 +2456,7 @@ var inputTransactionFormatter = function (options){
delete options.code;
}
['gasPrice', 'gas', 'value'].filter(function (key) {
['gasPrice', 'gas', 'value', 'nonce'].filter(function (key) {
return options[key] !== undefined;
}).forEach(function(key){
options[key] = utils.fromDecimal(options[key]);

10
dist/web3-light.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/web3-light.min.js vendored
View File

File diff suppressed because one or more lines are too long

75
dist/web3.js vendored
View File

@ -215,7 +215,7 @@ SolidityType.prototype.formatInput = function (param, arrayType) {
}).reduce(function (acc, current) {
acc.appendArrayElement(current);
return acc;
}, new SolidityParam(f.formatInputInt(param.length).value));
}, f.formatInputInt(param.length).swap());
}
return this._inputFormatter(param);
};
@ -232,9 +232,9 @@ SolidityType.prototype.formatOutput = function (param, arrayType) {
if (arrayType) {
// let's assume, that we solidity will never return long arrays :P
var result = [];
var length = new BigNumber(param.value, 16);
var length = new BigNumber(param.prefix, 16);
for (var i = 0; i < length * 64; i += 64) {
result.push(this._outputFormatter(new SolidityParam(param.suffix.slice(i, i + 64))));
result.push(this._outputFormatter(new SolidityParam('', param.suffix.slice(i, i + 64))));
}
return result;
}
@ -263,7 +263,7 @@ SolidityType.prototype.shiftParam = function (type, param) {
if (this._mode === 'bytes') {
return param.shiftBytes();
} else if (isArrayType(type)) {
var length = new BigNumber(param.value.slice(0, 64), 16);
var length = new BigNumber(param.prefix.slice(0, 64), 16);
return param.shiftArray(length);
}
return param.shiftValue();
@ -305,9 +305,14 @@ SolidityCoder.prototype._requireType = function (type) {
* @return {SolidityParam} SolidityParam for this group of params
*/
SolidityCoder.prototype._bytesToParam = function (types, bytes) {
var value = bytes.slice(0, types.length * 64);
var suffix = bytes.slice(types.length * 64);
return new SolidityParam(value, suffix);
var self = this;
var prefixLength = types.filter(function (type) {
return self._requireType(type).isVariadicType(type);
}).length;
var prefix = bytes.slice(0, prefixLength * 64);
var suffix = bytes.slice(prefixLength * 64);
return new SolidityParam(prefix, suffix);
};
/**
@ -498,7 +503,7 @@ var formatInputInt = function (value) {
var padding = c.ETH_PADDING * 2;
BigNumber.config(c.ETH_BIGNUMBER_ROUNDING_MODE);
var result = utils.padLeft(utils.toTwosComplement(value).round().toString(16), padding);
return new SolidityParam(result);
return new SolidityParam('', result);
};
/**
@ -510,7 +515,7 @@ var formatInputInt = function (value) {
*/
var formatInputBytes = function (value) {
var result = utils.fromAscii(value, c.ETH_PADDING).substr(2);
return new SolidityParam(result);
return new SolidityParam('', result);
};
/**
@ -522,7 +527,7 @@ var formatInputBytes = function (value) {
*/
var formatInputDynamicBytes = function (value) {
var result = utils.fromAscii(value, c.ETH_PADDING).substr(2);
return new SolidityParam(formatInputInt(value.length).value, result);
return new SolidityParam(formatInputInt(value.length).suffix, result);
};
/**
@ -534,7 +539,7 @@ var formatInputDynamicBytes = function (value) {
*/
var formatInputBool = function (value) {
var result = '000000000000000000000000000000000000000000000000000000000000000' + (value ? '1' : '0');
return new SolidityParam(result);
return new SolidityParam('', result);
};
/**
@ -568,7 +573,7 @@ var signedIsNegative = function (value) {
* @returns {BigNumber} right-aligned output bytes formatted to big number
*/
var formatOutputInt = function (param) {
var value = param.value || "0";
var value = param.suffix || "0";
// check if it's negative number
// it it is, return two's complement
@ -586,7 +591,7 @@ var formatOutputInt = function (param) {
* @returns {BigNumeber} right-aligned output bytes formatted to uint
*/
var formatOutputUInt = function (param) {
var value = param.value || "0";
var value = param.suffix || "0";
return new BigNumber(value, 16);
};
@ -620,7 +625,7 @@ var formatOutputUReal = function (param) {
* @returns {Boolean} right-aligned input bytes formatted to bool
*/
var formatOutputBool = function (param) {
return param.value === '0000000000000000000000000000000000000000000000000000000000000001' ? true : false;
return param.suffix === '0000000000000000000000000000000000000000000000000000000000000001' ? true : false;
};
/**
@ -632,7 +637,7 @@ var formatOutputBool = function (param) {
*/
var formatOutputBytes = function (param) {
// length might also be important!
return utils.toAscii(param.value);
return utils.toAscii(param.suffix);
};
/**
@ -655,7 +660,7 @@ var formatOutputDynamicBytes = function (param) {
* @returns {String} address
*/
var formatOutputAddress = function (param) {
var value = param.value;
var value = param.suffix;
return "0x" + value.slice(value.length - 40, value.length);
};
@ -703,8 +708,8 @@ module.exports = {
* SolidityParam object prototype.
* Should be used when encoding, decoding solidity bytes
*/
var SolidityParam = function (value, suffix) {
this.value = value || '';
var SolidityParam = function (prefix, suffix) {
this.prefix = prefix || '';
this.suffix = suffix || '';
};
@ -715,7 +720,7 @@ var SolidityParam = function (value, suffix) {
* @param {SolidityParam} param that it appended after this
*/
SolidityParam.prototype.append = function (param) {
this.value += param.value;
this.prefix += param.prefix;
this.suffix += param.suffix;
};
@ -726,8 +731,8 @@ SolidityParam.prototype.append = function (param) {
* @param {SolidityParam} param that is appended to an array
*/
SolidityParam.prototype.appendArrayElement = function (param) {
this.suffix += param.value;
//this.suffix += param.suffix; // we do not support nested dynamic types
this.suffix += param.suffix;
//this.prefix += param.prefix; // we do not support nested dynamic types
};
/**
@ -737,19 +742,19 @@ SolidityParam.prototype.appendArrayElement = function (param) {
* @return {String} encoded param(s)
*/
SolidityParam.prototype.encode = function () {
return this.value + this.suffix;
return this.prefix + this.suffix;
};
/**
* This method should be used to shift first param from group of params
*
* @method shiftValue
* @return {SolidityParam} first value param
* @return {SolidityParam} first prefix param
*/
SolidityParam.prototype.shiftValue = function () {
var value = this.value.slice(0, 64);
this.value = this.value.slice(64);
return new SolidityParam(value);
var suffix = this.suffix.slice(0, 64);
this.suffix = this.suffix.slice(64);
return new SolidityParam('', suffix);
};
/**
@ -770,11 +775,21 @@ SolidityParam.prototype.shiftBytes = function () {
* @return {SolidityParam} first array param
*/
SolidityParam.prototype.shiftArray = function (length) {
var value = this.value.slice(0, 64);
this.value = this.value.slice(64);
var prefix = this.prefix.slice(0, 64);
this.prefix = this.prefix.slice(64);
var suffix = this.suffix.slice(0, 64 * length);
this.suffix = this.suffix.slice(64 * length);
return new SolidityParam(value, suffix);
return new SolidityParam(prefix, suffix);
};
/**
* This method should be used to create new parram by swapping it's prefix and suffix
*
* @method swap
* @return {SolidityParam} param with swaped bytes
*/
SolidityParam.prototype.swap = function () {
return new SolidityParam(this.suffix, this.prefix);
};
module.exports = SolidityParam;
@ -2441,7 +2456,7 @@ var inputTransactionFormatter = function (options){
delete options.code;
}
['gasPrice', 'gas', 'value'].filter(function (key) {
['gasPrice', 'gas', 'value', 'nonce'].filter(function (key) {
return options[key] !== undefined;
}).forEach(function(key){
options[key] = utils.fromDecimal(options[key]);

10
dist/web3.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/web3.min.js vendored
View File

File diff suppressed because one or more lines are too long

19
lib/solidity/coder.js
View File

@ -79,7 +79,7 @@ SolidityType.prototype.formatInput = function (param, arrayType) {
}).reduce(function (acc, current) {
acc.appendArrayElement(current);
return acc;
}, new SolidityParam(f.formatInputInt(param.length).value));
}, f.formatInputInt(param.length).swap());
}
return this._inputFormatter(param);
};
@ -96,9 +96,9 @@ SolidityType.prototype.formatOutput = function (param, arrayType) {
if (arrayType) {
// let's assume, that we solidity will never return long arrays :P
var result = [];
var length = new BigNumber(param.value, 16);
var length = new BigNumber(param.prefix, 16);
for (var i = 0; i < length * 64; i += 64) {
result.push(this._outputFormatter(new SolidityParam(param.suffix.slice(i, i + 64))));
result.push(this._outputFormatter(new SolidityParam('', param.suffix.slice(i, i + 64))));
}
return result;
}
@ -127,7 +127,7 @@ SolidityType.prototype.shiftParam = function (type, param) {
if (this._mode === 'bytes') {
return param.shiftBytes();
} else if (isArrayType(type)) {
var length = new BigNumber(param.value.slice(0, 64), 16);
var length = new BigNumber(param.prefix.slice(0, 64), 16);
return param.shiftArray(length);
}
return param.shiftValue();
@ -169,9 +169,14 @@ SolidityCoder.prototype._requireType = function (type) {
* @return {SolidityParam} SolidityParam for this group of params
*/
SolidityCoder.prototype._bytesToParam = function (types, bytes) {
var value = bytes.slice(0, types.length * 64);
var suffix = bytes.slice(types.length * 64);
return new SolidityParam(value, suffix);
var self = this;
var prefixLength = types.filter(function (type) {
return self._requireType(type).isVariadicType(type);
}).length;
var prefix = bytes.slice(0, prefixLength * 64);
var suffix = bytes.slice(prefixLength * 64);
return new SolidityParam(prefix, suffix);
};
/**

18
lib/solidity/formatters.js
View File

@ -39,7 +39,7 @@ var formatInputInt = function (value) {
var padding = c.ETH_PADDING * 2;
BigNumber.config(c.ETH_BIGNUMBER_ROUNDING_MODE);
var result = utils.padLeft(utils.toTwosComplement(value).round().toString(16), padding);
return new SolidityParam(result);
return new SolidityParam('', result);
};
/**
@ -51,7 +51,7 @@ var formatInputInt = function (value) {
*/
var formatInputBytes = function (value) {
var result = utils.fromAscii(value, c.ETH_PADDING).substr(2);
return new SolidityParam(result);
return new SolidityParam('', result);
};
/**
@ -63,7 +63,7 @@ var formatInputBytes = function (value) {
*/
var formatInputDynamicBytes = function (value) {
var result = utils.fromAscii(value, c.ETH_PADDING).substr(2);
return new SolidityParam(formatInputInt(value.length).value, result);
return new SolidityParam(formatInputInt(value.length).suffix, result);
};
/**
@ -75,7 +75,7 @@ var formatInputDynamicBytes = function (value) {
*/
var formatInputBool = function (value) {
var result = '000000000000000000000000000000000000000000000000000000000000000' + (value ? '1' : '0');
return new SolidityParam(result);
return new SolidityParam('', result);
};
/**
@ -109,7 +109,7 @@ var signedIsNegative = function (value) {
* @returns {BigNumber} right-aligned output bytes formatted to big number
*/
var formatOutputInt = function (param) {
var value = param.value || "0";
var value = param.suffix || "0";
// check if it's negative number
// it it is, return two's complement
@ -127,7 +127,7 @@ var formatOutputInt = function (param) {
* @returns {BigNumeber} right-aligned output bytes formatted to uint
*/
var formatOutputUInt = function (param) {
var value = param.value || "0";
var value = param.suffix || "0";
return new BigNumber(value, 16);
};
@ -161,7 +161,7 @@ var formatOutputUReal = function (param) {
* @returns {Boolean} right-aligned input bytes formatted to bool
*/
var formatOutputBool = function (param) {
return param.value === '0000000000000000000000000000000000000000000000000000000000000001' ? true : false;
return param.suffix === '0000000000000000000000000000000000000000000000000000000000000001' ? true : false;
};
/**
@ -173,7 +173,7 @@ var formatOutputBool = function (param) {
*/
var formatOutputBytes = function (param) {
// length might also be important!
return utils.toAscii(param.value);
return utils.toAscii(param.suffix);
};
/**
@ -196,7 +196,7 @@ var formatOutputDynamicBytes = function (param) {
* @returns {String} address
*/
var formatOutputAddress = function (param) {
var value = param.value;
var value = param.suffix;
return "0x" + value.slice(value.length - 40, value.length);
};

36
lib/solidity/param.js
View File

@ -24,8 +24,8 @@
* SolidityParam object prototype.
* Should be used when encoding, decoding solidity bytes
*/
var SolidityParam = function (value, suffix) {
this.value = value || '';
var SolidityParam = function (prefix, suffix) {
this.prefix = prefix || '';
this.suffix = suffix || '';
};
@ -36,7 +36,7 @@ var SolidityParam = function (value, suffix) {
* @param {SolidityParam} param that it appended after this
*/
SolidityParam.prototype.append = function (param) {
this.value += param.value;
this.prefix += param.prefix;
this.suffix += param.suffix;
};
@ -47,8 +47,8 @@ SolidityParam.prototype.append = function (param) {
* @param {SolidityParam} param that is appended to an array
*/
SolidityParam.prototype.appendArrayElement = function (param) {
this.suffix += param.value;
//this.suffix += param.suffix; // we do not support nested dynamic types
this.suffix += param.suffix;
//this.prefix += param.prefix; // we do not support nested dynamic types
};
/**
@ -58,19 +58,19 @@ SolidityParam.prototype.appendArrayElement = function (param) {
* @return {String} encoded param(s)
*/
SolidityParam.prototype.encode = function () {
return this.value + this.suffix;
return this.prefix + this.suffix;
};
/**
* This method should be used to shift first param from group of params
*
* @method shiftValue
* @return {SolidityParam} first value param
* @return {SolidityParam} first prefix param
*/
SolidityParam.prototype.shiftValue = function () {
var value = this.value.slice(0, 64);
this.value = this.value.slice(64);
return new SolidityParam(value);
var suffix = this.suffix.slice(0, 64);
this.suffix = this.suffix.slice(64);
return new SolidityParam('', suffix);
};
/**
@ -91,11 +91,21 @@ SolidityParam.prototype.shiftBytes = function () {
* @return {SolidityParam} first array param
*/
SolidityParam.prototype.shiftArray = function (length) {
var value = this.value.slice(0, 64);
this.value = this.value.slice(64);
var prefix = this.prefix.slice(0, 64);
this.prefix = this.prefix.slice(64);
var suffix = this.suffix.slice(0, 64 * length);
this.suffix = this.suffix.slice(64 * length);
return new SolidityParam(value, suffix);
return new SolidityParam(prefix, suffix);
};
/**
* This method should be used to create new parram by swapping it's prefix and suffix
*
* @method swap
* @return {SolidityParam} param with swaped bytes
*/
SolidityParam.prototype.swap = function () {
return new SolidityParam(this.suffix, this.prefix);
};
module.exports = SolidityParam;

8
test/coder.decodeParam.js
View File

@ -64,13 +64,13 @@ describe('lib/solidity/coder', function () {
'6761766f66796f726b0000000000000000000000000000000000000000000000'});
test({ types: ['int', 'bytes', 'int', 'int', 'int', 'int[]'], expected: [new bn(1), 'gavofyork', new bn(2), new bn(3), new bn(4),
[new bn(5), new bn(6), new bn(7)]],
values: '0000000000000000000000000000000000000000000000000000000000000001' +
'0000000000000000000000000000000000000000000000000000000000000009' +
values: '0000000000000000000000000000000000000000000000000000000000000009' +
'0000000000000000000000000000000000000000000000000000000000000003' +
'0000000000000000000000000000000000000000000000000000000000000001' +
'6761766f66796f726b0000000000000000000000000000000000000000000000' +
'0000000000000000000000000000000000000000000000000000000000000002' +
'0000000000000000000000000000000000000000000000000000000000000003' +
'0000000000000000000000000000000000000000000000000000000000000004' +
'0000000000000000000000000000000000000000000000000000000000000003' +
'6761766f66796f726b0000000000000000000000000000000000000000000000' +
'0000000000000000000000000000000000000000000000000000000000000005' +
'0000000000000000000000000000000000000000000000000000000000000006' +
'0000000000000000000000000000000000000000000000000000000000000007'});

16
test/coder.encodeParam.js
View File

@ -80,8 +80,8 @@ describe('lib/solidity/coder', function () {
'6761766f66796f726b0000000000000000000000000000000000000000000000'});
test({ types: ['bytes', 'int'], values: ['gavofyork', 5],
expected: '0000000000000000000000000000000000000000000000000000000000000009' +
'0000000000000000000000000000000000000000000000000000000000000005' +
'6761766f66796f726b0000000000000000000000000000000000000000000000'});
'6761766f66796f726b0000000000000000000000000000000000000000000000' +
'0000000000000000000000000000000000000000000000000000000000000005'});
test({ types: ['bytes', 'int[]'], values: ['gavofyork', [1, 2, 3]],
expected: '0000000000000000000000000000000000000000000000000000000000000009' +
'0000000000000000000000000000000000000000000000000000000000000003' +
@ -90,17 +90,17 @@ describe('lib/solidity/coder', function () {
'0000000000000000000000000000000000000000000000000000000000000002' +
'0000000000000000000000000000000000000000000000000000000000000003'});
test({ types: ['int', 'bytes'], values: [5, 'gavofyork'],
expected: '0000000000000000000000000000000000000000000000000000000000000005' +
'0000000000000000000000000000000000000000000000000000000000000009' +
expected: '0000000000000000000000000000000000000000000000000000000000000009' +
'0000000000000000000000000000000000000000000000000000000000000005' +
'6761766f66796f726b0000000000000000000000000000000000000000000000'});
test({ types: ['int', 'bytes', 'int', 'int', 'int', 'int[]'], values: [1, 'gavofyork', 2, 3, 4, [5, 6, 7]],
expected: '0000000000000000000000000000000000000000000000000000000000000001' +
'0000000000000000000000000000000000000000000000000000000000000009' +
expected: '0000000000000000000000000000000000000000000000000000000000000009' +
'0000000000000000000000000000000000000000000000000000000000000003' +
'0000000000000000000000000000000000000000000000000000000000000001' +
'6761766f66796f726b0000000000000000000000000000000000000000000000' +
'0000000000000000000000000000000000000000000000000000000000000002' +
'0000000000000000000000000000000000000000000000000000000000000003' +
'0000000000000000000000000000000000000000000000000000000000000004' +
'0000000000000000000000000000000000000000000000000000000000000003' +
'6761766f66796f726b0000000000000000000000000000000000000000000000' +
'0000000000000000000000000000000000000000000000000000000000000005' +
'0000000000000000000000000000000000000000000000000000000000000006' +
'0000000000000000000000000000000000000000000000000000000000000007'});