Add registry tests

python/eth_token_index/data/TokenUniqueSymbolIndex.json

@@ -1 +1 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"AddressAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"_symbol","type":"bytes32"},{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"AddressKey","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"AddressRemoved","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"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_writer","type":"address"}],"name":"WriterAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_writer","type":"address"}],"name":"WriterDeleted","type":"event"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"activate","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"add","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"addWriter","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":"address","name":"_token","type":"address"}],"name":"deactivate","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"deleteWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","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":"identifierCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"identifiers","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"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":"address","name":"_token","type":"address"}],"name":"remove","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","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":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"AddressAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"_symbol","type":"bytes32"},{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"AddressKey","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"AddressRemoved","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"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_writer","type":"address"}],"name":"WriterAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_writer","type":"address"}],"name":"WriterDeleted","type":"event"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"activate","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"add","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"addWriter","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":"address","name":"_token","type":"address"}],"name":"deactivate","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"deleteWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","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":[{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"identifier","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"identifierCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"identifierList","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"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":"address","name":"_token","type":"address"}],"name":"remove","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","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/data/TokenUniqueSymbolIndex.metadata.json

@@ -1 +1 @@
-{"compiler":{"version":"0.8.18+commit.87f61d96"},"language":"Solidity","output":{"abi":[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"AddressAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"_symbol","type":"bytes32"},{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"AddressKey","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"AddressRemoved","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"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_writer","type":"address"}],"name":"WriterAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_writer","type":"address"}],"name":"WriterDeleted","type":"event"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"activate","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"add","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"addWriter","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":"address","name":"_token","type":"address"}],"name":"deactivate","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"deleteWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","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":"identifierCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"identifiers","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"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":"address","name":"_token","type":"address"}],"name":"remove","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","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"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"TokenUniqueSymbolIndex.sol":"TokenUniqueSymbolIndex"},"evmVersion":"byzantium","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"TokenUniqueSymbolIndex.sol":{"keccak256":"0x7ab6b392718181f82a79bb425715f39e77d191678a2b544cb3e72f0385a384fe","license":"AGPL-3.0-or-later","urls":["bzz-raw://3bcff1c12c6b3dbf96e43e7413958ef6336de0afb7dfd20b1d003c742b05ea5b","dweb:/ipfs/QmNwTu4Fjji8ewpNsMtivGEiwgdzvWEhdFYrWePQ7KPENG"]}},"version":1}
+{"compiler":{"version":"0.8.18+commit.87f61d96"},"language":"Solidity","output":{"abi":[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"AddressAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"_symbol","type":"bytes32"},{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"AddressKey","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"AddressRemoved","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"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_writer","type":"address"}],"name":"WriterAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_writer","type":"address"}],"name":"WriterDeleted","type":"event"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"activate","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"add","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"addWriter","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":"address","name":"_token","type":"address"}],"name":"deactivate","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_writer","type":"address"}],"name":"deleteWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","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":[{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"identifier","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"identifierCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"identifierList","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"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":"address","name":"_token","type":"address"}],"name":"remove","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","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"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"TokenUniqueSymbolIndex.sol":"TokenUniqueSymbolIndex"},"evmVersion":"byzantium","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"TokenUniqueSymbolIndex.sol":{"keccak256":"0x472d243e57b740cc7d8cec688bbd7fa76f979f6d857965cda1728d710595cc5e","license":"AGPL-3.0-or-later","urls":["bzz-raw://76a5eacbf65373e2275f1a9a1ec7120d98db592b395ad0503d62e0d18bf23905","dweb:/ipfs/QmNs8Bk5SuFUVG571QyoWQYk2B9ouGhqGU4vMNkQW9dM9j"]}},"version":1}

python/eth_token_index/index.py

@@ -33,7 +33,7 @@ datadir = os.path.join(moddir, 'data')
 
 def to_identifier(s):
     r = s.encode('utf-8').hex()
-    assert len(r) < 64
+    assert len(r) <= 64
     return '{:0<64}'.format(r)
 
 
@@ -144,6 +144,26 @@ class TokenUniqueSymbolIndex(TxFactory):
         return o
 
 
+    def identifier(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('identifier')
+        enc.typ(ABIContractType.UINT256)
+        enc.uint256(idx)
+        data = add_0x(enc.encode())
+        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 identifier_count(self, contract_address, sender_address=ZERO_ADDRESS, id_generator=None):
+        return self.call_noarg('identifierCount', contract_address, sender_address=sender_address, id_generator=id_generator)
+
+
     @classmethod
     def parse_address_of(self, v):
         return abi_decode_single(ABIContractType.ADDRESS, v)

python/test_requirements.txt

@@ -1,3 +1,4 @@
 eth-tester==0.5.0b3
 py-evm==0.3.0a20
 eth-address-index~=0.6.0
+eth-accounts-index~=0.5.1

python/tests/test_tokenindex.py

@@ -9,10 +9,14 @@ import hashlib
 from chainlib.eth.unittest.ethtester import EthTesterCase
 from chainlib.eth.nonce import RPCNonceOracle
 from chainlib.eth.tx import receipt
+from chainlib.error import JSONRPCException
 from giftable_erc20_token import GiftableToken
 from chainlib.eth.tx import unpack
 from hexathon import strip_0x
+from hexathon import same as same_hex
 from chainlib.eth.contract import ABIContractEncoder
+from chainlib.eth.unittest.ethtester import EthTesterCase
+from eth_accounts_index import AccountsIndex
 
 # local imports
 from eth_token_index.index import (
@@ -20,17 +24,13 @@ from eth_token_index.index import (
         to_identifier,
         )
 
-# test imports
-from eth_address_declarator.declarator import Declarator
-from eth_address_declarator.unittest import TestAddressDeclaratorBase
-
 logging.basicConfig(level=logging.DEBUG)
 logg = logging.getLogger()
 
 testdir = os.path.dirname(__file__)
 
 
-class TestTokenUniqueSymbolIndex(TestAddressDeclaratorBase):
+class TestTokenUniqueSymbolIndex(EthTesterCase):
 
     def setUp(self):
         super(TestTokenUniqueSymbolIndex, self).setUp()
@@ -43,21 +43,32 @@ class TestTokenUniqueSymbolIndex(TestAddressDeclaratorBase):
         r = self.rpc.do(o)
         self.assertEqual(r['status'], 1)
 
-        self.token_index_address = r['contract_address']
+        self.address = r['contract_address']
 
-        (tx_hash_hex, o) = c.add_writer(self.token_index_address, self.accounts[0], self.accounts[0])
+        (tx_hash_hex, o) = c.add_writer(self.address, self.accounts[0], self.accounts[0])
         self.rpc.do(o)
 
         o = receipt(tx_hash_hex)
         r = self.rpc.do(o)
         self.assertEqual(r['status'], 1)
 
+        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 published with address {}'.format(self.foo_token_address))
+
 
     def test_register(self):
         nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
         c = TokenUniqueSymbolIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
         
-        (tx_hash_hex, o) = c.register(self.token_index_address, self.accounts[0], self.foo_token_address)
+        (tx_hash_hex, o) = c.register(self.address, self.accounts[0], self.foo_token_address)
         self.rpc.do(o)
         e = unpack(bytes.fromhex(strip_0x(o['params'][0])), self.chain_spec)
 
@@ -65,21 +76,148 @@ class TestTokenUniqueSymbolIndex(TestAddressDeclaratorBase):
         r = self.rpc.do(o)
         self.assertEqual(r['status'], 1)
 
-        o = c.address_of(self.token_index_address, 'FOO', sender_address=self.accounts[0])
+        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, strip_0x(self.foo_token_address))
         
-        o = c.entry(self.token_index_address, 0, sender_address=self.accounts[0])
+        o = c.entry(self.address, 0, sender_address=self.accounts[0])
         r = self.rpc.do(o)
         address = c.parse_entry(r)
         self.assertEqual(address, strip_0x(self.foo_token_address))
         
-        o = c.entry_count(self.token_index_address, sender_address=self.accounts[0])
+        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)
-    
+
+
+
+    def test_identifiers(self):
+        nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
+        c = TokenUniqueSymbolIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+        (tx_hash_hex, o) = c.register(self.address, self.accounts[0], self.foo_token_address)
+        self.rpc.do(o)
+
+        tokens = [
+            self.foo_token_address,
+                ]
+        nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
+        token_names = [
+                'BAR',
+                'BAZ',
+                'XYZZY',
+                ]
+        for token_name in token_names:
+            c = GiftableToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+            (tx_hash_hex, o) = c.constructor(self.accounts[0], '{} Token'.format(token_name), token_name, 6)
+            self.rpc.do(o)
+            o = receipt(tx_hash_hex)
+            r = self.rpc.do(o)
+            self.assertEqual(r['status'], 1)
+
+            token_address = r['contract_address']
+
+            c = TokenUniqueSymbolIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+            (tx_hash_hex, o) = c.register(self.address, self.accounts[0], token_address)
+            self.rpc.do(o)
+            o = receipt(tx_hash_hex)
+            r = self.rpc.do(o)
+            self.assertEqual(r['status'], 1)
+
+            tokens.append(token_address)
+
+        token_names = ['FOO'] + token_names
+
+        i = 0
+        for token_name in token_names:
+            o = c.address_of(self.address, token_name, sender_address=self.accounts[0])
+            r = self.rpc.do(o)
+            r = strip_0x(r)
+            logg.debug('tokenn {} {} {}'.format(token_name, r, tokens[i]))
+            self.assertTrue(same_hex(r[24:], tokens[i]))
+            i += 1
+ 
+        o = c.identifier_count(self.address, sender_address=self.accounts[0])
+        r = self.rpc.do(o)
+        self.assertEqual(int(r, 16), 4)
+
+        c = AccountsIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+        (tx_hash_hex, o) = c.remove(self.address, self.accounts[0], tokens[1])
+        self.rpc.do(o)
+        o = receipt(tx_hash_hex)
+        r = self.rpc.do(o)
+        self.assertEqual(r['status'], 1)
+
+        c = TokenUniqueSymbolIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+        o = c.identifier(self.address, 4, sender_address=self.accounts[0])
+        with self.assertRaises(Exception):
+            self.rpc.do(o)
+
+        o = c.identifier(self.address, 0, sender_address=self.accounts[0])
+        r = self.rpc.do(o)
+        self.assertEqual(strip_0x(r)[:6], b'FOO'.hex())
+
+        o = c.identifier_count(self.address, sender_address=self.accounts[0])
+        r = self.rpc.do(o)
+        self.assertEqual(int(r, 16), 3)
+        
+        next_token_test = tokens[2]
+        token_names = [
+            'FOO',
+            'XYZZY',
+            'BAZ',
+                ]
+        tokens = [
+            tokens[0],
+            tokens[3],
+            tokens[2],
+                ]
+        i = 0
+        for token_name in token_names:
+            o = c.address_of(self.address, token_name, sender_address=self.accounts[0])
+            r = self.rpc.do(o)
+            r = strip_0x(r)
+            logg.debug('tokenn {} {} {}'.format(token_name, r, tokens[i]))
+            self.assertTrue(same_hex(r[24:], tokens[i]))
+            i += 1
+
+        c = AccountsIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+        (tx_hash_hex, o) = c.remove(self.address, self.accounts[0], next_token_test)
+        self.rpc.do(o)
+        o = receipt(tx_hash_hex)
+        r = self.rpc.do(o)
+        self.assertEqual(r['status'], 1)
+
+        c = TokenUniqueSymbolIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+        o = c.identifier(self.address, 1, sender_address=self.accounts[0])
+        r = self.rpc.do(o)
+        self.assertEqual(strip_0x(r)[:10], b'XYZZY'.hex())
+
+        token_names = [
+            'FOO',
+            'XYZZY',
+                ]
+        tokens = [
+            tokens[0],
+            tokens[1],
+                ]
+        i = 0
+        for token_name in token_names:
+            o = c.address_of(self.address, token_name, sender_address=self.accounts[0])
+            r = self.rpc.do(o)
+            r = strip_0x(r)
+            logg.debug('tokenn {} {} {}'.format(token_name, r, tokens[i]))
+            self.assertTrue(same_hex(r[24:], tokens[i]))
+            i += 1
+
+        o = c.identifier_count(self.address, sender_address=self.accounts[0])
+        r = self.rpc.do(o)
+        self.assertEqual(int(r, 16), 2)
+
+
+
+
 
 if __name__ == '__main__':
     unittest.main()

solidity/TokenUniqueSymbolIndex.sol

@@ -12,7 +12,7 @@ contract TokenUniqueSymbolIndex {
 	address public owner;
 
 	// Implements Registry
-	bytes32[] public identifiers;
+	bytes32[] public identifierList;
 
 	// Implements EIP173
 	event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
@@ -35,6 +35,7 @@ contract TokenUniqueSymbolIndex {
 	constructor() {
 		owner = msg.sender;
 		tokens.push(address(0));
+		identifierList.push(bytes32(0));
 	}
 
 	// Implements AccountsIndex
@@ -71,7 +72,7 @@ contract TokenUniqueSymbolIndex {
 
 		registry[token_symbol_key] = tokens.length;
 		tokens.push(_token);
-		identifiers.push(token_symbol_key);
+		identifierList.push(token_symbol_key);
 		tokenIndex[_token] = token_symbol_key;
 
 		emit AddressKey(token_symbol_key, _token);
@@ -89,18 +90,20 @@ contract TokenUniqueSymbolIndex {
 		uint256 i;
 		uint256 l;
 
-		require(isWriter[msg.sender], 'ERR_AXX');
+		require(isWriter[msg.sender] || msg.sender == owner, 'ERR_AXX');
 		require(tokenIndex[_token] != bytes32(0), 'ERR_NOT_FOUND');
 
 		l = tokens.length - 1;
-
 		i = registry[tokenIndex[_token]];
 		if (i < l) {
 			tokens[i] = tokens[l];
-			identifiers[i] = identifiers[l];
+			identifierList[i] = identifierList[l];
 		}		
+		registry[tokenIndex[tokens[i]]] = i;
 		tokens.pop();
+		identifierList.pop();
 		registry[tokenIndex[_token]] = 0;
+
 		emit AddressRemoved(_token);
 		return true;
 	}
@@ -156,14 +159,19 @@ contract TokenUniqueSymbolIndex {
 		return true;
 	}
 
+	// Implements Registry
+	function identifier(uint256 _idx) public view returns(bytes32) {
+		return identifierList[_idx + 1];
+	}
+
 	// Implements Registry
 	function identifierCount() public view returns(uint256) {
-		return identifiers.length;
+		return identifierList.length - 1;
 	}
 
 	// Implements EIP165
 	function supportsInterface(bytes4 _sum) public pure returns (bool) {
-		if (_sum == 0x12625fe5) { // Registry
+		if (_sum == 0xeffbf671) { // Registry
 			return true;
 		}
 		if (_sum == 0xb7bca625) { // AccountsIndex