Skip to content
This repository was archived by the owner on Oct 30, 2024. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ethereumjs/keythereum
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c49fd4d13e36538508cd648b4ed2c1c9d45cbbda
Choose a base ref
...
head repository: ethereumjs/keythereum
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 50d5d540ceaf54f91c8510d7e307168d30aebdea
Choose a head ref

Commits on Jul 23, 2017

  1. Copy the full SHA
    5c07209 View commit details

Commits on Sep 26, 2017

  1. Copy the full SHA
    f9ca690 View commit details

Commits on Oct 5, 2017

  1. Added package-lock.json

    tinybike committed Oct 5, 2017
    Copy the full SHA
    adfe5fc View commit details
  2. Updated distributables

    tinybike committed Oct 5, 2017
    Copy the full SHA
    2709ad7 View commit details
  3. Added Node 8 to .travis.yml

    tinybike committed Oct 5, 2017
    Copy the full SHA
    6c69502 View commit details

Commits on Dec 10, 2017

  1. uglify-js@2.6.1

    tinybike committed Dec 10, 2017
    Copy the full SHA
    e807b57 View commit details
  2. istanbul@0.4.5

    tinybike committed Dec 10, 2017
    Copy the full SHA
    ab68443 View commit details

Commits on Dec 19, 2017

  1. Merge pull request #40 from alexyangfox/patch-1

    importFromFile with address in upper case.
    tinybike authored Dec 19, 2017
    Copy the full SHA
    622b3a4 View commit details

Commits on Apr 12, 2018

  1. Update deps to allow work on airplanes

    Justin Barry committed Apr 12, 2018
    Copy the full SHA
    fdfaf56 View commit details

Commits on Apr 15, 2018

  1. Merge pull request #51 from justinbarry/master

    Update deps to allow work on airplanes
    tinybike authored Apr 15, 2018
    Copy the full SHA
    1fd8f8c View commit details
  2. Incremented version

    tinybike committed Apr 15, 2018
    Copy the full SHA
    591254b View commit details

Commits on May 8, 2018

  1. Updated dependencies

    tinybike committed May 8, 2018
    Copy the full SHA
    eb4be54 View commit details
  2. Copy the full SHA
    7efa14a View commit details
  3. Copy the full SHA
    acc3c71 View commit details

Commits on May 9, 2018

  1. Linting

    tinybike committed May 9, 2018
    11
    Copy the full SHA
    07847fe View commit details
  2. Bumped version

    tinybike committed May 9, 2018
    Copy the full SHA
    e81b70e View commit details

Commits on Oct 16, 2018

  1. Fixes from 'npm audit fix'

    tinybike committed Oct 16, 2018
    Copy the full SHA
    3181adb View commit details
  2. Copy the full SHA
    a696227 View commit details
  3. Merge pull request #63 from ethereumjs/tinybike/importFromFile-error-…

    …handling-fix
    
    Tinybike/import from file error handling fix
    tinybike authored Oct 16, 2018
    Copy the full SHA
    d4f1d57 View commit details
  4. Copy the full SHA
    c68286b View commit details
  5. Merge pull request #64 from ethereumjs/tinybike/55-incorrect-scrypt-k…

    …df-defaults
    
    Changed scrypt kdf defaults to match current geth values (p=1, r=8)
    tinybike authored Oct 16, 2018
    Copy the full SHA
    1baaa59 View commit details
  6. Copy the full SHA
    9c1d720 View commit details
  7. Merge pull request #65 from ethereumjs/tinybike/bump-dev-dependency-v…

    …ersions
    
    Bumped devDependency versions to resolve Github reported security vulnerability
    tinybike authored Oct 16, 2018
    Copy the full SHA
    4fc9842 View commit details

Commits on Nov 30, 2018

  1. Copy the full SHA
    9e7f7c4 View commit details
  2. Copy the full SHA
    428d501 View commit details
  3. Add missing JSDoc params

    whymarrh committed Nov 30, 2018
    Copy the full SHA
    16389a4 View commit details
  4. Copy the full SHA
    3767117 View commit details
  5. Copy the full SHA
    bbc8149 View commit details

Commits on Apr 3, 2019

  1. Merge pull request #69 from whymarrh/fix-jsdoc

    Fix JSDoc formatting
    whymarrh authored Apr 3, 2019
    Copy the full SHA
    7819dfb View commit details
  2. Merge pull request #70 from whymarrh/travis-config

    Update Travis CI configuration
    whymarrh authored Apr 3, 2019
    Copy the full SHA
    f4a0ade View commit details

Commits on Apr 16, 2019

  1. Merge pull request #72 from whymarrh/remove-lockfile

    Remove package-lock.json file
    whymarrh authored Apr 16, 2019
    Copy the full SHA
    6de4676 View commit details

Commits on Aug 6, 2020

  1. use scrypt-js

    ryanio committed Aug 6, 2020
    Copy the full SHA
    e5d632f View commit details
  2. upgrade keccak dependency

    ryanio committed Aug 6, 2020
    Copy the full SHA
    4866cca View commit details
  3. upgrade secp256k1 dependency

    ryanio committed Aug 6, 2020
    Copy the full SHA
    6a1178c View commit details
  4. lint

    ryanio committed Aug 6, 2020
    Copy the full SHA
    540e511 View commit details
  5. format to buffer for keccak

    ryanio committed Aug 6, 2020
    Copy the full SHA
    337ade9 View commit details
  6. update node versions

    ryanio committed Aug 6, 2020
    Copy the full SHA
    d55dbd8 View commit details
  7. 1
    Copy the full SHA
    2f93a76 View commit details

Commits on Sep 29, 2020

  1. Merge pull request #81 from ethereumjs/upgrade-crypto-deps

    Upgrade crypto deps
    tinybike authored Sep 29, 2020
    Copy the full SHA
    5c3ee93 View commit details
  2. Bumped version

    tinybike committed Sep 29, 2020
    Copy the full SHA
    fd59e27 View commit details

Commits on Sep 30, 2020

  1. Added CHANGELOG file

    holgerd77 committed Sep 30, 2020
    2
    Copy the full SHA
    a9f51ab View commit details

Commits on Oct 1, 2020

  1. Merge pull request #82 from ethereumjs/add-changelog

    New CHANGELOG
    holgerd77 authored Oct 1, 2020
    2
    Copy the full SHA
    3a80253 View commit details

Commits on Jul 25, 2022

  1. Update dependencies

    paulmillr committed Jul 25, 2022
    Copy the full SHA
    36aed98 View commit details

Commits on Aug 3, 2022

  1. Merge pull request #93 from paulmillr/master

    Update dependencies
    holgerd77 authored Aug 3, 2022
    Copy the full SHA
    9869955 View commit details
  2. Copy the full SHA
    00dc88b View commit details
  3. Merge pull request #94 from ethereumjs/new-release

    New v2.0.0 Release
    holgerd77 authored Aug 3, 2022
    Copy the full SHA
    50d5d54 View commit details
Showing with 12,813 additions and 45,549 deletions.
  1. +1 −0 .eslintrc
  2. +2 −0 .gitignore
  3. +6 −18 .travis.yml
  4. +60 −0 CHANGELOG.md
  5. +12,552 −33,606 dist/keythereum.js
  6. +14 −21 dist/keythereum.min.js
  7. +122 −141 index.js
  8. +0 −11,717 lib/scrypt.js
  9. +16 −22 package.json
  10. +0 −12 test/checkKeyObj.js
  11. +40 −12 test/keys.js
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -119,6 +119,7 @@
"no-throw-literal": 1,
"no-unused-expressions": 2,
"no-useless-call": 2,
"no-useless-escape": 0,
"no-void": 1,
"no-warning-comments": 1,
"radix": 2,
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package-lock.json
node_modules
*.log
coverage
overflow
data
scripts
test/fixtures/nodekey
test/fixtures/.password
test/fixtures/chaindata
24 changes: 6 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,19 @@
sudo: false

language: node_js

branches:
only:
- master

env:
- CXX=g++-4.8

node_js:
- "7"
- "6"
- "5"
- "4"

addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-4.8
- g++-4.8
- "14"
- "13"
- "12"
- "10"
- "8"

before_script:
- npm install

script:
- npm run lint
- istanbul cover -x **/lib/** ./node_modules/mocha/bin/_mocha test/keys.js --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage
- istanbul cover ./node_modules/mocha/bin/_mocha test/keys.js --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage
60 changes: 60 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
(modification: no type change headlines) and this project adheres to
[Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [2.0.0] - 2022-08-03

Maintenance release with various library updates and dependency simplifications.

Note that this version now uses the native JS [BigInt](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/BigInt) datatype, which is not supported in some older versions of browsers and dev/build tools!

Following Updates:

1. Replaced `crypto-browserify` with `browserify-aes`, which is a dependency of crypto-browserify; without all the unnecessary modules. We are still using `browserify-aes` because the keythereum's related api methods are synchronous - ethereum-cryptography/aes exposes async-only methods.
2. Replaced `keccak` with `ethereum-cryptography/keccak`
3. Replaced `scrypt-js` with `ethereum-cryptography/scrypt`
4. Replaced `secp256k1` with `ethereum-cryptography/secp256k1-compat`
5. Removed `sjcl` which had pbkdf2 implementation
6. Updated `uuid` from 3.0.0 to 8.3.2
7. The package versions are exact, like before - no version ranges

`wc < dist/keythereum.js` output:
- before `31994 118030 921363`
- after `15243 63140 484003`

Backwards incompatibilities:

- BigInt support is now required
- `keythereum.crypto` is now an emulated object instead of `crypto-browserify` stuff

[2.0.0]: https://github.com/ethereumjs/keythereum/compare/v1.2.0...v2.0.0

## [1.2.0] - 2020-09-29

This is a maintenance release after a longer period with no releases.
See PR [#81](https://github.com/ethereumjs/keythereum/pull/81) for implementation
details.

**Changes**

- `scrypt` to [`scrypt-js`](https://github.com/ricmoo/scrypt-js) for a pure js implementation (simplifies some code)
- `keccak` from `1.4.0` to `3.1.0` for node 12 and n-api support
- `secp256k1` from `3.5.0` to `4.0.2` for node 12 and n-api support
- travis ci node versions from `[4, 5, 6, 7, 8]` to `[8, 10, 12, 13, 14]`
- uglify-js to [`terser`](https://github.com/terser/terser) (build was having some trouble with es6 in node_modules)
- browserify from `16.2.2` to `16.5.2` for misc. bug fixes and upgrades.

[1.2.0]: https://github.com/ethereumjs/keythereum/compare/v1.0.4...v1.2.0

## [1.0.4]

TODO

## Older releases:

- [1.x.x](https://github.com/ethereumjs/keythereum/compare/v1.x.x...v1.y.y) - 20xx-xx-xx
- ...
Loading