Send contract code via POST body. Showing compilation errors in FE

fergarrui · fergarrui · commit 644435fbe7f9 · 2019-05-19T19:49:26.000+01:00
diff --git a/cfg b/cfg
diff --git a/src/api/bytecode/EVMDisassembler.ts b/src/api/bytecode/EVMDisassembler.ts
@@ -26,8 +26,6 @@ export class EVMDisassembler implements Disassembler {
     }
     
     const contract = this.contractService.compileContract(contractName, source, path)
-
-
     const bytecode = contract.evm.bytecode.object
     const runtimeBytecode = contract.evm.deployedBytecode.object
     const contractAssembly = contract.evm.legacyAssembly
diff --git a/src/api/service/controller/ControlFlowGraphController.ts b/src/api/service/controller/ControlFlowGraphController.ts
@@ -1,4 +1,4 @@
-import { Route, Controller, Get, Query } from 'tsoa'
+import { Route, Controller, Query, Body, Post } from 'tsoa'
 import { provideSingleton, inject } from '../../../inversify/ioc'
 import { TYPES } from '../../../inversify/types'
 import { CFGService } from '../service/CFGService'
@@ -7,6 +7,8 @@ import { CFGContract } from '../bean/CFGContract'
 import { GFCResponse } from '../response/CFGResponse'
 import { OperationResponse } from '../response/OperationResponse'
 import { logger } from '../../../Logger'
+import { StringBodyRequest } from '../request/StringBodyRequest';
+const fs = require('fs')
 
 @Route('cfg')
 @provideSingleton(ControlFlowGraphController)
@@ -18,33 +20,34 @@ export class ControlFlowGraphController extends Controller {
     super()
   }
 
-  @Get('source')
+  @Post('source')
   async getCFGFromSource(
-    @Query('source') source: string,
+    @Body() source: StringBodyRequest,
     @Query('name') name: string,
     @Query('path') path: string,
     @Query('constructor') constructor?: boolean
   ): Promise<GFCResponse> {
     try {
-      const contractBlocks: CFGContract = this.cfgService.buildCFGFromSource(name, source, path)
+      const contractBlocks: CFGContract = this.cfgService.buildCFGFromSource(name, source.request, path)
       if (!contractBlocks.contractConstructor && constructor) {
         throw new Error('Constructor is true but no constructor found in bytecode')
       }
       const cfg = this.createCFG(contractBlocks, constructor)
+      await fs.writeFileSync('cfg', cfg)
       return this.buildResponse(contractBlocks, constructor, cfg)
     } catch (err) {
       logger.error(err)
       throw new Error(err.message)
     }
   }
 
-  @Get('bytecode')
+  @Post('bytecode')
   async getCFGFromBytecode(
-    @Query('bytecode') bytecode: string,
+    @Body() bytecode: StringBodyRequest,
     @Query('constructor') constructor?: boolean
   ): Promise<GFCResponse> {
     try {
-      const contractBlocks: CFGContract = this.cfgService.buildCFGFromBytecode(bytecode)
+      const contractBlocks: CFGContract = this.cfgService.buildCFGFromBytecode(bytecode.request)
       if (!contractBlocks.contractConstructor && constructor) {
         throw new Error('Constructor is true but no constructor found in bytecode')
       }
diff --git a/src/api/service/controller/DebuggerController.ts b/src/api/service/controller/DebuggerController.ts
@@ -1,4 +1,4 @@
-import { Route, Controller, Get, Query, Path } from 'tsoa'
+import { Route, Controller, Query, Path, Body, Post } from 'tsoa'
 import { provideSingleton, inject } from '../../../inversify/ioc'
 import { TYPES } from '../../../inversify/types'
 import { CFGService } from '../service/CFGService'
@@ -10,6 +10,7 @@ import { OperationResponse } from '../response/OperationResponse'
 import { TraceResponse } from '../response/TraceResponse'
 import { logger } from '../../../Logger'
 import { Web3Configuration } from 'src/api/blockchain/Web3Configuration';
+import { StringBodyRequest } from '../request/StringBodyRequest';
 
 @Route('debug')
 @provideSingleton(DebuggerController)
@@ -22,10 +23,10 @@ export class DebuggerController extends Controller {
     super()
   }
 
-  @Get('{tx}')
+  @Post('{tx}')
   async debug(
     @Path() tx: string,
-    @Query('source') source: string,
+    @Body() source: StringBodyRequest,
     @Query('name') name: string,
     @Query('path') path: string,
     @Query('blockchainHost') blockchainHost?: string,
@@ -41,7 +42,7 @@ export class DebuggerController extends Controller {
         blockchainBasicAuthUsername,
         blockchainBasicAuthPassword
       } as Web3Configuration
-      const contractBlocks: CFGContract = await this.cfgService.buildCFGFromSource(name, source, path)
+      const contractBlocks: CFGContract = await this.cfgService.buildCFGFromSource(name, source.request, path)
       const runtimeRawBytecode = contractBlocks.contractRuntime.rawBytecode.startsWith('0x')? contractBlocks.contractRuntime.rawBytecode: `0x${contractBlocks.contractRuntime.rawBytecode}`
       const trace: DebugTrace = await this.transactionService.findTransactionTrace(tx, runtimeRawBytecode, config)
       const cfg = this.createCFG(contractBlocks, false, trace)
diff --git a/src/api/service/controller/DisassembleController.ts b/src/api/service/controller/DisassembleController.ts
@@ -1,10 +1,11 @@
-import { Controller, Route, Get, Query } from 'tsoa'
+import { Controller, Route, Query, Post, Body } from 'tsoa'
 import { provideSingleton, inject } from '../../../inversify/ioc'
 import { TYPES } from '../../../inversify/types'
 import { Disassembler } from '../../bytecode/Disassembler'
 import { DisassembledContract } from '../../bytecode/DisassembledContract'
 import { DisassembledContractResponse } from '../response/DisassembledContractResponse'
 import { logger } from '../../../Logger'
+import { StringBodyRequest } from '../request/StringBodyRequest';
 
 @Route('disassemble')
 @provideSingleton(DisassembleController)
@@ -13,14 +14,14 @@ export class DisassembleController extends Controller {
     super()
   }
 
-  @Get()
+  @Post()
   async disassembleSourceCode(
-    @Query('source') source: string,
+    @Body() source: StringBodyRequest,
     @Query('name') name: string,
     @Query('path') path: string
   ): Promise<DisassembledContractResponse> {
     try {
-      const disassembled: DisassembledContract = this.disassembler.disassembleSourceCode(name, source, path)
+      const disassembled: DisassembledContract = this.disassembler.disassembleSourceCode(name, source.request, path)
       return this.contractToResponse(disassembled)
     } catch (err) {
       logger.error(err)
diff --git a/src/api/service/request/StringBodyRequest.ts b/src/api/service/request/StringBodyRequest.ts
@@ -0,0 +1,3 @@
+export interface StringBodyRequest {
+  request: string
+}
diff --git a/src/api/service/service/ContractService.ts b/src/api/service/service/ContractService.ts
@@ -4,6 +4,7 @@ import { IWeb3 } from "../../blockchain/IWeb3";
 import { TransactionBase } from "../bean/TransactionBase";
 import { TYPES } from "../../../inversify/types";
 import { Solc } from "./Solc";
+import { logger } from "../../../Logger";
 let fs = require('fs')
 let nodePath = require('path')
 
@@ -22,6 +23,12 @@ export class ContractService {
   compileContract(contractName: string, source: string, path: string): any {
     const compileJson = this.generateCompileObject(contractName, source, path)
     const compiledContract = JSON.parse(this.solc.getInstance().compileStandardWrapper(JSON.stringify(compileJson)))
+    if (compiledContract.errors && compiledContract.errors.filter(e => e.severity === 'error').length > 0) {
+      const errors = compiledContract.errors.filter(e => e.severity === 'error')
+      let errorMessage = `Error compiling. ${errors[0].formattedMessage} . View console to see al errors`
+      logger.error(errors)
+      throw new Error(errorMessage)
+    }
     const contractWithExt = `${contractName}.sol`
     const contract = compiledContract.contracts[contractWithExt][contractName]
     if (!contract) {
diff --git a/src/client/components/Graph/Graph.js b/src/client/components/Graph/Graph.js
@@ -26,10 +26,9 @@ class ConnectedGraph extends React.Component {
 
   componentDidMount() {
     const { cfg, graphId, graphType } = this.props;
-
     const graphclass = graphId.replace('.sol', '').replace('.evm', '');
     const graphviz = d3.select(`.graph--${graphclass}--${graphType}`).graphviz()
-    graphviz.totalMemory(537395200)
+    graphviz.totalMemory(1074790400)
     graphviz.renderDot(cfg);
     // TODO make it configurable?
     graphviz._zoomBehavior.scaleExtent([1/10, 10000]);
diff --git a/src/client/components/Tab/TabPanel/TabPanel.js b/src/client/components/Tab/TabPanel/TabPanel.js
@@ -71,15 +71,20 @@ class TabPanel extends React.Component {
     return url;
   }
 
- fetchData(url, type) {
+ fetchData(url, type, body) {
    this.handleRequestPending();
-
-   fetch(url)
+  fetch(url, body? {
+      body: JSON.stringify({request: body}),
+      method: 'POST',
+      headers:{
+        'Content-Type': 'application/json'
+      }
+    }: {})
     .then(res => res.json())
     .then(data => {
-      data.error 
-      ? this.handleRequestFail(data.message) 
-      : this.handleRequestSuccess(data, type);      
+      data.error
+      ? this.handleRequestFail(data)
+      : this.handleRequestSuccess(data, type);
     })
     .catch(err => this.handleRequestFail(err));
  }
@@ -130,7 +135,8 @@ class TabPanel extends React.Component {
     this.props.loadingMessageOff();
   }
 
-  handleRequestFail(message) {
+  handleRequestFail(data) {
+    const message = data.message
     this.props.loadingMessageOff();
     this.props.errorMessageOn();
     this.props.getErrorMessage(message);
@@ -142,14 +148,13 @@ class TabPanel extends React.Component {
     const params = {
       name: name.replace('.sol', '').replace('.evm', ''),
       path: encodeURIComponent(path),
-      source: encodeURIComponent(code),
       blockchainHost: localStorage.getItem('host'),
       blockchainProtocol: localStorage.getItem('protocol'),
       blockchainBasicAuthUsername: localStorage.getItem('username'),
       blockchainBasicAuthPassword: localStorage.getItem('password')
     }
 
-    this.fetchData(this.getUrl(`debug/${this.state.transactionHash}/`, params), 'Transaction Debugger');
+    this.fetchData(this.getUrl(`debug/${this.state.transactionHash}/`, params), 'Transaction Debugger', code);
   }
 
   handleFormInputChange(event) {    
@@ -201,10 +206,9 @@ class TabPanel extends React.Component {
     const params = {
       name: name.replace('.sol', '').replace('.evm', ''),
       path: encodeURIComponent(path),
-      source: encodeURIComponent(code),
       'constructor': 'false'
     }
-    this.fetchData(this.getUrl('cfg/source', params), 'Control Flow Graph');
+    this.fetchData(this.getUrl('cfg/source', params), 'Control Flow Graph', code);
 
     document.removeEventListener('click', this.handleOutsideClick);
   }
@@ -214,10 +218,9 @@ class TabPanel extends React.Component {
 
     const params = {
       name: name.replace('.sol', '').replace('.evm', ''),
-      path: encodeURIComponent(path),
-      source: encodeURIComponent(code)
+      path: encodeURIComponent(path)
     }
-    this.fetchData(this.getUrl('disassemble', params), 'Disassembler');
+    this.fetchData(this.getUrl('disassemble', params), 'Disassembler', code);
 
     document.removeEventListener('click', this.handleOutsideClick);
   }
diff --git a/src/routes.ts b/src/routes.ts
@@ -34,6 +34,11 @@ const models: TsoaRoute.Models = {
             "trace": { "dataType": "any", "required": true },
         },
     },
+    "StringBodyRequest": {
+        "properties": {
+            "request": { "dataType": "string", "required": true },
+        },
+    },
     "ContractFile": {
         "properties": {
             "name": { "dataType": "string", "required": true },
@@ -108,11 +113,11 @@ const models: TsoaRoute.Models = {
 };
 
 export function RegisterRoutes(app: any) {
-    app.get('/debug/:tx',
+    app.post('/debug/:tx',
         function(request: any, response: any, next: any) {
             const args = {
                 tx: { "in": "path", "name": "tx", "required": true, "dataType": "string" },
-                source: { "in": "query", "name": "source", "required": true, "dataType": "string" },
+                source: { "in": "body", "name": "source", "required": true, "ref": "StringBodyRequest" },
                 name: { "in": "query", "name": "name", "required": true, "dataType": "string" },
                 path: { "in": "query", "name": "path", "required": true, "dataType": "string" },
                 blockchainHost: { "in": "query", "name": "blockchainHost", "dataType": "string" },
@@ -160,10 +165,10 @@ export function RegisterRoutes(app: any) {
             const promise = controller.findContractsInDir.apply(controller, validatedArgs);
             promiseHandler(controller, promise, response, next);
         });
-    app.get('/disassemble',
+    app.post('/disassemble',
         function(request: any, response: any, next: any) {
             const args = {
-                source: { "in": "query", "name": "source", "required": true, "dataType": "string" },
+                source: { "in": "body", "name": "source", "required": true, "ref": "StringBodyRequest" },
                 name: { "in": "query", "name": "name", "required": true, "dataType": "string" },
                 path: { "in": "query", "name": "path", "required": true, "dataType": "string" },
             };
@@ -210,10 +215,10 @@ export function RegisterRoutes(app: any) {
             const promise = controller.getReceipt.apply(controller, validatedArgs);
             promiseHandler(controller, promise, response, next);
         });
-    app.get('/cfg/source',
+    app.post('/cfg/source',
         function(request: any, response: any, next: any) {
             const args = {
-                source: { "in": "query", "name": "source", "required": true, "dataType": "string" },
+                source: { "in": "body", "name": "source", "required": true, "ref": "StringBodyRequest" },
                 name: { "in": "query", "name": "name", "required": true, "dataType": "string" },
                 path: { "in": "query", "name": "path", "required": true, "dataType": "string" },
                 constructor: { "in": "query", "name": "constructor", "dataType": "boolean" },
@@ -235,10 +240,10 @@ export function RegisterRoutes(app: any) {
             const promise = controller.getCFGFromSource.apply(controller, validatedArgs);
             promiseHandler(controller, promise, response, next);
         });
-    app.get('/cfg/bytecode',
+    app.post('/cfg/bytecode',
         function(request: any, response: any, next: any) {
             const args = {
-                bytecode: { "in": "query", "name": "bytecode", "required": true, "dataType": "string" },
+                bytecode: { "in": "body", "name": "bytecode", "required": true, "ref": "StringBodyRequest" },
                 constructor: { "in": "query", "name": "constructor", "dataType": "boolean" },
             };
 

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@ export class EVMDisassembler implements Disassembler {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`const contract = this.contractService.compileContract(contractName, source, path)`
`29`		`-`
`30`		`-`
`31`	`29`	`const bytecode = contract.evm.bytecode.object`
`32`	`30`	`const runtimeBytecode = contract.evm.deployedBytecode.object`
`33`	`31`	`const contractAssembly = contract.evm.legacyAssembly`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export interface StringBodyRequest {`
	`2`	`+ request: string`
	`3`	`+}`