Merge remote-tracking branch 'origin/master' into tmp

Add coverage and slither analysis

See merge request cicnet/eth-address-index!2

.gitignore

@@ -4,3 +4,5 @@ dist/
 __pycache__
 *.pyc
 gmon.out
+.idea
+venv

.gitlab-ci.yml

@@ -0,0 +1,58 @@
+stages:
+  - test
+  - run-coverage
+  - slither-analyzer
+
+
+variables:
+  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+
+cache:
+  paths:
+    - .cache/pip
+    - .venv/
+
+before_script:
+  - python -V               # Print out python version for debugging
+  - pip install virtualenv
+  - virtualenv venv
+  - source venv/bin/activate
+
+test:
+  image: registry.gitlab.com/grassrootseconomics/cic-base-images/ci-solc-python:latest
+  script: 
+      # install test dependencies
+      - cd python 
+      - export PYTHONPATH=.
+      - pip install --extra-index-url https://pip.grassrootseconomics.net 
+        --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple 
+        -r requirements.txt -r test_requirements.txt 
+      # run tests
+      - bash run_tests.sh
+
+run-coverage:
+  stage: test
+  image: registry.gitlab.com/grassrootseconomics/cic-base-images/ci-solc-python:latest
+  script:
+    - cd python 
+    - export PYTHONPATH=.
+    - pip install --extra-index-url https://pip.grassrootseconomics.net 
+        --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple 
+        -r requirements.txt -r test_requirements.txt 
+    -  pip install pytest pytest-cov
+    - coverage run -m pytest
+    - coverage html
+    - coverage report --fail-under=90
+
+  coverage: '/^TOTAL.+?(\d+\%)$/'
+  artifacts:
+    reports:
+      cobertura: python/htmlcov/index.html
+
+slither-analyzer:
+  image: registry.gitlab.com/grassrootseconomics/cic-base-images/ci-solc-python:latest
+  allow_failure: true
+  script: 
+    - cd solidity
+    - slither  AddressDeclarator.sol
+    - slither  AddressDeclarator.sol --print human-summary

python/.coveragerc

@@ -0,0 +1,7 @@
+[run]
+branch = True
+[report]
+omit = .venv/*
+        **/runnable/*.py
+[html]
+

python/CHANGELOG

@@ -1,4 +1,10 @@
-- 0.1.2-pending
+- 0.4.0
+	* Upgrade chainlib
+- 0.3.0
+	* Use -a and -e flag combination for consistency
+- 0.2.5
+	* Remove proof array idx overwrite when adding multiple proofs to subject
+- 0.1.2
 	* Move to chainlib-eth
 - 0.1.1-unreleased
 - 0.1.0-unreleased

python/eth_address_declarator/data/AddressDeclarator.json

@@ -1 +1 @@
-[{"inputs":[{"internalType":"bytes32","name":"_initialDescription","type":"bytes32"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_declarator","type":"address"},{"indexed":false,"internalType":"address","name":"_subject","type":"address"},{"indexed":false,"internalType":"bytes32","name":"_proof","type":"bytes32"}],"name":"DeclarationAdded","type":"event"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"},{"internalType":"bytes32","name":"_proof","type":"bytes32"}],"name":"addDeclaration","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"contents","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"},{"internalType":"address","name":"_subject","type":"address"}],"name":"declaration","outputs":[{"internalType":"bytes32[]","name":"","type":"bytes32[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"},{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"declarationAddressAt","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"}],"name":"declarationCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"},{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"declaratorAddressAt","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"}],"name":"declaratorCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"}]
+[{"inputs":[{"internalType":"bytes32","name":"_initialDescription","type":"bytes32"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_declarator","type":"address"},{"indexed":false,"internalType":"address","name":"_subject","type":"address"},{"indexed":false,"internalType":"bytes32","name":"_proof","type":"bytes32"}],"name":"DeclarationAdded","type":"event"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"},{"internalType":"bytes32","name":"_proof","type":"bytes32"}],"name":"addDeclaration","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"contents","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"},{"internalType":"address","name":"_subject","type":"address"}],"name":"declaration","outputs":[{"internalType":"bytes32[]","name":"","type":"bytes32[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"},{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"declarationAddressAt","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"}],"name":"declarationCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"},{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"declaratorAddressAt","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"}],"name":"declaratorCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"},{"internalType":"address","name":"_subject","type":"address"},{"internalType":"bytes32","name":"_proof","type":"bytes32"}],"name":"haveDeclaration","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"}]

python/eth_address_declarator/data/GiftableToken.json

@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_owner","type":"address"},{"indexed":true,"internalType":"address","name":"_spender","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":true,"internalType":"address","name":"_spender","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"TransferFrom","type":"event"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"addMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"address","name":"","type":"address"}],"name":"allowances","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_spender","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"approve","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"mint","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"removeMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"transfer","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_from","type":"address"},{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]

python/eth_address_declarator/interface.py

@@ -117,12 +117,15 @@ class Declarator(TxFactory):
     @classmethod
     def parse_declaration(self, v):
         cursor = 0
-        v = strip_0x(v)
+        r = []
+        try:
+            v = strip_0x(v)
+        except ValueError:
+            return r
         position = int.from_bytes(bytes.fromhex(v[cursor:cursor+64]), 'big')
         cursor += (position * 2)
         length = int.from_bytes(bytes.fromhex(v[cursor:cursor+64]), 'big')
         cursor += 64
-        r = []
         for i in range(length):
             r.append(v[cursor:cursor+64])
             cursor += 64

python/eth_address_declarator/runnable/view.py

@@ -32,14 +32,12 @@ logg = logging.getLogger()
 
 #argparser.add_argument('--resolve', action='store_true', help='Attempt to resolve the hashes to actual content')
 #argparser.add_argument('--resolve-http', dest='resolve_http', type=str, help='Base url to look up content hashes')
-arg_flags = chainlib.eth.cli.argflag_std_read | chainlib.eth.cli.Flag.EXEC
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
-argparser.add_argument('--declarator-address', required=True, type=str, help='Declarator of address')
+arg_flags = chainlib.eth.cli.argflag_std_read | chainlib.eth.cli.Flag.EXEC | chainlib.eth.cli.Flag.WALLET
+argparser = chainlib.eth.cli.ArgumentParser(arg_flags, arg_long={'-a': '--declarator-address'})
 argparser.add_positional('address', type=str, help='Ethereum declaration address to look up')
 args = argparser.parse_args()
 
 extra_args = {
-    'declarator_address': None,
     'address': None,
         }
 config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_fee_limit=AddressDeclarator.gas())
@@ -52,6 +50,8 @@ conn = rpc.connect_by_config(config)
 
 chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
 
+declarator_address = config.get('_WALLET_ADDRESS')
+
 
 def out_element(e, w=sys.stdout):
     w.write(e[1] + '\n')

python/eth_address_declarator/unittest/__init__.py

@@ -0,0 +1 @@
+from .addressdeclarator import *

python/eth_address_declarator/unittest/addressdeclarator.py

@@ -0,0 +1,46 @@
+# standard imports
+import unittest
+import logging
+import os
+
+# external imports
+from hexathon import add_0x
+from chainlib.eth.unittest.ethtester import EthTesterCase
+from chainlib.eth.nonce import RPCNonceOracle
+from chainlib.eth.tx import receipt
+from giftable_erc20_token import GiftableToken
+
+# local imports
+from eth_address_declarator.declarator import AddressDeclarator
+
+logging.basicConfig(level=logging.DEBUG)
+logg = logging.getLogger()
+
+
+class TestAddressDeclaratorBase(EthTesterCase):
+
+    def setUp(self):
+        super(TestAddressDeclaratorBase, self).setUp()
+        self.description = add_0x(os.urandom(32).hex())
+        nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
+        c = AddressDeclarator(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+        (tx_hash_hex, o) = c.constructor(self.accounts[0], self.description)
+        self.rpc.do(o)
+
+        o = receipt(tx_hash_hex)
+        r = self.rpc.do(o)
+        self.assertEqual(r['status'], 1)
+
+        self.address = r['contract_address']
+        logg.debug('address declarator deployed with address {}'.format(self.address))
+
+        c = GiftableToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+        (tx_hash_hex, o) = c.constructor(self.accounts[0], 'FooToken', 'FOO', 6)
+        self.rpc.do(o)
+
+        o = receipt(tx_hash_hex)
+        r = self.rpc.do(o)
+        self.assertEqual(r['status'], 1)
+
+        self.foo_token_address = r['contract_address']
+        logg.debug('foo token deployed with address {}'.format(self.foo_token_address))

python/eth_token_index/__init__.py

@@ -1,4 +0,0 @@
-from .index import (
-        TokenUniqueSymbolIndex,
-        to_identifier,
-        )

python/eth_token_index/data/ERC20.json

@@ -1 +0,0 @@
-[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_owner","type":"address"},{"indexed":true,"internalType":"address","name":"_spender","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Transfer","type":"event"},{"inputs":[{"internalType":"address","name":"_owner","type":"address"},{"internalType":"address","name":"_spender","type":"address"}],"name":"allowance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_spender","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"approve","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"transfer","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_from","type":"address"},{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]

python/eth_token_index/data/GiftableToken.json

@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_owner","type":"address"},{"indexed":true,"internalType":"address","name":"_spender","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":true,"internalType":"address","name":"_spender","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"TransferFrom","type":"event"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"addMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"address","name":"","type":"address"}],"name":"allowances","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_spender","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"approve","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"mint","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"removeMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"transfer","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_from","type":"address"},{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]

python/eth_token_index/data/TokenUniqueSymbolIndex.json

@@ -1 +0,0 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"addedAccount","type":"address"},{"indexed":true,"internalType":"uint256","name":"accountIndex","type":"uint256"}],"name":"AddressAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"inputs":[],"name":"acceptOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"add","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_key","type":"bytes32"}],"name":"addressOf","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"entry","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"entryCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"register","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"name":"registry","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]

python/eth_token_index/index.py

@@ -1,147 +0,0 @@
-# Author:	Louis Holbrook <dev@holbrook.no> 0826EDA1702D1E87C6E2875121D2E7BB88C2A746
-# SPDX-License-Identifier:	GPL-3.0-or-later
-# File-version: 1
-# Description: Python interface to abi and bin files for faucet contracts
-
-# standard imports
-import logging
-import json
-import os
-import hashlib
-
-# external imports
-from chainlib.eth.contract import (
-        ABIContractEncoder,
-        ABIContractType,
-        abi_decode_single,
-        )
-from chainlib.eth.tx import (
-        TxFactory,
-        TxFormat,
-        )
-from chainlib.jsonrpc import JSONRPCRequest
-from chainlib.eth.constant import ZERO_ADDRESS
-from hexathon import (
-        add_0x,
-        )
-
-logg = logging.getLogger(__name__)
-
-moddir = os.path.dirname(__file__)
-datadir = os.path.join(moddir, 'data')
-
-
-def to_identifier(s):
-    h = hashlib.new('sha256')
-    h.update(s.encode('utf-8'))
-    return h.digest().hex()
-
-
-class TokenUniqueSymbolIndex(TxFactory):
-
-    __abi = None
-    __bytecode = None
-
-
-    @staticmethod
-    def abi():
-        if TokenUniqueSymbolIndex.__abi == None:
-            f = open(os.path.join(datadir, 'TokenUniqueSymbolIndex.json'), 'r')
-            TokenUniqueSymbolIndex.__abi = json.load(f)
-            f.close()
-        return TokenUniqueSymbolIndex.__abi
-
-
-    @staticmethod
-    def bytecode():
-        if TokenUniqueSymbolIndex.__bytecode == None:
-            f = open(os.path.join(datadir, 'TokenUniqueSymbolIndex.bin'))
-            TokenUniqueSymbolIndex.__bytecode = f.read()
-            f.close()
-        return TokenUniqueSymbolIndex.__bytecode
-
-
-    @staticmethod
-    def gas(code=None):
-        return 1200000
-
-
-    def constructor(self, sender_address):
-        code = TokenUniqueSymbolIndex.bytecode()
-        tx = self.template(sender_address, None, use_nonce=True)
-        tx = self.set_code(tx, code)
-        return self.build(tx)
-
-
-    def register(self, contract_address, sender_address, address, tx_format=TxFormat.JSONRPC):
-        enc = ABIContractEncoder()
-        enc.method('register')
-        enc.typ(ABIContractType.ADDRESS)
-        enc.address(address)
-        data = enc.get()
-        tx = self.template(sender_address, contract_address, use_nonce=True)
-        tx = self.set_code(tx, data)
-        tx = self.finalize(tx, tx_format)
-        return tx
-
-
-    def address_of(self, contract_address, token_symbol, sender_address=ZERO_ADDRESS, id_generator=None):
-        j = JSONRPCRequest(id_generator)
-        o = j.template()
-        o['method'] = 'eth_call'
-        enc = ABIContractEncoder()
-        enc.method('addressOf')
-        enc.typ(ABIContractType.BYTES32)
-        token_symbol_digest = to_identifier(token_symbol)
-        enc.bytes32(token_symbol_digest)
-        data = add_0x(enc.get())
-        tx = self.template(sender_address, contract_address)
-        tx = self.set_code(tx, data)
-        o['params'].append(self.normalize(tx))
-        o = j.finalize(o)
-        return o
-
-
-    def entry(self, contract_address, idx, sender_address=ZERO_ADDRESS, id_generator=None):
-        j = JSONRPCRequest(id_generator)
-        o = j.template()
-        o['method'] = 'eth_call'
-        enc = ABIContractEncoder()
-        enc.method('entry')
-        enc.typ(ABIContractType.UINT256)
-        enc.uint256(idx)
-        data = add_0x(enc.get())
-        tx = self.template(sender_address, contract_address)
-        tx = self.set_code(tx, data)
-        o['params'].append(self.normalize(tx))
-        o = j.finalize(o)
-        return o
-
-
-    def entry_count(self, contract_address, sender_address=ZERO_ADDRESS, id_generator=None):
-        j = JSONRPCRequest(id_generator)
-        o = j.template()
-        o['method'] = 'eth_call'
-        enc = ABIContractEncoder()
-        enc.method('entryCount')
-        data = add_0x(enc.get())
-        tx = self.template(sender_address, contract_address)
-        tx = self.set_code(tx, data)
-        o['params'].append(self.normalize(tx))
-        o = j.finalize(o)
-        return o
-
-
-    @classmethod
-    def parse_address_of(self, v):
-        return abi_decode_single(ABIContractType.ADDRESS, v)
-
-
-    @classmethod
-    def parse_entry(self, v):
-        return abi_decode_single(ABIContractType.ADDRESS, v)
-
-
-    @classmethod
-    def parse_entry_count(self, v):
-        return abi_decode_single(ABIContractType.UINT256, v)

python/eth_token_index/runnable/add.py

@@ -1,89 +0,0 @@
-"""Adds a new token to the token symbol index
-
-.. moduleauthor:: Louis Holbrook <dev@holbrook.no>
-.. pgp:: 0826EDA1702D1E87C6E2875121D2E7BB88C2A746 
-
-"""
-
-# standard imports
-import sys
-import os
-import json
-import argparse
-import logging
-import hashlib
-
-# external imports
-import chainlib.eth.cli
-from chainlib.chain import ChainSpec
-from chainlib.eth.tx import receipt
-from eth_erc20 import ERC20
-from chainlib.eth.address import to_checksum_address
-from hexathon import add_0x
-
-# local imports
-from eth_token_index import TokenUniqueSymbolIndex
-
-logging.basicConfig(level=logging.WARNING)
-logg = logging.getLogger()
-
-arg_flags = chainlib.eth.cli.argflag_std_write | chainlib.eth.cli.Flag.EXEC
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
-argparser.add_argument('token_address', type=str, help='Token address to add to index')
-args = argparser.parse_args()
-
-extra_args = {
-    'token_address': None,
-        }
-config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_fee_limit=TokenUniqueSymbolIndex.gas())
-
-wallet = chainlib.eth.cli.Wallet()
-wallet.from_config(config)
-
-rpc = chainlib.eth.cli.Rpc(wallet=wallet)
-conn = rpc.connect_by_config(config)
-
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
-
-
-def main():
-    signer = rpc.get_signer()
-    signer_address = rpc.get_sender_address()
-
-    gas_oracle = rpc.get_gas_oracle()
-    nonce_oracle = rpc.get_nonce_oracle()
-
-    c = TokenUniqueSymbolIndex(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
-
-    token_address = to_checksum_address(config.get('_TOKEN_ADDRESS'))
-    if not config.true('_UNSAFE') and token_address != add_0x(config.get('_TOKEN_ADDRESS')):
-        raise ValueError('invalid checksum address for token_address')
-
-    contract_address = to_checksum_address(config.get('_EXEC_ADDRESS'))
-    if not config.true('_UNSAFE') and contract_address != add_0x(config.get('_EXEC_ADDRESS')):
-        raise ValueError('invalid checksum address for contract')
-
-    (tx_hash_hex, o) = c.register(contract_address, signer_address, token_address)
-
-    if config.get('_RPC_SEND'):
-        conn.do(o)
-        if config.get('_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)
-
-        c = ERC20(chain_spec)
-        o = c.symbol(token_address)
-        r = conn.do(o)
-        token_symbol = ERC20.parse_symbol(r)
-
-        logg.info('added token {} at {} to token index {}'.format(token_symbol, token_address, contract_address))
-
-        print(tx_hash_hex)
-    else:
-        print(o)
-
-
-if __name__ == '__main__':
-    main()

python/eth_token_index/runnable/deploy.py

@@ -1,69 +0,0 @@
-"""Deploys the token symbol index
-
-.. moduleauthor:: Louis Holbrook <dev@holbrook.no>
-.. pgp:: 0826EDA1702D1E87C6E2875121D2E7BB88C2A746 
-
-"""
-
-# standard imports
-import sys
-import os
-import json
-import argparse
-import logging
-
-# external imports
-import chainlib.eth.cli
-from chainlib.chain import ChainSpec
-from chainlib.eth.tx import receipt
-
-# local imports
-from eth_token_index import TokenUniqueSymbolIndex
-
-logging.basicConfig(level=logging.WARNING)
-logg = logging.getLogger()
-
-arg_flags = chainlib.eth.cli.argflag_std_write
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
-args = argparser.parse_args()
-
-config = chainlib.eth.cli.Config.from_args(args, arg_flags, default_fee_limit=TokenUniqueSymbolIndex.gas())
-
-wallet = chainlib.eth.cli.Wallet()
-wallet.from_config(config)
-
-rpc = chainlib.eth.cli.Rpc(wallet=wallet)
-conn = rpc.connect_by_config(config)
-
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
-
-
-def main():
-    signer = rpc.get_signer()
-    signer_address = rpc.get_sender_address()
-
-    gas_oracle = rpc.get_gas_oracle()
-    nonce_oracle = rpc.get_nonce_oracle()
-
-    c = TokenUniqueSymbolIndex(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
-
-    (tx_hash_hex, o) = c.constructor(signer_address)
-    if config.get('_RPC_SEND'):
-        conn.do(o)
-        if config.get('_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/eth_token_index/runnable/list.py

@@ -1,99 +0,0 @@
-"""Adds a new token to the token symbol index
-
-.. moduleauthor:: Louis Holbrook <dev@holbrook.no>
-.. pgp:: 0826EDA1702D1E87C6E2875121D2E7BB88C2A746 
-
-"""
-
-# standard imports
-import sys
-import os
-import json
-import argparse
-import logging
-import hashlib
-
-# external imports
-import chainlib.eth.cli
-from chainlib.chain import ChainSpec
-from eth_erc20 import ERC20
-from chainlib.eth.address import to_checksum_address
-
-# local imports
-from eth_token_index import TokenUniqueSymbolIndex
-
-logging.basicConfig(level=logging.WARNING)
-logg = logging.getLogger()
-default_format = 'terminal'
-
-script_dir = os.path.dirname(__file__)
-data_dir = os.path.join(script_dir, '..', 'data')
-
-arg_flags = chainlib.eth.cli.argflag_std_write | chainlib.eth.cli.Flag.EXEC
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
-argparser.add_argument('token_symbol', type=str, nargs='?', help='Token symbol to return address for')
-args = argparser.parse_args()
-
-extra_args = {
-    'token_symbol': None,
-        }
-config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_fee_limit=TokenUniqueSymbolIndex.gas())
-
-#wallet = chainlib.eth.cli.Wallet()
-#wallet.from_config(config)
-
-rpc = chainlib.eth.cli.Rpc()
-conn = rpc.connect_by_config(config)
-
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
-
-
-def out_element(e, w=sys.stdout):
-    if config.get('_RAW'):
-        w.write(e[1] + '\n')
-    else:
-        w.write(e[1] + '\t' + e[0] + '\n')
-
-
-def element(ifc, conn, contract_address, token_symbol, w=sys.stdout):
-    o = ifc.address_of(contract_address, token_symbol)
-    r = conn.do(o)
-    a = ifc.parse_address_of(r)
-    out_element((token_symbol, a), w)
-
-
-def ls(ifc, conn, contract_address, token_ifc, w=sys.stdout):
-    o = ifc.entry_count(contract_address)
-    r = conn.do(o)
-    count = ifc.parse_entry_count(r)
-    logg.debug('count {}'.format(count))
-
-    for i in range(count):
-        o = ifc.entry(contract_address, i)
-        r = conn.do(o)
-        token_address = ifc.parse_entry(r)
-
-        o = token_ifc.symbol(token_address)
-        r = conn.do(o)
-        token_symbol = token_ifc.parse_symbol(r)
-
-        element(ifc, conn, contract_address, token_symbol, w)
-
-
-def main():
-    token_ifc = ERC20(chain_spec)
-    ifc = TokenUniqueSymbolIndex(chain_spec)
-
-    contract_address = to_checksum_address(config.get('_EXEC_ADDRESS'))
-    if not config.true('_UNSAFE') and contract_address != add_0x(config.get('_EXEC_ADDRESS')):
-        raise ValueError('invalid checksum address for contract')
-
-    token_symbol = config.get('_TOKEN_SYMBOL')
-    if token_symbol != None:
-        element(ifc, conn, contract_address, token_symbol, sys.stdout)
-    else:
-        ls(ifc, conn, contract_address, token_ifc, sys.stdout)
-
-
-if __name__ == '__main__':
-    main()

python/requirements.txt

@@ -1,4 +1,2 @@
-confini>=0.3.6rc3,<0.5.0
-crypto-dev-signer>=0.4.15a1,<=0.4.15
-chainlib-eth>=0.0.9a3,<=0.1.0
-eth_erc20>=0.1.2a2,<=0.2.0
+confini~=0.6.0
+chainlib-eth>=0.1.0b1,<0.2.0

python/run_tests.sh

@@ -2,6 +2,8 @@
 
 set -e
 set -x
+default_pythonpath=$PYTHONPATH:.
+export PYTHONPATH=${default_pythonpath:-.}
 for f in `ls tests/*.py`; do
 	python $f
 	if [ $? -gt 0 ]; then

python/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = eth-address-index
-version = 0.2.3a3
+version = 0.5.0
 description = Signed metadata declarations for ethereum addresses
 author = Louis Holbrook
 author_email = dev@holbrook.no
@@ -26,28 +26,16 @@ python_requires = >= 3.6
 packages =
 	eth_address_declarator
 	eth_address_declarator.runnable
-	eth_token_index
-	eth_token_index.runnable
-
-[options.extras_require]
-testing =
-	eth-tester==0.5.0b2
-	py-evm==0.3.0a20
+	eth_address_declarator.unittest
 
 [options.package_data]
 * = 
 	data/AddressDeclarator.json
 	data/AddressDeclarator.bin
-	data/GiftableToken.bin
-	data/GifttableToken.json
-	data/TokenUniqueSymbolIndex.bin
-	data/TokenUniqueSymbolIndex.json
 	data/ERC20.json
 
 [options.entry_points]
 console_scripts =
 	eth-address-declarator-deploy = eth_address_declarator.runnable.deploy:main
 	eth-address-declarator-add = eth_address_declarator.runnable.add:main
-	eth-token-index-deploy = eth_token_index.runnable.deploy:main
-	eth-token-index-add = eth_token_index.runnable.add:main
-	eth-token-index-list = eth_token_index.runnable.list:main
+	eth-address-declarator-view = eth_address_declarator.runnable.view:main

python/setup.py

@@ -22,4 +22,7 @@ f.close()
 setup(
         install_requires=requirements,
         tests_require=test_requirements,
+        extras_require={
+            'dev': test_requirements,
+            },
         )

python/test_requirements.txt

@@ -1,2 +1,4 @@
 eth-tester==0.5.0b3
 py-evm==0.3.0a20
+eth-accounts-index~=0.1.3
+eth_erc20~=0.1.5

python/tests/test_addressdeclarator.py

@@ -14,51 +14,31 @@ from chainlib.eth.contract import (
 from chainlib.eth.nonce import RPCNonceOracle
 from chainlib.eth.tx import receipt
 from giftable_erc20_token import GiftableToken
-from hexathon import add_0x
+from hexathon import (
+    add_0x,
+    strip_0x,
+    )
 
 # local imports
 from eth_address_declarator.declarator import AddressDeclarator
 from eth_address_declarator import Declarator
+from eth_address_declarator.unittest import TestAddressDeclaratorBase
 
 logging.basicConfig(level=logging.DEBUG)
 logg = logging.getLogger()
 
-logging.getLogger('web3').setLevel(logging.WARNING)
-logging.getLogger('eth.vm').setLevel(logging.WARNING)
-
 testdir = os.path.dirname(__file__)
 
 description = '0x{:<064s}'.format(b'foo'.hex())
 
-class Test(EthTesterCase):
+
+class TestAddressDeclarator(TestAddressDeclaratorBase):
 
     def setUp(self):
-        super(Test, self).setUp()
-        self.description = add_0x(os.urandom(32).hex())
+        super(TestAddressDeclarator, self).setUp()
         nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
-        #c = AddressDeclarator(signer=self.signer, nonce_oracle=nonce_oracle, chain_id=self.chain_spec.chain_id())
-        c = AddressDeclarator(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
-        (tx_hash_hex, o) = c.constructor(self.accounts[0], self.description)
-        self.rpc.do(o)
 
-        o = receipt(tx_hash_hex)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 1)
-
-        self.address = r['contract_address']
-
-        #c = GiftableToken(signer=self.signer, nonce_oracle=nonce_oracle, chain_id=self.chain_spec.chain_id())
-        c = GiftableToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
-        (tx_hash_hex, o) = c.constructor(self.accounts[0], 'FooToken', 'FOO', 6)
-        self.rpc.do(o)
-
-        o = receipt(tx_hash_hex)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 1)
-
-        self.foo_token_address = r['contract_address']
-
-        #c = GiftableToken(signer=self.signer, nonce_oracle=nonce_oracle, chain_id=self.chain_spec.chain_id())
+       #c = GiftableToken(signer=self.signer, nonce_oracle=nonce_oracle, chain_id=self.chain_spec.chain_id())
         c = GiftableToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
         (tx_hash_hex, o) = c.constructor(self.accounts[0], 'BarToken', 'BAR', 6)
         self.rpc.do(o)
@@ -98,6 +78,23 @@ class Test(EthTesterCase):
         self.assertEqual(c.parse_declarator_count(r), 1)
 
 
+    def test_get_single_declaration(self):
+        d = add_0x(os.urandom(32).hex())
+
+        nonce_oracle = RPCNonceOracle(self.accounts[1], self.rpc)
+        c = Declarator(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+        (tx_hash_hex, o) = c.add_declaration(self.address, self.accounts[1], self.foo_token_address, d)
+        self.rpc.do(o)
+        o = receipt(tx_hash_hex)
+        r = self.rpc.do(o)
+        self.assertEqual(r['status'], 1)
+
+        o = c.declaration(self.address, self.accounts[1], self.foo_token_address, sender_address=self.accounts[0])
+        r = self.rpc.do(o)
+        proofs = c.parse_declaration(r)
+        self.assertEqual(proofs[0], strip_0x(d))
+
+
     def test_declaration(self):
 
         d = add_0x(os.urandom(32).hex())
@@ -124,11 +121,10 @@ class Test(EthTesterCase):
         o = c.declaration(self.address, self.accounts[1], self.foo_token_address, sender_address=self.accounts[0])
         r = self.rpc.do(o)
         proofs = c.parse_declaration(r)
-        self.assertEqual(proofs[0], d[2:])
-        self.assertEqual(proofs[1], d_two[2:])
+        self.assertEqual(proofs[0], strip_0x(d))
+        self.assertEqual(proofs[1], strip_0x(d_two))
 
 
-   
     def test_declarator_to_subject(self):
         d = add_0x(os.urandom(32).hex())
 
@@ -149,15 +145,15 @@ class Test(EthTesterCase):
 
         o = c.declaration_address_at(self.address, self.accounts[1], 0, sender_address=self.accounts[0])
         r = self.rpc.do(o)
-        self.assertEqual(c.parse_declaration_address_at(r), self.foo_token_address)
+        self.assertEqual(c.parse_declaration_address_at(r), strip_0x(self.foo_token_address))
 
         o = c.declaration_address_at(self.address, self.accounts[2], 0, sender_address=self.accounts[0])
         r = self.rpc.do(o)
-        self.assertEqual(c.parse_declaration_address_at(r), self.foo_token_address)
+        self.assertEqual(c.parse_declaration_address_at(r), strip_0x(self.foo_token_address))
 
         o = c.declaration_address_at(self.address, self.accounts[1], 1, sender_address=self.accounts[0])
         r = self.rpc.do(o)
-        self.assertEqual(c.parse_declaration_address_at(r), self.bar_token_address)
+        self.assertEqual(c.parse_declaration_address_at(r), strip_0x(self.bar_token_address))
 
 
     def test_subject_to_declarator(self):
@@ -180,11 +176,62 @@ class Test(EthTesterCase):
 
         o = c.declarator_address_at(self.address, self.foo_token_address, 0, sender_address=self.accounts[0])
         r = self.rpc.do(o)
-        self.assertEqual(c.parse_declaration_address_at(r), self.accounts[1])
+        self.assertEqual(c.parse_declaration_address_at(r), strip_0x(self.accounts[1]))
 
         o = c.declarator_address_at(self.address, self.foo_token_address, 1, sender_address=self.accounts[0])
         r = self.rpc.do(o)
-        self.assertEqual(c.parse_declaration_address_at(r), self.accounts[2])
+        self.assertEqual(c.parse_declaration_address_at(r), strip_0x(self.accounts[2]))
+
+
+    def test_three_first(self):
+        d = []
+        for i in range(3):
+            d.append(add_0x(os.urandom(32).hex()))
+
+        nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
+        c = Declarator(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+
+        for proof in d:
+            (tx_hash_hex, o) = c.add_declaration(self.address, self.accounts[0], self.foo_token_address, proof)
+            self.rpc.do(o)
+
+        o = c.declarator_count(self.address, self.foo_token_address, sender_address=self.accounts[0])
+        r = self.rpc.do(o)
+        self.assertEqual(c.parse_declarator_count(r), 1)
+
+        o = c.declaration(self.address, self.accounts[0], self.foo_token_address, sender_address=self.accounts[0])
+        r = self.rpc.do(o)
+        proofs = c.parse_declaration(r)
+        self.assertEqual(len(proofs), 3)
+
+        for i in range(3):
+            self.assertEqual(proofs[i], strip_0x(d[i]))
+
+
+    def test_three_first_different(self):
+        d = []
+        a = []
+        for i in range(3):
+            d.append(add_0x(os.urandom(32).hex()))
+            a.append(add_0x(os.urandom(20).hex()))
+
+        nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
+        c = Declarator(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+
+        for i in range(3):
+            (tx_hash_hex, o) = c.add_declaration(self.address, self.accounts[0], a[i], d[i])
+            self.rpc.do(o)
+
+        for i in range(3):
+            o = c.declarator_count(self.address, a[i], sender_address=self.accounts[0])
+            r = self.rpc.do(o)
+            self.assertEqual(c.parse_declarator_count(r), 1)
+
+            o = c.declaration(self.address, self.accounts[0], a[i], sender_address=self.accounts[0])
+            r = self.rpc.do(o)
+            proofs = c.parse_declaration(r)
+            self.assertEqual(len(proofs), 1)
+            self.assertEqual(proofs[0], strip_0x(d[i]))
 
 
 if __name__ == '__main__':

python/tests/test_tokenindex.py

@@ -1,87 +0,0 @@
-# standard imports
-import os
-import unittest
-import json
-import logging
-import hashlib
-
-# external imports
-from chainlib.eth.unittest.ethtester import EthTesterCase
-from chainlib.eth.nonce import RPCNonceOracle
-from chainlib.eth.tx import receipt
-from giftable_erc20_token import GiftableToken
-from chainlib.eth.tx import unpack
-from hexathon import strip_0x
-
-# local imports
-from eth_token_index import TokenUniqueSymbolIndex
-
-logging.basicConfig(level=logging.DEBUG)
-logg = logging.getLogger()
-
-logging.getLogger('web3').setLevel(logging.WARNING)
-logging.getLogger('eth.vm').setLevel(logging.WARNING)
-
-testdir = os.path.dirname(__file__)
-
-
-class Test(EthTesterCase):
-
-    def setUp(self):
-        super(Test, self).setUp()
-        nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
-        #c = TokenUniqueSymbolIndex(signer=self.signer, nonce_oracle=nonce_oracle, chain_id=self.chain_spec.chain_id())
-        c = TokenUniqueSymbolIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
-        (tx_hash_hex, o) = c.constructor(self.accounts[0])
-        self.rpc.do(o)
-
-        o = receipt(tx_hash_hex)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 1)
-
-        self.address = r['contract_address']
-
-        #c = GiftableToken(signer=self.signer, nonce_oracle=nonce_oracle, chain_id=self.chain_spec.chain_id())
-        c = GiftableToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
-        (tx_hash_hex, o) = c.constructor(self.accounts[0], 'FooToken', 'FOO', 6)
-        self.rpc.do(o)
-
-        o = receipt(tx_hash_hex)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 1)
-
-        self.token_address = r['contract_address']
-
-
-    def test_register(self):
-        nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
-        #c = TokenUniqueSymbolIndex(signer=self.signer, nonce_oracle=nonce_oracle, chain_id=self.chain_spec.chain_id())
-        c = TokenUniqueSymbolIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
-        
-        (tx_hash_hex, o) = c.register(self.address, self.accounts[0], self.token_address)
-        self.rpc.do(o)
-        e = unpack(bytes.fromhex(strip_0x(o['params'][0])), self.chain_spec)
-        logg.debug('e {}'.format(e))
-
-        o = receipt(tx_hash_hex)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 1)
-
-        o = c.address_of(self.address, 'FOO', sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        address = c.parse_address_of(r)
-        self.assertEqual(address, self.token_address)
-        
-        o = c.entry(self.address, 0, sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        address = c.parse_entry(r)
-        self.assertEqual(address, self.token_address)
-        
-        o = c.entry_count(self.address, sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        count = c.parse_entry_count(r)
-        self.assertEqual(count, 1)
-        
-
-if __name__ == '__main__':
-    unittest.main()

solidity/AddressDeclarator.json

@@ -1 +1 @@
-[{"inputs":[{"internalType":"bytes32","name":"_initialDescription","type":"bytes32"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_declarator","type":"address"},{"indexed":false,"internalType":"address","name":"_subject","type":"address"},{"indexed":false,"internalType":"bytes32","name":"_proof","type":"bytes32"}],"name":"DeclarationAdded","type":"event"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"},{"internalType":"bytes32","name":"_proof","type":"bytes32"}],"name":"addDeclaration","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"contents","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"},{"internalType":"address","name":"_subject","type":"address"}],"name":"declaration","outputs":[{"internalType":"bytes32[]","name":"","type":"bytes32[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"},{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"declarationAddressAt","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"}],"name":"declarationCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"},{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"declaratorAddressAt","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"}],"name":"declaratorCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"}]
+[{"inputs":[{"internalType":"bytes32","name":"_initialDescription","type":"bytes32"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_declarator","type":"address"},{"indexed":false,"internalType":"address","name":"_subject","type":"address"},{"indexed":false,"internalType":"bytes32","name":"_proof","type":"bytes32"}],"name":"DeclarationAdded","type":"event"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"},{"internalType":"bytes32","name":"_proof","type":"bytes32"}],"name":"addDeclaration","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"contents","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"},{"internalType":"address","name":"_subject","type":"address"}],"name":"declaration","outputs":[{"internalType":"bytes32[]","name":"","type":"bytes32[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"},{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"declarationAddressAt","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"}],"name":"declarationCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"},{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"declaratorAddressAt","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_subject","type":"address"}],"name":"declaratorCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_declarator","type":"address"},{"internalType":"address","name":"_subject","type":"address"},{"internalType":"bytes32","name":"_proof","type":"bytes32"}],"name":"haveDeclaration","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"}]

solidity/AddressDeclarator.sol

@@ -5,9 +5,10 @@ pragma solidity >0.6.11;
 contract AddressDeclarator {
 
 	mapping( address => address[] ) declarationIndex;
-	mapping( bytes32 => uint256 ) declarationContentIndex;
+	mapping( bytes32 => uint256 ) declarationContentIndex; // the _latest_ content pointer for the declarator to subject mapping
 	mapping( address => address[] ) declarator;
 	mapping( address => address[] ) declaratorReverse;
+	mapping( bytes32 => bool ) declarationExistIndex;
 	bytes32[][] public contents;
 
 	event DeclarationAdded(address _declarator, address _subject, bytes32 _proof);
@@ -19,23 +20,43 @@ contract AddressDeclarator {
 		contents[contents.length-1].push(blockhash(block.number));
 
 		addDeclaration(msg.sender, _initialDescription);
+
 	}
 	
 	function toReference(address _declarator, address _subject) private pure returns ( bytes32 ) {
 		bytes32 k;
-		bytes memory signMaterial = new bytes(40);
+		bytes memory addrMaterial = new bytes(40);
 		bytes memory addrBytes = abi.encodePacked(_declarator);
 		for (uint256 i = 0; i < 20; i++) {
-			signMaterial[i] = addrBytes[i];
+			addrMaterial[i] = addrBytes[i];
 		}
 		addrBytes = abi.encodePacked(_subject);
 		for (uint256 i = 0; i < 20; i++) {
-			signMaterial[i+20] = addrBytes[i];
+			addrMaterial[i+20] = addrBytes[i];
 		}
-		k = sha256(signMaterial);
+		k = sha256(addrMaterial);
 		return k;
 	}
 
+	function toReference(address _declarator, address _subject, bytes32 _proof) private pure returns ( bytes32[2] memory ) {
+		bytes32 k;
+		bytes32[2] memory ks;
+		bytes memory signMaterial = new bytes(64);
+
+		k = toReference(_declarator, _subject);
+		for (uint256 i = 0; i < 32; i++) {
+			signMaterial[i] = k[i];
+		}
+		for (uint256 i = 0; i < 32; i++) {
+			signMaterial[i+32] = _proof[i];
+		}
+
+		ks[0] = k;
+		ks[1] = sha256(signMaterial);
+
+		return ks;
+	}
+
 	// Implements Declarator
 	function declaratorCount(address _subject) public view returns ( uint256 ) {
 		return declarator[_subject].length;
@@ -48,20 +69,23 @@ contract AddressDeclarator {
 
 	// Implements Declarator
 	function addDeclaration(address _subject, bytes32 _proof) public returns ( bool ) {
-		bytes32 k;
+		bytes32[2] memory ks;
 		bytes32[] memory declarationContents;
 		uint256 idx;
-		k = toReference(msg.sender, _subject);
-		idx = declarationContentIndex[k];
+		ks = toReference(tx.origin, _subject, _proof);
+		idx = declarationContentIndex[ks[0]];
 		if (idx == 0) { // This also works for the constructor :)
-			declarator[_subject].push(msg.sender);
-			contents.push(declarationContents); //= contents[idx],
-			declarationIndex[msg.sender].push(_subject);
+			declarator[_subject].push(tx.origin);
+			contents.push(declarationContents);
+			declarationIndex[tx.origin].push(_subject);
+			idx = contents.length-1;
 		}
-		idx = contents.length-1;
-		declarationContentIndex[k] = idx;
+
+		declarationContentIndex[ks[0]] = idx;
 		contents[idx].push(_proof);
 
+		declarationExistIndex[ks[1]] = true;
+
 		return true;
 	}
 
@@ -74,6 +98,15 @@ contract AddressDeclarator {
 		return contents[idx];
 	}
 
+	// Implements Declarator
+	function haveDeclaration(address _declarator, address _subject, bytes32 _proof) public view returns (bool) {
+		bytes32[2] memory ks;
+		
+		ks = toReference(_declarator, _subject, _proof);
+
+		return declarationExistIndex[ks[1]];
+	}
+
 	// Implements Declarator
 	function declarationCount(address _declarator) public view returns ( uint256 ) {
 		return declarationIndex[_declarator].length;
@@ -92,5 +125,6 @@ contract AddressDeclarator {
 		if (_sum == 0x01ffc9a7) { // EIP165
 			return true;
 		}
+		return false;
 	}
 }

solidity/Makefile

@@ -1,19 +1,30 @@
 SOLC = /usr/bin/solc
 
-all:
+all: address_declarator token_index accounts_index
+
+address_declarator:
 	$(SOLC) AddressDeclarator.sol --abi --evm-version byzantium | awk 'NR>3' > AddressDeclarator.json
 	$(SOLC) AddressDeclarator.sol --bin --evm-version byzantium | awk 'NR>3' > AddressDeclarator.bin
 	truncate -s -1 AddressDeclarator.bin
-	$(SOLC) TokenUniqueSymbolIndex.sol --abi --evm-version byzantium | awk 'NR>3' > TokenUniqueSymbolIndex.json
-	$(SOLC) TokenUniqueSymbolIndex.sol --bin --evm-version byzantium | awk 'NR>3' > TokenUniqueSymbolIndex.bin
-	truncate -s -1 TokenUniqueSymbolIndex.bin
 
-test: all
+token_index:
+	$(SOLC) TokenUniqueSymbolIndexAddressDeclarator.sol --abi --evm-version byzantium | awk 'NR>3' > TokenUniqueSymbolIndexAddressDeclarator.json
+	$(SOLC) TokenUniqueSymbolIndexAddressDeclarator.sol --bin --evm-version byzantium | awk 'NR>3' > TokenUniqueSymbolIndexAddressDeclarator.bin
+	truncate -s -1 TokenUniqueSymbolIndexAddressDeclarator.bin
+
+
+accounts_index:
+	$(SOLC) AccountsIndexAddressDeclarator.sol --abi --evm-version byzantium | awk 'NR>3' > AccountsIndexAddressDeclarator.json
+	$(SOLC) AccountsIndexAddressDeclarator.sol --bin --evm-version byzantium | awk 'NR>3' > AccountsIndexAddressDeclarator.bin
+	truncate -s -1 AccountsIndexAddressDeclarator.bin
+
+#test: all
 	#python test.py
-	python test_tokenindex.py
+	#python test_tokenindex.py
 
 install: all
 	cp -v AddressDeclarator.{json,bin} ../python/eth_address_declarator/data/
-	cp -v TokenUniqueSymbolIndex.{json,bin} ../python/eth_token_index/data/
+	cp -v TokenUniqueSymbolIndexAddressDeclarator.{json,bin} ../python/eth_address_declarator/data/
+	cp -v AccountsIndexAddressDeclarator.{json,bin} ../python/eth_address_declarator/data/
 	
 .PHONY: test install

solidity/TokenUniqueSymbolIndex.json

@@ -1 +1 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"addedAccount","type":"address"},{"indexed":true,"internalType":"uint256","name":"accountIndex","type":"uint256"}],"name":"AddressAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"inputs":[],"name":"acceptOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"add","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_key","type":"bytes32"}],"name":"addressOf","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"entry","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"entryCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"register","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"name":"registry","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]
+[{"inputs":[{"internalType":"address","name":"_addressDeclaratorAddress","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"addedAccount","type":"address"},{"indexed":true,"internalType":"uint256","name":"accountIndex","type":"uint256"}],"name":"AddressAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"inputs":[],"name":"acceptOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"add","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"addressDeclaratorAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_key","type":"bytes32"}],"name":"addressOf","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"entry","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"entryCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"register","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"name":"registry","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]

solidity/TokenUniqueSymbolIndex.sol

@@ -1,105 +0,0 @@
-pragma solidity >0.6.11;
-
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-contract TokenUniqueSymbolIndex {
-
-	// EIP 173
-	address public owner;
-	address newOwner;
-
-	mapping ( bytes32 => uint256 ) public registry;
-	address[] tokens;
-
-	event OwnershipTransferred(address indexed previousOwner, address indexed newOwner); // EIP173
-	event AddressAdded(address indexed addedAccount, uint256 indexed accountIndex); // AccountsIndex
-
-	constructor() public {
-		owner = msg.sender;
-		tokens.push(address(0));
-	}
-
-	// Implements AccountsIndex
-	function entry(uint256 _idx) public view returns ( address ) {
-		return tokens[_idx + 1];
-	}
-
-	// Implements Registry
-	function addressOf(bytes32 _key) public view returns ( address ) {
-		uint256 idx;
-
-		idx = registry[_key];
-		return tokens[idx];
-	}
-
-	function register(address _token) public returns (bool) {
-		require(msg.sender == owner);
-
-		bytes memory token_symbol;
-		bytes32 token_symbol_key;
-		uint256 idx;
-
-		(bool _ok, bytes memory _r) = _token.call(abi.encodeWithSignature('symbol()'));
-		require(_ok);
-
-		token_symbol = abi.decode(_r, (bytes));
-		token_symbol_key = sha256(token_symbol);
-
-		idx = registry[token_symbol_key];
-		require(idx == 0);
-
-		registry[token_symbol_key] = tokens.length;
-		tokens.push(_token);
-		emit AddressAdded(_token, tokens.length - 1);
-		return true;
-	}
-
-	// Implements AccountsIndex
-	function add(address _token) public returns (bool) {
-		return register(_token);
-	}
-
-
-	// Implements AccountsIndex
-	function entryCount() public view returns ( uint256 ) {
-		return tokens.length - 1;
-	}
-
-	// Implements EIP173
-	function transferOwnership(address _newOwner) public returns (bool) {
-		require(msg.sender == owner);
-		newOwner = _newOwner;
-	}
-
-	// Implements OwnedAccepter
-	function acceptOwnership() public returns (bool) {
-		address oldOwner;
-
-		require(msg.sender == newOwner);
-		oldOwner = owner; 
-		owner = newOwner;
-		newOwner = address(0);
-		emit OwnershipTransferred(oldOwner, owner);
-	}
-
-
-	// Implements EIP165
-	function supportsInterface(bytes4 _sum) public pure returns (bool) {
-		if (_sum == 0xcbdb05c7) { // AccountsIndex
-			return true;
-		}
-		if (_sum == 0xbb34534c) { // Registry
-			return true;
-		}
-		if (_sum == 0x01ffc9a7) { // EIP165
-			return true;
-		}
-		if (_sum == 0x9493f8b2) { // EIP173
-			return true;
-		}
-		if (_sum == 0x37a47be4) { // OwnedAccepter
-			return true;
-		}
-		return false;
-	}
-}