cicnet/okota
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sohail/fix duplicate token entry base 0.4.0 (#3)

Browse Source 
* feat: remove unique token check from register fn

* tests: add duplicate entry test

- add FOO
- add FOO

* bump: v0.4.1
This commit is contained in:
Mohamed Sohail 2022-06-23 12:22:57 +03:00 committed by GitHub
parent 179a6d4e03
commit 9bad5b5ccf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/okota/data/TokenUniqueSymbolIndexAddressDeclarator.bin
View File

File diff suppressed because one or more lines are too long

2
python/setup.cfg
View File

@ -1,6 +1,6 @@
[metadata] [metadata]
name = okota name = okota
version = 0.4.0 version = 0.4.1
description = Registries for CIC using the eth-address-index backend description = Registries for CIC using the eth-address-index backend
author = Louis Holbrook author = Louis Holbrook
author_email = dev@holbrook.no author_email = dev@holbrook.no

33
python/tests/test_tokenindex.py
View File

@ -25,7 +25,7 @@ from okota.token_index.index import (
# test imports # test imports
from eth_address_declarator.unittest import TestAddressDeclaratorBase from eth_address_declarator.unittest import TestAddressDeclaratorBase
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.INFO)
logg = logging.getLogger() logg = logging.getLogger()
testdir = os.path.dirname(__file__) testdir = os.path.dirname(__file__)
@ -54,12 +54,11 @@ class TestTokenIndex(TestAddressDeclaratorBase):
r = self.rpc.do(o) r = self.rpc.do(o)
self.assertEqual(r['status'], 1) self.assertEqual(r['status'], 1)
def test_register(self): def test_register(self):
nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc) nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
c = CICTokenIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle) c = CICTokenIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
logg.info('using token index {}'.format(self.token_index_address))
(tx_hash_hex, o) = c.add(self.token_index_address, self.accounts[0], self.foo_token_address) (tx_hash_hex, o) = c.add(self.token_index_address, self.accounts[0], self.foo_token_address)
self.rpc.do(o) self.rpc.do(o)
e = unpack(bytes.fromhex(strip_0x(o['params'][0])), self.chain_spec) e = unpack(bytes.fromhex(strip_0x(o['params'][0])), self.chain_spec)
@ -99,6 +98,34 @@ class TestTokenIndex(TestAddressDeclaratorBase):
identifier = to_identifier('foo') identifier = to_identifier('foo')
self.assertEqual(proofs[0], identifier) self.assertEqual(proofs[0], identifier)
def test_duplicate_entry(self):
nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
gft = GiftableToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
(tx_hash_hex, o) = gft.constructor(self.accounts[0], 'FooTokenRedeploy', '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_redeploy = r['contract_address']
logg.info('second foo token deployed with address {}'.format(self.foo_token_address_redeploy))
nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
c = CICTokenIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
logg.info('using token index {}'.format(self.token_index_address))
(tx_hash_hex, o) = c.add(self.token_index_address, self.accounts[0], self.foo_token_address_redeploy)
self.rpc.do(o)
e = unpack(bytes.fromhex(strip_0x(o['params'][0])), self.chain_spec)
o = receipt(tx_hash_hex)
r = self.rpc.do(o)
self.assertEqual(r['status'], 1)
o = c.address_of(self.token_index_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_redeploy))
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

3
solidity/TokenUniqueSymbolIndexAddressDeclarator.sol
View File

@ -55,9 +55,6 @@ contract TokenUniqueSymbolIndexAddressDeclarator {
require(ok); require(ok);
require(r[31] == 0x01); require(r[31] == 0x01);
idx = registry[token_symbol_key];
require(idx == 0);
registry[token_symbol_key] = tokens.length; registry[token_symbol_key] = tokens.length;
tokens.push(_token); tokens.push(_token);