update to v0.2.1 (#24)

update from cryptogarageinc v0.2.10 + CI Co-authored-by: k-matsuzawa <matsuzawa@cryptogarage.co.jp>
p2pderivatives · Nov 21, 2020 · 9f54d6d · 9f54d6d
1 parent 680ffb8
commit 9f54d6d
Show file tree

Hide file tree

Showing 18 changed files with 1,060 additions and 190 deletions.
diff --git a/.github/workflows/check_pre-merge_develop.yml b/.github/workflows/check_pre-merge_develop.yml
@@ -14,7 +14,7 @@ env:
 jobs:
   cmake-win-test:
     name: cmake build-win
-    runs-on: windows-latest
+    runs-on: windows-2019
     strategy:
       matrix:
         generator: ['Visual Studio 16 2019', 'MSYS Makefiles']
@@ -37,7 +37,10 @@ jobs:
 
   cmake-mac-test:
     name: cmake build-mac
-    runs-on: macos-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-10.15, macos-11.0]
 
     steps:
     - uses: actions/checkout@v2
@@ -92,7 +95,7 @@ jobs:
 
   doxygen-ubuntu:
     name: doxygen-check
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/check_pre-merge_master.yml b/.github/workflows/check_pre-merge_master.yml
@@ -14,7 +14,7 @@ env:
 jobs:
   cmake-win-test:
     name: cmake build-win
-    runs-on: windows-latest
+    runs-on: windows-2019
     strategy:
       matrix:
         generator: ['Visual Studio 16 2019', 'MSYS Makefiles']
@@ -37,7 +37,10 @@ jobs:
 
   cmake-mac-test:
     name: cmake build-mac
-    runs-on: macos-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-10.15, macos-11.0]
 
     steps:
     - uses: actions/checkout@v2
@@ -92,7 +95,7 @@ jobs:
 
   doxygen-ubuntu:
     name: doxygen-check
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/check_pre-merge_sprint.yml b/.github/workflows/check_pre-merge_sprint.yml
@@ -14,7 +14,7 @@ env:
 jobs:
   cmake-win:
     name: cmake build-win
-    runs-on: windows-latest
+    runs-on: windows-2019
     strategy:
       matrix:
         generator: ['Visual Studio 16 2019', 'MSYS Makefiles']
@@ -37,7 +37,10 @@ jobs:
 
   cmake-mac:
     name: cmake build-mac
-    runs-on: macos-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-10.15, macos-11.0]
 
     steps:
     - uses: actions/checkout@v2
@@ -98,7 +101,7 @@ jobs:
 
   doxygen-ubuntu:
     name: doxygen-check
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/code_scanner.yml b/.github/workflows/code_scanner.yml
@@ -7,6 +7,13 @@ on:
     - develop
     - features/sprint*
     - feature/code_scanning
+    paths:
+    - '**.js'
+    - '**.ts'
+    - '**.cpp'
+    - '**.h'
+    - '**/code_scanner.yml'
+    - '**/external_project_local_setting.config'
   pull_request:
     branches:
     - master
@@ -16,7 +23,7 @@ on:
 jobs:
   analyze-CodeQL:
     name: CodeQL
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     strategy:
       fail-fast: false
@@ -68,7 +75,7 @@ jobs:
   OSSAR-Scan:
     # OSSAR runs on windows-latest.
     # ubuntu-latest and macos-latest support coming soon
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       # Checkout your code repository to scan

diff --git a/.github/workflows/create_release-and-upload.yml b/.github/workflows/create_release-and-upload.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   create_releases:
     name: create-releases
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     outputs:
       release_url: ${{ steps.output_url.outputs.upload_url }}
 
@@ -44,7 +44,7 @@ jobs:
   upload-object-windows:
     name: upload-object-win
     needs: create_releases
-    runs-on: windows-latest
+    runs-on: windows-2019
     strategy:
       fail-fast: false
       matrix:
@@ -171,7 +171,7 @@ jobs:
   upload-object-alpine-3-10:
     name: upload-object-alpine-3.10
     needs: create_releases
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: checkout
@@ -218,7 +218,7 @@ jobs:
   upload-object-alpine-3-12:
     name: upload-object-alpine-3.12
     needs: create_releases
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: checkout
@@ -265,7 +265,7 @@ jobs:
   upload-object-macos:
     name: upload-object-macos
     needs: create_releases
-    runs-on: macos-latest
+    runs-on: macos-10.15
     strategy:
       fail-fast: false
       matrix:

diff --git a/.travis.yml b/.travis.yml
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -50,7 +50,7 @@ if(CFDCORE_TARGET_VERSION)
 set(CFDCORE_TARGET_TAG  ${CFDCORE_TARGET_VERSION})
 message(STATUS "[external project local] cfd-core target=${CFDCORE_TARGET_VERSION}")
 else()
-set(CFDCORE_TARGET_TAG  v0.2.0)
+set(CFDCORE_TARGET_TAG  v0.2.1)
 endif()
 if(CFDCORE_TARGET_URL)
 set(CFDCORE_TARGET_REP  ${CFDCORE_TARGET_URL})

diff --git a/include/cfd/cfd_elements_transaction.h b/include/cfd/cfd_elements_transaction.h
@@ -34,6 +34,7 @@ using cfd::core::AbstractTransaction;
 using cfd::core::Address;
 using cfd::core::AddressType;
 using cfd::core::Amount;
+using cfd::core::BlindData;
 using cfd::core::BlindFactor;
 using cfd::core::BlindParameter;
 using cfd::core::BlockHash;
@@ -428,14 +429,16 @@ class CFD_EXPORT ConfidentialTransactionContext
    *   -1 to 18. -1 is public value. 0 is most private.
    * @param[in] minimum_bits               rangeproof blinding bits.
    *   0 to 64. Number of bits of the value to keep private. 0 is auto.
+   * @param[out] blinder_list             blinder list. (default is null)
    */
   void BlindTransaction(
       const std::map<OutPoint, BlindParameter>& utxo_info_map,
       const std::map<OutPoint, IssuanceBlindingKeyPair>& issuance_key_map,
       const std::vector<ElementsConfidentialAddress>&
           confidential_address_list,
       int64_t minimum_range_value = 1, int exponent = 0,
-      int minimum_bits = kDefaultBlindMinimumBits);
+      int minimum_bits = kDefaultBlindMinimumBits,
+      std::vector<BlindData>* blinder_list = nullptr);
   /**
    * @brief Blind Trasnsaction.
    * @param[in] utxo_info_map              txin utxo information map.
@@ -448,6 +451,7 @@ class CFD_EXPORT ConfidentialTransactionContext
    *   -1 to 18. -1 is public value. 0 is most private.
    * @param[in] minimum_bits               rangeproof blinding bits.
    *   0 to 64. Number of bits of the value to keep private. 0 is auto.
+   * @param[out] blinder_list             blinder list. (default is null)
    */
   void BlindTransactionWithDirectKey(
       const std::map<OutPoint, BlindParameter>& utxo_info_map,
@@ -456,7 +460,8 @@ class CFD_EXPORT ConfidentialTransactionContext
           confidential_address_list,
       const std::vector<ConfidentialKeyBlindParameter>& confidential_key_list,
       int64_t minimum_range_value = 1, int exponent = 0,
-      int minimum_bits = kDefaultBlindMinimumBits);
+      int minimum_bits = kDefaultBlindMinimumBits,
+      std::vector<BlindData>* blinder_list = nullptr);
 
   /**
    * @brief Unblind issuance data.
@@ -502,12 +507,14 @@ class CFD_EXPORT ConfidentialTransactionContext
    *   -1 to 18. -1 is public value. 0 is most private.
    * @param[in] minimum_bits               rangeproof blinding bits.
    *   0 to 64. Number of bits of the value to keep private. 0 is auto.
+   * @param[out] blinder_list             blinder list. (default is null)
    */
   void Blind(
       const std::vector<ElementsConfidentialAddress>* confidential_addresses =
           nullptr,
       int64_t minimum_range_value = 1, int exponent = 0,
-      int minimum_bits = kDefaultBlindMinimumBits);
+      int minimum_bits = kDefaultBlindMinimumBits,
+      std::vector<BlindData>* blinder_list = nullptr);
   /**
    * @brief Execute blinding issuance & txout using utxo data.
    * @param[in] issuance_key_map           issue blinding key map.
@@ -519,13 +526,15 @@ class CFD_EXPORT ConfidentialTransactionContext
    *   -1 to 18. -1 is public value. 0 is most private.
    * @param[in] minimum_bits               rangeproof blinding bits.
    *   0 to 64. Number of bits of the value to keep private. 0 is auto.
+   * @param[out] blinder_list             blinder list. (default is null)
    */
   void BlindIssuance(
       const std::map<OutPoint, IssuanceBlindingKeyPair>& issuance_key_map,
       const std::vector<ElementsConfidentialAddress>* confidential_addresses =
           nullptr,
       int64_t minimum_range_value = 1, int exponent = 0,
-      int minimum_bits = kDefaultBlindMinimumBits);
+      int minimum_bits = kDefaultBlindMinimumBits,
+      std::vector<BlindData>* blinder_list = nullptr);
 
   /**
    * @brief sign with privkey.

diff --git a/include/cfdc/cfdcapi_elements_transaction.h b/include/cfdc/cfdcapi_elements_transaction.h
@@ -31,6 +31,8 @@ enum CfdBlindOption {
   kCfdBlindOptionExponent = 2,
   /** blind option: minBits */
   kCfdBlindOptionMinimumBits = 3,
+  /** blind option: collect blinder */
+  kCfdBlindOptionCollectBlinder = 4,
 };
 
 /**
@@ -557,12 +559,44 @@ CFDC_API int CfdAddBlindTxOutByAddress(
  * @param[in] blind_handle    blinding handle.
  * @param[in] tx_hex_string   transaction hex.
  * @param[out] tx_string      blinding transaction hex.
+ *   If 'CfdFreeStringBuffer' is implemented,
+ *   Call 'CfdFreeStringBuffer' after you are finished using it.
  * @return CfdErrorCode
  */
 CFDC_API int CfdFinalizeBlindTx(
     void* handle, void* blind_handle, const char* tx_hex_string,
     char** tx_string);
 
+/**
+ * @brief get blinding data.
+ * @param[in] handle                cfd handle.
+ * @param[in] blind_handle          blinding handle.
+ * @param[in] index                 index.
+ * @param[out] vout                 txout vout.
+ * @param[out] asset                asset.
+ *   If 'CfdFreeStringBuffer' is implemented,
+ *   Call 'CfdFreeStringBuffer' after you are finished using it.
+ * @param[out] value_satoshi        satoshi amount.
+ * @param[out] asset_blind_factor   asset blinder.
+ *   If 'CfdFreeStringBuffer' is implemented,
+ *   Call 'CfdFreeStringBuffer' after you are finished using it.
+ * @param[out] value_blind_factor   amount blinder.
+ *   If 'CfdFreeStringBuffer' is implemented,
+ *   Call 'CfdFreeStringBuffer' after you are finished using it.
+ * @param[out] issuance_txid        issuance utxo txid.
+ *   If 'CfdFreeStringBuffer' is implemented,
+ *   Call 'CfdFreeStringBuffer' after you are finished using it.
+ * @param[out] issuance_vout        issuance utxo vount.
+ * @param[out] is_issuance_asset    issuance asset.
+ * @param[out] is_issuance_token    issuance token.
+ * @return CfdErrorCode
+ */
+CFDC_API int CfdGetBlindTxBlindData(
+    void* handle, void* blind_handle, uint32_t index, uint32_t* vout,
+    char** asset, int64_t* value_satoshi, char** asset_blind_factor,
+    char** value_blind_factor, char** issuance_txid, uint32_t* issuance_vout,
+    bool* is_issuance_asset, bool* is_issuance_token);
+
 /**
  * @brief free blinding handle.
  * @param[in] handle        handle pointer.