Skip to content

Commit

Permalink
Replace heavy crypto packages for lighter noble implementations via u…
Browse files Browse the repository at this point in the history
…pgrading `ethereumjs-util` to latest (now called `@ethereumjs/util`) (#260)

* upgrade ethereumjs-util to latest (@ethereumjs/util) and adapt accordingly

* fix types

* wip

* fix something

* swap out TextEncoder for Buffer.from

* fix number hashing

* fix more tests

* add comments

* all tests passing

* cutting out ethereumjs-abi

* add jsdocs

* fully remove old secp256k1 from dependency tree via ethereum-cryptography 0.1.3"

* progress?

* idk

* tests passing

* move ethereumjs-abi methods to their own file

* switch out toBuffers for typed specific buffer converts

* add tests for ethereumjs-abi-util functions

* lower test threshhold

* lint

* fix tests
  • Loading branch information
adonesky1 authored Aug 17, 2022
1 parent e33457f commit 9f01c9d
Show file tree
Hide file tree
Showing 11 changed files with 825 additions and 330 deletions.
6 changes: 3 additions & 3 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ module.exports = {
coverageThreshold: {
global: {
branches: 74,
functions: 100,
lines: 94,
statements: 94,
functions: 98,
lines: 93.4,
statements: 93.4,
},
},
moduleFileExtensions: ['js', 'json', 'jsx', 'ts', 'tsx', 'node'],
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@
"airtap/engine.io-client/xmlhttprequest-ssl": "^1.6.2"
},
"dependencies": {
"ethereumjs-abi": "^0.6.8",
"ethereumjs-util": "^6.2.1",
"@ethereumjs/util": "^8.0.0-beta.1",
"bn.js": "4.11.8",
"ethereum-cryptography": "^1.1.2",
"ethjs-util": "^0.1.6",
"tweetnacl": "^1.0.3",
"tweetnacl-util": "^0.15.1"
Expand Down
295 changes: 295 additions & 0 deletions src/ethereumjs-abi-utils.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,295 @@
import BN from 'bn.js';
import { rawEncode, solidityPack, parseNumber } from './ethereumjs-abi-utils';

describe('encoding negative int256', function () {
it('should equal', function () {
const a = rawEncode(
['int256'],
[
new BN(
'-19999999999999999999999999999999999999999999999999999999999999',
10,
),
],
).toString('hex');
const b =
'fffffffffffff38dd0f10627f5529bdb2c52d4846810af0ac000000000000001';
expect(a).toStrictEqual(b);
});
});

describe('encoding string >32bytes', function () {
it('should equal', function () {
const a = rawEncode(
['string'],
[
' hello world hello world hello world hello world hello world hello world hello world hello world hello world hello world hello world hello world hello world hello world hello world hello world',
],
).toString('hex');
const b =
'000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c22068656c6c6f20776f726c642068656c6c6f20776f726c642068656c6c6f20776f726c642068656c6c6f20776f726c64202068656c6c6f20776f726c642068656c6c6f20776f726c642068656c6c6f20776f726c642068656c6c6f20776f726c64202068656c6c6f20776f726c642068656c6c6f20776f726c642068656c6c6f20776f726c642068656c6c6f20776f726c642068656c6c6f20776f726c642068656c6c6f20776f726c642068656c6c6f20776f726c642068656c6c6f20776f726c64000000000000000000000000000000000000000000000000000000000000';
expect(a).toStrictEqual(b);
});
});

describe('encoding uint32 response', function () {
it('should equal', function () {
const a = rawEncode(['uint32'], [42]).toString('hex');
const b =
'000000000000000000000000000000000000000000000000000000000000002a';
expect(a).toStrictEqual(b);
});
});

describe('encoding string response (unsupported)', function () {
it('should equal', function () {
const a = rawEncode(
['string'],
['a response string (unsupported)'],
).toString('hex');
const b =
'0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001f6120726573706f6e736520737472696e672028756e737570706f727465642900';
expect(a).toStrictEqual(b);
});
});

describe('encoding', function () {
it('should work for uint256', function () {
const a = rawEncode(['uint256'], [1]).toString('hex');
const b =
'0000000000000000000000000000000000000000000000000000000000000001';
expect(a).toStrictEqual(b);
});

it('should work for uint', function () {
const a = rawEncode(['uint'], [1]).toString('hex');
const b =
'0000000000000000000000000000000000000000000000000000000000000001';
expect(a).toStrictEqual(b);
});

it('should work for int256', function () {
const a = rawEncode(['int256'], [-1]).toString('hex');
const b =
'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff';
expect(a).toStrictEqual(b);
});

it('should work for string and uint256[2]', function () {
const a = rawEncode(['string', 'uint256[2]'], ['foo', [5, 6]]).toString(
'hex',
);
const b =
'0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000003666f6f0000000000000000000000000000000000000000000000000000000000';
expect(a).toStrictEqual(b);
});
});

describe('encoding bytes33', function () {
it('should fail', function () {
expect(() => rawEncode('fail', ['bytes33'])).toThrow(
'types.forEach is not a function',
);
});
});

describe('encoding uint0', function () {
it('should fail', function () {
expect(() => rawEncode('fail', ['uint0'])).toThrow(
'types.forEach is not a function',
);
});
});

describe('encoding uint257', function () {
it('should fail', function () {
expect(() => rawEncode('fail', ['uint257'])).toThrow(
'types.forEach is not a function',
);
});
});

describe('encoding int0', function () {
it('should fail', function () {
expect(() => rawEncode(['int0'], [1])).toThrow('Invalid int<N> width: 0');
});
});

describe('encoding int257', function () {
it('should fail', function () {
expect(() => rawEncode(['int257'], [1])).toThrow(
'Invalid int<N> width: 257',
);
});
});

describe('encoding uint[2] with [1,2,3]', function () {
it('should fail', function () {
expect(() => rawEncode(['uint[2]'], [[1, 2, 3]])).toThrow(
'Elements exceed array size: 2',
);
});
});

describe('encoding uint8 with 9bit data', function () {
it('should fail', function () {
expect(() => rawEncode(['uint8'], [new BN(1).iushln(9)])).toThrow(
'Supplied uint exceeds width: 8 vs 10',
);
});
});

describe('solidity tight packing bool', function () {
it('should equal', function () {
let a = solidityPack(['bool'], [true]);
let b = '01';
expect(a.toString('hex')).toStrictEqual(b);
a = solidityPack(['bool'], [false]);
b = '00';
expect(a.toString('hex')).toStrictEqual(b);
});
});

describe('solidity tight packing address', function () {
it('should equal', function () {
const a = solidityPack(
['address'],
[new BN('43989fb883ba8111221e89123897538475893837', 16)],
);
const b = '43989fb883ba8111221e89123897538475893837';
expect(a.toString('hex')).toStrictEqual(b);
});
});

describe('solidity tight packing string', function () {
it('should equal', function () {
const a = solidityPack(['string'], ['test']);
const b = '74657374';
expect(a.toString('hex')).toStrictEqual(b);
});
});

describe('solidity tight packing bytes', function () {
it('should equal', function () {
const a = solidityPack(['bytes'], [Buffer.from('123456', 'hex')]);
const b = '123456';
expect(a.toString('hex')).toStrictEqual(b);
});
});

describe('solidity tight packing bytes8', function () {
it('should equal', function () {
const a = solidityPack(['bytes8'], [Buffer.from('123456', 'hex')]);
const b = '1234560000000000';
expect(a.toString('hex')).toStrictEqual(b);
});
});

describe('solidity tight packing uint', function () {
it('should equal', function () {
const a = solidityPack(['uint'], [42]);
const b =
'000000000000000000000000000000000000000000000000000000000000002a';
expect(a.toString('hex')).toStrictEqual(b);
});
});

describe('solidity tight packing uint16', function () {
it('should equal', function () {
const a = solidityPack(['uint16'], [42]);
const b = '002a';
expect(a.toString('hex')).toStrictEqual(b);
});
});

describe('solidity tight packing int', function () {
it('should equal', function () {
const a = solidityPack(['int'], [-42]);
const b =
'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd6';
expect(a.toString('hex')).toStrictEqual(b);
});
});

describe('solidity tight packing int16', function () {
it('should equal', function () {
const a = solidityPack(['int16'], [-42]);
const b = 'ffd6';
expect(a.toString('hex')).toStrictEqual(b);
});
});

describe('solidity tight packing multiple arguments', function () {
it('should equal', function () {
const a = solidityPack(
['bytes32', 'uint32', 'uint32', 'uint32', 'uint32'],
[Buffer.from('123456', 'hex'), 6, 7, 8, 9],
);
const b =
'123456000000000000000000000000000000000000000000000000000000000000000006000000070000000800000009';
expect(a.toString('hex')).toStrictEqual(b);
});
});

describe('solidity tight packing uint32[]', function () {
it('should equal', function () {
const a = solidityPack(['uint32[]'], [[8, 9]]);
const b =
'00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009';
expect(a.toString('hex')).toStrictEqual(b);
});
});

describe('solidity tight packing bool[][]', function () {
it('should equal', function () {
const a = solidityPack(
['bool[][]'],
[
[
[true, false],
[false, true],
],
],
);
const b =
'0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001';
expect(a.toString('hex')).toStrictEqual(b);
});
});

describe('solidity tight packing address[]', function () {
it('should equal', function () {
const a = solidityPack(
['address[]'],
[[new BN('43989fb883ba8111221e89123897538475893837', 16)]],
);
const b =
'00000000000000000000000043989fb883ba8111221e89123897538475893837';
expect(a.toString('hex')).toStrictEqual(b);
});
});

describe('solidity tight packing uint32[2]', function () {
it('should equal', function () {
const a = solidityPack(['uint32[2]'], [[11, 12]]);
const b =
'000000000000000000000000000000000000000000000000000000000000000b000000000000000000000000000000000000000000000000000000000000000c';
expect(a.toString('hex')).toStrictEqual(b);
});
});

describe('solidity packing different amounts of values and types should fail', function () {
it('should throw "Number of types are not matching the values"', function () {
expect(() => {
solidityPack(['uint32'], [11, 12]);
}).toThrow('Number of types are not matching the values');
});
});

describe('parseNumber should throw an error when passed an object', function () {
it('should throw "Argument is not a number', function () {
expect(() => {
parseNumber({ test: 'test' });
}).toThrow('Argument is not a number');
});
});
Loading

0 comments on commit 9f01c9d

Please sign in to comment.