Merge branch 'hotstuff_integration' of github.com:AntelopeIO/leap int…

…o gh_2034_part2
AntelopeIO · Jan 11, 2024 · be875ee · be875ee
2 parents 57ccf14 + 59532df
commit be875ee
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 19 deletions.
diff --git a/.cicd/defaults.json b/.cicd/defaults.json
@@ -1,9 +1,9 @@
 {
     "cdt":{
-       "target":"4",
+       "target":"hotstuff_integration",
        "prerelease":false
     },
     "referencecontracts":{
-       "ref":"main"
+       "ref":"instant-finality"
     }
  }
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -312,22 +312,22 @@ jobs:
           rm ./*.deb
 
       # Reference Contracts
-#     - name: checkout reference-contracts
-#       uses: actions/checkout@v4
-#       with:
-#         repository: AntelopeIO/reference-contracts
-#         path: reference-contracts
-#         ref: '${{needs.v.outputs.reference-contracts-ref}}'
-#     - if: ${{ matrix.test == 'deb-install' }}
-#       name: Install reference-contracts deps
-#       run: |
-#         apt-get -y install cmake build-essential
-#     - name: Build & Test reference-contracts
-#       run: |
-#         cmake -S reference-contracts -B reference-contracts/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=On -DSYSTEM_ENABLE_LEAP_VERSION_CHECK=Off -DSYSTEM_ENABLE_CDT_VERSION_CHECK=Off
-#         cmake --build reference-contracts/build -- -j $(nproc)
-#         cd reference-contracts/build/tests
-#         ctest --output-on-failure -j $(nproc)
+      - name: checkout reference-contracts
+        uses: actions/checkout@v4
+        with:
+          repository: AntelopeIO/reference-contracts
+          path: reference-contracts
+          ref: '${{needs.v.outputs.reference-contracts-ref}}'
+      - if: ${{ matrix.test == 'deb-install' }}
+        name: Install reference-contracts deps
+        run: |
+          apt-get -y install cmake build-essential
+      - name: Build & Test reference-contracts
+        run: |
+          cmake -S reference-contracts -B reference-contracts/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=On -DSYSTEM_ENABLE_LEAP_VERSION_CHECK=Off -DSYSTEM_ENABLE_CDT_VERSION_CHECK=Off
+          cmake --build reference-contracts/build -- -j $(nproc)
+          cd reference-contracts/build/tests
+          ctest --output-on-failure -j $(nproc)
 
   all-passing:
     name: All Required Tests Passed

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
@@ -1139,10 +1139,13 @@ void producer_plugin_impl::plugin_initialize(const boost::program_options::varia
             }
          } catch(secure_enclave_exception& e) {
             elog("Error with Secure Enclave signature provider: ${e}; ignoring ${val}", ("e", e.top_message())("val", key_spec_pair));
+            throw;
          } catch (fc::exception& e) {
             elog("Malformed signature provider: \"${val}\": ${e}, ignoring!", ("val", key_spec_pair)("e", e));
+            throw;
          } catch (...) {
             elog("Malformed signature provider: \"${val}\", ignoring!", ("val", key_spec_pair));
+            throw;
          }
       }
    }

diff --git a/plugins/signature_provider_plugin/signature_provider_plugin.cpp b/plugins/signature_provider_plugin/signature_provider_plugin.cpp
@@ -42,6 +42,11 @@ class signature_provider_plugin_impl {
       std::tuple<std::string, std::string, std::string> parse_spec(const std::string& spec) const {
          auto delim = spec.find("=");
          EOS_ASSERT(delim != std::string::npos, chain::plugin_config_exception, "Missing \"=\" in the key spec pair");
+         // public_key can be base64 encoded with trailing `=`
+         // e.g. --signature-provider PUB_BLS_Fmgk<snip>iuA===KEY:PVT_BLS_NZhJ<snip>ZHFu
+         while( spec.size() > delim+1 && spec[delim+1] == '=' )
+            ++delim;
+         EOS_ASSERT(delim < spec.size() + 1, chain::plugin_config_exception, "Missing spec data in the key spec pair");
          auto pub_key_str = spec.substr(0, delim);
          auto spec_str = spec.substr(delim + 1);
 

diff --git a/tests/TestHarness/launcher.py b/tests/TestHarness/launcher.py
@@ -514,7 +514,7 @@ def construct_command_line(self, instance: nodeDefinition):
             a(a(eosdcmd, '--plugin'), 'eosio::producer_plugin')
             producer_keys = list(sum([('--signature-provider', f'{key.pubkey}=KEY:{key.privkey}') for key in instance.keys], ()))
             eosdcmd.extend(producer_keys)
-            finalizer_keys = list(sum([('--signature-provider', f'{key.blspubkey}=KEY:{key.blsprivkey}') for key in instance.keys], ()))
+            finalizer_keys = list(sum([('--signature-provider', f'{key.blspubkey}=KEY:{key.blsprivkey}') for key in instance.keys if key.blspubkey is not None], ()))
             eosdcmd.extend(finalizer_keys)
             producer_names = list(sum([('--producer-name', p) for p in instance.producers], ()))
             eosdcmd.extend(producer_names)