Commit Graph

143 Commits

Author SHA1 Message Date
Michael Bradley, Jr a663268f66 bump this fork to 0.6.4 in prep to publish in @embarklabs scope
A tag already exists for 0.6.3 so prefer 0.6.4 even though the changes in this
fork don't really amount to a patch-level version bump.
2020-01-14 18:15:37 -06:00
Michael Bradley 8fa52c876d
Merge pull request #1 from embark-framework/web3-js-scrypt-shim
Web3 js scrypt shim
2020-01-14 18:08:45 -06:00
Michael Bradley, Jr 544e2ab442 top-level hdkey.js module 2020-01-14 18:06:39 -06:00
Michael Bradley, Jr 1ec629a57d use @web3-js/scrypt-shim in place of scrypt.js 2020-01-14 18:06:39 -06:00
Michael Bradley, Jr 8156be2d00 npm-script "lint-fix" expects a script named "format:fix" 2020-01-14 18:06:39 -06:00
Michael Bradley, Jr 675d4c300b format-fix 2020-01-14 18:06:39 -06:00
Michael Bradley, Jr d94a4f6efc fork and prep to publish as @embarklabs/ethereumjs-wallet 2020-01-14 18:03:08 -06:00
Holger Drewes ac906751dd
Merge pull request #95 from michaelsbradleyjr/fix/tov3-salt-buffer
Normalize salt, iv, uuid params of .toV3()  before encrypting
2019-08-28 20:37:34 +02:00
Michael Bradley, Jr debbd4f4b1 Normalize salt, iv, uuid params of .toV3() before encrypting
Previously, if `salt`, `iv` and/or `uuid` options were supplied as strings to
`.toV3()` they would be passed to `pbkdf2Sync`/`scrypt` as strings. That could
result in errors during encryption. Also, during decryption these options were
always converted to Buffer instances such that supplying strings during
encryption could result in output that could not be decrypted.

This commit fixes the inconsistencies, guards against bad inputs, and also
makes encrypted output match up with the output of other wallet libraries, e.g.
`ethers`, whenever the equivalent encryption options are used consistently
across libraries.
2019-08-26 14:14:21 -05:00
Holger Drewes de3a92e752
Merge pull request #93 from the-jackalope/typescript-rewrite
Typescript rewrite
2019-08-01 12:56:26 +02:00
Jack Cook 807b98003d cleaner flow around the .toV3 KDF parameters 2019-07-16 20:32:06 -07:00
Jack Cook 288442924e PR review fixes 2019-07-02 11:56:56 -07:00
Jack Cook bca01ea69f deduped travis setting 2019-06-28 15:18:46 -07:00
Jack Cook 733e49b7e9 use module style exports to maintain the way JS imports the compiled code 2019-06-28 15:17:29 -07:00
Jack Cook 384860ea6b linting fixes 2019-06-27 19:26:49 -07:00
Jack Cook 96f5f5af4c adding lint commands per ethereumjs config guidelines 2019-06-27 19:19:03 -07:00
Jack Cook 695da18e44 converted files to ts, fixed tests, implemented ethereumjs standards for coverage, ts compiler, and tslint 2019-06-27 19:10:15 -07:00
Holger Drewes c04b80e2b1
Merge pull request #88 from ethereumjs/org-links-and-git-hooks
Org links and git hooks
2019-04-26 16:39:49 +02:00
holgerd77 18de4ecc2d Added husky (Git hooks) dependency and pre-push hook to package.json 2019-04-26 15:11:03 +02:00
holgerd77 799fa23017 Added EthereumJS footer with organization docs linking 2019-04-26 15:10:19 +02:00
holgerd77 72f629d502 Added contributing file to .github folder 2019-04-26 15:09:51 +02:00
Holger Drewes e896df6e23
Merge pull request #87 from blockhive/master
Update hdkey to 1.1.1
2019-03-15 13:11:10 +01:00
Vitaly Migunov cdfa8d848f update hdkey to 1.1.1 2019-03-13 12:14:09 +09:00
Alex Beregszaszi 830307cb1b
Merge pull request #82 from ethereumjs/cipherbuffer
Refactor decipherBuffer
2018-12-22 18:21:36 +00:00
Alex Beregszaszi 9ee22af4ba Refactor decipherBuffer 2018-12-20 21:04:15 +00:00
Alex Beregszaszi 444d833338
Merge pull request #80 from ethereumjs/presale
Add more test for fromEthSale
2018-12-20 11:50:55 +00:00
Holger Drewes d7e729c1eb
Merge pull request #79 from ethereumjs/changelog-0.6.3
Add changelog for 0.6.3
2018-12-20 12:46:53 +01:00
Alex Beregszaszi e401f5686c Add more test for fromEthSale 2018-12-20 11:44:48 +00:00
Alex Beregszaszi e68a04290b Bump version to 0.6.3 2018-12-20 11:31:03 +00:00
Alex Beregszaszi 19685eaff0 Add changelog for 0.6.3 2018-12-19 11:59:03 +00:00
Holger Drewes 088b0a9cc6
Merge pull request #78 from ethereumjs/update-deps
Update dependencies
2018-12-19 12:33:30 +01:00
Alex Beregszaszi 2a5f319301 Upgrade to standard 12.0.0 2018-12-19 00:11:31 +00:00
Alex Beregszaszi a0ab9292dc Upgrade to ethereumjs-util 6.0.0 2018-12-19 00:11:22 +00:00
Alex Beregszaszi 93b0fae5f9 Update dependencies 2018-12-19 00:11:22 +00:00
Alex Beregszaszi 2d1c13b89b
Merge pull request #77 from ethereumjs/remove-excess-parameter
Remove excess parameter from decipherBuffer
2018-12-12 14:49:59 +00:00
Alex Beregszaszi dd2a4b826e Remove excess parameter from decipherBuffer 2018-12-12 14:45:41 +00:00
Holger Drewes 3927a0e540
Merge pull request #62 from ethereumjs/test-fromv3
Add comprehensive test coverage for fromV3
2018-09-24 11:15:47 +02:00
Alex Beregszaszi 1ed1f2f5f8 Add comprehensive test coverage for fromV3 2018-09-24 10:48:36 +02:00
Holger Drewes 573502611f
Merge pull request #63 from ethereumjs/remove-crypto
Remove dependency on crypto
2018-09-24 10:47:42 +02:00
Alex Beregszaszi 1d719ea2ae Do not use crypto.randomBytes but rely on the randombytes package 2018-09-24 10:40:12 +02:00
Holger Drewes 95683dd4bc
Merge pull request #67 from jwerle/patch-1
Update package.json to include published files
2018-09-24 10:35:59 +02:00
Joseph Werle 7b1082cf6a
Fix bad path spec in package.json 2018-08-14 19:35:18 -04:00
Holger Drewes 4c7cbfc12e
Merge pull request #66 from ethereumjs/new-release-v062
New release v0.6.2
2018-08-08 11:31:31 +02:00
holgerd77 093350d372 Bumped version to v0.6.2, added CHANGELOG entry 2018-08-08 11:18:57 +02:00
Holger Drewes efd2012e44
Merge pull request #65 from ethereumjs/fix-dist-import-issue
Fix dist import issue
2018-08-08 10:53:02 +02:00
holgerd77 b4c1c2e3db Switched build to root directory, excluded root JS files in .gitignore 2018-08-08 10:41:20 +02:00
holgerd77 f69a16ffb2 Moved source files and test folder to src/ directory, updated src test command 2018-08-07 11:05:17 +02:00
Alex Beregszaszi 71a51f1b2e
Merge pull request #61 from ethereumjs/fix-provider-engine
Make opts field optional in WalletSubprovider
2018-07-28 19:42:54 +01:00
Alex Beregszaszi 38d1601311 Make opts field optional in WalletSubprovider 2018-07-28 19:36:53 +01:00
Alex Beregszaszi b72fe4c0dc
Merge pull request #60 from ethereumjs/update-dependencies
Update dependency versions
2018-07-28 19:26:52 +01:00