formatting and cleanup

Run the formatter on all files
remove non-error console.log

Author: shemnon

lerna.json

@@ -1,6 +1,6 @@
 {
   "packages": [
-    "packages/*"
+	"packages/*"
   ],
   "version": "independent",
   "useWorkspaces": true

package.json

@@ -1,28 +1,28 @@
 {
   "name": "root",
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.11.0",
-    "@typescript-eslint/parser": "^5.11.0",
-    "eslint": "^8.8.0",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.25.4",
-    "lerna": "^4.0.0",
-    "prettier": "^2.5.1",
-    "typescript": "^4.5.5"
+	"@typescript-eslint/eslint-plugin": "^5.11.0",
+	"@typescript-eslint/parser": "^5.11.0",
+	"eslint": "^8.8.0",
+	"eslint-config-airbnb-base": "^15.0.0",
+	"eslint-config-prettier": "^8.3.0",
+	"eslint-plugin-import": "^2.25.4",
+	"lerna": "^4.0.0",
+	"prettier": "^2.5.1",
+	"typescript": "^4.5.5"
   },
   "workspaces": {
-    "packages": [
-      "packages/**"
-    ]
+	"packages": [
+	  "packages/**"
+	]
   },
   "scripts": {
-    "setup": "npx lerna bootstrap --hoist",
-    "build": "npx lerna run build",
-    "clean": "npx lerna run clean",
-    "compile": "npx lerna run compile",
-    "lint": "npx lerna run lint",
-    "format": "npx lerna run format",
-    "start": "npx lerna exec --scope server -- npm run start"
+	"setup": "npx lerna bootstrap --hoist",
+	"build": "npx lerna run build",
+	"clean": "npx lerna run clean",
+	"compile": "npx lerna run compile",
+	"lint": "npx lerna run lint",
+	"format": "npx lerna run format",
+	"start": "npx lerna exec --scope server -- npm run start"
   }
 }

packages/bridge/src/index.ts

@@ -2,8 +2,11 @@ export { BridgeImpl } from './lib/bridge';
 
 export interface Bridge {
   parity(): Parity;
+
   web3(): Web3;
+
   net(): Net;
+
   eth(): Eth;
 }
 
@@ -18,42 +21,57 @@ export interface Web3 {
 
 export interface Net {
   listening(): boolean;
+
   peerCount(): number;
+
   version(): number;
 }
 
 export interface Eth {
   // getProof();
   // accounts();
   blockNumber(): number;
+
   call(call: any, blockParam: string): Promise<string>;
+
   // coinbase();
   estimateGas(): number;
+
   gasPrice(): number;
+
   getBalance(): number;
+
   getBlockByHash(hash: string): any;
+
   getBlockByNumber(blockNum: number): any;
+
   // getBlockTransactionCountByHash();
   // getBlockTransactionCountByNumber();
   getCode(): number;
+
   chainId(): number;
+
   // getLogs();
   // getStorageAt();
   // getTransactionByBlockHashAndIndex();
   // getTransactionByBLockNumberAndIndex();
   // getTransactionByHash();
   getTransactionCount(): number;
+
   getTransactionReceipt(hash: string): Promise<any>;
+
   // getUncleByBlockHashAndIndex();
   // getUncleByBlockNumberAndIndex();
   // getUncleCountByBlockHash();
   // getUncleCountByBlockNumber();
   // getWork();
   feeHistory(): any;
+
   // hashrate();
   // mining();
   // protocolVersion();
   sendRawTransaction(transaction: string): Promise<string>;
+
   // sendTransaction();
   // sign();
   // signTransaction();

packages/bridge/src/lib/eth.ts

@@ -1,12 +1,13 @@
 import { Eth } from '../index';
 import {
-  ContractExecuteTransaction,
-  Client,
   AccountId,
+  Client,
   ContractCallQuery,
+  ContractExecuteTransaction,
   ContractId,
   TransactionReceiptQuery,
 } from '@hashgraph/sdk';
+
 var cache = require('js-cache');
 
 export class EthImpl implements Eth {
@@ -43,15 +44,11 @@ export class EthImpl implements Eth {
     }
 
     const transactionId = cache.get(Buffer.from(hash, 'hex'));
-    console.log(transactionId);
 
-    console.log('transactionId.toString()');
-    console.log(transactionId.toString());
     try {
       let receipt = await new TransactionReceiptQuery()
         .setTransactionId(transactionId)
         .execute(client);
-      console.log(receipt);
     } catch (e) {
       console.log(e);
       throw e;
@@ -178,7 +175,6 @@ export class EthImpl implements Eth {
             '302e020100300506032b65700422042091132178e72057a1d7528025956fe39b0b847f200ab59b2fdd367017f3087137',
         },
       });
-      console.log(client);
     } catch (error) {
       console.log(error);
       throw new Error(
@@ -192,10 +188,6 @@ export class EthImpl implements Eth {
 
     txRequest = txRequest.populateFromForeignTransaction(transaction);
 
-    console.log(txRequest);
-
-    console.log('ProtoBuf');
-
     var contractExecuteResponse = null;
 
     if (client instanceof Client) {
@@ -215,8 +207,6 @@ export class EthImpl implements Eth {
       contractExecuteResponse.transactionId
     );
 
-    console.log(contractExecuteResponse);
-
     // try {
     //     const contractRecord = await contractExecuteResponse.getRecord(client);
     //
@@ -237,8 +227,6 @@ export class EthImpl implements Eth {
     const hashString = Buffer.from(txnHash).toString('hex');
 
     var receipt = await this.getTransactionReceipt(hashString);
-    console.log('receipt');
-    console.log(receipt);
 
     return Buffer.from(contractExecuteResponse.transactionHash).toString('hex');
   }
@@ -291,9 +279,7 @@ export class EthImpl implements Eth {
         contractCallQuery.setSenderId(senderId);
       }
 
-      console.log(contractCallQuery);
       const contractCallResponse = await contractCallQuery.execute(client);
-      console.log(contractCallResponse);
       return Buffer.from(contractCallResponse.asBytes())
         .toString('hex')
         .replace('^(0x)?0+', '');

packages/bridge/tsconfig.json

@@ -1,8 +1,9 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "rootDir": "./src" /* Specify the root folder within your source files. */,
-    "outDir": "./dist" /* Specify an output folder for all emitted files. */
+    "rootDir": "./src",
+    /* Specify the root folder within your source files. */ "outDir": "./dist"
+    /* Specify an output folder for all emitted files. */
   },
   "exclude": ["node_modules", "dist"]
 }

packages/server/package.json

@@ -6,26 +6,26 @@
   "keywords": [],
   "author": "",
   "dependencies": {
-    "bridge": "^0.1.0",
-    "koa": "^2.13.4",
-    "koa-body-parser": "^0.2.1",
-    "koa-jsonrpc": "^1.1.1",
-    "koa-router": "^10.1.1"
+	"bridge": "^0.1.0",
+	"koa": "^2.13.4",
+	"koa-body-parser": "^0.2.1",
+	"koa-jsonrpc": "^1.1.1",
+	"koa-router": "^10.1.1"
   },
   "devDependencies": {
-    "@koa/cors": "^3.1.0",
-    "@types/cors": "^2.8.12",
-    "@types/express": "^4.17.13",
-    "@types/koa-bodyparser": "^4.3.5",
-    "@types/koa-router": "^7.4.4",
-    "@types/node": "^17.0.14",
-    "tsc": "^2.0.4",
-    "typescript": "^4.5.5"
+	"@koa/cors": "^3.1.0",
+	"@types/cors": "^2.8.12",
+	"@types/express": "^4.17.13",
+	"@types/koa-bodyparser": "^4.3.5",
+	"@types/koa-router": "^7.4.4",
+	"@types/node": "^17.0.14",
+	"tsc": "^2.0.4",
+	"typescript": "^4.5.5"
   },
   "scripts": {
-    "build": "npm run clean && npm run compile",
-    "clean": "rm -rf ./dist && rm -rf tsconfig.tsbuildinfo",
-    "compile": "../../node_modules/typescript/bin/tsc -b tsconfig.json",
-    "start": "NODE_PATH=../../node_modules node dist/index.js"
+	"build": "npm run clean && npm run compile",
+	"clean": "rm -rf ./dist && rm -rf tsconfig.tsbuildinfo",
+	"compile": "../../node_modules/typescript/bin/tsc -b tsconfig.json",
+	"start": "NODE_PATH=../../node_modules node dist/index.js"
   }
 }

packages/server/src/index.ts

@@ -1,6 +1,7 @@
-import app from "./server";
+import app from './server'
+
 async function main() {
-	await app.listen({port: 7546});
+  await app.listen({ port: 7546 })
 }
 
-main();
+main()

packages/server/src/server.ts

@@ -1,42 +1,66 @@
-import Koa from 'koa';
-import koaJsonRpc from 'koa-jsonrpc';
-import {Bridge, BridgeImpl} from 'bridge';
+import Koa from 'koa'
+import koaJsonRpc from 'koa-jsonrpc'
+import { Bridge, BridgeImpl } from 'bridge'
 
-const bridge: Bridge = new BridgeImpl();
-const app = new Koa();
-const rpc = koaJsonRpc();
+const bridge: Bridge = new BridgeImpl()
+const app = new Koa()
+const rpc = koaJsonRpc()
 
-rpc.use('net_listening', async () => { return "" + bridge.net().listening() });
-rpc.use('net_version', async () => { return toHexString(bridge.net().version()) });
-rpc.use('eth_blockNumber', async () => { return toHexString(bridge.eth().blockNumber()) });
-rpc.use('eth_estimateGas', async () => { return toHexString(bridge.eth().estimateGas()) });
-rpc.use('eth_getBalance', async () => { return toHexString(bridge.eth().getBalance()) });
-rpc.use('eth_getCode', async () => { return toHexString(bridge.eth().getCode()) });
-rpc.use('eth_chainId', async () => { return toHexString(bridge.eth().chainId()) });
-rpc.use('eth_getBlockByNumber', async (params:any) => { return bridge.eth().getBlockByNumber(params?.[0]) });
-rpc.use('eth_getBlockByHash', async (params:any) => { return bridge.eth().getBlockByHash(params?.[0]) });
-rpc.use('eth_gasPrice', async () => { return toHexString(bridge.eth().gasPrice()) });
-rpc.use('eth_getTransactionCount', async () => { return toHexString(bridge.eth().getTransactionCount()) });
+rpc.use('net_listening', async () => {
+  return '' + bridge.net().listening()
+})
+rpc.use('net_version', async () => {
+  return toHexString(bridge.net().version())
+})
+rpc.use('eth_blockNumber', async () => {
+  return toHexString(bridge.eth().blockNumber())
+})
+rpc.use('eth_estimateGas', async () => {
+  return toHexString(bridge.eth().estimateGas())
+})
+rpc.use('eth_getBalance', async () => {
+  return toHexString(bridge.eth().getBalance())
+})
+rpc.use('eth_getCode', async () => {
+  return toHexString(bridge.eth().getCode())
+})
+rpc.use('eth_chainId', async () => {
+  return toHexString(bridge.eth().chainId())
+})
+rpc.use('eth_getBlockByNumber', async (params: any) => {
+  return bridge.eth().getBlockByNumber(params?.[0])
+})
+rpc.use('eth_getBlockByHash', async (params: any) => {
+  return bridge.eth().getBlockByHash(params?.[0])
+})
+rpc.use('eth_gasPrice', async () => {
+  return toHexString(bridge.eth().gasPrice())
+})
+rpc.use('eth_getTransactionCount', async () => {
+  return toHexString(bridge.eth().getTransactionCount())
+})
 rpc.use('eth_call', async (params: any) => {
-    try {
-        return bridge.eth().call(params?.[0], "params?.[1]");
-    } catch (e) {
-        console.log(e);
-        throw e;
-    }
-});
-rpc.use('eth_sendRawTransaction', async (params:any) => {
-    try {
-        return bridge.eth().sendRawTransaction(params?.[0]);
-    } catch (e) {
-        console.log(e);
-        throw e;
-    }
-});
-rpc.use('eth_getTransactionReceipt', async (hash: string) => { return bridge.eth().getTransactionReceipt(hash) });
-app.use(rpc.app());
+  try {
+    return bridge.eth().call(params?.[0], 'params?.[1]')
+  } catch (e) {
+    console.log(e)
+    throw e
+  }
+})
+rpc.use('eth_sendRawTransaction', async (params: any) => {
+  try {
+    return bridge.eth().sendRawTransaction(params?.[0])
+  } catch (e) {
+    console.log(e)
+    throw e
+  }
+})
+rpc.use('eth_getTransactionReceipt', async (hash: string) => {
+  return bridge.eth().getTransactionReceipt(hash)
+})
+app.use(rpc.app())
 
-export default app;
+export default app
 
 // const app:Application = new Application();
 // app.use(
@@ -48,6 +72,6 @@ export default app;
 // export default app;
 //
 
-function toHexString(num:number) {
-    return "0x" + num.toString(16);
+function toHexString(num: number) {
+  return '0x' + num.toString(16)
 }