Initial new UI source code import (#2607)
* address -> name mappings * expanding, loading all coin details * send use only actual BasicCoin tokens registered (any reg) * sending token & accounts * form styling updates * send form layout in place * coin send working as expected * api subscriptions on multiple addresses * bring in events * simplify * basic events display in-place, functionally complete * basic functionality in-place * fix horrible event address issue * rwork display of events slightly * test TLA availability * table for owner -> tokens * fix signature lookup address * fix signature lookup address * basic overview styling * txhash links * page layout adjustments * background import * adjust colors * no global registration, simplify color selection * updated styling * connection dialog for "busy connecting" * initial token connection - WIP * init token updates take place * basic test for manual token * rework connection display * allow updates of the secure token * first stab at making the build build * update runner tags * fix linting issues * skip tests requiring network (should be e2e, TODO) * re-enable javascript tag/runner * release push does the trick * push to any branch, CI name * javscript-test runner as well * swap dependencies build requires test * revert stages swap * retrieve images associated with tokens * remove js build deps order * null image when hash = 0x0 * 6x64 images (hashes for registries) * don't pass tokens as prop to IdentityIcon * check images against content hash pictures * cleanup signer after connection changes * fix naming typo * display unknownImages for balances (not available as content hash) * unknownImage for transfer dialog * basic githubhint layout * single input for commit/filename * ethcore_hashContent call * lookup hash * registration in place * fixes * events is using a proper table * pass value through as-is * stop wrongly using main app IdentityIcon * NEVER export class instance functions * alignment back to normal * typo in definition * set & get images working (mostly) * show content retrieval info * set exitcode via || * use javascript:latest images * disable npm progress bar * rename phase I * rename phase II * only send build output to GitHub on major branches * also run the build step as part of the test (until comprehensive) * ci-specific build (no webpack progress) * allow for account creation via recovery phrase * display account uuid (where available), closes #2546 * connection dialog now shows up in dapps as well, closes #2538 * token images show up as expected * IdentityName component added and deployed * fix padding tests * adjust tests to map to stricter 0x-prefixed hex * render names via common component for the address -> name * split lint into seperate script (early exit) * test phases changed to lint, test & pack * pack part of test phase * remove files marked for deletion (cleanup) * Signer cleanups, start moving in the direction of the rest * add personal signer methods * basic signer request subscription * don't poll blockNumber when not connected * missing return, creating massive ws queue backlogs * ΞTH -> ETH * fix failing tests * registry uses setAddress to actually set addresses now * bytes mapping operates on lowerCase hex strings * sha3 ids for each application * add dappreg to list of contracts * adjust alignment of queries * show gas estimation log * abi with payable for register function * add key as required * image retrieval from dappreg * use proper Image urls * embed and link apps from Parity, retrieved via /api/apps * filter apps that has been replaced * proxy entry for parity-utils * add basiccoin abi * add support for fallback abi type * capture constructor paramaters * merge master into js * move images to assets/images/ * add font assets * import fonts as part of build * don't inline woff files * Revert "merge master into js" This reverts commit cfcfa81bd26f1b3cbc748d3afa1eb5c670b363fe. * remove unused npm packages * information on gas estimates (like almost everywhere else) * don't pass gas & gasPrice to estimation * display account passwordhint when available * signer subscriptions based on polling & function trapping * pending requests retrieved via jsapi * update signer middleware * remove all web3 instances * remove web3 package * last web3 dependencies removed * no need to toChecksumAddress - api takes care of it * expand description for personal_confirmRequest * Signer conversion from web3 -> parity.js completed * explicit in no return * green circle background * remove generated background * convert /api/* paths to localhost:8080/api/* paths (hard-coded, temporary) * change dapps to load from localhost:8080/ui/* * remove dangling web3 files * update manager test for signer * /api/ping -> / * additional token images * additional token images * add missing styles.css for 8180 error pages * cater for txhash returning null/empty object * adjust output directories * Release merge with origin with ours strategy * additional token images * cater for development server * s/localhost/127.0.0.1/ (cater for origin) * Fix address selection for contract deployment * Adjust z-index for error overlay * better text on unique background pattern * fix signer rejections * Don't allow gavcoin transfer with no balance * fix txhash rendering in signer * remove unnecessary ParityBackground * script to update js-precompiled * Redirect from :8080 to :8180 * Remove extra return * Dapp logo images
This commit is contained in:
72
js/src/abi/encoder/encoder.js
Normal file
72
js/src/abi/encoder/encoder.js
Normal file
@@ -0,0 +1,72 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import { padAddress, padBool, padBytes, padFixedBytes, padU32, padString } from '../util/pad';
|
||||
import Mediate from './mediate';
|
||||
import Token from '../token/token';
|
||||
import { isArray, isInstanceOf } from '../util/types';
|
||||
|
||||
export default class Encoder {
|
||||
static encode (tokens) {
|
||||
if (!isArray(tokens)) {
|
||||
throw new Error('tokens should be array of Token');
|
||||
}
|
||||
|
||||
const mediates = tokens.map((token) => Encoder.encodeToken(token));
|
||||
const inits = mediates
|
||||
.map((mediate, idx) => mediate.init(Mediate.offsetFor(mediates, idx)))
|
||||
.join('');
|
||||
const closings = mediates
|
||||
.map((mediate, idx) => mediate.closing(Mediate.offsetFor(mediates, idx)))
|
||||
.join('');
|
||||
|
||||
return `${inits}${closings}`;
|
||||
}
|
||||
|
||||
static encodeToken (token) {
|
||||
if (!isInstanceOf(token, Token)) {
|
||||
throw new Error('token should be instanceof Token');
|
||||
}
|
||||
|
||||
switch (token.type) {
|
||||
case 'address':
|
||||
return new Mediate('raw', padAddress(token.value));
|
||||
|
||||
case 'int':
|
||||
case 'uint':
|
||||
return new Mediate('raw', padU32(token.value));
|
||||
|
||||
case 'bool':
|
||||
return new Mediate('raw', padBool(token.value));
|
||||
|
||||
case 'fixedBytes':
|
||||
return new Mediate('raw', padFixedBytes(token.value));
|
||||
|
||||
case 'bytes':
|
||||
return new Mediate('prefixed', padBytes(token.value));
|
||||
|
||||
case 'string':
|
||||
return new Mediate('prefixed', padString(token.value));
|
||||
|
||||
case 'fixedArray':
|
||||
case 'array':
|
||||
return new Mediate(token.type, token.value.map((token) => Encoder.encodeToken(token)));
|
||||
|
||||
default:
|
||||
throw new Error(`Invalid token type ${token.type} in encodeToken`);
|
||||
}
|
||||
}
|
||||
}
|
||||
290
js/src/abi/encoder/encoder.spec.js
Normal file
290
js/src/abi/encoder/encoder.spec.js
Normal file
@@ -0,0 +1,290 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import Encoder from './encoder';
|
||||
import Token from '../token';
|
||||
import { padAddress, padFixedBytes, padU32 } from '../util/pad';
|
||||
|
||||
describe('abi/encoder/Encoder', () => {
|
||||
describe('encodeToken', () => {
|
||||
it('requires token as Token', () => {
|
||||
expect(() => Encoder.encodeToken()).to.throw(/Token/);
|
||||
});
|
||||
|
||||
it('encodes address tokens in Mediate(raw)', () => {
|
||||
const mediate = Encoder.encodeToken(new Token('address', '123'));
|
||||
|
||||
expect(mediate.type).to.equal('raw');
|
||||
expect(mediate.value).to.be.ok;
|
||||
});
|
||||
|
||||
it('encodes bool tokens in Mediate(raw)', () => {
|
||||
const mediatet = Encoder.encodeToken(new Token('bool', true));
|
||||
const mediatef = Encoder.encodeToken(new Token('bool', false));
|
||||
|
||||
expect(mediatet.type).to.equal('raw');
|
||||
expect(mediatet.value).to.be.ok;
|
||||
|
||||
expect(mediatef.type).to.equal('raw');
|
||||
expect(mediatef.value).to.be.ok;
|
||||
});
|
||||
|
||||
it('encodes int tokens in Mediate(raw)', () => {
|
||||
const mediate = Encoder.encodeToken(new Token('int', '123'));
|
||||
|
||||
expect(mediate.type).to.equal('raw');
|
||||
expect(mediate.value).to.be.ok;
|
||||
});
|
||||
|
||||
it('encodes uint tokens in Mediate(raw)', () => {
|
||||
const mediate = Encoder.encodeToken(new Token('uint', '123'));
|
||||
|
||||
expect(mediate.type).to.equal('raw');
|
||||
expect(mediate.value).to.be.ok;
|
||||
});
|
||||
|
||||
it('encodes fixedBytes tokens in Mediate(raw)', () => {
|
||||
const mediate = Encoder.encodeToken(new Token('fixedBytes', '123'));
|
||||
|
||||
expect(mediate.type).to.equal('raw');
|
||||
expect(mediate.value).to.be.ok;
|
||||
});
|
||||
|
||||
it('encodes bytes tokens in Mediate(prefixed)', () => {
|
||||
const mediate = Encoder.encodeToken(new Token('bytes', '123'));
|
||||
|
||||
expect(mediate.type).to.equal('prefixed');
|
||||
expect(mediate.value).to.be.ok;
|
||||
});
|
||||
|
||||
it('encodes string tokens in Mediate(prefixed)', () => {
|
||||
const mediate = Encoder.encodeToken(new Token('string', '123'));
|
||||
|
||||
expect(mediate.type).to.equal('prefixed');
|
||||
expect(mediate.value).to.be.ok;
|
||||
});
|
||||
|
||||
it('encodes fixedArray tokens in Mediate(fixedArray)', () => {
|
||||
const mediate = Encoder.encodeToken(new Token('fixedArray', [new Token('uint', '123')]));
|
||||
|
||||
expect(mediate.type).to.equal('fixedArray');
|
||||
expect(mediate.value).to.be.ok;
|
||||
});
|
||||
|
||||
it('encodes array tokens in Mediate(array)', () => {
|
||||
const mediate = Encoder.encodeToken(new Token('array', [new Token('uint', '123')]));
|
||||
|
||||
expect(mediate.type).to.equal('array');
|
||||
expect(mediate.value).to.be.ok;
|
||||
});
|
||||
|
||||
it('throws an Error on invalid tokens', () => {
|
||||
const token = new Token('address');
|
||||
token._type = 'noMatch';
|
||||
|
||||
expect(() => Encoder.encodeToken(token)).to.throw(/noMatch/);
|
||||
});
|
||||
});
|
||||
|
||||
describe('encode', () => {
|
||||
it('requires tokens array', () => {
|
||||
expect(() => Encoder.encode()).to.throw(/array/);
|
||||
});
|
||||
|
||||
describe('addresses', () => {
|
||||
const address1 = '1111111111111111111111111111111111111111';
|
||||
const address2 = '2222222222222222222222222222222222222222';
|
||||
const address3 = '3333333333333333333333333333333333333333';
|
||||
const address4 = '4444444444444444444444444444444444444444';
|
||||
const encAddress1 = padAddress(address1);
|
||||
const encAddress2 = padAddress(address2);
|
||||
const encAddress3 = padAddress(address3);
|
||||
const encAddress4 = padAddress(address4);
|
||||
const tokenAddress1 = new Token('address', address1);
|
||||
const tokenAddress2 = new Token('address', address2);
|
||||
const tokenAddress3 = new Token('address', address3);
|
||||
const tokenAddress4 = new Token('address', address4);
|
||||
|
||||
it('encodes an address', () => {
|
||||
const token = tokenAddress1;
|
||||
|
||||
expect(Encoder.encode([token])).to.equal(encAddress1);
|
||||
});
|
||||
|
||||
it('encodes an array of addresses', () => {
|
||||
const expected = `${padU32(0x20)}${padU32(2)}${encAddress1}${encAddress2}`;
|
||||
const token = new Token('array', [tokenAddress1, tokenAddress2]);
|
||||
|
||||
expect(Encoder.encode([token])).to.equal(expected);
|
||||
});
|
||||
|
||||
it('encodes an fixedArray of addresses', () => {
|
||||
const expected = `${encAddress1}${encAddress2}`;
|
||||
const token = new Token('fixedArray', [tokenAddress1, tokenAddress2]);
|
||||
|
||||
expect(Encoder.encode([token])).to.equal(expected);
|
||||
});
|
||||
|
||||
it('encodes two addresses', () => {
|
||||
const expected = `${encAddress1}${encAddress2}`;
|
||||
const tokens = [tokenAddress1, tokenAddress2];
|
||||
|
||||
expect(Encoder.encode(tokens)).to.equal(expected);
|
||||
});
|
||||
|
||||
it('encodes fixed array of dynamic array addresses', () => {
|
||||
const tokens1 = new Token('array', [tokenAddress1, tokenAddress2]);
|
||||
const tokens2 = new Token('array', [tokenAddress3, tokenAddress4]);
|
||||
const fixed = new Token('fixedArray', [tokens1, tokens2]);
|
||||
const expected = `${padU32(0x40)}${padU32(0xa0)}${padU32(2)}${encAddress1}${encAddress2}${padU32(2)}${encAddress3}${encAddress4}`;
|
||||
|
||||
expect(Encoder.encode([fixed])).to.equal(expected);
|
||||
});
|
||||
|
||||
it('encodes dynamic array of fixed array addresses', () => {
|
||||
const tokens1 = new Token('fixedArray', [tokenAddress1, tokenAddress2]);
|
||||
const tokens2 = new Token('fixedArray', [tokenAddress3, tokenAddress4]);
|
||||
const dynamic = new Token('array', [tokens1, tokens2]);
|
||||
const expected = `${padU32(0x20)}${padU32(2)}${encAddress1}${encAddress2}${encAddress3}${encAddress4}`;
|
||||
|
||||
expect(Encoder.encode([dynamic])).to.equal(expected);
|
||||
});
|
||||
|
||||
it('encodes dynamic array of dynamic array addresses', () => {
|
||||
const tokens1 = new Token('array', [tokenAddress1]);
|
||||
const tokens2 = new Token('array', [tokenAddress2]);
|
||||
const dynamic = new Token('array', [tokens1, tokens2]);
|
||||
const expected = `${padU32(0x20)}${padU32(2)}${padU32(0x80)}${padU32(0xc0)}${padU32(1)}${encAddress1}${padU32(1)}${encAddress2}`;
|
||||
|
||||
expect(Encoder.encode([dynamic])).to.equal(expected);
|
||||
});
|
||||
|
||||
it('encodes dynamic array of dynamic array addresses (2)', () => {
|
||||
const tokens1 = new Token('array', [tokenAddress1, tokenAddress2]);
|
||||
const tokens2 = new Token('array', [tokenAddress3, tokenAddress4]);
|
||||
const dynamic = new Token('array', [tokens1, tokens2]);
|
||||
const expected = `${padU32(0x20)}${padU32(2)}${padU32(0x80)}${padU32(0xe0)}${padU32(2)}${encAddress1}${encAddress2}${padU32(2)}${encAddress3}${encAddress4}`;
|
||||
|
||||
expect(Encoder.encode([dynamic])).to.equal(expected);
|
||||
});
|
||||
|
||||
it('encodes fixed array of fixed array addresses', () => {
|
||||
const tokens1 = new Token('fixedArray', [tokenAddress1, tokenAddress2]);
|
||||
const tokens2 = new Token('fixedArray', [tokenAddress3, tokenAddress4]);
|
||||
const dynamic = new Token('fixedArray', [tokens1, tokens2]);
|
||||
const expected = `${encAddress1}${encAddress2}${encAddress3}${encAddress4}`;
|
||||
|
||||
expect(Encoder.encode([dynamic])).to.equal(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe('bytes', () => {
|
||||
const bytes1 = '0x1234';
|
||||
const bytes2 = '0x10000000000000000000000000000000000000000000000000000000000002';
|
||||
const bytes3 = '0x1000000000000000000000000000000000000000000000000000000000000000';
|
||||
|
||||
it('encodes fixed bytes', () => {
|
||||
const token = new Token('fixedBytes', bytes1);
|
||||
|
||||
expect(Encoder.encode([token])).to.equal(padFixedBytes(bytes1));
|
||||
});
|
||||
|
||||
it('encodes bytes', () => {
|
||||
const token = new Token('bytes', bytes1);
|
||||
|
||||
expect(Encoder.encode([token])).to.equal(`${padU32(0x20)}${padU32(2)}${padFixedBytes(bytes1)}`);
|
||||
});
|
||||
|
||||
it('encodes bytes (short of boundary)', () => {
|
||||
const token = new Token('bytes', bytes2);
|
||||
|
||||
expect(Encoder.encode([token])).to.equal(`${padU32(0x20)}${padU32(0x1f)}${padFixedBytes(bytes2)}`);
|
||||
});
|
||||
|
||||
it('encodes bytes (two blocks)', () => {
|
||||
const input = `${bytes3}${bytes3.slice(-64)}`;
|
||||
const token = new Token('bytes', input);
|
||||
|
||||
expect(Encoder.encode([token])).to.equal(`${padU32(0x20)}${padU32(0x40)}${padFixedBytes(input)}`);
|
||||
});
|
||||
|
||||
it('encodes two consecutive bytes', () => {
|
||||
const in1 = '0x10000000000000000000000000000000000000000000000000000000000002';
|
||||
const in2 = '0x0010000000000000000000000000000000000000000000000000000000000002';
|
||||
const tokens = [new Token('bytes', in1), new Token('bytes', in2)];
|
||||
|
||||
expect(Encoder.encode(tokens)).to.equal(`${padU32(0x40)}${padU32(0x80)}${padU32(0x1f)}${padFixedBytes(in1)}${padU32(0x20)}${padFixedBytes(in2)}`);
|
||||
});
|
||||
});
|
||||
|
||||
describe('string', () => {
|
||||
it('encodes a string', () => {
|
||||
const string = 'gavofyork';
|
||||
const stringEnc = padFixedBytes('0x6761766f66796f726b');
|
||||
const token = new Token('string', string);
|
||||
|
||||
expect(Encoder.encode([token])).to.equal(`${padU32(0x20)}${padU32(string.length.toString(16))}${stringEnc}`);
|
||||
});
|
||||
});
|
||||
|
||||
describe('uint', () => {
|
||||
it('encodes a uint', () => {
|
||||
const token = new Token('uint', 4);
|
||||
|
||||
expect(Encoder.encode([token])).to.equal(padU32(4));
|
||||
});
|
||||
});
|
||||
|
||||
describe('int', () => {
|
||||
it('encodes a int', () => {
|
||||
const token = new Token('int', 4);
|
||||
|
||||
expect(Encoder.encode([token])).to.equal(padU32(4));
|
||||
});
|
||||
});
|
||||
|
||||
describe('bool', () => {
|
||||
it('encodes a bool (true)', () => {
|
||||
const token = new Token('bool', true);
|
||||
|
||||
expect(Encoder.encode([token])).to.equal(padU32(1));
|
||||
});
|
||||
|
||||
it('encodes a bool (false)', () => {
|
||||
const token = new Token('bool', false);
|
||||
|
||||
expect(Encoder.encode([token])).to.equal(padU32(0));
|
||||
});
|
||||
});
|
||||
|
||||
describe('comprehensive test', () => {
|
||||
it('encodes a complex sequence', () => {
|
||||
const bytes = '0x131a3afc00d1b1e3461b955e53fc866dcf303b3eb9f4c16f89e388930f48134b131a3afc00d1b1e3461b955e53fc866dcf303b3eb9f4c16f89e388930f48134b';
|
||||
const tokens = [new Token('int', 5), new Token('bytes', bytes), new Token('int', 3), new Token('bytes', bytes)];
|
||||
|
||||
expect(Encoder.encode(tokens)).to.equal(`${padU32(5)}${padU32(0x80)}${padU32(3)}${padU32(0xe0)}${padU32(0x40)}${bytes.substr(2)}${padU32(0x40)}${bytes.substr(2)}`);
|
||||
});
|
||||
|
||||
it('encodes a complex sequence (nested)', () => {
|
||||
const array = [new Token('int', 5), new Token('int', 6), new Token('int', 7)];
|
||||
const tokens = [new Token('int', 1), new Token('string', 'gavofyork'), new Token('int', 2), new Token('int', 3), new Token('int', 4), new Token('array', array)];
|
||||
const stringEnc = padFixedBytes('0x6761766f66796f726b');
|
||||
|
||||
expect(Encoder.encode(tokens)).to.equal(`${padU32(1)}${padU32(0xc0)}${padU32(2)}${padU32(3)}${padU32(4)}${padU32(0x100)}${padU32(9)}${stringEnc}${padU32(3)}${padU32(5)}${padU32(6)}${padU32(7)}`);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
17
js/src/abi/encoder/index.js
Normal file
17
js/src/abi/encoder/index.js
Normal file
@@ -0,0 +1,17 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
export default from './encoder';
|
||||
142
js/src/abi/encoder/mediate.js
Normal file
142
js/src/abi/encoder/mediate.js
Normal file
@@ -0,0 +1,142 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
const TYPES = ['raw', 'prefixed', 'fixedArray', 'array'];
|
||||
|
||||
import { padU32 } from '../util/pad';
|
||||
|
||||
export default class Mediate {
|
||||
constructor (type, value) {
|
||||
Mediate.validateType(type);
|
||||
|
||||
this._type = type;
|
||||
this._value = value;
|
||||
}
|
||||
|
||||
initLength () {
|
||||
switch (this._type) {
|
||||
case 'raw':
|
||||
return this._value.length / 2;
|
||||
|
||||
case 'array':
|
||||
case 'prefixed':
|
||||
return 32;
|
||||
|
||||
case 'fixedArray':
|
||||
return this._value
|
||||
.reduce((total, mediate) => {
|
||||
return total + mediate.initLength();
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
|
||||
closingLength () {
|
||||
switch (this._type) {
|
||||
case 'raw':
|
||||
return 0;
|
||||
|
||||
case 'prefixed':
|
||||
return this._value.length / 2;
|
||||
|
||||
case 'array':
|
||||
return this._value
|
||||
.reduce((total, mediate) => {
|
||||
return total + mediate.initLength();
|
||||
}, 32);
|
||||
|
||||
case 'fixedArray':
|
||||
return this._value
|
||||
.reduce((total, mediate) => {
|
||||
return total + mediate.initLength() + mediate.closingLength();
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
|
||||
init (suffixOffset) {
|
||||
switch (this._type) {
|
||||
case 'raw':
|
||||
return this._value;
|
||||
|
||||
case 'fixedArray':
|
||||
return this._value
|
||||
.map((mediate, idx) => mediate.init(Mediate.offsetFor(this._value, idx)).toString(16))
|
||||
.join('');
|
||||
|
||||
case 'prefixed':
|
||||
case 'array':
|
||||
return padU32(suffixOffset);
|
||||
}
|
||||
}
|
||||
|
||||
closing (offset) {
|
||||
switch (this._type) {
|
||||
case 'raw':
|
||||
return '';
|
||||
|
||||
case 'prefixed':
|
||||
return this._value;
|
||||
|
||||
case 'fixedArray':
|
||||
return this._value
|
||||
.map((mediate, idx) => mediate.closing(Mediate.offsetFor(this._value, idx)).toString(16))
|
||||
.join('');
|
||||
|
||||
case 'array':
|
||||
const prefix = padU32(this._value.length);
|
||||
const inits = this._value
|
||||
.map((mediate, idx) => mediate.init(offset + Mediate.offsetFor(this._value, idx) + 32).toString(16))
|
||||
.join('');
|
||||
const closings = this._value
|
||||
.map((mediate, idx) => mediate.closing(offset + Mediate.offsetFor(this._value, idx)).toString(16))
|
||||
.join('');
|
||||
|
||||
return `${prefix}${inits}${closings}`;
|
||||
}
|
||||
}
|
||||
|
||||
get type () {
|
||||
return this._type;
|
||||
}
|
||||
|
||||
get value () {
|
||||
return this._value;
|
||||
}
|
||||
|
||||
static offsetFor (mediates, position) {
|
||||
if (position < 0 || position >= mediates.length) {
|
||||
throw new Error(`Invalid position ${position} specified for Mediate.offsetFor`);
|
||||
}
|
||||
|
||||
const initLength = mediates
|
||||
.reduce((total, mediate) => {
|
||||
return total + mediate.initLength();
|
||||
}, 0);
|
||||
|
||||
return mediates
|
||||
.slice(0, position)
|
||||
.reduce((total, mediate) => {
|
||||
return total + mediate.closingLength();
|
||||
}, initLength);
|
||||
}
|
||||
|
||||
static validateType (type) {
|
||||
if (TYPES.filter((_type) => type === _type).length) {
|
||||
return true;
|
||||
}
|
||||
|
||||
throw new Error(`Invalid type ${type} received for Mediate.validateType`);
|
||||
}
|
||||
}
|
||||
105
js/src/abi/encoder/mediate.spec.js
Normal file
105
js/src/abi/encoder/mediate.spec.js
Normal file
@@ -0,0 +1,105 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import Mediate from './mediate';
|
||||
|
||||
describe('abi/encoder/Mediate', () => {
|
||||
const LONG15 = '1234567890abcdef000000000000000000000000000000000000000000000000';
|
||||
const DOUBLE15 = `${LONG15}${LONG15}`;
|
||||
const ARRAY = [new Mediate('raw', DOUBLE15), new Mediate('raw', LONG15)];
|
||||
|
||||
describe('validateType', () => {
|
||||
it('validates raw', () => {
|
||||
expect(Mediate.validateType('raw')).to.be.true;
|
||||
});
|
||||
|
||||
it('validates prefixed', () => {
|
||||
expect(Mediate.validateType('prefixed')).to.be.true;
|
||||
});
|
||||
|
||||
it('validates fixedArray', () => {
|
||||
expect(Mediate.validateType('fixedArray')).to.be.true;
|
||||
});
|
||||
|
||||
it('validates array', () => {
|
||||
expect(Mediate.validateType('array')).to.be.true;
|
||||
});
|
||||
|
||||
it('throws an error on invalid types', () => {
|
||||
expect(() => Mediate.validateType('noMatch')).to.throw(/noMatch/);
|
||||
});
|
||||
});
|
||||
|
||||
describe('offsetFor', () => {
|
||||
it('thows an error when offset < 0', () => {
|
||||
expect(() => Mediate.offsetFor([1], -1)).to.throw(/Invalid position/);
|
||||
});
|
||||
|
||||
it('throws an error when offset >= length', () => {
|
||||
expect(() => Mediate.offsetFor([1], 1)).to.throw(/Invalid position/);
|
||||
});
|
||||
});
|
||||
|
||||
describe('constructor', () => {
|
||||
it('throws an error on invalid types', () => {
|
||||
expect(() => new Mediate('noMatch', '1')).to.throw(/noMatch/);
|
||||
});
|
||||
|
||||
it('sets the type of the object', () => {
|
||||
expect((new Mediate('raw', '1')).type).to.equal('raw');
|
||||
});
|
||||
|
||||
it('sets the value of the object', () => {
|
||||
expect((new Mediate('raw', '1')).value).to.equal('1');
|
||||
});
|
||||
});
|
||||
|
||||
describe('initLength', () => {
|
||||
it('returns correct variable byte length for raw', () => {
|
||||
expect(new Mediate('raw', DOUBLE15).initLength()).to.equal(64);
|
||||
});
|
||||
|
||||
it('returns correct fixed byte length for array', () => {
|
||||
expect(new Mediate('array', [1, 2, 3, 4]).initLength()).to.equal(32);
|
||||
});
|
||||
|
||||
it('returns correct fixed byte length for prefixed', () => {
|
||||
expect(new Mediate('prefixed', 0).initLength()).to.equal(32);
|
||||
});
|
||||
|
||||
it('returns correct variable byte length for fixedArray', () => {
|
||||
expect(new Mediate('fixedArray', ARRAY).initLength()).to.equal(96);
|
||||
});
|
||||
});
|
||||
|
||||
describe('closingLength', () => {
|
||||
it('returns 0 byte length for raw', () => {
|
||||
expect(new Mediate('raw', DOUBLE15).closingLength()).to.equal(0);
|
||||
});
|
||||
|
||||
it('returns prefix + size for prefixed', () => {
|
||||
expect(new Mediate('prefixed', DOUBLE15).closingLength()).to.equal(64);
|
||||
});
|
||||
|
||||
it('returns prefix + size for array', () => {
|
||||
expect(new Mediate('array', ARRAY).closingLength()).to.equal(128);
|
||||
});
|
||||
|
||||
it('returns total length for fixedArray', () => {
|
||||
expect(new Mediate('fixedArray', ARRAY).closingLength()).to.equal(96);
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user