Correct constructor args method name

* defaults to 'latest'

python/CHANGELOG

@@ -1,3 +1,9 @@
+* 0.5.4
+	- Enable setting sender address on contract read calls
+* 0.5.3
+	- Fix giftable token cli commands
+* 0.5.2
+	- Add block height to balance call
 * 0.5.1
 	- Change license to AGPL3 and copyright waived to public domain
 * 0.5.0

python/MANIFEST.in

@@ -1 +1 @@
-include **/data/ERC20.json **/data/GiftableToken.json **/data/GiftableToken.bin *requirements.txt CHANGELOG LICENSE WAIVER WAIVER.asc
+include **/data/ERC20.json **/data/GiftableToken.json **/data/GiftableToken.bin *requirements.txt CHANGELOG LICENSE WAIVER WAIVER.asc **/data/.chainlib 

python/eth_erc20/erc20.py

@@ -9,12 +9,14 @@ from chainlib.eth.contract import (
     ABIContractType,
     abi_decode_single,
 )
+from chainlib.eth.jsonrpc import to_blockheight_param
 from chainlib.eth.error import RequestMismatchException
 from chainlib.eth.tx import (
     TxFactory,
     TxFormat,
 )
 from chainlib.jsonrpc import JSONRPCRequest
+from chainlib.block import BlockSpec
 from hexathon import (
     add_0x,
     strip_0x,
@@ -26,7 +28,7 @@ logg = logging.getLogger()
 class ERC20(TxFactory):
     
 
-    def balance_of(self, contract_address, address, sender_address=ZERO_ADDRESS, id_generator=None):
+    def balance_of(self, contract_address, address, sender_address=ZERO_ADDRESS, id_generator=None, height=BlockSpec.LATEST):
         j = JSONRPCRequest(id_generator)
         o = j.template()
         o['method'] = 'eth_call'
@@ -38,7 +40,8 @@ class ERC20(TxFactory):
         tx = self.template(sender_address, contract_address)
         tx = self.set_code(tx, data)
         o['params'].append(self.normalize(tx))
-        o['params'].append('latest')
+        height = to_blockheight_param(height)
+        o['params'].append(height)
         o = j.finalize(o)
         return o
 

python/eth_erc20/runnable/balance.py

@@ -65,7 +65,7 @@ logg = logging.getLogger()
 
 arg_flags = ArgFlag()
 arg = Arg(arg_flags)
-flags = arg_flags.STD_READ | arg_flags.EXEC
+flags = arg_flags.STD_READ | arg_flags.EXEC | arg_flags.SENDER
 
 argparser = chainlib.eth.cli.ArgumentParser()
 argparser = process_args(argparser, arg, flags)
@@ -87,29 +87,30 @@ logg.debug('settings loaded:\n{}'.format(settings))
 def main():
     token_address = settings.get('EXEC')
     conn = settings.get('CONN')
+    sender_address = settings.get('SENDER_ADDRESS')
     g = ERC20(
             chain_spec=settings.get('CHAIN_SPEC'),
             gas_oracle=settings.get('GAS_ORACLE'),
             )
 
     # determine decimals
-    decimals_o = g.decimals(token_address)
+    decimals_o = g.decimals(token_address, sender_address=sender_address)
     r = conn.do(decimals_o)
     decimals = int(strip_0x(r), 16)
     logg.info('decimals {}'.format(decimals))
 
-    name_o = g.name(token_address)
+    name_o = g.name(token_address, sender_address=sender_address)
     r = conn.do(name_o)
     token_name = g.parse_name(r)
     logg.info('name {}'.format(token_name))
 
-    symbol_o = g.symbol(token_address)
+    symbol_o = g.symbol(token_address, sender_address=sender_address)
     r = conn.do(symbol_o)
     token_symbol = g.parse_symbol(r)
     logg.info('symbol {}'.format(token_symbol))
 
     # get balance
-    balance_o = g.balance(token_address, settings.get('RECIPIENT'))
+    balance_o = g.balance(token_address, settings.get('RECIPIENT'), sender_address=sender_address)
     r = conn.do(balance_o)
    
     hx = strip_0x(r)

python/eth_erc20/runnable/info.py

@@ -74,7 +74,7 @@ def process_config_local(config, arg, args, flags):
 
 arg_flags = ArgFlag()
 arg = Arg(arg_flags)
-flags = arg_flags.STD_READ | arg_flags.EXEC | arg_flags.TAB
+flags = arg_flags.STD_READ | arg_flags.EXEC | arg_flags.TAB | arg_flags.SENDER 
 
 argparser = chainlib.eth.cli.ArgumentParser()
 argparser = process_args(argparser, arg, flags)
@@ -96,6 +96,7 @@ logg.debug('settings loaded:\n{}'.format(settings))
 def main():
     token_address = config.get('_CONTRACT')
     conn = settings.get('CONN')
+    sender_address = settings.get('SENDER_ADDRESS')
     g = ERC20(
             chain_spec=settings.get('CHAIN_SPEC'),
             gas_oracle=settings.get('GAS_ORACLE'),
@@ -104,7 +105,7 @@ def main():
     outkeys = config.get('_OUTARG')
 
     if not outkeys or 'address' in outkeys:
-        name_o = g.name(token_address)
+        name_o = g.name(token_address, sender_address=sender_address)
         r = conn.do(name_o)
         token_name = g.parse_name(r)
         s = ''
@@ -114,7 +115,7 @@ def main():
         print(s)
 
     if not outkeys or 'symbol' in outkeys:
-        symbol_o = g.symbol(token_address)
+        symbol_o = g.symbol(token_address, sender_address=sender_address)
         r = conn.do(symbol_o)
         token_symbol = g.parse_symbol(r)
         s = ''
@@ -124,7 +125,7 @@ def main():
         print(s)
 
     if not outkeys or 'decimals' in outkeys:
-        decimals_o = g.decimals(token_address)
+        decimals_o = g.decimals(token_address, sender_address=sender_address)
         r = conn.do(decimals_o)
         decimals = int(strip_0x(r), 16)
         s = ''
@@ -134,7 +135,7 @@ def main():
         print(s)
 
     if not outkeys or 'supply' in outkeys:
-        supply_o = g.total_supply(token_address)
+        supply_o = g.total_supply(token_address, sender_address=sender_address)
         r = conn.do(supply_o)
         supply = int(strip_0x(r), 16)
         s = ''

python/giftable_erc20_token/__init__.py

@@ -1 +1,4 @@
 from .factory import GiftableToken
+from .factory import bytecode
+from .factory import create
+from .factory import args

python/giftable_erc20_token/factory.py

@@ -24,16 +24,22 @@ class GiftableToken(TxFactory):
     __abi = None
     __bytecode = None
 
-    def constructor(self, sender_address, name, symbol, decimals, tx_format=TxFormat.JSONRPC):
+    def constructor(self, sender_address, name, symbol, decimals, tx_format=TxFormat.JSONRPC, version=None):
-        code = GiftableToken.bytecode()
+        code = self.cargs(name, symbol, decimals)
+        tx = self.template(sender_address, None, use_nonce=True)
+        tx = self.set_code(tx, code)
+        return self.finalize(tx, tx_format)
+
+
+    @staticmethod
+    def cargs(name, symbol, decimals, version=None):
+        code = GiftableToken.bytecode(version=version)
         enc = ABIContractEncoder()
         enc.string(name)
         enc.string(symbol)
         enc.uint256(decimals)
         code += enc.get()
-        tx = self.template(sender_address, None, use_nonce=True)
+        return code
-        tx = self.set_code(tx, code)
-        return self.finalize(tx, tx_format)
 
 
     @staticmethod
@@ -51,7 +57,7 @@ class GiftableToken(TxFactory):
 
 
     @staticmethod
-    def bytecode():
+    def bytecode(version=None):
         if GiftableToken.__bytecode == None:
             f = open(os.path.join(data_dir, 'GiftableToken.bin'))
             GiftableToken.__bytecode = f.read()
@@ -97,3 +103,17 @@ class GiftableToken(TxFactory):
         return tx
 
 
+def bytecode(**kwargs):
+    return GiftableToken.bytecode(version=kwargs.get('version'))
+
+
+def create(**kwargs):
+    return GiftableToken.cargs(kwargs['name'], kwargs['symbol'], kwargs['decimals'], version=kwargs.get('version'))
+
+
+def args(v):
+    if v == 'create':
+        return (['name', 'symbol', 'decimals'], ['version'],)
+    elif v == 'default' or v == 'bytecode':
+        return ([], ['version'],)
+    raise ValueError('unknown command: ' + v)

python/giftable_erc20_token/runnable/deploy.py

@@ -73,6 +73,7 @@ logg.debug('settings loaded:\n{}'.format(settings))
 
 def main():
     signer_address = settings.get('SENDER_ADDRESS')
+    conn = settings.get('CONN')
 
     c = GiftableToken(
             settings.get('CHAIN_SPEC'),

python/giftable_erc20_token/runnable/gift.py

@@ -25,62 +25,80 @@ from hexathon import (
         strip_0x,
         add_0x,
         )
+from chainlib.settings import ChainSettings
+from chainlib.eth.cli.log import process_log
+from chainlib.eth.settings import process_settings
+from chainlib.eth.cli.arg import (
+        Arg,
+        ArgFlag,
+        process_args,
+        )
+from chainlib.eth.cli.config import (
+        Config,
+        process_config,
+        )
 
 # local imports
 from giftable_erc20_token import GiftableToken
 
-logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-arg_flags = chainlib.eth.cli.argflag_std_write | chainlib.eth.cli.Flag.EXEC | chainlib.eth.cli.Flag.WALLET
+
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
+def process_config_local(config, arg, args, flags):
-argparser.add_positional('amount', type=int, help='Token amount to gift')
+    config.add(config.get('_POSARG'), '_VALUE', False)
+    return config
+
+
+arg_flags = ArgFlag()
+arg = Arg(arg_flags)
+flags = arg_flags.STD_WRITE | arg_flags.WALLET | arg_flags.EXEC
+
+argparser = chainlib.eth.cli.ArgumentParser()
+argparser = process_args(argparser, arg, flags)
+argparser.add_argument('value', type=str, help='Token value to send')
 args = argparser.parse_args()
-extra_args = {
-    'amount': None,
-    }
-config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_fee_limit=GiftableToken.gas())
 
-wallet = chainlib.eth.cli.Wallet()
+logg = process_log(args, logg)
-wallet.from_config(config)
 
-rpc = chainlib.eth.cli.Rpc(wallet=wallet)
+config = Config()
-conn = rpc.connect_by_config(config)
+config = process_config(config, arg, args, flags, positional_name='value')
+config = process_config_local(config, arg, args, flags)
+logg.debug('config loaded:\n{}'.format(config))
 
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
+settings = ChainSettings()
+settings = process_settings(settings, config)
+logg.debug('settings loaded:\n{}'.format(settings))
 
 
 def main():
-    signer = rpc.get_signer()
+    token_address = settings.get('EXEC')
-    signer_address = rpc.get_sender_address()
+    signer_address = settings.get('SENDER_ADDRESS')
+    recipient = settings.get('RECIPIENT')
+    value = settings.get('VALUE')
+    conn = settings.get('CONN')
 
-    gas_oracle = rpc.get_gas_oracle()
+    c = GiftableToken(
-    nonce_oracle = rpc.get_nonce_oracle()
+            settings.get('CHAIN_SPEC'),
+            signer=settings.get('SIGNER'),
+            gas_oracle=settings.get('GAS_ORACLE'),
+            nonce_oracle=settings.get('NONCE_ORACLE'),
+            )
 
-    recipient_address_input = config.get('_RECIPIENT')
+    (tx_hash_hex, o) = c.mint_to(
-    if recipient_address_input == None:
+            token_address,
-        recipient_address_input = signer_address
+            signer_address,
-
+            recipient,
-    recipient_address = add_0x(to_checksum_address(recipient_address_input))
+            value,
-    if not config.true('_UNSAFE') and recipient_address != add_0x(recipient_address_input):
+            )
-        raise ValueError('invalid checksum address for recipient')
+    if settings.get('RPC_SEND'):
-
-    token_address = add_0x(to_checksum_address(config.get('_EXEC_ADDRESS')))
-    if not config.true('_UNSAFE') and token_address != add_0x(config.get('_EXEC_ADDRESS')):
-        raise ValueError('invalid checksum address for contract')
-
-    token_value = config.get('_AMOUNT')
-    c = GiftableToken(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
-    (tx_hash_hex, o) = c.mint_to(token_address, signer_address, recipient_address, token_value)
-    if config.get('_RPC_SEND'):
         conn.do(o)
-        if config.get('_WAIT'):
+        if settings.get('WAIT'):
             r = conn.wait(tx_hash_hex)
             if r['status'] == 0:
                 sys.stderr.write('EVM revert. Wish I had more to tell you')
                 sys.exit(1)
 
-        logg.info('mint to {} tx {}'.format(recipient_address, tx_hash_hex))
+        logg.info('mint to {} tx {}'.format(recipient, tx_hash_hex))
 
         print(tx_hash_hex)
     else:

python/giftable_erc20_token/runnable/minter.py

@@ -72,7 +72,9 @@ logg.debug('settings loaded:\n{}'.format(settings))
 
 
 def main():
+    token_address = settings.get('EXEC')
     signer_address = settings.get('SENDER_ADDRESS')
+    conn = settings.get('CONN')
 
     recipient_address_input = settings.get('RECIPIENT')
     if recipient_address_input == None:

python/requirements.txt

@@ -1,3 +1,4 @@
 confini~=0.6.1
-chainlib-eth~=0.4.2
+chainlib-eth~=0.4.15
+chainlib~=0.4.8
 potaahto~=0.1.1

python/setup.cfg

@@ -1,10 +1,10 @@
 [metadata]
 name = eth-erc20
-version = 0.5.1
+version = 0.5.5
 description = ERC20 interface and simple contract with deployment script that lets any address mint and gift itself tokens.
 author = Louis Holbrook
 author_email = dev@holbrook.no
-url = https://git.defalsify.org/eth-erc20.git
+url = https://git.defalsify.org/eth-erc20
 keywords =
 	dlt
 	ethereum
@@ -20,7 +20,7 @@ classifiers =
 	License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
 	Topic :: Internet
 	#Topic :: Blockchain :: EVM
-license = OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
+license = AGPLv3+
 licence_files =
 	LICENSE