Added deploy contract endpoint. Refactoring

Author: fergarrui

src/api/service/bean/Transaction.ts

@@ -1,13 +1,11 @@
-export interface Transaction {
+import { TransactionBase } from "./TransactionBase";
+
+export interface Transaction extends TransactionBase {
   blockHash: string;
   blockNumber: number;
-  from: string;
-  gas: number;
-  gasPrice: number;
   hash: string;
+  to: string,
   input: string;
   nonce: number;
-  to: string;
   transactionIndex: number;
-  value: number;
 }

src/api/service/bean/TransactionBase.ts

@@ -0,0 +1,6 @@
+export interface TransactionBase {
+  from?: string;
+  gas?: number;
+  gasPrice?: number;
+  value?: number;
+}

src/api/service/controller/ContractController.ts

@@ -8,6 +8,7 @@ import { IWeb3 } from '../../blockchain/IWeb3';
 import { Web3Instance } from '../../blockchain/Web3Instance';
 import { Web3Configuration } from '../../blockchain/Web3Configuration';
 import { DeployContractRequest } from '../request/DeployContractRequest';
+import { TransactionRequest } from '../request/TransactionRequest';
 
 @Route('contract')
 @provideSingleton(ContractController)
@@ -41,7 +42,13 @@ export class ContractController extends Controller {
   async deploy(
     @Body() deployRequest: DeployContractRequest,
   ) {
-
+    const config = {
+      blockchainHost: deployRequest.blockchainHost,
+      blockchainProtocol: deployRequest.blockchainProtocol,
+      blockchainBasicAuthUsername: deployRequest.blockchainBasicAuthUsername,
+      blockchainBasicAuthPassword: deployRequest.blockchainBasicAuthPassword
+    } as Web3Configuration
+    return this.contractService.deployContractSource(config, deployRequest.name, deployRequest.source, deployRequest.path, deployRequest)
   }
 
   @Post('run/{contractAddress}')
@@ -56,18 +63,13 @@ export class ContractController extends Controller {
       blockchainBasicAuthUsername: runFunction.blockchainBasicAuthUsername,
       blockchainBasicAuthPassword: runFunction.blockchainBasicAuthPassword
     } as Web3Configuration
-    const iWeb3: IWeb3 = new Web3Instance(config)
-    const web3 = iWeb3.getInstance()
-    const functionCallEncoded = web3.eth.abi.encodeFunctionCall(runFunction.abi, runFunction.params)
-    const accounts = await web3.eth.getAccounts()
-    const receipt = await web3.eth.sendTransaction({
-      to: contractAddress,
-      from: runFunction.from || accounts[0],
-      gas: runFunction.gas,
-      gasPrice: runFunction.gasPrice,
-      value: runFunction.value,
-      input: functionCallEncoded
-    })
-    return receipt
+
+    return this.contractService.runFunction(
+      config, 
+      runFunction.abi, 
+      runFunction.params, 
+      contractAddress, 
+      runFunction
+    )
   }
 }

src/api/service/request/DeployContractRequest.ts

@@ -1,4 +1,7 @@
 import { TransactionRequest } from "./TransactionRequest";
 
 export interface DeployContractRequest extends TransactionRequest {
+  name: string,
+  source: string,
+  path: string
 }

src/api/service/request/TransactionRequest.ts

@@ -1,8 +1,6 @@
-export interface TransactionRequest {
-  from?: string,
-  gas?: number,
-  gasPrice?: number,
-  value?: number,
+import { TransactionBase } from "../bean/TransactionBase";
+
+export interface TransactionRequest extends TransactionBase {
   blockchainHost?: string,
   blockchainProtocol?: string,
   blockchainBasicAuthUsername?: string,

src/api/service/service/ContractService.ts

@@ -1,17 +1,20 @@
 import { injectable } from "inversify";
+import { Web3Instance } from "../../blockchain/Web3Instance";
+import { IWeb3 } from "../../blockchain/IWeb3";
+import { TransactionBase } from "../bean/TransactionBase";
 let solc = require('solc')
 let fs = require('fs')
 let nodePath = require('path')
 
 @injectable()
 export class ContractService {
 
-  getAbi(contractName: string, source: string, path: string) {
+  getAbi(contractName: string, source: string, path: string): any {
     const contract = this.compileContract(contractName, source, path)
     return contract.abi
   }
 
-  compileContract(contractName: string, source: string, path: string) {
+  compileContract(contractName: string, source: string, path: string): any {
     const compileJson = this.generateCompileObject(contractName, source, path)
     const compiledContract = JSON.parse(solc.compileStandardWrapper(JSON.stringify(compileJson)))
     const contractWithExt = `${contractName}.sol`
@@ -22,6 +25,33 @@ export class ContractService {
     return contract
   }
 
+  async deployContractSource <T extends TransactionBase> (web3config: any, contractName: string, source: string, path: string, txBase: T): Promise<any> {
+    const iWeb3: IWeb3 = new Web3Instance(web3config)
+    const web3 = iWeb3.getInstance()
+    const compiledContract = this.compileContract(contractName, source, path)
+    const bytecode = compiledContract.evm.bytecode.object
+    return this.sendTx(web3, null, bytecode, txBase.from, txBase.gas, txBase.gasPrice, txBase.value)
+  }
+
+  async runFunction <T extends TransactionBase> (web3config: any, abi: any, params: string[], to: string, txBase: T): Promise<any> {
+    const iWeb3: IWeb3 = new Web3Instance(web3config)
+    const web3 = iWeb3.getInstance()
+    const functionCallEncoded: string = web3.eth.abi.encodeFunctionCall(abi, params)
+    return this.sendTx(web3, to, functionCallEncoded, txBase.from, txBase.gas, txBase.gasPrice, txBase.value)
+  }
+
+  private async sendTx(web3: any, to: string, input: string, from?: string, gas?: number, gasPrice?: number, value?: number): Promise<any> {
+    const accounts = await web3.eth.getAccounts()
+    return web3.eth.sendTransaction({
+      to,
+      from: from || accounts[0],
+      gas,
+      gasPrice,
+      value,
+      input
+    });
+  }
+
   private generateCompileObject(contractName: string, content: string, path: string) {
     const sources = {}
     sources[`${contractName}.sol`] = {