mirror of
https://github.com/status-im/web3.js.git
synced 2025-02-23 03:28:07 +00:00
fixed most of jshint issues
This commit is contained in:
debris
parent
e02a96528e
commit
e6c31f7558
@ -126,49 +126,63 @@ SolidityCoder.prototype.encodeMultiWithOffset = function (types, solidityTypes,
|
||||
return result;
|
||||
};
|
||||
|
||||
// TODO: refactor whole encoding!
|
||||
SolidityCoder.prototype.encodeWithOffset = function (type, solidityType, encoded, offset) {
|
||||
var self = this;
|
||||
if (solidityType.isDynamicArray(type)) {
|
||||
// offset was already set
|
||||
var nestedName = solidityType.nestedName(type);
|
||||
var nestedStaticPartLength = solidityType.staticPartLength(nestedName);
|
||||
var result = encoded[0];
|
||||
|
||||
var previousLength = 2; // in int
|
||||
if (solidityType.isDynamicArray(nestedName)) {
|
||||
for (var i = 1; i < encoded.length; i++) {
|
||||
previousLength += +(encoded[i - 1] || {})[0] || 0;
|
||||
result += f.formatInputInt(offset + i * nestedStaticPartLength + previousLength * 32).encode();
|
||||
}
|
||||
}
|
||||
|
||||
// first element is length, skip it
|
||||
for (var i = 0; i < encoded.length - 1; i++) {
|
||||
var additionalOffset = result / 2;
|
||||
result += this.encodeWithOffset(nestedName, solidityType, encoded[i + 1], offset + additionalOffset);
|
||||
}
|
||||
return (function () {
|
||||
// offset was already set
|
||||
var nestedName = solidityType.nestedName(type);
|
||||
var nestedStaticPartLength = solidityType.staticPartLength(nestedName);
|
||||
var result = encoded[0];
|
||||
|
||||
(function () {
|
||||
var previousLength = 2; // in int
|
||||
if (solidityType.isDynamicArray(nestedName)) {
|
||||
for (var i = 1; i < encoded.length; i++) {
|
||||
previousLength += +(encoded[i - 1])[0] || 0;
|
||||
result += f.formatInputInt(offset + i * nestedStaticPartLength + previousLength * 32).encode();
|
||||
}
|
||||
}
|
||||
})();
|
||||
|
||||
// first element is length, skip it
|
||||
(function () {
|
||||
for (var i = 0; i < encoded.length - 1; i++) {
|
||||
var additionalOffset = result / 2;
|
||||
result += self.encodeWithOffset(nestedName, solidityType, encoded[i + 1], offset + additionalOffset);
|
||||
}
|
||||
})();
|
||||
|
||||
return result;
|
||||
return result;
|
||||
})();
|
||||
|
||||
} else if (solidityType.isStaticArray(type)) {
|
||||
var nestedName = solidityType.nestedName(type);
|
||||
var nestedStaticPartLength = solidityType.staticPartLength(nestedName);
|
||||
var result = "";
|
||||
return (function () {
|
||||
var nestedName = solidityType.nestedName(type);
|
||||
var nestedStaticPartLength = solidityType.staticPartLength(nestedName);
|
||||
var result = "";
|
||||
|
||||
var previousLength = 0; // in int
|
||||
if (solidityType.isDynamicArray(nestedName)) {
|
||||
for (var i = 0; i < encoded.length; i++) {
|
||||
// calculate length of previous item
|
||||
previousLength += +(encoded[i - 1] || {})[0] || 0;
|
||||
result += f.formatInputInt(offset + i * nestedStaticPartLength + previousLength * 32).encode();
|
||||
}
|
||||
}
|
||||
(function () {
|
||||
var previousLength = 0; // in int
|
||||
if (solidityType.isDynamicArray(nestedName)) {
|
||||
for (var i = 0; i < encoded.length; i++) {
|
||||
// calculate length of previous item
|
||||
previousLength += +(encoded[i - 1] || [])[0] || 0;
|
||||
result += f.formatInputInt(offset + i * nestedStaticPartLength + previousLength * 32).encode();
|
||||
}
|
||||
}
|
||||
})();
|
||||
|
||||
for (var i = 0; i < encoded.length; i++) {
|
||||
var additionalOffset = result / 2;
|
||||
result += this.encodeWithOffset(nestedName, solidityType, encoded[i], offset + additionalOffset);
|
||||
}
|
||||
(function () {
|
||||
for (var i = 0; i < encoded.length; i++) {
|
||||
var additionalOffset = result / 2;
|
||||
result += self.encodeWithOffset(nestedName, solidityType, encoded[i], offset + additionalOffset);
|
||||
}
|
||||
})();
|
||||
|
||||
return result;
|
||||
return result;
|
||||
})();
|
||||
}
|
||||
|
||||
return encoded;
|
||||
|
||||
@ -143,29 +143,37 @@ SolidityType.prototype.nestedTypes = function (name) {
|
||||
* @return {String} encoded value
|
||||
*/
|
||||
SolidityType.prototype.encode = function (value, name) {
|
||||
var self = this;
|
||||
if (this.isDynamicArray(name)) {
|
||||
var length = value.length; // in int
|
||||
var nestedName = this.nestedName(name);
|
||||
|
||||
var result = [];
|
||||
result.push(f.formatInputInt(length).encode());
|
||||
|
||||
var self = this;
|
||||
value.forEach(function (v) {
|
||||
result.push(self.encode(v, nestedName));
|
||||
});
|
||||
return (function () {
|
||||
var length = value.length; // in int
|
||||
var nestedName = self.nestedName(name);
|
||||
|
||||
var result = [];
|
||||
result.push(f.formatInputInt(length).encode());
|
||||
|
||||
value.forEach(function (v) {
|
||||
result.push(self.encode(v, nestedName));
|
||||
});
|
||||
|
||||
return result;
|
||||
})();
|
||||
|
||||
return result;
|
||||
} else if (this.isStaticArray(name)) {
|
||||
var length = this.staticArrayLength(name); // in int
|
||||
var nestedName = this.nestedName(name);
|
||||
|
||||
var result = [];
|
||||
for (var i = 0; i < length; i++) {
|
||||
result.push(this.encode(value[i], nestedName));
|
||||
}
|
||||
return (function () {
|
||||
var length = self.staticArrayLength(name); // in int
|
||||
var nestedName = self.nestedName(name);
|
||||
|
||||
var result = [];
|
||||
for (var i = 0; i < length; i++) {
|
||||
result.push(self.encode(value[i], nestedName));
|
||||
}
|
||||
|
||||
return result;
|
||||
})();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
return this._inputFormatter(value, name).encode();
|
||||
@ -181,39 +189,51 @@ SolidityType.prototype.encode = function (value, name) {
|
||||
* @returns {Object} decoded value
|
||||
*/
|
||||
SolidityType.prototype.decode = function (bytes, offset, name) {
|
||||
var self = this;
|
||||
|
||||
if (this.isDynamicArray(name)) {
|
||||
var arrayOffset = parseInt('0x' + bytes.substr(offset * 2, 64)); // in bytes
|
||||
var length = parseInt('0x' + bytes.substr(arrayOffset * 2, 64)); // in int
|
||||
var arrayStart = arrayOffset + 32; // array starts after length; // in bytes
|
||||
|
||||
var nestedName = this.nestedName(name);
|
||||
var nestedStaticPartLength = this.staticPartLength(nestedName); // in bytes
|
||||
var result = [];
|
||||
return (function () {
|
||||
var arrayOffset = parseInt('0x' + bytes.substr(offset * 2, 64)); // in bytes
|
||||
var length = parseInt('0x' + bytes.substr(arrayOffset * 2, 64)); // in int
|
||||
var arrayStart = arrayOffset + 32; // array starts after length; // in bytes
|
||||
|
||||
for (var i = 0; i < length * nestedStaticPartLength; i += nestedStaticPartLength) {
|
||||
result.push(this.decode(bytes, arrayStart + i, nestedName));
|
||||
}
|
||||
var nestedName = self.nestedName(name);
|
||||
var nestedStaticPartLength = self.staticPartLength(nestedName); // in bytes
|
||||
var result = [];
|
||||
|
||||
for (var i = 0; i < length * nestedStaticPartLength; i += nestedStaticPartLength) {
|
||||
result.push(self.decode(bytes, arrayStart + i, nestedName));
|
||||
}
|
||||
|
||||
return result;
|
||||
})();
|
||||
|
||||
return result;
|
||||
} else if (this.isStaticArray(name)) {
|
||||
var length = this.staticArrayLength(name); // in int
|
||||
var arrayStart = offset; // in bytes
|
||||
|
||||
var nestedName = this.nestedName(name);
|
||||
var nestedStaticPartLength = this.staticPartLength(nestedName); // in bytes
|
||||
var result = [];
|
||||
return (function () {
|
||||
var length = self.staticArrayLength(name); // in int
|
||||
var arrayStart = offset; // in bytes
|
||||
|
||||
for (var i = 0; i < length * nestedStaticPartLength; i += nestedStaticPartLength) {
|
||||
result.push(this.decode(bytes, arrayStart + i, nestedName));
|
||||
}
|
||||
var nestedName = self.nestedName(name);
|
||||
var nestedStaticPartLength = self.staticPartLength(nestedName); // in bytes
|
||||
var result = [];
|
||||
|
||||
return result;
|
||||
for (var i = 0; i < length * nestedStaticPartLength; i += nestedStaticPartLength) {
|
||||
result.push(self.decode(bytes, arrayStart + i, nestedName));
|
||||
}
|
||||
|
||||
return result;
|
||||
})();
|
||||
} else if (this.isDynamicType(name)) {
|
||||
var dynamicOffset = parseInt('0x' + bytes.substr(offset * 2, 64)); // in bytes
|
||||
var length = parseInt('0x' + bytes.substr(dynamicOffset * 2, 64)); // in bytes
|
||||
var roundedLength = Math.floor((length + 31) / 32); // in int
|
||||
|
||||
return this._outputFormatter(new SolidityParam(bytes.substr(dynamicOffset * 2, ( 1 + roundedLength) * 64), 0));
|
||||
return (function () {
|
||||
var dynamicOffset = parseInt('0x' + bytes.substr(offset * 2, 64)); // in bytes
|
||||
var length = parseInt('0x' + bytes.substr(dynamicOffset * 2, 64)); // in bytes
|
||||
var roundedLength = Math.floor((length + 31) / 32); // in int
|
||||
|
||||
return self._outputFormatter(new SolidityParam(bytes.substr(dynamicOffset * 2, ( 1 + roundedLength) * 64), 0));
|
||||
})();
|
||||
}
|
||||
|
||||
var length = this.staticPartLength(name);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user