Change data endpoint to block range

apps/cic-eth/cic_eth/admin/token.py

@@ -16,6 +16,4 @@ def default_token(self):
     return {
             'symbol': self.default_token_symbol,
             'address': self.default_token_address,
-            'name': self.default_token_name,
-            'decimals': self.default_token_decimals,
             }

apps/cic-eth/cic_eth/runnable/daemons/filters/callback.py

@@ -72,9 +72,7 @@ class CallbackFilter(SyncFilter):
         #transfer_data['token_address'] = tx.inputs[0]
         faucet_contract = tx.inputs[0]
 
-        c = Faucet(self.chain_spec)
-
-        o = c.token(faucet_contract, sender_address=self.caller_address)
+        o = Faucet.token(faucet_contract, sender_address=self.caller_address)
         r = conn.do(o)
         transfer_data['token_address'] = add_0x(c.parse_token(r))
 

apps/cic-eth/cic_eth/runnable/daemons/tasker.py

@@ -22,7 +22,6 @@ from chainlib.eth.connection import (
 from chainlib.chain import ChainSpec
 from chainqueue.db.models.otx import Otx
 from cic_eth_registry.error import UnknownContractError
-from cic_eth_registry.erc20 import ERC20Token
 import liveness.linux
 
 
@@ -208,11 +207,6 @@ def main():
 
     BaseTask.default_token_symbol = config.get('CIC_DEFAULT_TOKEN_SYMBOL')
     BaseTask.default_token_address = registry.by_name(BaseTask.default_token_symbol)
-    default_token = ERC20Token(chain_spec, rpc, BaseTask.default_token_address)
-    default_token.load(rpc)
-    BaseTask.default_token_decimals = default_token.decimals
-    BaseTask.default_token_name = default_token.name
-
     BaseTask.run_dir = config.get('CIC_RUN_DIR')
     logg.info('default token set to {} {}'.format(BaseTask.default_token_symbol, BaseTask.default_token_address))
    

apps/cic-eth/cic_eth/runnable/info.py

@@ -67,8 +67,6 @@ def main():
     token_info = t.get()
     print('Default token symbol: {}'.format(token_info['symbol']))
     print('Default token address: {}'.format(token_info['address']))
-    logg.debug('Default token name: {}'.format(token_info['name']))
-    logg.debug('Default token decimals: {}'.format(token_info['decimals']))
 
     
 if __name__ == '__main__':

apps/cic-eth/cic_eth/task.py

@@ -33,8 +33,6 @@ class BaseTask(celery.Task):
     create_gas_oracle = RPCGasOracle
     default_token_address = None
     default_token_symbol = None
-    default_token_name = None
-    default_token_decimals = None
     run_dir = '/run'
 
     def create_session(self):

apps/cic-eth/tests/conftest.py

@@ -4,7 +4,7 @@ import sys
 import logging
 
 # external imports
-from eth_erc20 import ERC20
+from chainlib.eth.erc20 import ERC20
 
 # local imports
 from cic_eth.api import Api

apps/cic-eth/tests/filters/test_callback_filter.py

@@ -14,9 +14,9 @@ from chainlib.eth.tx import (
         Tx,
         )
 from chainlib.eth.block import Block
-from eth_erc20 import ERC20
+from chainlib.eth.erc20 import ERC20
 from sarafu_faucet import MinterFaucet
-from eth_accounts_index.registry import AccountRegistry
+from eth_accounts_index import AccountRegistry
 from potaahto.symbols import snake_and_camel
 from hexathon import add_0x
 
@@ -26,6 +26,7 @@ from cic_eth.runnable.daemons.filters.callback import CallbackFilter
 logg = logging.getLogger()
 
 
+@pytest.mark.skip()
 def test_transfer_tx(
         default_chain_spec,
         init_database,
@@ -65,6 +66,7 @@ def test_transfer_tx(
     assert transfer_type == 'transfer'
 
 
+@pytest.mark.skip()
 def test_transfer_from_tx(
         default_chain_spec,
         init_database,

apps/cic-eth/tests/task/api/test_list.py

@@ -4,7 +4,7 @@ import logging
 # external imports
 import pytest
 from chainlib.eth.nonce import RPCNonceOracle
-from eth_erc20 import ERC20
+from chainlib.eth.erc20 import ERC20
 from chainlib.eth.tx import receipt
 
 # local imports

apps/cic-eth/tests/task/test_task_account.py

@@ -9,7 +9,7 @@ import celery
 from chainlib.connection import RPCConnection
 from chainlib.eth.nonce import RPCNonceOracle
 from chainlib.eth.tx import receipt
-from eth_accounts_index.registry import AccountRegistry
+from eth_accounts_index import AccountRegistry
 from hexathon import strip_0x
 from chainqueue.db.enum import StatusEnum
 from chainqueue.db.models.otx import Otx

apps/cic-eth/tests/task/test_task_erc20.py

@@ -4,7 +4,7 @@ import logging
 # external imports
 import pytest
 import celery
-from eth_erc20 import ERC20
+from chainlib.eth.erc20 import ERC20
 from chainlib.eth.nonce import RPCNonceOracle
 from chainlib.eth.tx import (
         receipt,

apps/cic-eth/tests/unit/ext/test_address.py

@@ -3,7 +3,7 @@ from chainlib.eth.nonce import RPCNonceOracle
 from chainlib.eth.tx import (
         receipt,
         )
-from eth_address_declarator import Declarator
+from eth_address_declarator import AddressDeclarator
 from hexathon import add_0x
 
 # local imports
@@ -23,7 +23,7 @@ def test_translate(
 
     nonce_oracle = RPCNonceOracle(contract_roles['CONTRACT_DEPLOYER'], eth_rpc)
 
-    c = Declarator(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle)
+    c = AddressDeclarator(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle)
 
     description = 'alice'.encode('utf-8').ljust(32, b'\x00').hex()
     (tx_hash_hex, o) = c.add_declaration(address_declarator, contract_roles['CONTRACT_DEPLOYER'], agent_roles['ALICE'], add_0x(description))

apps/cic-eth/tests/unit/ext/test_ext_tx.py

@@ -8,7 +8,7 @@ from chainlib.eth.tx import (
         count,
         receipt,
         )
-from eth_erc20 import ERC20
+from chainlib.eth.erc20 import ERC20
 from chainlib.eth.nonce import RPCNonceOracle
 
 # local imports

apps/cic-ussd/var/lib/locale/sms.en.yml

@@ -1,7 +1,7 @@
 en:
   account_successfully_created: |-
-    You have been registered on Sarafu Network! To use dial *384*96# on Safaricom and *483*96# on other networks. For help %{support_phone}.
+    Hello, you have been registered on Sarafu Network! Your balance is %{balance} %{token_symbol}. To use dial *483*46#. For help 0757628885.
   received_tokens: |-
     Successfully received %{amount} %{token_symbol} from %{tx_sender_information} %{timestamp}. New balance is %{balance} %{token_symbol}.
   terms: |-
-    By using the service, you agree to the terms and conditions at http://grassecon.org/tos
+    By using the service, you agree to the terms and conditions at https://www.grassrootseconomics.org/terms-and-conditions.

apps/cic-ussd/var/lib/locale/sms.sw.yml

@@ -1,7 +1,7 @@
 sw:
   account_successfully_created: |-
-    Umesajiliwa kwa huduma ya Sarafu! Kutumia bonyeza *384*96# Safaricom ama *483*46# kwa utandao tofauti. Kwa Usaidizi %{support_phone}.
+    Habari, umesajiliwa kwa huduma ya sarafu! Salio lako ni %{token_symbol} %{balance}. Kutumia bonyeza *483*46#. Kwa Usaidizi 0757628885.
   received_tokens: |-
     Umepokea %{amount} %{token_symbol} kutoka kwa %{tx_sender_information} %{timestamp}. Salio la %{token_symbol} ni %{balance}.
   terms: |-
-    Kwa kutumia hii huduma, umekubali sheria na masharti yafuatayo http://grassecon.org/tos
+    Kwa kutumia hii huduma, umekubali sheria na masharti yafuatayo https://www.grassrootseconomics.org/terms-and-conditions.

apps/cic-ussd/var/lib/locale/ussd.en.yml

@@ -1,30 +1,29 @@
 en:
   kenya:
     initial_language_selection: |-
-      CON Welcome to Sarafu Network
+      CON Welcome to Sarafu
       1. English
       2. Kiswahili
       3. Help
     initial_pin_entry: |-
-      CON Please enter a new four number PIN for your account. 
+      CON Please enter a PIN to manage your account.
       0. Back
     initial_pin_confirmation: |-
-      CON Enter your four number PIN again
+      CON Enter your PIN again
       0. Back
     enter_given_name: |-
       CON Enter first name
       0. Back
     enter_family_name: |-
-      CON Enter family name
+      CON Enter last name
       0. Back
     enter_gender: |-
       CON Enter gender
       1. Male
       2. Female
-      3. Other
       0. Back
     enter_location: |-
-      CON Enter your location
+      CON Enter location
       0. Back
     enter_products: |-
       CON Please enter a product or service you offer
@@ -84,34 +83,34 @@ en:
         Please enter your PIN to confirm.
         0. Back
       retry: |-
-        CON Please enter your PIN. You have %{remaining_attempts} attempts remaining
+        CON Please enter your PIN. You have %{remaining_attempts} attempts remaining.
         0. Back
     display_metadata_pin_authorization:
       first: |-
-        CON Please enter your PIN
+        CON Please enter your PIN.
         0. Back
       retry: |-
-        CON Please enter your PIN. You have %{remaining_attempts} attempts remaining
+        CON Please enter your PIN. You have %{remaining_attempts} attempts remaining.
         0. Back
     account_balances_pin_authorization:
       first: |-
-        CON Please enter your PIN to view balances
+        CON Please enter your PIN to view balances.
         0. Back
       retry: |-
-        CON Please enter your PIN. You have %{remaining_attempts} attempts remaining
+        CON Please enter your PIN. You have %{remaining_attempts} attempts remaining.
         0. Back
     account_statement_pin_authorization:
       first: |-
-        CON Please enter your PIN to view statement
+        CON Please enter your PIN to view statement.
         0. Back
       retry: |-
-        CON Please enter your PIN. You have %{remaining_attempts} attempts remaining
+        CON Please enter your PIN. You have %{remaining_attempts} attempts remaining.
         0. Back
     account_balances: |-
       CON Your balances are as follows:
         balance: %{operational_balance} %{token_symbol}
-        fees: %{tax} %{token_symbol}
-        rewards: %{bonus} %{token_symbol}
+        taxes: %{tax} %{token_symbol}
+        bonsuses: %{bonus} %{token_symbol}
       0. Back
     first_transaction_set: |-
       CON %{first_transaction_set}
@@ -141,9 +140,9 @@ en:
     exit_pin_blocked: |-
       END Your PIN has been blocked. For help, please call %{support_phone}.
     exit_invalid_pin: |-
-      END The PIN you have entered is invalid. PIN must consist of 4 digits. For help, call %{support_phone}.
+      END The PIN you have entered is Invalid. PIN must consist of 4 digits. For help, call %{support_phone}.
     exit_invalid_new_pin: |-
-      END The PIN you have entered is invalid. PIN must be different from your current PIN. For help, call %{support_phone}.
+      END The PIN you have entered is Invalid. PIN must be different from your current PIN. For help, call %{support_phone}.
     exit_pin_mismatch: |-
       END The new PIN does not match the one you entered. Please try again. For help, call %{support_phone}.
     exit_invalid_recipient: |-
@@ -170,4 +169,4 @@ en:
       00. Back
       99. Exit
     account_creation_prompt: |-
-      Your account is being created. You will receive an SMS when your account is ready.
+      Your account is being created. You will receive an SMS when your account is ready.

apps/contract-migration/scripts/cic_eth/import_users.py

@@ -171,7 +171,6 @@ if __name__ == '__main__':
                 logg.error('load error for {}: {}'.format(y, e))
                 continue
             f.close()
-            logg.debug('deserializing {} {}'.format(filepath, o))
             u = Person.deserialize(o)
 
             new_address = register_eth(i, u)

apps/contract-migration/scripts/create_import_users.py

@@ -105,7 +105,7 @@ def genId(addr, typ):
 def genDate():
 
     ts = random.randint(ts_then, ts_now)
-    return int(datetime.datetime.fromtimestamp(ts).timestamp())
+    return datetime.datetime.fromtimestamp(ts).timestamp()
 
 
 def genPhone():
@@ -193,7 +193,6 @@ def prepareLocalFilePath(datadir, address):
 if __name__ == '__main__':
 
     base_dir = os.path.join(user_dir, 'old')
-    ussd_dir = os.path.join(user_dir, 'ussd')
     os.makedirs(base_dir, exist_ok=True)
 
     fa = open(os.path.join(user_dir, 'balances.csv'), 'w')
@@ -224,8 +223,6 @@ if __name__ == '__main__':
         f = open('{}/{}'.format(d, uid + '.json'), 'w')
         json.dump(o.serialize(), f)
         f.close()
-
-        d = prepareLocalFilePath(ussd_dir, uid)
         x = open('{}/{}'.format(d, uid + '_ussd_data.json'), 'w')
         json.dump(ussd_data, x)
         x.close()

apps/contract-migration/scripts/eth/import_users.py

@@ -23,7 +23,7 @@ from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.gas import RPCGasOracle
 from chainlib.eth.nonce import RPCNonceOracle
 from cic_types.processor import generate_metadata_pointer
-from eth_accounts_index.registry import AccountRegistry
+from eth_accounts_index import AccountRegistry
 from eth_contract_registry import Registry
 from crypto_dev_signer.keystore.dict import DictKeystore
 from crypto_dev_signer.eth.signer.defaultsigner import ReferenceSigner as EIP155Signer