From 07a51b090b4b239d87766c12fbd360afda0059e3 Mon Sep 17 00:00:00 2001 From: gujjar95 Date: Sat, 20 Jan 2018 13:32:53 +0530 Subject: [PATCH 1/3] requestSynchrone initial implementation --- ...requestSyncrhoneExtensionEscrow_service.py | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/servicesExtensions/requestSyncrhoneExtensionEscrow_service.py b/servicesExtensions/requestSyncrhoneExtensionEscrow_service.py index 95b0867..9cd9459 100644 --- a/servicesExtensions/requestSyncrhoneExtensionEscrow_service.py +++ b/servicesExtensions/requestSyncrhoneExtensionEscrow_service.py @@ -6,13 +6,33 @@ from servicesCore.requestCore_service import RequestCoreService from servicesExternal.web3_single import Web3Single - +requestCoreArtifact = Artifacts.requestCoreArtifact +requestSynchroneExtensionEscrowArtifact = Artifacts.requestSynchroneExtensionEscrowArtifact class RequestSynchroneExtensionEscrowService: def __init__(self): - pass + global requestCoreArtifact, requestSynchroneExtensionEscrowArtifact + self._web3Single = Web3Single.getInstance() + self._abiRequestCore = requestCoreArtifact.abi + self._requestCoreServices = RequestCoreService() + networkName = self._web3Single.networkName + self._abiSynchroneExtensionEscrow = requestSynchroneExtensionEscrowArtifact.abi + if not requestSynchroneExtensionEscrowArtifact[networkName] : + raise ValueError('Escrow Artifact no configuration for network: ' + networkName) + self._addressSynchroneExtensionEscrow = requestSynchroneExtensionEscrowArtifact.networks[networkName].address + self._instanceSynchroneExtensionEscrow = self._web3Single.web3.eth.Contract( + self._abiSynchroneExtensionEscrow, + self._addressSynchroneExtensionEscrow) def parseParameters(self, extensionParams: List[Any]) -> Any: - pass + if not extensionParams or not self._web3Single.isAddressNoChecksum(extensionParams[0]): + return {'error' : ValueError('first parameter must be a valid eth address')} + ret : List[Any] = [] + #no idea about address parameter + ret.append(self._web3Single.toSolidityBytes32(address, extensionParams[0])) + for i in range(1,9): + ret.append(self._web3Single.toSolidityBytes32('bytes32',0S)) + return {'result' : ret} + def releaseToPayeeAction(self, requestId: str, options: Any = None): pass From cfd944cdd7d4d630eefb569a10871abc4507a3f8 Mon Sep 17 00:00:00 2001 From: gujjar95 Date: Sat, 20 Jan 2018 13:35:59 +0530 Subject: [PATCH 2/3] typo --- servicesExtensions/requestSyncrhoneExtensionEscrow_service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servicesExtensions/requestSyncrhoneExtensionEscrow_service.py b/servicesExtensions/requestSyncrhoneExtensionEscrow_service.py index 9cd9459..6f0b40a 100644 --- a/servicesExtensions/requestSyncrhoneExtensionEscrow_service.py +++ b/servicesExtensions/requestSyncrhoneExtensionEscrow_service.py @@ -30,7 +30,7 @@ def parseParameters(self, extensionParams: List[Any]) -> Any: #no idea about address parameter ret.append(self._web3Single.toSolidityBytes32(address, extensionParams[0])) for i in range(1,9): - ret.append(self._web3Single.toSolidityBytes32('bytes32',0S)) + ret.append(self._web3Single.toSolidityBytes32('bytes32',0)) return {'result' : ret} From e64ca928fba1b3c0b743620352f24efac1d37653 Mon Sep 17 00:00:00 2001 From: gujjar95 Date: Wed, 24 Jan 2018 11:46:44 +0530 Subject: [PATCH 3/3] Address correction --- servicesExtensions/requestSyncrhoneExtensionEscrow_service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servicesExtensions/requestSyncrhoneExtensionEscrow_service.py b/servicesExtensions/requestSyncrhoneExtensionEscrow_service.py index 6f0b40a..90c23bd 100644 --- a/servicesExtensions/requestSyncrhoneExtensionEscrow_service.py +++ b/servicesExtensions/requestSyncrhoneExtensionEscrow_service.py @@ -28,7 +28,7 @@ def parseParameters(self, extensionParams: List[Any]) -> Any: return {'error' : ValueError('first parameter must be a valid eth address')} ret : List[Any] = [] #no idea about address parameter - ret.append(self._web3Single.toSolidityBytes32(address, extensionParams[0])) + ret.append(self._web3Single.toSolidityBytes32("address", extensionParams[0])) for i in range(1,9): ret.append(self._web3Single.toSolidityBytes32('bytes32',0)) return {'result' : ret}