Add missing event emissions, codegen script package fix

python/eth_faucet/runnable/gen.py

@@ -0,0 +1,27 @@
+# standard imports
+import sys
+import os
+import argparse
+
+script_dir=os.path.dirname(os.path.realpath(__file__))
+data_dir=os.path.join(script_dir, '..', 'data')
+
+tr={
+        'faucet': 'EthFaucet',
+        'period': 'PeriodSimple',
+        }
+
+argparser = argparse.ArgumentParser()
+argparser.add_argument('name', type=str, default='faucet', choices=['faucet', 'period'], help='list code identifiers')
+args = argparser.parse_args(sys.argv[1:])
+
+def main():
+    fp = os.path.join(data_dir, tr[args.name] + '.bin')
+    f = open(fp, 'r')
+    r = f.read()
+    f.close()
+    print(r)
+
+
+if __name__ == '__main__':
+    main()

python/eth_faucet/runnable/publish.py

@@ -0,0 +1,88 @@
+"""Deploys accounts index, registering arbitrary number of writers
+
+.. moduleauthor:: Louis Holbrook <dev@holbrook.no>
+.. pgp:: 0826EDA1702D1E87C6E2875121D2E7BB88C2A746 
+
+"""
+
+# standard imports
+import sys
+import os
+import logging
+
+# external imports
+import chainlib.eth.cli
+from chainlib.chain import ChainSpec
+from chainlib.eth.connection import EthHTTPConnection
+from chainlib.eth.tx import receipt
+from chainlib.eth.cli.arg import (
+        Arg,
+        ArgFlag,
+        process_args,
+        )
+from chainlib.eth.cli.config import (
+        Config,
+        process_config,
+        )
+from chainlib.eth.cli.log import process_log
+from chainlib.eth.settings import process_settings
+from chainlib.settings import ChainSettings
+
+# local imports
+from eth_faucet import EthFaucet
+
+logging.basicConfig(level=logging.WARNING)
+logg = logging.getLogger()
+
+arg_flags = ArgFlag()
+arg = Arg(arg_flags)
+flags = arg_flags.STD_WRITE 
+
+argparser = chainlib.eth.cli.ArgumentParser()
+argparser = process_args(argparser, arg, flags)
+args = argparser.parse_args()
+
+logg = process_log(args, logg)
+
+config = Config()
+config = process_config(config, arg, args, flags)
+logg.debug('config loaded:\n{}'.format(config))
+
+settings = ChainSettings()
+settings = process_settings(settings, config)
+logg.debug('settings loaded:\n{}'.format(settings))
+
+
+def main():
+    conn = settings.get('CONN')
+
+    c = EthFaucet(
+            settings.get('CHAIN_SPEC'),
+            signer=settings.get('SIGNER'),
+            gas_oracle=settings.get('FEE_ORACLE'),
+            nonce_oracle=settings.get('NONCE_ORACLE'),
+            )
+
+    (tx_hash_hex, o) = c.constructor(
+            settings.get('SENDER_ADDRESS'),
+            )
+
+    if settings.get('RPC_SEND'):
+        conn.do(o)
+        if config.true('_WAIT'):
+            r = conn.wait(tx_hash_hex)
+            if r['status'] == 0:
+                sys.stderr.write('EVM revert while deploying contract. Wish I had more to tell you')
+                sys.exit(1)
+            # TODO: pass through translator for keys (evm tester uses underscore instead of camelcase)
+            address = r['contractAddress']
+
+            print(address)
+        else:
+            print(tx_hash_hex)
+    else:
+        print(o)
+
+
+if __name__ == '__main__':
+    main()

python/setup.cfg

@@ -1,10 +1,10 @@
 [metadata]
 name = eth-faucet
-version = 0.1.0
+version = 0.1.1
 description = Gas token gifter with controls from time intervals, amounts and access.
 author = Louis Holbrook
 author_email = dev@holbrook.no
-url = https://git.grassecon.net/cicnet/eth-faucet
+url = https://git.defalsify.org/eth-faucet
 keywords =
 	ethereum
 classifiers =
@@ -24,8 +24,8 @@ licence_files =
 include_package_data = True
 python_requires = >= 3.6
 packages = 
-	eth_accounts_index
-	eth_accounts_index.runnable
+	eth_faucet
+	eth_faucet.runnable
 
 [options.extras_require]
 testing = 
@@ -38,6 +38,7 @@ testing =
  	**/data/*.json
  	**/data/*.bin
 
-#[options.entry_points]
-#console_scripts =
-	#eth-faucet-publish = eth_faucet.runnable.publish:main
+[options.entry_points]
+console_scripts =
+	eth-faucet-publish = eth_faucet.runnable.publish:main
+	eth-faucet-gen = eth_faucet.runnable.gen:main

solidity/PeriodSimple.sol

@@ -11,7 +11,7 @@ contract PeriodSimple {
 	mapping (address => uint256) public lastUsed;
 
 	event PeriodChange(uint256 _value);
-
+	event BalanceThresholdChange(uint256 _value);
 	constructor() {
 		owner = msg.sender;
 		poker = owner;
@@ -20,6 +20,7 @@ contract PeriodSimple {
 	function setPeriod(uint256 _period) public {
 		require(owner == msg.sender, 'ERR_NOT_OWNER');
 		period = _period;
+		emit PeriodChange(_period);
 	}
 
 	function setPoker(address _poker) public {
@@ -30,6 +31,7 @@ contract PeriodSimple {
 	function setBalanceThreshold(uint256 _threshold) public {
 		require(msg.sender == owner);
 		balanceThreshold = _threshold;
+		emit BalanceThresholdChange(_threshold);
 	}
 
 	function check(address _subject) public view returns(bool) {