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

Fix/dependency #1037

Open
wants to merge 27 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ff6c588
modify dep constraint for supporting upper version of heimdall and bi…
owljoa Oct 27, 2018
6c00954
modify codes for supporting newer heimdall and bifrost version
owljoa Oct 27, 2018
f8bd49f
add implementations for key service in bifrost
owljoa Oct 27, 2018
44b8de6
add NodeID type and modify GetNodeID function for supporting newer ve…
owljoa Oct 27, 2018
5bd00d8
add security level and private key path to engine config info for set…
owljoa Oct 27, 2018
d881026
remove unused file
owljoa Oct 27, 2018
af7581e
add NewNodeID function for keep node id in memory
owljoa Oct 27, 2018
3f23db0
remove using function for getting node id and add node id as a parame…
owljoa Oct 27, 2018
251e1c4
modify node ids' type to added NodeID type
owljoa Oct 27, 2018
63c4f25
modify test codes for supporting changed functions in grpc_service
owljoa Oct 27, 2018
62580ce
update heimdal, bifrost version
owljoa Nov 4, 2018
4f7fa14
add NewSecConfig, NewKeyPair functions to common fx
owljoa Nov 4, 2018
f076f41
modify functions for getting node id and loading key pair to support …
owljoa Nov 4, 2018
d5c5b87
modify ECDSASigner, ECDSAVerifier to have signer option instead of ha…
owljoa Nov 4, 2018
d3776eb
add signing algorithm name to engine config for changed keystore in h…
owljoa Nov 4, 2018
5a153df
modify default config file to newer config file applying newer heimdall
owljoa Nov 4, 2018
a17c5d1
modify codes for changed functions
owljoa Nov 4, 2018
d4cecff
Merge branch 'develop' into integration/heimdallNewVer
hea9549 Mar 8, 2019
95dc09c
resolve dependency
hea9549 Mar 8, 2019
6aeac69
resolve conflict
hea9549 Mar 8, 2019
a98a0fc
fix: rename it-chain to DE-labtory
hea9549 Jul 14, 2019
e7180cd
fix: rename engine to it-chain
hea9549 Jul 23, 2019
a9e81e3
fix: travis change dep to mod
hea9549 Jul 23, 2019
a76164f
fix: travis update commit
hea9549 Jul 25, 2019
a5f706a
fix: rename cla hub
hea9549 Jul 25, 2019
99fb8c3
fix: mod dependency & upgrade to go ver 1.12
hea9549 Jul 26, 2019
d6718ef
fix: goimport format
hea9549 Jul 26, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ sample/db/test/*

# key
.keys
/keystore

# ledger
.ledger
Expand Down Expand Up @@ -58,4 +59,4 @@ images/*.xml
vim.exe.stackdump

# pri
id_rsa
id_rsa
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: go

go:
- '1.10'
- '1.12'

notifications:
email: false
Expand All @@ -27,11 +27,12 @@ before_install:
- go get -u github.com/ipfs/ipfs-update

install:
- dep ensure
- go mod vendor
- ipfs-update install latest
- ipfs init
- ipfs daemon &

env:
global:
secure: LhxjmgALk13ZZoKSCwlpVqvqmHq+zAt50JjXpLa7WrrHR8FkGnyGIgkn1VuMbvck6a39Vhn10mKO8GAPqTj4ayejOFvvmXZj/+UXpFc8nvs9cPGCLkzt5qdLEsgE6TEMdfwjLysxN1t3n/Up99FA3ObilKTuXRV1ZUoCa2ZX3Xr9/60A39LY5lAXqwRuCtM4pPhQB3byz2BEctR/zD1HRbceZN6LT+aO1mSwoyOwFgYUVj0MubhfympokxlwqMIqG1B8g0hKakkf5gKIMaJMn07KxwyPCq3fSVUgbpWVdRRh8xExGhRtT4huc0tUrSD0yXYbmnnb3D/e+tLS3//3rkGrGk1GYSwdCbYcO5oUjBKES+ydzwgIpvVsw80M5fAUxE8tdIAdCTiDdMbovN0YJk56NSsfkASTLbGevQrDGkhm9q4Jk9NUCaKyFu39nkfjaL4vKJngAVEbO5gEXIYP3qdCpogf2VWXcgOKse7FezaPfrxM2fWY6ene4sOuy1EXSkdoOUNxWPAtBd39bzRbO9uy9176Psjp9uF0DvgzHl5ukC9PsBE8Xkt/Fw1IUJ9OuELUZxKiPek99R8DipjAs/pDFHY+QykWcyaHblgskxIqODYjWSfiYGzVsO9E1IBsAz6w3iazYr8nd7GLm8q7+/648tJopca4GKAQXHiXjYY=
- secure: LhxjmgALk13ZZoKSCwlpVqvqmHq+zAt50JjXpLa7WrrHR8FkGnyGIgkn1VuMbvck6a39Vhn10mKO8GAPqTj4ayejOFvvmXZj/+UXpFc8nvs9cPGCLkzt5qdLEsgE6TEMdfwjLysxN1t3n/Up99FA3ObilKTuXRV1ZUoCa2ZX3Xr9/60A39LY5lAXqwRuCtM4pPhQB3byz2BEctR/zD1HRbceZN6LT+aO1mSwoyOwFgYUVj0MubhfympokxlwqMIqG1B8g0hKakkf5gKIMaJMn07KxwyPCq3fSVUgbpWVdRRh8xExGhRtT4huc0tUrSD0yXYbmnnb3D/e+tLS3//3rkGrGk1GYSwdCbYcO5oUjBKES+ydzwgIpvVsw80M5fAUxE8tdIAdCTiDdMbovN0YJk56NSsfkASTLbGevQrDGkhm9q4Jk9NUCaKyFu39nkfjaL4vKJngAVEbO5gEXIYP3qdCpogf2VWXcgOKse7FezaPfrxM2fWY6ene4sOuy1EXSkdoOUNxWPAtBd39bzRbO9uy9176Psjp9uF0DvgzHl5ukC9PsBE8Xkt/Fw1IUJ9OuELUZxKiPek99R8DipjAs/pDFHY+QykWcyaHblgskxIqODYjWSfiYGzVsO9E1IBsAz6w3iazYr8nd7GLm8q7+/648tJopca4GKAQXHiXjYY=
- GO111MODULE=on
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Contribution 방법

0. https://github.com/it-chain/engine 을 `fork`하기
0. https://github.com/DE-labtory/it-chain을 `fork`하기
1. 작업 할 내용 이슈에 등록하기 or 이슈에 이미 등록된 작업 선택 (작업중인 이슈에 댓글로 표시)
2. 이슈로 등록된 작업 수행
3. 수행한 작업의 문서, 단위 테스트 필수로 작성하기
Expand All @@ -17,10 +17,10 @@

### CLA

To get started, <a href="https://www.clahub.com/agreements/it-chain/engine">sign the Contributor License Agreement</a>.
To get started, <a href="https://www.clahub.com/agreements/DE-labtory/it-chain">sign the Contributor License Agreement</a>.


### Tip

* 최대한 다른 사람과 작업하는 부분이 겹치지 않도록 feature를 작게 잡고 작업해주세요.
* 이슈는 다른 사람들이 볼 때 쉽게 이해할 수 있도록 되도록이면 구체적으로 작성해주세요.
* 이슈는 다른 사람들이 볼 때 쉽게 이해할 수 있도록 되도록이면 구체적으로 작성해주세요.
Loading