Add legacy deploy script, python pacakging

python/MANIFEST.in

@@ -0,0 +1 @@
+include sarafu_token/data/*

python/requirements.txt

@@ -0,0 +1,2 @@
+chainlib~=0.0.1a7
+crypto-dev-signer~=0.4.13rc2

python/sarafu_token/runnable/legacy/deploy.py

@@ -0,0 +1,133 @@
+"""Deploys Sarafu token
+
+.. moduleauthor:: Louis Holbrook <dev@holbrook.no>
+.. pgp:: 0826EDA1702D1E87C6E2875121D2E7BB88C2A746 
+
+"""
+
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# standard imports
+import sys
+import os
+import json
+import argparse
+import logging
+import time
+from enum import Enum
+
+# third-party imports
+import web3
+from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
+from crypto_dev_signer.keystore import DictKeystore
+from crypto_dev_signer.eth.helper import EthTxExecutor
+
+logging.basicConfig(level=logging.WARNING)
+logg = logging.getLogger()
+
+logging.getLogger('web3').setLevel(logging.WARNING)
+logging.getLogger('urllib3').setLevel(logging.WARNING)
+
+script_dir = os.path.dirname(__file__)
+data_dir = os.path.join(script_dir, '..', '..', 'data')
+
+
+argparser = argparse.ArgumentParser()
+argparser.add_argument('-p', '--provider', dest='p', default='http://localhost:8545', type=str, help='Web3 provider url (http only)')
+argparser.add_argument('-w', action='store_true', help='Wait for the last transaction to be confirmed')
+argparser.add_argument('-ww', action='store_true', help='Wait for every transaction to be confirmed')
+argparser.add_argument('-e', action='store_true', help='Treat all transactions as essential')
+argparser.add_argument('-i', '--chain-spec', dest='i', type=str, default='Ethereum:1', help='Chain specification string')
+argparser.add_argument('-y', '--key-file', dest='y', type=str, help='Ethereum keystore file to use for signing')
+argparser.add_argument('--name', dest='n', default='Giftable Token', type=str, help='Token name')
+argparser.add_argument('--symbol', dest='s', default='GFT', type=str, help='Token symbol')
+argparser.add_argument('--decimals', dest='d', default=18, type=int, help='Token decimals')
+argparser.add_argument('--minter', action='append', type=str, help='Minter to add')
+argparser.add_argument('--sink-address', type=str, help='Sink address (if not set, signer address is used)')
+argparser.add_argument('--abi-dir', dest='abi_dir', type=str, default=data_dir, help='Directory containing bytecode and abi (default: {})'.format(data_dir))
+
+argparser.add_argument('-v', action='store_true', help='Be verbose')
+argparser.add_argument('taxlevel_minute', type=int, help='Tax level per minute in ppm')
+argparser.add_argument('period_minutes', type=int, help='Redistribution period, in minutes')
+args = argparser.parse_args()
+
+if args.v:
+    logg.setLevel(logging.DEBUG)
+
+block_last = args.w
+block_all = args.ww
+
+w3 = web3.Web3(web3.Web3.HTTPProvider(args.p))
+
+signer_address = None
+keystore = DictKeystore()
+if args.y != None:
+    logg.debug('loading keystore file {}'.format(args.y))
+    signer_address = keystore.import_keystore_file(args.y)
+    logg.debug('now have key for signer address {}'.format(signer_address))
+signer = EIP155Signer(keystore)
+
+chain_pair = args.i.split(':')
+chain_id = int(chain_pair[1])
+
+helper = EthTxExecutor(
+        w3,
+        signer_address,
+        signer,
+        chain_id,
+        block=args.ww,
+    )
+#g = ERC20TxFactory(signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle, chain_id=chain_id)
+
+
+def main():
+
+    f = open(os.path.join(args.abi_dir, 'RedistributedDemurrageToken.json'), 'r')
+    abi = json.load(f)
+    f.close()
+
+    f = open(os.path.join(args.abi_dir, 'RedistributedDemurrageToken.bin'), 'r')
+    bytecode = f.read()
+    f.close()
+
+    sink_address = args.sink_address
+    if sink_address == None:
+        sink_address = signer_address
+
+    c = w3.eth.contract(abi=abi, bytecode=bytecode)
+    (tx_hash, rcpt) = helper.sign_and_send(
+            [
+                c.constructor(args.n, args.s, args.d, args.taxlevel_minute, args.period_minutes, sink_address).buildTransaction
+                ],
+            force_wait=True,
+            )
+    logg.debug('tx hash {} rcpt {}'.format(tx_hash, rcpt))
+
+    address = rcpt.contractAddress
+    logg.debug('token contract mined {} {} {} {}'.format(address, args.n, args.s, args.d, args.taxlevel_minute, args.period_minutes, sink_address))
+    c = w3.eth.contract(abi=abi, address=address)
+
+    balance = c.functions.balanceOf(signer_address).call()
+    logg.info('balance {}: {} {}'.format(signer_address, balance, tx_hash))
+
+    if args.minter != None:
+        for a in args.minter:
+            if a == signer_address:
+                continue
+            (tx_hash, rcpt) = helper.sign_and_send(
+                [
+                    c.functions.addMinter(a).buildTransaction,
+                    ],
+                    )
+            logg.debug('minter add {} {}'.format(a, tx_hash))
+
+    if block_last:
+        helper.wait_for()
+
+    print(address)
+
+    sys.exit(0)
+
+
+if __name__ == '__main__':
+    main()

python/setup.cfg

@@ -0,0 +1,41 @@
+[metadata]
+name = sarafu-token
+version = 0.0.1a1
+description = ERC20 token with redistributed continual demurrage
+author = Louis Holbrook
+author_email = dev@holbrook.no
+url = https://gitlab.com/grassrootseconomics/sarafu-token
+keywords =
+	ethereum
+classifiers =
+	Programming Language :: Python :: 3
+	Operating System :: OS Independent
+	Development Status :: 3 - Alpha
+	Environment :: No Input/Output (Daemon)
+	Intended Audience :: Developers
+	License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+	Topic :: Internet
+	#Topic :: Blockchain :: EVM
+license = GPL3
+licence_files =
+	LICENSE
+
+[options]
+include_package_data = True
+python_requires = >= 3.6
+packages =
+	sarafu_token
+	sarafu_token.runnable.legacy
+install_requires =
+	chainlib~=0.0.1a7
+	crypto-dev-signer~=0.4.13rc2
+	web3==5.12.2
+
+[options.package_data]
+* =
+ 	data/RedistributedDemurrageToken.bin
+ 	data/RedistributedDemurrageToken.json
+
+[options.entry_points]
+console_scripts =
+	sarafu-token-deploy = sarafu_faucet.runnable.legacy.deploy:main

python/setup.py

@@ -0,0 +1,10 @@
+from setuptools import setup
+
+setup(
+        package_data={
+            '': [
+                'data/MintableFactor.bin',
+                ],
+            },
+        include_package_data=True,
+        )

solidity/RedistributedDemurrageToken.sol

@@ -65,7 +65,7 @@ contract RedistributedDemurrageToken {
 		uint256 currentDemurrageAmount;
 		uint256 periodCount;
 
-		baseBalance = getBaseBalance(_account);
+		baseBalance = baseBalanceOf(_account);
 		anchorDemurrageAmount = toDemurrageAmount(demurrageModifier);
 		anchorDemurragePeriod = toDemurragePeriod(demurrageModifier);
 
@@ -77,7 +77,7 @@ contract RedistributedDemurrageToken {
 	}
 
 	/// Balance unmodified by demurrage
-	function getBaseBalance(address _account) private view returns (uint256) {
+	function baseBalanceOf(address _account) public view returns (uint256) {
 		return uint256(account[_account]) & 0xffffffffffffffffff;
 	}
 
@@ -93,7 +93,7 @@ contract RedistributedDemurrageToken {
 			return false;
 		}
 
-		oldBalance = getBaseBalance(_account);
+		oldBalance = baseBalanceOf(_account);
 		newBalance = oldBalance + _delta;
 		require(uint160(newBalance) > uint160(oldBalance), 'ERR_WOULDWRAP'); // revert if increase would result in a wrapped value
 		workAccount &= 0xfffffffffffffffffffffffffffffffffffffffffffff000000000000000000;
@@ -114,7 +114,7 @@ contract RedistributedDemurrageToken {
 			return false;
 		}
 
-		oldBalance = getBaseBalance(_account);	
+		oldBalance = baseBalanceOf(_account);	
 		require(oldBalance >= _delta, 'ERR_OVERSPEND'); // overspend guard
 		newBalance = oldBalance - _delta;
 		workAccount &= 0xfffffffffffffffffffffffffffffffffffffffffffff000000000000000000;