return get address with leading 0x

Author: billbsing

.github/workflows/deploy.yml

@@ -1,9 +1,11 @@
 name: deploy
 on:
   push:
-    tags:
-      - v*
-# if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
+    branches:
+    - master
+#    tags:
+#      - v*
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -26,11 +28,11 @@ jobs:
         PERSONAL_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         PUBLISH_BRANCH: gh-pages
         PUBLISH_DIR: docs/build/html
-    #- name: Build Package
-      #run: |
-        #python3 setup.py sdist
-    #- name: Deploy Package
-      #uses: pypa/gh-action-pypi-publish@master
-      #with:
-        #user: __token__
-        #password: ${{ secrets.PYPI_TOKEN }}
+    - name: Build Package
+      run: |
+        python3 setup.py sdist
+    - name: Deploy Package
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Change log
 
+### 0.0.5
++   Return an address with the 0x prefix added
+
 ### 0.0.4
 +   Import/export account private keys as a word phrase
 +   Convex Wallet tool

convex_api/convex_api.py

@@ -13,7 +13,10 @@
 from urllib.parse import urljoin
 
 import requests
-from eth_utils import remove_0x_prefix
+from eth_utils import (
+    remove_0x_prefix,
+    add_0x_prefix
+)
 
 from convex_api.exceptions import (
     ConvexAPIError,
@@ -138,7 +141,7 @@ def get_address(self, function_name, address_account):
             line = f'address({function_name})'
         result = self.query(line, address_account)
         if result and 'value' in result:
-            return result['value']
+            return add_0x_prefix(result['value'])
 
     def get_balance(self, address_account, account_from=None):
         """

tests/intergration/test_convex_api.py

@@ -5,7 +5,10 @@
 """
 import pytest
 import secrets
-from eth_utils import remove_0x_prefix
+from eth_utils import (
+    remove_0x_prefix,
+    add_0x_prefix
+)
 
 from convex_api.account import Account
 from convex_api.convex_api import ConvexAPI
@@ -16,6 +19,7 @@
 
 TEST_FUNDING_AMOUNT = 8888888
 
+
 def test_convex_api_language_setup(convex_url):
     convex = ConvexAPI(convex_url)
     assert(convex.language == ConvexAPI.LANGUAGE_LISP)
@@ -69,7 +73,6 @@ def test_convex_api_send_basic_scrypt(convex_url, test_account):
     assert 'value' in result
     assert(result['value'] == [2, 3, 4, 5, 6])
 
-
 def test_convex_api_get_balance_no_funds(convex_url):
     convex = ConvexAPI(convex_url)
     account = Account.create_new()
@@ -113,7 +116,7 @@ def test_convex_api_call(convex_url):
     request_amount = convex.request_funds(amount, account)
     result = convex.send(deploy_storage, account)
     assert(result['value'])
-    contract_address = result['value']
+    contract_address = add_0x_prefix(result['value'])
     test_number = secrets.randbelow(1000)
     call_set_result = convex.send(f'(call storage-example(set {test_number}))', account)
     assert(call_set_result['value'] == test_number)
@@ -142,7 +145,6 @@ def test_convex_api_call(convex_url):
     #address = convex.get_address(contract_address_api, account)
     assert(address == contract_address )
 
-
 def test_convex_api_transfer(convex_url):
     convex = ConvexAPI(convex_url)
     account_from = Account.create_new()
@@ -156,18 +158,16 @@ def test_convex_api_transfer(convex_url):
     balance_to = convex.get_balance(account_to)
     assert(balance_to == amount / 2)
 
-
-
 def test_convex_api_query_lisp(convex_url, test_account):
     convex = ConvexAPI(convex_url)
     result = convex.query(f'(address "{test_account.address_api}")', test_account)
     assert(result)
     # return value is the address as a checksum
-    assert(result['value'] == test_account.address_checksum)
+    assert(add_0x_prefix(result['value']) == test_account.address_checksum)
 
 def test_convex_api_query_scrypt(convex_url, test_account):
     convex = ConvexAPI(convex_url, ConvexAPI.LANGUAGE_SCRYPT)
     result = convex.query(f'address("{test_account.address_api}")', test_account)
     assert(result)
     # return value is the address as a checksum
-    assert(result['value'] == test_account.address_checksum)
+    assert(add_0x_prefix(result['value']) == test_account.address_checksum)

tests/intergration/test_convex_break.py

@@ -7,6 +7,8 @@
 
 import pytest
 import secrets
+from eth_utils import add_0x_prefix
+
 
 from tests.helpers import auto_topup_account
 
@@ -35,7 +37,7 @@ def test_convex_recursion(convex, test_account):
 """
         auto_topup_account(convex, test_account)
         result = convex.send(contract, test_account)
-        address_list.append(result['value'])
+        address_list.append(add_0x_prefix(result['value']))
     for index in range(0, chain_length):
         next_index = index + 1
         if next_index == chain_length:
@@ -82,7 +84,7 @@ def test_schedule_transfer(convex, test_account, other_account):
     auto_topup_account(convex, test_account)
     auto_topup_account(convex, other_account)
     result = convex.send(contract, test_account)
-    contract_address = result['value']
+    contract_address = add_0x_prefix(result['value'])
     convex.transfer(contract_address, 8000000, other_account)
     auto_topup_account(convex, test_account)
     result = convex.send(f'(call {contract_address} (tx-delay {other_account.address} 1000))', test_account)