Refactor contract runFunction

Author: fergarrui

src/api/service/controller/ContractController.ts

@@ -7,6 +7,7 @@ import { RunContractFunctionRequest } from '../request/RunContractFunctionReques
 import { IWeb3 } from '../../blockchain/IWeb3';
 import { Web3Instance } from '../../blockchain/Web3Instance';
 import { Web3Configuration } from '../../blockchain/Web3Configuration';
+import { DeployContractRequest } from '../request/DeployContractRequest';
 
 @Route('contract')
 @provideSingleton(ContractController)
@@ -36,21 +37,24 @@ export class ContractController extends Controller {
     }
   }
 
+  @Post('deploy')
+  async deploy(
+    @Body() deployRequest: DeployContractRequest,
+  ) {
+
+  }
+
   @Post('run/{contractAddress}')
   async run(
     @Path() contractAddress: string,
     @Body() runFunction: RunContractFunctionRequest,
-    @Query('blockchainHost') blockchainHost?: string,
-    @Query('blockchainProtocol') blockchainProtocol?: string,
-    @Query('blockchainBasicAuthUsername') blockchainBasicAuthUsername?: string,
-    @Query('blockchainBasicAuthPassword') blockchainBasicAuthPassword?: string
   )
   {
     const config = {
-      blockchainHost,
-      blockchainProtocol,
-      blockchainBasicAuthUsername,
-      blockchainBasicAuthPassword
+      blockchainHost: runFunction.blockchainHost,
+      blockchainProtocol: runFunction.blockchainProtocol,
+      blockchainBasicAuthUsername: runFunction.blockchainBasicAuthUsername,
+      blockchainBasicAuthPassword: runFunction.blockchainBasicAuthPassword
     } as Web3Configuration
     const iWeb3: IWeb3 = new Web3Instance(config)
     const web3 = iWeb3.getInstance()

src/api/service/request/DeployContractRequest.ts

@@ -0,0 +1,4 @@
+import { TransactionRequest } from "./TransactionRequest";
+
+export interface DeployContractRequest extends TransactionRequest {
+}

src/api/service/request/RunContractFunctionRequest.ts

@@ -1,8 +1,6 @@
-export interface RunContractFunctionRequest {
+import { TransactionRequest } from "./TransactionRequest";
+
+export interface RunContractFunctionRequest extends TransactionRequest {
   abi: any
-  params: string[],
-  from?: string,
-  gas?: number,
-  gasPrice?: number,
-  value?: number
-}
+  params: string[]
+  }

src/api/service/request/TransactionRequest.ts

@@ -0,0 +1,10 @@
+export interface TransactionRequest {
+  from?: string,
+  gas?: number,
+  gasPrice?: number,
+  value?: number,
+  blockchainHost?: string,
+  blockchainProtocol?: string,
+  blockchainBasicAuthUsername?: string,
+  blockchainBasicAuthPassword?: string
+}