update to v0.3.1 (#7)

* update from cryptogarageinc v0.3.3

.github/workflows/check_pre-merge_develop.yml

@@ -15,8 +15,8 @@ on:
     - test_ci
 
 env:
-  GITHUB_VERSION: v0.0.8
-  GITHUB_BITCOIN_VERSION: v0.0.8
+  GITHUB_VERSION: v0.0.10
+  GITHUB_BITCOIN_VERSION: v0.0.10
   DOCKER_PYTHON_VERSION: 3.7
   GITHUB_DOCKER_IMAGE: docker.pkg.github.com/cryptogarageinc/elements-testing-dockerfile/elements-testing
   ENTRYPOINT_PATH: /github/workspace/.github/workflows/docker/test_entrypoint.sh
@@ -91,9 +91,9 @@ jobs:
     - name: call example
       run: python ./tools/example.py
 
-  e2e-test:
+  elements-e2e-test:
     timeout-minutes: 20
-    name: e2e-test
+    name: elements e2e test
     runs-on: ubuntu-18.04
 
     steps:

.github/workflows/check_pre-merge_master.yml

@@ -13,8 +13,8 @@ on:
     - master
 
 env:
-  GITHUB_VERSION: v0.0.8
-  GITHUB_BITCOIN_VERSION: v0.0.8
+  GITHUB_VERSION: v0.0.10
+  GITHUB_BITCOIN_VERSION: v0.0.10
   DOCKER_PYTHON_VERSION: 3.7
   GITHUB_DOCKER_IMAGE: docker.pkg.github.com/cryptogarageinc/elements-testing-dockerfile/elements-testing
   ENTRYPOINT_PATH: /github/workspace/.github/workflows/docker/test_entrypoint.sh
@@ -90,9 +90,9 @@ jobs:
     - name: call example
       run: python ./tools/example.py
 
-  e2e-test:
+  elements-e2e-test:
     timeout-minutes: 20
-    name: e2e-test
+    name: elements e2e test
     runs-on: ubuntu-18.04
 
     steps:

.github/workflows/check_pre-merge_sprint.yml

@@ -13,8 +13,8 @@ on:
     - features/sprint*
 
 env:
-  GITHUB_VERSION: v0.0.8
-  GITHUB_BITCOIN_VERSION: v0.0.8
+  GITHUB_VERSION: v0.0.10
+  GITHUB_BITCOIN_VERSION: v0.0.10
   DOCKER_PYTHON_VERSION: 3.7
   GITHUB_DOCKER_IMAGE: docker.pkg.github.com/cryptogarageinc/elements-testing-dockerfile/elements-testing
   ENTRYPOINT_PATH: /github/workspace/.github/workflows/docker/test_entrypoint.sh

.github/workflows/code_scanner.yml

@@ -41,10 +41,6 @@ jobs:
         # We must fetch at least the immediate parents so that if this is a pull request then we can checkout the head.
         fetch-depth: 2
 
-    # If this run was triggered by a pull request event, then checkout the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1

.github/workflows/docker/test_entrypoint.sh

@@ -52,12 +52,6 @@ pip3 install python-bitcoinrpc
 
 cd integration_test
 
-python3 tests/test_bitcoin.py -v
-if [ $? -gt 0 ]; then
-  cd ../..
-  exit 1
-fi
-
 python3 tests/test_elements.py -v
 if [ $? -gt 0 ]; then
   cd ../..

Pipfile

@@ -22,3 +22,4 @@ build3 = "python3 ./setup.py build"
 doc = "cd doc && doxygen Doxyfile_quiet_all"
 pip_install = "pip install"
 pip_list = "pip list"
+wheel = "pip wheel ."

VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

cfd/address.py

@@ -3,7 +3,7 @@
 # @file address.py
 # @brief address function implements file.
 # @note Copyright 2020 CryptoGarage
-from typing import Union, Optional, List
+from typing import Tuple, Union, Optional, List
 from .util import get_util, CfdError, JobHandle, to_hex_string
 from .key import Network, Pubkey, SchnorrPubkey
 from .script import HashType, Script
@@ -386,6 +386,46 @@ def get_multisig_address_list(
                     addr_list.append(_addr)
         return addr_list
 
+    ##
+    # @brief get pegin address.
+    # @param[in] fedpeg_script          fedpeg script
+    # @param[in] pubkey                 pubkey
+    # @param[in] redeem_script          redeem script
+    # @param[in] hash_type              script hash type
+    # @param[in] mainchain_network      mainchain network type
+    # @retval [0]      pegin address.
+    # @retval [1]      claim script.
+    # @retval [2]      tweaked fedpeg script.
+    @classmethod
+    def get_pegin_address(
+            cls,
+            fedpeg_script: Union['Script', str],
+            pubkey='',
+            redeem_script='',
+            hash_type: Union['HashType', str] = HashType.P2SH_P2WSH,
+            mainchain_network=Network.MAINNET,
+    ) -> Tuple['Address', 'Script', 'Script']:
+        _fedpeg_script = to_hex_string(fedpeg_script)
+        _hash_type = HashType.get(hash_type)
+        _network = Network.get(mainchain_network)
+        _pubkey = '' if pubkey is None else to_hex_string(pubkey)
+        _script = '' if redeem_script is None else to_hex_string(redeem_script)
+        if (not _pubkey) and (not _script):
+            raise CfdError(
+                error_code=1,
+                message='Error: Both pubkey and redeem_script is empty.')
+        elif not _script:
+            _ = Pubkey(_pubkey)  # check pubkey
+
+        util = get_util()
+        with util.create_handle() as handle:
+            addr, claim_script, tweaked_fedpeg = util.call_func(
+                'CfdGetPeginAddress',
+                handle.get_handle(), _network.value, _fedpeg_script,
+                _hash_type.value, _pubkey, _script)
+            return cls.parse(addr), Script(claim_script), Script(
+                tweaked_fedpeg)
+
 
 ##
 # All import target.