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.

Sign up for GitHub

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

Jump to bottom

chore: move keychain #633

Merged
merged 97 commits into from
May 12, 2020
Merged

chore: move keychain #633

merged 97 commits into from
May 12, 2020

Conversation

vasco-santos
Copy link
Member

@vasco-santos vasco-santos commented May 11, 2020 •
edited
Loading

Per #631 review, I added in this PR the commit history of libp2p-keychain and moved the code here.

Points to note:

  • The entire libp2p-keychain history has been added
  • An additional commit was made to move keychain under ./src/keychain and its tests under ./test/keychain and necessary deps added
  • Some of the unneeded files were removed (like LICENSE) since libp2p already has a version of that file

Note on Merging:

Right now the plan (obtained from libp2p-keychain PR) is to:

  • squash the merge to minimize the commit pollution
  • update the readme to point to the original repo
  • append the Co-Author list to the squashed commit to maintain author credit
    • This co author list was generated from the libp2p-keychain package.json which is auto generated from the commit history there.
Co-authored-by: Alan Shaw <alan.shaw@protocol.ai>
Co-authored-by: Alberto Elias <hi@albertoelias.me>
Co-authored-by: Alex Potsides <alex@achingbrain.net>
Co-authored-by: David Dias <daviddias.p@gmail.com>
Co-authored-by: Hugo Dias <mail@hugodias.me>
Co-authored-by: Jacob Heun <jacobheun@gmail.com>
Co-authored-by: Maciej Krüger <mkg20001@gmail.com>
Co-authored-by: Masahiro Saito <camelmasa@gmail.com>
Co-authored-by: Richard Schneider <makaretu@gmail.com>
Co-authored-by: Vasco Santos <vasco.santos@moxy.studio>
Co-authored-by: Vasco Santos <vasco.santos@ua.pt>
Co-authored-by: Victor Bjelkholm <victorbjelkholm@gmail.com>

daviddias and others added 30 commits December 6, 2017 08:24
@daviddias
Initial commit
4c8d147
@daviddias
chore: setup repo
49e6c47
@richardschneider
feat: move bits from https://github.com/richardschneider/ipfs-encryption
1a96ae8
@richardschneider
docs: install and links
658a4d7
@richardschneider
fix: linting
409a999
@richardschneider
fix: more linting
7c44c91
@richardschneider
test: needs more time to generate RSA key
98ba68a
@richardschneider
test: temporarily disable webworker tests #3
569f963
@richardschneider
test: disable webworker
358c8c2
@richardschneider
chore: ci coverage
99780ab 
Fixes #2
@richardschneider
chore: publish coverage report
cfdd2f4
@mkg20001
Add syntax highlighting to README
643bcd4
@richardschneider
Merge pull request #4 from libp2p/mkg20001-patch-1
506e1d7 
Add syntax highlighting to README
@richardschneider
fix: return info on removed key #10
f49e753
@richardschneider
fix: error message
8305d20
@richardschneider
docs(keychain): add API documentation
3b8d05a
@richardschneider
fix: maps an IPFS hash name to its forge equivalent
f71d3a6 
Fixes #12
@richardschneider
fix: lint errors
ff4f656
@richardschneider
fix: lint errors
06917f7
@richardschneider
test: importing openssl keys
2dd069b
@richardschneider
refactor: keep the key info in the store
1b2664a
@victorb
Updating CI files
ee9dbeb 
This commit updates all CI scripts to the latest version
@richardschneider
Merge pull request #15 from libp2p/automatic-ci-script-update
b4518e0 
Updating CI files
@richardschneider
docs: correct hash name
9129d20
@richardschneider
Merge pull request #13 from libp2p/ds-keyinfo
97bf98f 
Persist the key info in the store
@richardschneider
test: key name comparision
e78b248
@richardschneider
test(openssl): verify key id
3b7c691
@richardschneider
Merge pull request #17 from libp2p/filenames
605d290 
test: key name comparision
@richardschneider @daviddias
feat: use libp2p-crypto (#18)
c1627a9 
* test: openssl interop is now the responsibility of libp2p-crypto

* feat: use libp2p-crypto, not node-forge, for key management

* fix: use libp2p-crypto.pbkdf, not node-forge

* fix: do not ship CMS

This removes all depencies on node-forge

* test: update dependencies

* test: remove dead code
@daviddias
chore: update deps
5343b0f
vasco-santos and others added 11 commits December 18, 2019 16:52
@vasco-santos
chore: update contributors
66c1fb3
@vasco-santos
chore: release version v0.5.4
0d13a8b
@alanshaw @vasco-santos
chore: update deps (#40)
464fcbe
@vasco-santos
chore: update contributors
24e10f3
@vasco-santos
chore: release version v0.6.0
44a1e7c
@dependabot-preview
chore(deps-dev): bump aegir from 20.6.1 to 21.2.0 (#44)
55fb5d5 
Bumps [aegir](https://github.com/ipfs/aegir) from 20.6.1 to 21.2.0.
- [Release notes](https://github.com/ipfs/aegir/releases)
- [Changelog](https://github.com/ipfs/aegir/blob/master/CHANGELOG.md)
- [Commits](ipfs/aegir@v20.6.1...v21.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
@dependabot-preview
chore(deps-dev): bump datastore-level from 0.14.1 to 1.0.0
fd618b6 
Bumps [datastore-level](https://github.com/ipfs/js-datastore-level) from 0.14.1 to 1.0.0.
- [Release notes](https://github.com/ipfs/js-datastore-level/releases)
- [Changelog](https://github.com/ipfs/js-datastore-level/blob/master/CHANGELOG.md)
- [Commits](ipfs/js-datastore-level@v0.14.1...v1.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
@vasco-santos
chore(deps-dev): bump datastore-level from 0.14.1 to 1.0.0
e72a5b0
@dependabot-preview
chore(deps-dev): bump datastore-fs from 0.9.1 to 1.0.0 (#46)
9e96dbc 
Bumps [datastore-fs](https://github.com/ipfs/js-datastore-fs) from 0.9.1 to 1.0.0.
- [Release notes](https://github.com/ipfs/js-datastore-fs/releases)
- [Changelog](https://github.com/ipfs/js-datastore-fs/blob/master/CHANGELOG.md)
- [Commits](ipfs/js-datastore-fs@v0.9.1...v1.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
@vasco-santos
chore: move to libp2p
d9fd726
@vasco-santos
Merge branch 'master' of ../js-libp2p-keychain into chore/move-keychain
476a3b7
jacobheun
jacobheun approved these changes May 12, 2020
View reviewed changes
Copy link
Contributor

@jacobheun jacobheun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jacobheun jacobheun merged commit e33667f into 0.28.x May 12, 2020
@jacobheun jacobheun deleted the chore/move-keychain branch May 12, 2020 12:09
vasco-santos added a commit that referenced this pull request May 12, 2020
@vasco-santos @daviddias
@richardschneider @mkg20001 @victorb @camelmasa @alanshaw @hugomrdias @AlbertoElias @achingbrain @jacobheun
chore: integrate libp2p-keychain into js-libp2p (#633)
fc67af6 
Integrates the libp2p-keychain codebase into this repo

Co-authored-by: David Dias <daviddias.p@gmail.com>
Co-authored-by: Richard Schneider <makaretu@gmail.com>
Co-authored-by: Maciej Krüger <mkg20001@gmail.com>
Co-authored-by: Victor Bjelkholm <victorbjelkholm@gmail.com>
Co-authored-by: Masahiro Saito <camelmasa@gmail.com>
Co-authored-by: Alan Shaw <alan.shaw@protocol.ai>
Co-authored-by: Hugo Dias <mail@hugodias.me>
Co-authored-by: Alberto Elias <hi@albertoelias.me>
Co-authored-by: Alex Potsides <alex@achingbrain.net>
Co-authored-by: Jacob Heun <jacobheun@gmail.com>
vasco-santos added a commit that referenced this pull request May 13, 2020
@vasco-santos
chore: integrate libp2p-keychain into js-libp2p (#633)
afb2095 
Integrates the libp2p-keychain codebase into this repo
vasco-santos added a commit that referenced this pull request May 13, 2020
@vasco-santos
chore: integrate libp2p-keychain into js-libp2p (#633)
1e6de2e 
Integrates the libp2p-keychain codebase into this repo
vasco-santos added a commit that referenced this pull request May 13, 2020
@vasco-santos
chore: integrate libp2p-keychain into js-libp2p (#633)
8128e6f 
Integrates the libp2p-keychain codebase into this repo
vasco-santos added a commit that referenced this pull request May 13, 2020
@vasco-santos
chore: integrate libp2p-keychain into js-libp2p (#633)
f8a80e8 
Integrates the libp2p-keychain codebase into this repo
vasco-santos added a commit that referenced this pull request May 13, 2020
@vasco-santos
chore: integrate libp2p-keychain into js-libp2p (#633)
a275c78 
Integrates the libp2p-keychain codebase into this repo
vasco-santos added a commit that referenced this pull request May 13, 2020
@vasco-santos
chore: integrate libp2p-keychain into js-libp2p (#633)
303bbee 
Integrates the libp2p-keychain codebase into this repo
@vasco-santos vasco-santos mentioned this pull request May 13, 2020
Closed
jacobheun pushed a commit that referenced this pull request May 13, 2020
@vasco-santos @jacobheun
chore: integrate libp2p-keychain into js-libp2p (#633)
80e18c1 
Integrates the libp2p-keychain codebase into this repo
@vasco-santos vasco-santos mentioned this pull request May 15, 2020
Merged
1 task
jacobheun added a commit that referenced this pull request May 28, 2020
@vasco-santos @daviddias
@richardschneider @mkg20001 @victorb @camelmasa @alanshaw @hugomrdias @AlbertoElias @achingbrain @jacobheun
chore: integrate libp2p-keychain into js-libp2p (#633)
e92f7db 
Integrates the libp2p-keychain codebase into this repo

Co-authored-by: David Dias <daviddias.p@gmail.com>
Co-authored-by: Richard Schneider <makaretu@gmail.com>
Co-authored-by: Maciej Krüger <mkg20001@gmail.com>
Co-authored-by: Victor Bjelkholm <victorbjelkholm@gmail.com>
Co-authored-by: Masahiro Saito <camelmasa@gmail.com>
Co-authored-by: Alan Shaw <alan.shaw@protocol.ai>
Co-authored-by: Hugo Dias <mail@hugodias.me>
Co-authored-by: Alberto Elias <hi@albertoelias.me>
Co-authored-by: Alex Potsides <alex@achingbrain.net>
Co-authored-by: Jacob Heun <jacobheun@gmail.com>
jacobheun pushed a commit that referenced this pull request May 28, 2020
@vasco-santos @jacobheun
chore: integrate libp2p-keychain into js-libp2p (#633)
e34f8cb 
Integrates the libp2p-keychain codebase into this repo
jacobheun added a commit that referenced this pull request May 28, 2020
@vasco-santos @daviddias
@richardschneider @mkg20001 @victorb @camelmasa @alanshaw @hugomrdias @AlbertoElias @achingbrain @jacobheun
chore: integrate libp2p-keychain into js-libp2p (#633)
8bf5a70 
Integrates the libp2p-keychain codebase into this repo

Co-authored-by: David Dias <daviddias.p@gmail.com>
Co-authored-by: Richard Schneider <makaretu@gmail.com>
Co-authored-by: Maciej Krüger <mkg20001@gmail.com>
Co-authored-by: Victor Bjelkholm <victorbjelkholm@gmail.com>
Co-authored-by: Masahiro Saito <camelmasa@gmail.com>
Co-authored-by: Alan Shaw <alan.shaw@protocol.ai>
Co-authored-by: Hugo Dias <mail@hugodias.me>
Co-authored-by: Alberto Elias <hi@albertoelias.me>
Co-authored-by: Alex Potsides <alex@achingbrain.net>
Co-authored-by: Jacob Heun <jacobheun@gmail.com>
jacobheun pushed a commit that referenced this pull request May 28, 2020
@vasco-santos @jacobheun
chore: integrate libp2p-keychain into js-libp2p (#633)
6065923 
Integrates the libp2p-keychain codebase into this repo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jacobheun jacobheun jacobheun approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet