cicnet/cic-cli
5
1
Fork 0
Code Issues Pull Requests Projects Releases 18 Wiki Activity

Run extensions processing from core processor

Browse Source
This commit is contained in:
nolash
2021-10-11 15:28:09 +02:00
parent dd9640b383
commit 23567905a1
13 changed files with 233 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
cic/ext/eth/__init__.py
View File

@@ -27,7 +27,7 @@ logg = logging.getLogger(__name__)
class CICEth:
def __init__(self, core_processor, chain_spec, resources, proof, signer=None, metadata=None, rpc=None, fee_oracle=None):
def __init__(self, chain_spec, resources, proof, signer=None, rpc=None, fee_oracle=None, outputs_writer=None):
"""resources will be modified
"""
self.resources = resources
@@ -35,14 +35,13 @@ 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
self.outputs = []
self.tx_format = TxFormat.RAW_ARGS
self.outputs_writer = outputs_writer
if self.rpc != None:
self.tx_format = TxFormat.JSONRPC
elif self.signer != None:
@@ -122,10 +121,20 @@ class CICEth:
return (args, args_types, positions)
def add_outputs(self, k, v):
logg.debug('adding outputs {} {}'.format(k, v))
self.outputs.append((k, v))
def get_outputs(self):
return self.outputs
def process_token(self, writer=None):
if writer == None:
writer = self.core_processor.writer()
writer = self.outputs_writer
logg.debug('ZZZZZZZZ token details {}'.format(self.token_details))
(args, args_types, positions) = self.__order_args()
enc = ABIContractEncoder()
@@ -158,13 +167,13 @@ class CICEth:
if r == None:
r = code
self.outputs.append(r)
self.add_outputs('token', r)
return r
def process_token_index(self, writer=None):
if writer == None:
writer = self.core_processor.writer()
writer = self.outputs_writer
signer_address = self.resources['token_index']['key_address']
contract_address = self.resources['token_index']['reference']
@@ -184,13 +193,13 @@ class CICEth:
else:
r = o
self.outputs.append(r)
self.add_outputs('token_index', r)
return r
def process_address_declarator(self, writer=None):
if writer == None:
writer = self.core_processor.writer()
writer = self.outputs_writer
signer_address = self.resources['address_declarator']['key_address']
contract_address = self.resources['address_declarator']['reference']
@@ -201,21 +210,26 @@ class CICEth:
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 = []
results = []
for proof in self.proof.get():
o = c.add_declaration(contract_address, signer_address, self.token_address, proof, tx_format=self.tx_format)
r = None
if self.rpc != None:
r.append(self.rpc.do(o[1]))
r = self.rpc.do(o[1])
elif self.signer != None:
r.append(o[1])
r = o[1]
else:
r.append(o)
r = o
self.add_outputs('address_declarator', r)
results.append(r)
self.outputs += r
return r
return results
def process(self):
def process(self, writer=None):
if writer == None:
writer = self.outputs_writer
tasks = []
self.token_address = self.resources['token']['reference']
@@ -230,12 +244,10 @@ class CICEth:
for task in tasks:
logg.debug('ciceth adapter process {}'.format(task))
r = getattr(self, 'process_' + task)(writer=self.core_processor.writer())
r = getattr(self, 'process_' + task)(writer=writer)
self.core_processor.process()
return self.outputs
return self.token_address
def new(core_processor, resources, proof, signer_hint=None):
return CICEth(core_processor, resources, proof, signer=None)
def new(resources, proof, signer_hint=None):
return CICEth(resources, proof, signer=None)

8
cic/meta.py
View File

@@ -62,6 +62,14 @@ class Meta(Data):
'contact': self.contact,
}
def process(self, token_address=None, writer=None):
k = self.reference(token_address)
v = json.dumps(self.asdict())
writer.write(k, v)
return (k, v)
def __str__(self):
s = "contact.name = {}\n".format(self.name)

2
cic/output.py
View File

@@ -10,7 +10,7 @@ class KVWriter:
def write(self, k, v):
fp = open(self.path, str(k))
fp = os.path.join(self.path, str(k))
f = open(fp, 'w')
f.write(v)
f.close()

42
cic/processor.py
View File

@@ -1,22 +1,38 @@
# standard imports
import logging
logg = logging.getLogger(__name__)
class Processor:
def __init__(self, token=None, metadata=None, outputs_writer=None):
self.token = token
def __init__(self, metadata=None, outputs_writer=None, extensions=[]):
self.token_address = None
self.metadata = metadata
self.extensions = extensions
self.outputs = []
self.__outputs_writer = outputs_writer
def set_token_address(address):
self.token_address = address
def writer(self):
return self.__outputs_writer
def can_process(self):
return self.token_address != None
def process_metadata(self, writer=None):
pass
if not self.can_process():
raise RuntimeError('incomplete processing state for metadata')
def get_outputs(self):
outputs = []
for ext in self.extensions:
outputs += ext.outputs
outputs += self.outputs
return outputs
def process(self):
@@ -24,7 +40,13 @@ class Processor:
'metadata',
]
for task in tasks:
getattr(self, 'process_' + task)(writer=self.__outputs_writer)
for ext in self.extensions:
token_address = ext.process()
for task in tasks:
a = getattr(self, task)
if a == None:
logg.debug('skipping missing task receiver "{}"'.format(task))
continue
v = a.process(token_address=token_address, writer=self.__outputs_writer)
self.outputs.append(v)