Add interface for token index

python/eth_address_declarator/declarator.py

@@ -15,15 +15,15 @@ moddir = os.path.dirname(__file__)
 datadir = os.path.join(moddir, 'data')
 
 
-class TokenEndorser:
+class AddressDeclarator:
 
     __abi = None
     __bytecode = None
     __address = None
 
     def __init__(self, w3, address, signer_address=None):
-        abi = TokenEndorser.abi()
+        abi = AddressDeclarator.abi()
-        TokenEndorser.bytecode()
+        AddressDeclarator.bytecode()
         self.__address = address
         self.contract = w3.eth.contract(abi=abi, address=address)
         self.w3 = w3
@@ -37,20 +37,20 @@ class TokenEndorser:
 
     @staticmethod
     def abi():
-        if TokenEndorser.__abi == None:
+        if AddressDeclarator.__abi == None:
             f = open(os.path.join(datadir, 'AccountDeclarator.json'), 'r')
             AccountDeclarator.__abi = json.load(f)
             f.close()
-        return TokenEndorser.__abi
+        return AddressDeclarator.__abi
 
 
     @staticmethod
     def bytecode():
-        if TokenEndorser.__bytecode == None:
+        if AddressDeclarator.__bytecode == None:
             f = open(os.path.join(datadir, 'AccountDeclarator.bin'))
             AccountDeclarator.__bytecode = f.read()
             f.close()
-        return TokenEndorser.__bytecode
+        return AddressDeclarator.__bytecode
 
 
 #    def token_from_symbol(self, symbol):

python/eth_token_index/__init__.py

@@ -0,0 +1 @@
+from .index import TokenUniqueSymbolIndex

python/eth_token_index/data/ERC20.json

@@ -0,0 +1 @@
+[{"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

@@ -0,0 +1 @@
+[{"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 +1 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"bytes32","name":"_key","type":"bytes32"}],"name":"addressOf","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_key","type":"bytes32"},{"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":[],"name":"registryCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"tokens","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"}]
+[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"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":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_key","type":"bytes32"},{"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":[],"name":"registryCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"}]

python/eth_token_index/index.py

@@ -0,0 +1,84 @@
+# 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
+
+logg = logging.getLogger(__name__)
+
+moddir = os.path.dirname(__file__)
+datadir = os.path.join(moddir, 'data')
+
+
+class TokenUniqueSymbolIndex:
+
+    __abi = None
+    __bytecode = None
+    __address = None
+    __erc20_abi = None
+
+    def __init__(self, w3, address, signer_address=None):
+        abi = TokenUniqueSymbolIndex.abi()
+        TokenUniqueSymbolIndex.bytecode()
+        self.__address = address
+        self.contract = w3.eth.contract(abi=abi, address=address)
+        self.w3 = w3
+        if signer_address != None:
+            self.signer_address = signer_address
+        else:
+            if type(self.w3.eth.defaultAccount).__name__ == 'Empty':
+                self.w3.eth.defaultAccount = self.w3.eth.accounts[0]
+            self.signer_address = self.w3.eth.defaultAccount
+        
+        f = open(os.path.join(datadir, 'ERC20.json'), 'r')
+        TokenUniqueSymbolIndex.__erc20_abi = json.load(f)
+        f.close()
+
+
+    @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
+
+
+    def add(self, address):
+        c = self.w3.eth.contract(abi=TokenUniqueSymbolIndex.__erc20_abi, address=address)
+        s = c.functions.symbol().call()
+        h = to_ref(s)
+        return self.contract.functions.register(h, address).transact({'from':self.signer_address})
+
+
+    def count(self):
+        return self.contract.functions.registryCount().call()
+
+
+    def get_index(self, idx):
+        return self.contract.functions.tokens(idx).call()
+
+
+    def get_token_by_symbol(self, symbol):
+        ref = to_ref(symbol)
+        return self.contract.functions.addressOf(symbol).call()
+
+
+def to_ref(s):
+    h = hashlib.new('sha256')
+    h.update(s.encode('utf-8'))
+    return h.digest().hex()

python/tests/test_inteface.py

@@ -0,0 +1,100 @@
+import os
+import unittest
+import json
+import logging
+import hashlib
+
+import web3
+import eth_tester
+import eth_abi
+
+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(unittest.TestCase):
+
+    contract = None
+
+    def setUp(self):
+        eth_params = eth_tester.backends.pyevm.main.get_default_genesis_params({
+            'gas_limit': 9000000,
+            })
+
+        # create store of used accounts
+        #f = open(os.path.join(testdir, '../eth_token_index/data/TokenUniqueSymbolIndex.bin'), 'r')
+        f = open(os.path.join(testdir, '../eth_token_index/data/TokenUniqueSymbolIndex.bin'), 'r')
+        bytecode = f.read()
+        f.close()
+
+        #f = open(os.path.join(testdir, '../eth_token_index/data/TokenUniqueSymbolIndex.json'), 'r')
+        f = open(os.path.join(testdir, '../eth_token_index/data/TokenUniqueSymbolIndex.json'), 'r')
+        self.abi = json.load(f)
+        f.close()
+
+
+        backend = eth_tester.PyEVMBackend(eth_params)
+        self.eth_tester =  eth_tester.EthereumTester(backend)
+        provider = web3.Web3.EthereumTesterProvider(self.eth_tester)
+        self.w3 = web3.Web3(provider)
+        c = self.w3.eth.contract(abi=self.abi, bytecode=bytecode)
+        tx_hash = c.constructor().transact({'from': self.w3.eth.accounts[0]})
+
+        r = self.w3.eth.getTransactionReceipt(tx_hash)
+
+        self.address = r.contractAddress
+
+
+        # create token
+        f = open(os.path.join(testdir, '../eth_token_index/data/GiftableToken.bin'), 'r')
+        bytecode = f.read()
+        f.close()
+
+        f = open(os.path.join(testdir, '../eth_token_index/data/GiftableToken.json'), 'r')
+        self.abi_token = json.load(f)
+        f.close()
+
+        t = self.w3.eth.contract(abi=self.abi_token, bytecode=bytecode)
+        tx_hash = t.constructor('Foo Token', 'FOO', 18).transact({'from': self.w3.eth.accounts[0]})
+
+        r = self.w3.eth.getTransactionReceipt(tx_hash)
+
+        self.address_token_one = r.contractAddress
+
+        t = self.w3.eth.contract(abi=self.abi_token, bytecode=bytecode)
+        tx_hash = t.constructor('Bar Token', 'BAR', 18).transact({'from': self.w3.eth.accounts[0]})
+
+        r = self.w3.eth.getTransactionReceipt(tx_hash)
+
+        self.address_token_two = r.contractAddress
+
+        t = self.w3.eth.contract(abi=self.abi_token, bytecode=bytecode)
+        tx_hash = t.constructor('Bar Token Duplicate', 'BAR', 18).transact({'from': self.w3.eth.accounts[0]})
+
+        r = self.w3.eth.getTransactionReceipt(tx_hash)
+
+        self.address_token_three = r.contractAddress
+
+
+    def tearDown(self):
+        pass
+
+
+    def test_basic(self):
+        ifc = TokenUniqueSymbolIndex(self.w3, self.address)
+
+        logg.info('tx {}'.format(ifc.add(self.address_token_one)))
+        logg.info('tx {}'.format(ifc.add(self.address_token_two)))
+
+        assert ifc.count() == 2
+
+
+if __name__ == '__main__':
+    unittest.main()

python/tests/test_tokenindex.py

@@ -28,12 +28,12 @@ class Test(unittest.TestCase):
 
         # create store of used accounts
         #f = open(os.path.join(testdir, '../eth_token_index/data/TokenUniqueSymbolIndex.bin'), 'r')
-        f = open(os.path.join(testdir, '../../solidity/TokenUniqueSymbolIndex.bin'), 'r')
+        f = open(os.path.join(testdir, '../eth_token_index/data/TokenUniqueSymbolIndex.bin'), 'r')
         bytecode = f.read()
         f.close()
 
         #f = open(os.path.join(testdir, '../eth_token_index/data/TokenUniqueSymbolIndex.json'), 'r')
-        f = open(os.path.join(testdir, '../../solidity/TokenUniqueSymbolIndex.json'), 'r')
+        f = open(os.path.join(testdir, '../eth_token_index/data/TokenUniqueSymbolIndex.json'), 'r')
         self.abi = json.load(f)
         f.close()
 
@@ -51,11 +51,11 @@ class Test(unittest.TestCase):
 
 
         # create token
-        f = open(os.path.join(testdir, '../eth_token_endorser/data/GiftableToken.bin'), 'r')
+        f = open(os.path.join(testdir, '../eth_token_index/data/GiftableToken.bin'), 'r')
         bytecode = f.read()
         f.close()
 
-        f = open(os.path.join(testdir, '../eth_token_endorser/data/GiftableToken.json'), 'r')
+        f = open(os.path.join(testdir, '../eth_token_index/data/GiftableToken.json'), 'r')
         self.abi_token = json.load(f)
         f.close()
 

solidity/TokenUniqueSymbolIndex.json

@@ -1 +1 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"bytes32","name":"_key","type":"bytes32"}],"name":"addressOf","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_key","type":"bytes32"},{"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":[],"name":"registryCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"tokens","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"}]
+[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"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":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_key","type":"bytes32"},{"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":[],"name":"registryCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"}]

solidity/TokenUniqueSymbolIndex.sol

@@ -8,7 +8,7 @@ contract TokenUniqueSymbolIndex {
 	address public owner;
 
 	mapping ( bytes32 => uint256 ) public registry;
-	address[] public tokens;
+	address[] tokens;
 
 	constructor() {
 		owner = msg.sender;
@@ -50,6 +50,6 @@ contract TokenUniqueSymbolIndex {
 	}
 
 	function registryCount() public view returns ( uint256 ) {
-		return tokens.length;
+		return tokens.length - 1;
 	}
 }