Bump chainlib eth minor version

.gitignore

@@ -6,5 +6,3 @@ __pycache__
 gmon.out
 solidity/*.json
 solidity/*.bin
-.venv
-venv

.gitlab-ci.yml

@@ -1,36 +0,0 @@
-# To contribute improvements to CI/CD templates, please follow the Development guide at:
-# https://docs.gitlab.com/ee/development/cicd/templates.html
-# This specific template is located at:
-# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Python.gitlab-ci.yml
-
-# Official language image. Look for the different tagged releases at:
-# https://hub.docker.com/r/library/python/tags/
-image: python:3.8
-
-# Change pip's cache directory to be inside the project directory since we can
-# only cache local items.
-variables:
-  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-
-# Pip's cache doesn't store the python packages
-# https://pip.pypa.io/en/stable/reference/pip_install/#caching
-#
-# If you want to also cache the installed packages, you have to install
-# them in a virtualenv and cache it as well.
-cache:
-  paths:
-    - .cache/pip
-    - venv/
-
-before_script:
-  - cd ./python
-  - python --version  # For debugging
-  - pip install virtualenv
-  - virtualenv venv
-  - source venv/bin/activate
-
-test:
-  script:
-    - pip install -r requirements.txt -r test_requirements.txt --extra-index-url https://pip.grassrootseconomics.net
-    - bash run_tests.sh 
-

python/requirements.txt

@@ -1,3 +1,3 @@
-chainlib-eth~=0.0.27
-eth-erc20~=0.1.10
+chainlib-eth>=0.0.27,<=0.1.0
+eth-erc20~=0.1.11
 funga-eth~=0.5.6

python/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = erc20-demurrage-token
-version = 0.0.10
+version = 0.1.0
 description = ERC20 token with redistributed continual demurrage
 author = Louis Holbrook
 author_email = dev@holbrook.no

python/tests/test_basic.py

@@ -80,6 +80,7 @@ class TestBasic(TestDemurrageDefault):
         self.assertEqual(modifier, demurrage_amount)
 
 
+
     def test_apply_demurrage(self):
         modifier = (10 ** 28)
 

python/tests/test_period.py

@@ -7,15 +7,7 @@ import logging
 # external imports
 from chainlib.eth.constant import ZERO_ADDRESS
 from chainlib.eth.nonce import RPCNonceOracle
-from chainlib.eth.tx import (
-        receipt,
-        TxFactory,
-        TxFormat,
-        )
-from chainlib.eth.contract import (
-        ABIContractEncoder,
-        ABIContractType,
-        )
+from chainlib.eth.tx import receipt
 
 # local imports
 from erc20_demurrage_token import DemurrageToken
@@ -111,90 +103,5 @@ class TestPeriod(TestDemurrageDefault):
         self.assertEqual(modifier, period)
 
 
-    def test_change_sink(self):
-        nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
-        c = DemurrageToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
-
-        o = c.balance_of(self.address, ZERO_ADDRESS, sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        balance = c.parse_balance_of(r)
-        self.assertEqual(balance, 0)
-
-        (tx_hash, o) = c.mint_to(self.address, self.accounts[0], self.accounts[1], 102400000000)
-        r = self.rpc.do(o)
-        o = receipt(tx_hash)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 1)
-
-        self.backend.time_travel(self.start_time + self.period_seconds + 1)
-
-        c = DemurrageToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
-        (tx_hash, o) = c.change_period(self.address, self.accounts[0])
-        r = self.rpc.do(o)
-        o = receipt(tx_hash)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 1)
-
-        o = c.balance_of(self.address, ZERO_ADDRESS, sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        balance = c.parse_balance_of(r)
-        self.assertGreater(balance, 0)
-        old_sink_balance = balance
-
-        o = c.balance_of(self.address, self.accounts[3], sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        balance = c.parse_balance_of(r)
-        self.assertEqual(balance, 0)
-
-        nonce_oracle = RPCNonceOracle(self.accounts[5], self.rpc)
-        c = TxFactory(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
-        enc = ABIContractEncoder()
-        enc.method('setSinkAddress')
-        enc.typ(ABIContractType.ADDRESS)
-        enc.address(self.accounts[3])
-        data = enc.get()
-        o = c.template(self.accounts[5], self.address, use_nonce=True)
-        o = c.set_code(o, data)
-        (tx_hash, o) = c.finalize(o, TxFormat.JSONRPC)
-        r = self.rpc.do(o)
-        o = receipt(tx_hash)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 0)
-
-        nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
-        c = TxFactory(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
-        enc = ABIContractEncoder()
-        enc.method('setSinkAddress')
-        enc.typ(ABIContractType.ADDRESS)
-        enc.address(self.accounts[3])
-        data = enc.get()
-        o = c.template(self.accounts[0], self.address, use_nonce=True)
-        o = c.set_code(o, data)
-        (tx_hash, o) = c.finalize(o, TxFormat.JSONRPC)
-        r = self.rpc.do(o)
-        o = receipt(tx_hash)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 1)
-
-        self.backend.time_travel(self.start_time + (self.period_seconds * 2) + 1)
-
-        c = DemurrageToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
-        (tx_hash, o) = c.change_period(self.address, self.accounts[0])
-        r = self.rpc.do(o)
-        o = receipt(tx_hash)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 1)
-
-        o = c.balance_of(self.address, ZERO_ADDRESS, sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        balance = c.parse_balance_of(r)
-        self.assertLess(balance, old_sink_balance)
-
-        o = c.balance_of(self.address, self.accounts[3], sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        balance = c.parse_balance_of(r)
-        self.assertGreater(balance, 0)
-
-
 if __name__ == '__main__':
     unittest.main()

solidity/DemurrageTokenSingleCap.sol

@@ -128,12 +128,6 @@ contract DemurrageTokenSingleCap {
 		minimumParticipantSpend = 10 ** uint256(_decimals);
 	}
 
-	// Change sink address for redistribution
-	function setSinkAddress(address _sinkAddress) public {
-		require(msg.sender == owner);
-		sinkAddress = _sinkAddress;
-	}
-
 	// Given address will be allowed to call the mintTo() function
 	function addMinter(address _minter) public returns (bool) {
 		require(msg.sender == owner);

solidity/DemurrageTokenSingleNocap.sol

@@ -124,13 +124,6 @@ contract DemurrageTokenSingleCap {
 		minimumParticipantSpend = 10 ** uint256(_decimals);
 	}
 
-
-	// Change sink address for redistribution
-	function setSinkAddress(address _sinkAddress) public {
-		require(msg.sender == owner);
-		sinkAddress = _sinkAddress;
-	}
-
 	// Given address will be allowed to call the mintTo() function
 	function addMinter(address _minter) public returns (bool) {
 		require(msg.sender == owner);