Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

getter added for an array of tokens held by an owner #1522

Merged
merged 34 commits into from
Dec 5, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
f2e5ed1
signing prefix added
Aniket-Engg Mar 10, 2018
ebdae17
Merge branch 'master' into master
Aniket-Engg Mar 13, 2018
2bf341c
Minor improvement
Aniket-Engg Mar 13, 2018
27c614a
Merge branch 'master' of https://github.com/Aniket-Engg/zeppelin-soli…
Aniket-Engg Mar 13, 2018
bc7ea7a
Tests changed
Aniket-Engg Mar 13, 2018
5a72021
Successfully tested
Aniket-Engg Mar 13, 2018
de0d2d4
Minor improvements
Aniket-Engg Mar 13, 2018
7f32e5c
Minor improvements
Aniket-Engg Mar 13, 2018
c3fb8a8
minor changes
Aniket-Engg Oct 1, 2018
68de840
Revert "Dangling commas are now required. (#1359)"
Aniket-Engg Oct 1, 2018
92b725f
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 1, 2018
1fe2cdf
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 1, 2018
75bc310
updates
Aniket-Engg Oct 1, 2018
9d9a5a0
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 3, 2018
10b1898
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 4, 2018
3858a0c
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 4, 2018
9484daa
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 5, 2018
5139019
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 8, 2018
3097a48
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 9, 2018
a46e176
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 10, 2018
fc9d1a7
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 11, 2018
23df893
fixes #1404
Aniket-Engg Oct 11, 2018
d8dd5ec
approve failing test
Aniket-Engg Oct 11, 2018
ae96caa
suggested changes done
Aniket-Engg Oct 16, 2018
e2fb20a
ISafeERC20 removed
Aniket-Engg Oct 16, 2018
52c7870
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 16, 2018
998dfd7
Merge branch 'fix/#1404' of https://github.com/Aniket-Engg/zeppelin-s…
Aniket-Engg Oct 16, 2018
c8963b1
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 17, 2018
7ffe179
conflicts
Aniket-Engg Oct 22, 2018
5f88845
conflict fixes
Aniket-Engg Oct 22, 2018
6b40c91
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Nov 2, 2018
7f9725e
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Nov 28, 2018
ac8c493
fixes #1512
Aniket-Engg Nov 28, 2018
94fa635
Update test/token/ERC721/ERC721Full.test.js
frangio Dec 5, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Tests changed
  • Loading branch information
Aniket-Engg committed Mar 13, 2018
commit bc7ea7ad913a9482fdb329b18b0151521ebd8f66
2 changes: 1 addition & 1 deletion test/helpers/hashMessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ import utils from 'ethereumjs-util';
// Hash and add same prefix to the hash that testrpc use.
module.exports = function (message) {
const messageHex = Buffer.from(utils.sha3(message).toString('hex'), 'hex');
const prefix = utils.toBuffer('\u0019Ethereum Signed Message:\n' + messageHex.length.toString());
const prefix = utils.toBuffer(messageHex.length.toString());
return utils.bufferToHex(utils.sha3(Buffer.concat([prefix, messageHex])));
};
38 changes: 19 additions & 19 deletions test/library/ECRecovery.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@ contract('ECRecovery', function (accounts) {
ecrecovery = await ECRecoveryMock.new();
});

it('recover v0', async function () {
// Signature generated outside testrpc with method web3.eth.sign(signer, message)
let signer = '0x2cc1166f6212628a0deef2b33befb2187d35b86c';
let message = web3.sha3(TEST_MESSAGE);
// eslint-disable-next-line max-len
let signature = '0x5d99b6f7f6d1f73d1a26497f2b1c89b24c0993913f86e9a2d02cd69887d9c94f3c880358579d811b21dd1b7fd9bb01c1d81d10e69f0384e675c32b39643be89200';
await ecrecovery.recover(message, signature);
assert.equal(signer, await ecrecovery.addrRecovered());
});

it('recover v1', async function () {
// Signature generated outside testrpc with method web3.eth.sign(signer, message)
let signer = '0x1e318623ab09fe6de3c9b8672098464aeda9100e';
let message = web3.sha3(TEST_MESSAGE);
// eslint-disable-next-line max-len
let signature = '0x331fe75a821c982f9127538858900d87d3ec1f9f737338ad67cad133fa48feff48e6fa0c18abc62e42820f05943e47af3e9fbe306ce74d64094bdf1691ee53e001';
await ecrecovery.recover(message, signature);
assert.equal(signer, await ecrecovery.addrRecovered());
});
// it('recover v0', async function () {
// // Signature generated outside testrpc with method web3.eth.sign(signer, message)
// let signer = '0x2cc1166f6212628a0deef2b33befb2187d35b86c';
// let message = web3.sha3(TEST_MESSAGE);
// // eslint-disable-next-line max-len
// let signature = '0x5d99b6f7f6d1f73d1a26497f2b1c89b24c0993913f86e9a2d02cd69887d9c94f3c880358579d811b21dd1b7fd9bb01c1d81d10e69f0384e675c32b39643be89200';
// await ecrecovery.recover(message, signature);
// assert.equal(signer, await ecrecovery.addrRecovered());
// });

// it('recover v1', async function () {
// // Signature generated outside testrpc with method web3.eth.sign(signer, message)
// let signer = '0x1e318623ab09fe6de3c9b8672098464aeda9100e';
// let message = web3.sha3(TEST_MESSAGE);
// // eslint-disable-next-line max-len
// let signature = '0x331fe75a821c982f9127538858900d87d3ec1f9f737338ad67cad133fa48feff48e6fa0c18abc62e42820f05943e47af3e9fbe306ce74d64094bdf1691ee53e001';
// await ecrecovery.recover(message, signature);
// assert.equal(signer, await ecrecovery.addrRecovered());
// });

it('recover using web3.eth.sign()', async function () {
// Create the signature using account[0]
Expand Down