Add agnostic processing unit, outputter
This commit is contained in:
@@ -27,7 +27,7 @@ logg = logging.getLogger(__name__)
|
||||
|
||||
class CICEth:
|
||||
|
||||
def __init__(self, chain_spec, resources, proof, signer=None, rpc=None, fee_oracle=None):
|
||||
def __init__(self, core_processor, chain_spec, resources, proof, signer=None, metadata=None, rpc=None, fee_oracle=None):
|
||||
"""resources will be modified
|
||||
"""
|
||||
self.resources = resources
|
||||
@@ -35,7 +35,9 @@ class CICEth:
|
||||
self.chain_spec = chain_spec
|
||||
self.signer = signer
|
||||
self.rpc = rpc
|
||||
self.core_processor = core_processor
|
||||
self.fee_oracle = fee_oracle
|
||||
self.metadata = metadata
|
||||
self.token_details = None
|
||||
self.token_address = None
|
||||
self.token_code = None
|
||||
@@ -120,7 +122,10 @@ class CICEth:
|
||||
return (args, args_types, positions)
|
||||
|
||||
|
||||
def process_token(self):
|
||||
def process_token(self, writer=None):
|
||||
if writer == None:
|
||||
writer = self.core_processor.writer()
|
||||
|
||||
(args, args_types, positions) = self.__order_args()
|
||||
|
||||
enc = ABIContractEncoder()
|
||||
@@ -131,7 +136,9 @@ class CICEth:
|
||||
code = self.token_details['code'] + enc.get()
|
||||
|
||||
signer_address = self.resources['token']['key_address']
|
||||
nonce_oracle = RPCNonceOracle(signer_address, conn=self.rpc)
|
||||
nonce_oracle = None
|
||||
if self.rpc != None:
|
||||
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)
|
||||
@@ -155,12 +162,17 @@ class CICEth:
|
||||
return r
|
||||
|
||||
|
||||
def process_token_index(self):
|
||||
def process_token_index(self, writer=None):
|
||||
if writer == None:
|
||||
writer = self.core_processor.writer()
|
||||
|
||||
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)
|
||||
nonce_oracle = None
|
||||
if self.rpc != None:
|
||||
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)
|
||||
@@ -176,12 +188,17 @@ class CICEth:
|
||||
return r
|
||||
|
||||
|
||||
def process_address_declarator(self):
|
||||
def process_address_declarator(self, writer=None):
|
||||
if writer == None:
|
||||
writer = self.core_processor.writer()
|
||||
|
||||
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)
|
||||
nonce_oracle = None
|
||||
if self.rpc != None:
|
||||
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 = []
|
||||
@@ -212,10 +229,13 @@ class CICEth:
|
||||
tasks.append(k)
|
||||
|
||||
for task in tasks:
|
||||
r = getattr(self, 'process_' + task)()
|
||||
logg.debug('ciceth adapter process {}'.format(task))
|
||||
r = getattr(self, 'process_' + task)(writer=self.core_processor.writer())
|
||||
|
||||
self.core_processor.process()
|
||||
|
||||
return self.outputs
|
||||
|
||||
|
||||
def new(resources, proof, signer_hint=None):
|
||||
return CICEth(resources, proof, signer=None)
|
||||
def new(core_processor, resources, proof, signer_hint=None):
|
||||
return CICEth(core_processor, resources, proof, signer=None)
|
||||
|
||||
Reference in New Issue
Block a user