Skip to content

Commit

Permalink
Merge pull request #350 from WeBankBlockchain/feature/reconstruction
Browse files Browse the repository at this point in the history
final commit
  • Loading branch information
youwenbusi authored Dec 15, 2022
2 parents 0755051 + f7ce499 commit 586cea6
Show file tree
Hide file tree
Showing 449 changed files with 13,965 additions and 34,898 deletions.
20 changes: 0 additions & 20 deletions .ci/ca.crt
Original file line number Diff line number Diff line change
@@ -1,20 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIDPTCCAiWgAwIBAgIJAMS6EqK879cHMA0GCSqGSIb3DQEBCwUAMDUxDjAMBgNV
BAMMBWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAe
Fw0xOTA5MDYwMzI4MThaFw0yOTA5MDMwMzI4MThaMDUxDjAMBgNVBAMMBWNoYWlu
MRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjCCASIwDQYJKoZI
hvcNAQEBBQADggEPADCCAQoCggEBAMy81sz5eAudWDVvOSF4BRrdSZp+uWO8VJph
e2eA1C7gFkd2259gSbvg8mBRivXu5hGvTbbKdFsiq732zixzGzRZ8kyYkUr2QqPy
H8tFAjx+frBQXcBooVDYIPal59thPOuuJsVIWFGqgTnWJCqpymcAzdQAFJ3ebtwH
jvlGW2WN6NJm5bEY5MObKn3391C+rRFVzqm01TRhUWzLczr4Ajv+HyuQheLq+FpY
rKYMgcsXnYK023+VRuXJIc89Ph7JFWFthU8I30AL6BZWsGNZwT+VNkfaie2iMcaS
UkQaLtEL1BVsxqborTljO43Yb9u5OZ4ihu2KFXvKN6GUcmii4fECAwEAAaNQME4w
HQYDVR0OBBYEFAYOx+/OBQb7/EOgf5bKy1WBGfq8MB8GA1UdIwQYMBaAFAYOx+/O
BQb7/EOgf5bKy1WBGfq8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
AK7+Xa0MTi7DtE7czIFMJ5FL5lIZ+OX6heKngxE3pun37aFO3PEgQtvr9gutLzQX
/Yiy8vY2lPtO7erHH6do3H5D6NlAMDsfh8CRuq4DeseNpinA4KwiFmvBEdsWxDI+
qpyHYx3YOnE7wYbossg0+m+eDrFT0SdowY8zHI65qb0T+urtqMWG60dCcmOPe8+E
mPL7JVuTLC0pQiQvVdhM9yyX2sgD8Bwmsw5SILQ9UdX7TVFN4VSuTUh2+DNiR4gt
Umw9W6G7bSG2ZlDhwXesgJdzXcGoPR0j9z4kqf5vvnYCZETG7NZ6++EJ5byZqM49
JaWJWp2OMDwm4e3nLPOS26g=
-----END CERTIFICATE-----
33 changes: 0 additions & 33 deletions .ci/node.crt

This file was deleted.

5 changes: 0 additions & 5 deletions .ci/node.key

This file was deleted.

8 changes: 4 additions & 4 deletions .ci/script/build-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ function modify_config()
cp ${java_source_code_dir}/ecdsa_key ${java_source_code_dir}/src/test/resources/
fi
cp ${java_source_code_dir}/.ci/ca.crt ${java_source_code_dir}/src/test/resources
cp ${java_source_code_dir}/.ci/node.crt ${java_source_code_dir}/src/test/resources
cp ${java_source_code_dir}/.ci/node.key ${java_source_code_dir}/src/test/resources
cp ${java_source_code_dir}/.ci/sdk.crt ${java_source_code_dir}/src/test/resources
cp ${java_source_code_dir}/.ci/sdk.key ${java_source_code_dir}/src/test/resources
cp ${java_source_code_dir}/NotoSansCJKtc-Regular.ttf ${java_source_code_dir}/src/main/resources
cp ${java_source_code_dir}/NotoSansCJKtc-Regular.ttf ${java_source_code_dir}/src/test/resources
cp -r ${java_source_code_dir}/src/main/resources/WeDPR_dynamic_lib ${java_source_code_dir}/src/test/resources
Expand All @@ -60,8 +60,8 @@ function gradle_build_sdk()
{
#run gradle build
cp ${java_source_code_dir}/.ci/ca.crt ${java_source_code_dir}/src/main/resources
cp ${java_source_code_dir}/.ci/node.crt ${java_source_code_dir}/src/main/resources
cp ${java_source_code_dir}/.ci/node.key ${java_source_code_dir}/src/main/resources
cp ${java_source_code_dir}/.ci/sdk.crt ${java_source_code_dir}/src/main/resources
cp ${java_source_code_dir}/.ci/sdk.key ${java_source_code_dir}/src/main/resources

export FISCO_BCOS_VERSION="2"
export CNS_PROFILE_ACTIVE="ci"
Expand Down
4 changes: 2 additions & 2 deletions .ci/script/weid-build-tools/build-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ if [ "$TRAVIS_BRANCH" = "master" ];then

# copy blockchain cfg files
cp .ci/ca.crt weid-build-tools/resources/
cp .ci/node.crt weid-build-tools/resources/
cp .ci/node.key weid-build-tools/resources/
cp .ci/sdk.crt weid-build-tools/resources/
cp .ci/sdk.key weid-build-tools/resources/

# run repo ci scripts
cd weid-build-tools/
Expand Down
8 changes: 4 additions & 4 deletions .ci/script/weid-http-service/build-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ if [ "$TRAVIS_BRANCH" = "master" ];then
cp src/main/resources/* weid-http-service/src/test/resources/
cp .ci/ca.crt weid-http-service/src/test/resources/
cp .ci/ca.crt weid-http-service/src/main/resources/
cp .ci/node.crt weid-http-service/src/test/resources/
cp .ci/node.crt weid-http-service/src/main/resources/
cp .ci/node.key weid-http-service/src/test/resources/
cp .ci/node.key weid-http-service/src/main/resources/
cp .ci/sdk.crt weid-http-service/src/test/resources/
cp .ci/sdk.crt weid-http-service/src/main/resources/
cp .ci/sdk.key weid-http-service/src/test/resources/
cp .ci/sdk.key weid-http-service/src/main/resources/

# run repo ci scripts
cd weid-http-service/
Expand Down
4 changes: 2 additions & 2 deletions .ci/script/weid-sample/build-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ if [ "$TRAVIS_BRANCH" = "master" ];then
cp src/main/resources/fisco.properties weid-sample/src/main/resources/
cp src/main/resources/weidentity.properties weid-sample/src/main/resources/
cp .ci/ca.crt weid-sample/src/main/resources/
cp .ci/node.crt weid-sample/src/main/resources/
cp .ci/node.key weid-sample/src/main/resources/
cp .ci/sdk.crt weid-sample/src/main/resources/
cp .ci/sdk.key weid-sample/src/main/resources/

# run repo ci scripts
cd weid-sample/
Expand Down
30 changes: 30 additions & 0 deletions .ci/sdk.crt
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
-----BEGIN CERTIFICATE-----
MIIBeDCCAR6gAwIBAgIJALkdvuWSdhvfMAoGCCqGSM49BAMCMDcxDzANBgNVBAMM
BmFnZW5jeTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5MCAX
DTIyMDMyMzA5MTM0NFoYDzIxMjIwMjI3MDkxMzQ0WjAxMQwwCgYDVQQDDANzZGsx
EzARBgNVBAoMCmZpc2NvLWJjb3MxDDAKBgNVBAsMA3NkazBWMBAGByqGSM49AgEG
BSuBBAAKA0IABEhQrhgxPHQIGOW7V12Jv+7BzKnheZYPIPbqMR/993QGKqk/5u3+
FyVE2xEGlXa/agLUU2JhmD9yH3nlKR/agfWjGjAYMAkGA1UdEwQCMAAwCwYDVR0P
BAQDAgXgMAoGCCqGSM49BAMCA0gAMEUCIFzn+OXMvv8yD3jzKjb7ccLfPMoUxUZB
pHHmaeaxfamBAiEA6vK2UJivk2j1bxV3NnqTKtDqCwzRHkEAD55iId/mU50=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIBcDCCARagAwIBAgIJAKybOwjnSONHMAoGCCqGSM49BAMCMDUxDjAMBgNVBAMM
BWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAeFw0y
MjAzMjMwOTEzNDRaFw0zMjAzMjAwOTEzNDRaMDcxDzANBgNVBAMMBmFnZW5jeTET
MBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5MFYwEAYHKoZIzj0C
AQYFK4EEAAoDQgAEtaOfgPeNxIkIftVUjvOccocHx4LWnr8lIyT62IKNQPXtDi8U
cJ/0ZaO1btA9lBP4v7YYXVS08iAPvbwwkd002aMQMA4wDAYDVR0TBAUwAwEB/zAK
BggqhkjOPQQDAgNIADBFAiEA1bFbIlVgMr7pbS1VO4UgMnVSPKt1M5115niCdgfU
b1UCIHXSu/stpU+2FWD6HwKRWZQ7VQu/m3qxWpg/+a/S/roM
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIBVzCB/wIJAKoq+vyUmlMJMAoGCCqGSM49BAMCMDUxDjAMBgNVBAMMBWNoYWlu
MRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAgFw0yMjAzMjMw
OTEzNDRaGA8yMTIyMDIyNzA5MTM0NFowNTEOMAwGA1UEAwwFY2hhaW4xEzARBgNV
BAoMCmZpc2NvLWJjb3MxDjAMBgNVBAsMBWNoYWluMFYwEAYHKoZIzj0CAQYFK4EE
AAoDQgAEZC0Gxxlvd4jLugWP/usLPQYWvXYWjMHSwF/U2ZQeYklf85r3GaqP6HV2
yEnvDuaemDxMPItzy5cHzjfSBrif5TAKBggqhkjOPQQDAgNHADBEAiA4or46kQ4R
IKQZQyjbL+JvHsj5nMLyaHe4esX9xRVwTQIgI0P7B7XJd8qX8qZqgp2hWbVNdtN/
7W1/jYj/9NjJysE=
-----END CERTIFICATE-----
5 changes: 5 additions & 0 deletions .ci/sdk.key
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-----BEGIN PRIVATE KEY-----
MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgsT4z8MIQvU/QnUhRsz9b
YUx609vYlghhWRiyekMbIaChRANCAARIUK4YMTx0CBjlu1ddib/uwcyp4XmWDyD2
6jEf/fd0BiqpP+bt/hclRNsRBpV2v2oC1FNiYZg/ch955Skf2oH1
-----END PRIVATE KEY-----
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Created by https://www.gitignore.io/api/vim,java,maven,gradle,java-web,intellij,
.idea/**/tasks.xml
.idea/dictionaries
.idea/checkstyle-idea.xml

# Sensitive or high-churn files:
.idea/**/dataSources/
.idea/**/dataSources.ids
Expand All @@ -23,6 +22,9 @@ Created by https://www.gitignore.io/api/vim,java,maven,gradle,java-web,intellij,
.idea/**/gradle.xml
.idea/**/libraries

.idea/*.xml
.idea/vcs.xml

# CMake
cmake-build-debug/

Expand Down Expand Up @@ -191,3 +193,9 @@ doc/bak/
.settings/
.project
.classpath
.idea/
/dist/

secring.gpg
*.address
logs/
23 changes: 21 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
### V1.7.0
Features:
### V3.0.0 (2022-12-15)
- Features:
1. The project was restructured to strip the blockchain-related functions and interfaces from the project, as well as the file transfer and format conversion functions from the project
- Bugfixes:
1. the value of sdk.sm-crypto in fisco.properties adapt to FISCO BCOS 3.0 guomi

### V1.8.6 (2022-10-14)
- Features:
1. Upgrade the property fields in WeIdDocument to conform to the W3C DID Specification
2. Upgrade the way data is stored and retrieved in the weid-contract
3. Upgrade the interfaces related to WeId and Evidence

### V1.8.5 (2022-08-16)
- Features:
1. Replace the web3sdk with fisco-bcos-java-sdk
2. Support the OSCCA-approved(SM2/SM3) cryptography algorithm
3. Support the FISCO BCOS 3.0.0 (rc4 version)
4. Upgrade the functionality of WeID-Build-Tools to accommodate the new version of weid-java-sdk

### V1.7.0 (2021-01-08)
- Features:
1. FISCO BCOS 1.3.x support is fully removed - please use the FISCO BCOS 2.x node version respectively.
2. Evidence and WeIdDocument query performance improved due to support batch type blockchain node data lookup.
3. Authority Issuer can be registered by any WeID while only administrator can recognize.
Expand Down
Loading

0 comments on commit 586cea6

Please sign in to comment.