zecfoundation
/
zcash-grant-system
mirror of https://github.com/ZcashFoundation/zcash-grant-system.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #479 from ZcashFoundation/develop 

Additional version updates for 1.6.1
This commit is contained in:
Daniel Ternyak 2019-08-21 18:35:53 -05:00 committed by GitHub
parent 8677a36587 70591453b5
commit 47eef0b70b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 93 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blockchain/package.json
View File

@ -16,6 +16,10 @@
"heroku-postbuild": "yarn build",
"start": "node ./dist/index.js"
},
"resolutions": {
"axios": "0.18.1",
"lodash": "4.17.13"
},
"devDependencies": {
"@types/body-parser": "1.17.0",
"@types/expect": "^1.20.3",

115
blockchain/src/util.spec.ts
View File

@ -37,63 +37,64 @@ describe('util', () => {
});
// Keys and values taken from https://iancoleman.io/bip39/
describe('deriveTransparentAddress', () => {
const xpub = 'xpub6DKCpzYonPtjhfL9Gc6cJRxqtX3pvw3ACLguiZByfS1vic1EqgHPRBu7inUvoNxBT1m6BNuU5uUSSo5X3Zzi5mbrByBBQwhvNmmi8HErHt6';
const addresses = {
mainnet: {
0: 't1MZtRMbCE6uJTbVot6XczUKNvG5iRgcf8d',
999: 't1aCsQns9UuRZzdXp71gFTpcMomyFfpWE1W',
},
testnet: {
0: 'tmDQdkC5bcmQobqhFYpqMr8z8XFAXragbZ6',
999: 'tmS3cjdMYsZw58sjFmjyzKVH7Qm458gbea7',
},
};
let oldXPub: any;
before(() => {
oldXPub = process.env.BIP32_XPUB;
process.env.BIP32_XPUB = xpub;
});
it('Should generate the correct address for mainnet m/0/0', () => {
const addr = util.deriveTransparentAddress(0, bitcore.Networks.mainnet);
assert.equal(addr, addresses.mainnet[0]);
});
it('Should generate the correct address for index m/0/999', () => {
const addr = util.deriveTransparentAddress(999, bitcore.Networks.mainnet);
assert.equal(addr, addresses.mainnet[999]);
});
it('Should generate the correct address for testnet m/0/0', () => {
const addr = util.deriveTransparentAddress(0, bitcore.Networks.testnet);
assert.equal(addr, addresses.testnet[0]);
});
it('Should generate the correct address for testnet index m/0/999', () => {
const addr = util.deriveTransparentAddress(999, bitcore.Networks.testnet);
assert.equal(addr, addresses.testnet[999]);
});
it('Should throw on numbers greater than or equal to 2^31', () => {
assert.ok(util.deriveTransparentAddress(Math.pow(2, 31) - 1, bitcore.Networks.mainnet));
assert.throws(() => {
util.deriveTransparentAddress(Math.pow(2, 31), bitcore.Networks.mainnet);
});
});
it('Should throw on numbers less than 0', () => {
assert.throws(() => {
util.deriveTransparentAddress(-1, bitcore.Networks.mainnet);
});
});
after(() => {
process.env.BIP32_XPUB = oldXPub;
});
});
// zcash-bitcore-lib requires a version of lodash that is insecure.
// describe('deriveTransparentAddress', () => {
// const xpub = 'xpub6DKCpzYonPtjhfL9Gc6cJRxqtX3pvw3ACLguiZByfS1vic1EqgHPRBu7inUvoNxBT1m6BNuU5uUSSo5X3Zzi5mbrByBBQwhvNmmi8HErHt6';
// const addresses = {
// mainnet: {
// 0: 't1MZtRMbCE6uJTbVot6XczUKNvG5iRgcf8d',
// 999: 't1aCsQns9UuRZzdXp71gFTpcMomyFfpWE1W',
// },
// testnet: {
// 0: 'tmDQdkC5bcmQobqhFYpqMr8z8XFAXragbZ6',
// 999: 'tmS3cjdMYsZw58sjFmjyzKVH7Qm458gbea7',
// },
// };
// let oldXPub: any;
//
// before(() => {
// oldXPub = process.env.BIP32_XPUB;
// process.env.BIP32_XPUB = xpub;
// });
//
//
// it('Should generate the correct address for mainnet m/0/0', () => {
// const addr = util.deriveTransparentAddress(0, bitcore.Networks.mainnet);
// assert.equal(addr, addresses.mainnet[0]);
// });
//
// it('Should generate the correct address for index m/0/999', () => {
// const addr = util.deriveTransparentAddress(999, bitcore.Networks.mainnet);
// assert.equal(addr, addresses.mainnet[999]);
// });
//
// it('Should generate the correct address for testnet m/0/0', () => {
// const addr = util.deriveTransparentAddress(0, bitcore.Networks.testnet);
// assert.equal(addr, addresses.testnet[0]);
// });
//
// it('Should generate the correct address for testnet index m/0/999', () => {
// const addr = util.deriveTransparentAddress(999, bitcore.Networks.testnet);
// assert.equal(addr, addresses.testnet[999]);
// });
//
// it('Should throw on numbers greater than or equal to 2^31', () => {
// assert.ok(util.deriveTransparentAddress(Math.pow(2, 31) - 1, bitcore.Networks.mainnet));
// assert.throws(() => {
// util.deriveTransparentAddress(Math.pow(2, 31), bitcore.Networks.mainnet);
// });
// });
//
// it('Should throw on numbers less than 0', () => {
// assert.throws(() => {
// util.deriveTransparentAddress(-1, bitcore.Networks.mainnet);
// });
// });
//
// after(() => {
// process.env.BIP32_XPUB = oldXPub;
// });
// });
describe('dedupeArray', () => {
it('Should remove duplicates', () => {

35
blockchain/yarn.lock
View File

@ -290,7 +290,7 @@ atob@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
axios@0.18.1:
axios@0.18.1, axios@^0.16.2, axios@^0.18.0:
version "0.18.1"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3"
integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==
@ -298,20 +298,6 @@ axios@0.18.1:
follow-redirects "1.5.10"
is-buffer "^2.0.2"
axios@^0.16.2:
version "0.16.2"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.2.tgz#ba4f92f17167dfbab40983785454b9ac149c3c6d"
dependencies:
follow-redirects "^1.2.3"
is-buffer "^1.1.5"
axios@^0.18.0:
version "0.18.0"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
dependencies:
follow-redirects "^1.3.0"
is-buffer "^1.1.5"
babel-runtime@^5.8.20:
version "5.8.38"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-5.8.38.tgz#1c0b02eb63312f5f087ff20450827b425c9d4c19"
@ -1483,18 +1469,12 @@ finalhandler@1.1.1:
statuses "~1.4.0"
unpipe "~1.0.0"
follow-redirects@1.5.10, follow-redirects@^1.2.3:
follow-redirects@1.5.10:
version "1.5.10"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
dependencies:
debug "=3.1.0"
follow-redirects@^1.3.0:
version "1.6.1"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.6.1.tgz#514973c44b5757368bad8bddfe52f81f015c94cb"
dependencies:
debug "=3.1.0"
for-in@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@ -2090,13 +2070,10 @@ lodash.debounce@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
lodash@4.17.11, lodash@^4.12.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.4:
version "4.17.11"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
lodash@=3.10.1:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
lodash@4.17.11, lodash@4.17.13, lodash@=3.10.1, lodash@^4.12.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.4:
version "4.17.13"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.13.tgz#0bdc3a6adc873d2f4e0c4bac285df91b64fc7b93"
integrity sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA==
logform@^1.9.1:
version "1.10.0"

6
frontend/package.json
View File

@ -28,6 +28,12 @@
"git add"
]
},
"resolutions": {
"js-yaml": "3.13.1",
"lodash": "4.17.13",
"marked": "0.6.1",
"lodash-es": "4.17.14"
},
"dependencies": {
"@babel/core": "^7.0.1",
"@babel/plugin-proposal-class-properties": "^7.0.0",

34
frontend/yarn.lock
View File

@ -6961,9 +6961,10 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
js-yaml@3.12.0, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
version "3.12.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
js-yaml@3.12.0, js-yaml@3.13.1, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
version "3.13.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"
@ -7345,15 +7346,16 @@ lodash-decorators@^6.0.0:
dependencies:
tslib "^1.9.2"
lodash-es@4.17.14, lodash-es@^4.17.5, lodash-es@^4.2.1:
version "4.17.14"
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.14.tgz#12a95a963cc5955683cee3b74e85458954f37ecc"
integrity sha512-7zchRrGa8UZXjD/4ivUWP1867jDkhzTG2c/uj739utSd7O/pFFdxspCemIFKEEjErbcqRzn8nKnGsi7mvTgRPA==
lodash-es@^4.17.15:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
lodash-es@^4.17.5, lodash-es@^4.2.1:
version "4.17.10"
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.10.tgz#62cd7104cdf5dd87f235a837f0ede0e8e5117e05"
lodash._getnative@^3.0.0:
version "3.9.1"
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
@ -7448,15 +7450,16 @@ lodash.throttle@^4.0.0, lodash.throttle@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.16.5, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10:
lodash@4.17.13, "lodash@>=3.5 <5", lodash@^3.9.1, lodash@^4.0.0, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.16.5, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10:
version "4.17.13"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.13.tgz#0bdc3a6adc873d2f4e0c4bac285df91b64fc7b93"
integrity sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA==
lodash@^4.17.15:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
lodash@^3.9.1:
version "3.10.1"
resolved "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
log-symbols@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@ -7581,9 +7584,10 @@ markdown-loader@^4.0.0:
loader-utils "^1.1.0"
marked "^0.5.0"
marked@^0.5.0:
version "0.5.2"
resolved "https://registry.yarnpkg.com/marked/-/marked-0.5.2.tgz#3efdb27b1fd0ecec4f5aba362bddcd18120e5ba9"
marked@0.6.1, marked@^0.5.0:
version "0.6.1"
resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.1.tgz#a63addde477bca9613028de4b2bc3629e53a0562"
integrity sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA==
math-random@^1.0.1:
version "1.0.1"