Merge pull request #285 from yanggang-JV/feature/adapt-web3sdk-2.6.3

* adapt web3sdk 2.6.3
WeBankBlockchain · Dec 30, 2020 · 935c0c9 · 935c0c9
2 parents 1e61bff + ae2998d
commit 935c0c9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 35 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -33,14 +33,8 @@ jobs:
       - name: Prepare blockchain nodes and certificates
         run: |
           mkdir -p fisco && cd fisco
-          curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.3.0/build_chain.sh && chmod u+x build_chain.sh
+          curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.7.1/build_chain.sh && chmod u+x build_chain.sh
           bash build_chain.sh -l "127.0.0.1:2" -p 30300,20200,8545
-          cd nodes/127.0.0.1
-          rm -rf fisco-bcos
-          curl -LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeIdentity/fisco-bcos.tar.gz
-          tar -zxvf fisco-bcos.tar.gz
-          chmod u+x fisco-bcos
-          cd ../..
           bash nodes/127.0.0.1/start_all.sh
           ps -ef | grep -v grep | grep fisco
           cd ..
@@ -85,14 +79,8 @@ jobs:
       - name: Prepare blockchain nodes and certificates
         run: |
           mkdir -p fisco && cd fisco
-          curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.3.0/build_chain.sh && chmod u+x build_chain.sh
+          curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.7.1/build_chain.sh && chmod u+x build_chain.sh
           bash build_chain.sh -l "127.0.0.1:2" -p 30300,20200,8545
-          cd nodes/127.0.0.1
-          rm -rf fisco-bcos
-          curl -LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeIdentity/fisco-bcos.tar.gz
-          tar -zxvf fisco-bcos.tar.gz
-          chmod u+x fisco-bcos
-          cd ../..
           bash nodes/127.0.0.1/start_all.sh
           ps -ef | grep -v grep | grep fisco
           cd ..
@@ -119,11 +107,11 @@ jobs:
           mkdir -p weid-sample/libs
           cp dist/lib/*.jar weid-sample/libs/
           cp ecdsa_key weid-sample/keys/priv/
-          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 src/main/resources/fisco.properties weid-sample/resources/
+          cp src/main/resources/weidentity.properties weid-sample/resources/
+          cp .ci/ca.crt weid-sample/resources/
+          cp .ci/node.crt weid-sample/resources/
+          cp .ci/node.key weid-sample/resources/
       - name: Run CI
         run: |
           cd weid-sample
@@ -155,14 +143,8 @@ jobs:
       - name: Prepare blockchain nodes and certificates
         run: |
           mkdir -p fisco && cd fisco
-          curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.3.0/build_chain.sh && chmod u+x build_chain.sh
+          curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.7.1/build_chain.sh && chmod u+x build_chain.sh
           bash build_chain.sh -l "127.0.0.1:2" -p 30300,20200,8545
-          cd nodes/127.0.0.1
-          rm -rf fisco-bcos
-          curl -LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeIdentity/fisco-bcos.tar.gz
-          tar -zxvf fisco-bcos.tar.gz
-          chmod u+x fisco-bcos
-          cd ../..
           bash nodes/127.0.0.1/start_all.sh
           ps -ef | grep -v grep | grep fisco
           cd ..
@@ -224,14 +206,8 @@ jobs:
       - name: Prepare blockchain nodes and certificates
         run: |
           mkdir -p fisco && cd fisco
-          curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.3.0/build_chain.sh && chmod u+x build_chain.sh
+          curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.7.1/build_chain.sh && chmod u+x build_chain.sh
           bash build_chain.sh -l "127.0.0.1:2" -p 30300,20200,8545
-          cd nodes/127.0.0.1
-          rm -rf fisco-bcos
-          curl -LO https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeIdentity/fisco-bcos.tar.gz
-          tar -zxvf fisco-bcos.tar.gz
-          chmod u+x fisco-bcos
-          cd ../..
           bash nodes/127.0.0.1/start_all.sh
           ps -ef | grep -v grep | grep fisco
           cd ..

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.7.0
+1.7.1
diff --git a/build.gradle b/build.gradle
@@ -153,7 +153,7 @@ dependencies {
     localDeps 'org.projectlombok:lombok:1.18.10'
     if (!gradle.startParameter.isOffline()) {
         compile logger, lombok, apache_commons, json, mysql_driver, redisson, zxing, rpc, pdfbox, protobuf, caffeine, oval
-        compile("com.webank:weid-contract-java:1.2.27") {
+        compile("com.webank:weid-contract-java:1.2.28") {
             exclude group: "org.slf4j", module: "slf4j-log4j12"
         }
         compile fileTree(dir: 'lib', include: '*.jar')