Add full deployment test

cic/ext/eth/__init__.py

@@ -7,22 +7,27 @@ from chainlib.chain import ChainSpec
 from chainlib.eth.tx import (
         TxFormat,
         TxFactory,
+        Tx,
+        receipt,
         )
 from chainlib.eth.connection import RPCConnection
 from chainlib.eth.contract import (
         ABIContractEncoder,
         ABIContractType
         )
+from chainlib.eth.gas import OverrideGasOracle
+from chainlib.eth.nonce import RPCNonceOracle
 from chainlib.eth.address import is_address
 from eth_token_index import TokenUniqueSymbolIndex
 from eth_address_declarator import Declarator
+from eth_address_declarator.declarator import AddressDeclarator
 
 logg = logging.getLogger(__name__)
 
 
 class CICEth:
 
-    def __init__(self, chain_spec, resources, proof, signer=None, rpc=None, nonce_oracle=None, fee_oracle=None):
+    def __init__(self, chain_spec, resources, proof, signer=None, rpc=None, fee_oracle=None):
         """resources will be modified
         """
         self.resources = resources
@@ -30,7 +35,6 @@ class CICEth:
         self.chain_spec = chain_spec
         self.signer = signer
         self.rpc = rpc
-        self.nonce_oracle = nonce_oracle
         self.fee_oracle = fee_oracle
         self.token_details = None
         self.token_address = None
@@ -127,7 +131,9 @@ class CICEth:
         code = self.token_details['code'] + enc.get()
 
         signer_address = self.resources['token']['key_address']
-        c = TxFactory(self.chain_spec, signer=self.signer, nonce_oracle=self.nonce_oracle, gas_oracle=self.fee_oracle)
+        nonce_oracle = RPCNonceOracle(signer_address, conn=self.rpc)
+
+        c = TxFactory(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle, gas_oracle=self.fee_oracle)
         tx = c.template(signer_address, None, use_nonce=True)
         tx = c.set_code(tx, code)
         o = c.finalize(tx, self.tx_format)
@@ -135,6 +141,10 @@ class CICEth:
         r = None
         if self.rpc != None:
             r = self.rpc.do(o[1])
+            ro = receipt(r)
+            rr = self.rpc.do(ro)
+            rr = Tx.src_normalize(rr)
+            self.token_address = rr['contract_address']
         elif self.signer != None:
             r = o[1]
 
@@ -146,10 +156,12 @@ class CICEth:
 
 
     def process_token_index(self):
-        c = TokenUniqueSymbolIndex(self.chain_spec, signer=self.signer, nonce_oracle=self.nonce_oracle, gas_oracle=self.fee_oracle)
-
-        contract_address = self.resources['token_index']['reference']
         signer_address = self.resources['token_index']['key_address']
+        contract_address = self.resources['token_index']['reference']
+
+        gas_oracle = OverrideGasOracle(limit=TokenUniqueSymbolIndex.gas(), conn=self.rpc)
+        nonce_oracle = RPCNonceOracle(signer_address, conn=self.rpc)
+        c = TokenUniqueSymbolIndex(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
         
         o = c.register(contract_address, signer_address, self.token_address, tx_format=self.tx_format)
         r = None
@@ -165,10 +177,12 @@ class CICEth:
 
 
     def process_address_declarator(self):
-        c = Declarator(self.chain_spec, signer=self.signer, nonce_oracle=self.nonce_oracle, gas_oracle=self.fee_oracle)
-
-        contract_address = self.resources['address_declarator']['reference']
         signer_address = self.resources['address_declarator']['key_address']
+        contract_address = self.resources['address_declarator']['reference']
+
+        gas_oracle = OverrideGasOracle(limit=AddressDeclarator.gas(), conn=self.rpc)
+        nonce_oracle = RPCNonceOracle(signer_address, conn=self.rpc)
+        c = Declarator(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
 
         r = []
         for proof in self.proof.get():
@@ -187,6 +201,7 @@ class CICEth:
     def process(self):
         tasks = [] 
         self.token_address = self.resources['token']['reference']
+        
         if self.token_address == None:
             tasks.append('token')
 
@@ -197,7 +212,9 @@ class CICEth:
                 tasks.append(k)
                 
         for task in tasks:
-            getattr(self, 'process_' + task)()
+            r = getattr(self, 'process_' + task)()
+
+        return self.outputs
 
 
 def new(resources, proof, signer_hint=None):

cic/hash.py

@@ -0,0 +1,10 @@
+class Hasher:
+
+    def __basehasher(self, v):
+        h = hashlib.sha256()
+        h.update(v)
+        return h.digest()
+
+
+    def hash(self, v):
+        return self.__basehasher(v)