Skip to content

Commit a11a8e9

Browse files
committedMay 24, 2021
add address "#" before each address value
·
v0.3.1v0.1.4
1 parent ee2e61d commit a11a8e9

File tree

7 files changed

+29
-24
lines changed

7 files changed

+29
-24
lines changed
 

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
## Change log
22

3+
### 0.1.4
4+
+ Add address '#' ident before each address number.
5+
36
### 0.1.3
47
+ Add transfer_account, the ability to change your account public key for a given account address
58
+ Remove eth-utils library dependency

‎convex_api/convex_api.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def request_funds(self, amount, account):
375375
"""
376376
faucet_url = urljoin(self._url, '/api/v1/faucet')
377377
faucet_data = {
378-
'address': account.address,
378+
'address': f'#{account.address}',
379379
'amount': amount
380380
}
381381
logger.debug(f'request_funds {faucet_url} {faucet_data}')
@@ -497,9 +497,9 @@ def get_balance(self, address_account, account_from=None):
497497
address_from = to_address(account_from)
498498
else:
499499
address_from = account_from.address
500-
line = f'(balance {address})'
500+
line = f'(balance #{address})'
501501
if self._language == ConvexAPI.LANGUAGE_SCRYPT:
502-
line = f'balance({address})'
502+
line = f'balance(#{address})'
503503
try:
504504

505505
result = self._transaction_query(address_from, line)
@@ -550,9 +550,9 @@ def transfer(self, to_address_account, amount, account):
550550
if not to_address:
551551
raise ValueError(f'You must provide a valid to account/address ({transfer_to_address}) to transfer funds too')
552552

553-
line = f'(transfer {transfer_to_address} {amount})'
553+
line = f'(transfer #{transfer_to_address} {amount})'
554554
if self._language == ConvexAPI.LANGUAGE_SCRYPT:
555-
line = f'transfer({transfer_to_address}, {amount})'
555+
line = f'transfer(#{transfer_to_address}, {amount})'
556556

557557
result = self.send(line, account)
558558
if result and 'value' in result:
@@ -689,7 +689,7 @@ def _transaction_prepare(self, address, transaction, language=None, sequence_num
689689
language = self._language
690690
prepare_url = urljoin(self._url, '/api/v1/transaction/prepare')
691691
data = {
692-
'address': address,
692+
'address': f'#{address}',
693693
'lang': language,
694694
'source': transaction,
695695
}
@@ -713,7 +713,7 @@ def _transaction_submit(self, address, public_key, hash_data, signed_data):
713713
"""
714714
submit_url = urljoin(self._url, '/api/v1/transaction/submit')
715715
data = {
716-
'address': to_address(address),
716+
'address': f'#{to_address(address)}',
717717
'accountKey': public_key,
718718
'hash': hash_data,
719719
'sig': remove_0x_prefix(signed_data)
@@ -738,7 +738,7 @@ def _transaction_query(self, address, transaction, language=None):
738738

739739
prepare_url = urljoin(self._url, '/api/v1/query')
740740
data = {
741-
'address': address,
741+
'address': f'#{address}',
742742
'lang': language,
743743
'source': transaction,
744744
}

‎convex_api/registry.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ def clear(self):
3838
self._address = None
3939

4040
def register(self, name, contract_address, account):
41-
result = self._convex.send(f'(call {self.address} (register {{:name "{name}"}}))', account)
41+
result = self._convex.send(f'(call #{self.address} (register {{:name "{name}"}}))', account)
4242
logger.debug(f'register result: {result}')
4343
if result and 'value' in result:
4444
try:
45-
result = self._convex.send(f'(call {self.address} (cns-update "{name}" {contract_address}))', account)
45+
result = self._convex.send(f'(call #{self.address} (cns-update "{name}" {contract_address}))', account)
4646
logger.debug(f'cns-update result: {result}')
4747
if result and 'value' in result:
4848
items = result['value']

‎tests/conftest.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
PRIVATE_TEST_KEY = 0x973f69bcd654b264759170724e1e30ccd2e75fc46b7993fd24ce755f0a8c24d0
1818
PUBLIC_KEY = '0x5288Fec4153b702430771DFAC8AeD0B21CAFca4344daE0d47B97F0bf532b3306'
19-
19+
PRIVATE_KEY_MNEMONIC = 'now win hundred protect enroll cram stone come inch ill method often common quiz balance hundred negative truck crime turkey vague ecology nation balcony'
2020

2121
PRIVATE_TEST_KEY_TEXT = """
2222
-----BEGIN ENCRYPTED PRIVATE KEY-----
@@ -39,12 +39,14 @@ def test_account_info():
3939
'private_bytes': to_bytes(PRIVATE_TEST_KEY),
4040
'private_text': PRIVATE_TEST_KEY_TEXT,
4141
'private_password': PRIVATE_TEST_KEY_PASSWORD,
42+
'private_mnemonic': PRIVATE_KEY_MNEMONIC,
4243
'public_key': PUBLIC_KEY
4344
}
4445

4546
@pytest.fixture(scope='module')
4647
def import_account(test_account_info):
47-
return Account.import_from_bytes(test_account_info['private_bytes'])
48+
account = Account.import_from_bytes(test_account_info['private_bytes'])
49+
return account
4850

4951
@pytest.fixture(scope='module')
5052
def test_account(convex, import_account):

‎tests/intergration/test_basic_api.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def create_account(convex_url, public_address):
4343

4444
def request_funds(convex_url, address):
4545
faucet_data = {
46-
'address': address,
46+
'address': f'#{address}',
4747
'amount': 10000000
4848
}
4949
print('faucet send', faucet_data)
@@ -64,7 +64,7 @@ def test_submit_transaction(convex_url):
6464

6565
# prepare
6666
prepare_data = {
67-
'address': address,
67+
'address': f'#{address}',
6868
'source': '(map inc [1 2 3])'
6969
}
7070
url = f'{convex_url}/api/v1/transaction/prepare'
@@ -82,7 +82,7 @@ def test_submit_transaction(convex_url):
8282
signed_hash_bytes = private_key.sign(hash_data)
8383
signed_hash = to_hex(signed_hash_bytes)
8484
submit_data = {
85-
'address': address,
85+
'address': f'#{address}',
8686
'accountKey': public_address,
8787
'hash': result['hash'],
8888
'sig': remove_0x_prefix(signed_hash)
@@ -103,9 +103,9 @@ def test_query_lisp(convex_url):
103103
address = create_account(convex_url, public_address)
104104
request_funds(convex_url, address)
105105
query_data = {
106-
'address': address,
106+
'address': f'#{address}',
107107
'lang': 'convex-lisp',
108-
'source': f'(balance {address})'
108+
'source': f'(balance #{address})'
109109
}
110110
url = f'{convex_url}/api/v1/query'
111111
print('query send', query_data)
@@ -123,9 +123,9 @@ def test_query_scrypt(convex_url):
123123
address = create_account(convex_url, public_address)
124124
request_funds(convex_url, address)
125125
query_data = {
126-
'address': address,
126+
'address': f'#{address}',
127127
'lang': 'convex-scrypt',
128-
'source': f'balance({address})'
128+
'source': f'balance(#{address})'
129129
}
130130
url = f'{convex_url}/api/v1/query'
131131
print('query send', query_data)

‎tests/intergration/test_convex_api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,11 @@ def test_convex_api_call(convex_url):
199199
call_get_result = convex.query('call storage_example get()', account)
200200
assert(call_get_result['value'] == test_number)
201201

202-
call_get_result = convex.query(f'call {contract_address} get()', account)
202+
call_get_result = convex.query(f'call #{contract_address} get()', account)
203203
assert(call_get_result['value'] == test_number)
204204

205205
with pytest.raises(ConvexRequestError, match='400'):
206-
call_set_result = convex.send(f'call {contract_address}.set({test_number})', account)
206+
call_set_result = convex.send(f'call #{contract_address}.set({test_number})', account)
207207

208208
address = convex.get_address('storage_example', account)
209209
assert(address == contract_address)

‎tests/intergration/test_convex_break.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def test_convex_recursion(convex, test_account):
4343
if next_index == chain_length:
4444
next_index = 0
4545
call_address = address_list[next_index]
46-
result = convex.send(f'(call chain-{index} (set-chain-address {call_address}))', test_account)
46+
result = convex.send(f'(call chain-{index} (set-chain-address #{call_address}))', test_account)
4747
test_number = secrets.randbelow(1000)
4848
if index == chain_length - 1:
4949
with pytest.raises(ConvexAPIError, match='DEPTH'):
@@ -87,7 +87,7 @@ def test_schedule_transfer(convex, test_account, other_account):
8787
contract_address = to_address(result['value'])
8888
convex.transfer(contract_address, 800000, other_account)
8989
convex.topup_account(test_account)
90-
result = convex.send(f'(call {contract_address} (tx-delay {other_account.address} 1000))', test_account)
90+
result = convex.send(f'(call #{contract_address} (tx-delay #{other_account.address} 1000))', test_account)
9191
print(result)
92-
result = convex.send(f'(call {contract_address} (show-schedule))', test_account)
92+
result = convex.send(f'(call #{contract_address} (show-schedule))', test_account)
9393
print(result)

0 commit comments

Comments
 (0)
Please sign in to comment.