ethereum-optimism · ben-chain · Apr 29, 2020 · Apr 24, 2020 · Apr 24, 2020 · Apr 24, 2020
diff --git a/packages/core-utils/src/app/misc.ts b/packages/core-utils/src/app/misc.ts
@@ -290,22 +290,3 @@ export const runInDomain = async (
 export const getCurrentTime = (): number => {
   return Math.round(Date.now() / 1000)
 }
-/**
- * Encodes a transaction in RLP format, using a random signature
- * @param {object} Transaction object
- */
-export const rlpEncodeTransactionWithRandomSig = (
-  transaction: object
-): string => {
-  return RLP.encode([
-    hexlify(transaction['nonce']),
-    hexlify(transaction['gasPrice']),
-    hexlify(transaction['gasLimit']),
-    hexlify(transaction['to']),
-    hexlify(transaction['value']),
-    hexlify(transaction['data']),
-    '0x11', // v
-    '0x' + '11'.repeat(32), // r
-    '0x' + '11'.repeat(32), // s
-  ])
-}
diff --git a/packages/rollup-full-node/src/app/fullnode-rpc-server.ts b/packages/rollup-full-node/src/app/fullnode-rpc-server.ts
@@ -119,7 +119,13 @@ export class FullnodeRpcServer extends ExpressHttpServer {
         )
         return buildJsonRpcError('INVALID_PARAMS', request.id)
       }
-      logError(log, `Uncaught exception at endpoint-level`, err)
+      logError(
+        log,
+        `Uncaught exception at endpoint-level for request [${JSON.stringify(
+          request
+        )}]:`,
+        err
+      )
       return buildJsonRpcError(
         'INTERNAL_ERROR',
         request && request.id ? request.id : null

diff --git a/packages/rollup-full-node/src/app/test-web3-rpc-handler.ts b/packages/rollup-full-node/src/app/test-web3-rpc-handler.ts
@@ -4,7 +4,6 @@ import {
   getLogger,
   numberToHexString,
   castToNumber,
-  rlpEncodeTransactionWithRandomSig,
   ZERO_ADDRESS,
 } from '@eth-optimism/core-utils'
 import { GAS_LIMIT } from '@eth-optimism/ovm'
@@ -144,16 +143,18 @@ export class TestWeb3Handler extends DefaultWeb3Handler {
     if (!ovmTx.to) {
       ovmTx.to = '0x'
     }
-    if (!ovmTx.gasPrice) {
-      ovmTx.gasPrice = 0
-    }
-    if (!ovmTx.gasLimit) {
+    if (!ovmTx.gas) {
       ovmTx.gasLimit = GAS_LIMIT
+    } else {
+      ovmTx.gasLimit = ovmTx.gas
+      delete ovmTx.gas
     }
+    const ovmTxFrom = ovmTx.from
+    delete ovmTx.from
     ovmTx.value = 0
     return this.sendRawTransaction(
-      rlpEncodeTransactionWithRandomSig(ovmTx),
-      ovmTx.from
+      await this.getNewWallet().sign(ovmTx),
+      ovmTxFrom
     )
   }
 

diff --git a/packages/rollup-full-node/test/app/web-rpc-handler.spec.ts b/packages/rollup-full-node/test/app/web-rpc-handler.spec.ts
@@ -9,7 +9,7 @@ import {
   ZERO_ADDRESS,
   hexStrToBuf,
 } from '@eth-optimism/core-utils'
-import { CHAIN_ID } from '@eth-optimism/ovm'
+import { CHAIN_ID, convertInternalLogsToOvmLogs } from '@eth-optimism/ovm'
 
 import {
   ethers,