Map internal transactions to external (OVM) transactions (#97)

ethereum-optimism · Apr 22, 2020 · bb727d9 · bb727d9
1 parent 2ef5b34
commit bb727d9
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 3 deletions.
diff --git a/packages/ovm/src/contracts/L2ExecutionManager.sol b/packages/ovm/src/contracts/L2ExecutionManager.sol
@@ -11,6 +11,7 @@ import {ExecutionManager} from "./ExecutionManager.sol";
  */
 contract L2ExecutionManager is ExecutionManager {
     mapping(bytes32 => bytes32) ovmHashToEvmHash;
+    mapping(bytes32 => bytes32) evmHashToOvmHash;
     mapping(bytes32 => bytes) ovmHashToOvmTx;
 
     constructor(
@@ -28,10 +29,20 @@ contract L2ExecutionManager is ExecutionManager {
     @param signedOvmTx The signed OVM tx that we received
     */
     function storeOvmTransaction(bytes32 ovmTransactionHash, bytes32 internalTransactionHash, bytes memory signedOvmTx) public {
+        evmHashToOvmHash[internalTransactionHash] = ovmTransactionHash;
         ovmHashToEvmHash[ovmTransactionHash] = internalTransactionHash;
         ovmHashToOvmTx[ovmTransactionHash] = signedOvmTx;
     }
 
+    /**
+    @notice Gets the OVM transaction hash associated with the provided EVM transaction hash.
+    @param evmTransactionHash The EVM transaction hash.
+    @return The associated OVM transaction hash.
+    */
+    function getOvmTransactionHash(bytes32 evmTransactionHash) public view returns (bytes32) {
+        return evmHashToOvmHash[evmTransactionHash];
+    }
+
     /**
     @notice Gets the EVM transaction hash associated with the provided OVM transaction hash.
     @param ovmTransactionHash The OVM transaction hash.

diff --git a/packages/ovm/test/contracts/l2-execution-manager.spec.ts b/packages/ovm/test/contracts/l2-execution-manager.spec.ts
@@ -63,6 +63,12 @@ describe('L2 Execution Manager', () => {
       result.should.equal(value, 'Incorrect hash mapped!')
     })
 
+    it('properly reads existing internal tx hash -> OVM tx hash mapping', async () => {
+      await l2ExecutionManager.storeOvmTransaction(key, value, fakeSignedTx)
+      const result = await l2ExecutionManager.getOvmTransactionHash(value)
+      result.should.equal(key, 'Incorrect hash mapped!')
+    })
+
     it('properly reads existing OVM tx hash -> OVM tx mapping', async () => {
       await l2ExecutionManager.storeOvmTransaction(key, value, fakeSignedTx)
       const result = await l2ExecutionManager.getOvmTransaction(key)

diff --git a/packages/rollup-full-node/src/app/web3-rpc-handler.ts b/packages/rollup-full-node/src/app/web3-rpc-handler.ts
@@ -361,15 +361,28 @@ export class DefaultWeb3Handler
       block['transactions'] = (
         await Promise.all(
           block['transactions'].map(async (transaction) => {
-            transaction['hash'] = await this.getInternalTxHash(
-              transaction['hash']
-            )
+            transaction['hash'] = await this.getOvmTxHash(transaction['hash'])
+            const ovmTx = await this.getTransactionByHash(transaction['hash'])
+            Object.keys(transaction).forEach((key) => {
+              if (ovmTx && ovmTx[key]) {
+                transaction[key] = utils.BigNumber.isBigNumber(ovmTx[key])
+                  ? ovmTx[key].toNumber()
+                  : ovmTx[key]
+              }
+            })
+
             return transaction
           })
         )
       )
         // Filter transactions that aren't included in the execution manager
         .filter((transaction) => transaction['hash'] !== add0x('00'.repeat(32)))
+    } else {
+      block['transactions'] = await Promise.all(
+        block['transactions'].map(async (transactionHash) =>
+          this.getOvmTxHash(transactionHash)
+        )
+      )
     }
 
     log.debug(
@@ -771,6 +784,16 @@ export class DefaultWeb3Handler
     )
   }
 
+  /**
+   * Gets the external OVM transaction hash for the provided EVM transaction hash, if one exists.
+   *
+   * @param evmTxHash The EVM transaction hash
+   * @returns The OVM tx hash if one exists, else undefined.
+   */
+  private async getOvmTxHash(evmTxHash: string): Promise<string> {
+    return this.context.executionManager.getOvmTransactionHash(add0x(evmTxHash))
+  }
+
   /**
    * Gets the signed OVM transaction that we received by its hash.
    *

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
@@ -5,6 +5,7 @@ import {
   getLogger,
   keccak256,
   numberToHexString,
+  hexStrToBuf,
   ZERO_ADDRESS,
 } from '@eth-optimism/core-utils'
 import { CHAIN_ID } from '@eth-optimism/ovm'
@@ -178,6 +179,41 @@ describe('Web3Handler', () => {
         const block = await httpProvider.getBlock('latest', true)
         block.timestamp.should.be.gte(timestamp)
       })
+
+      it('should return the latest block with transaction objects', async () => {
+        const executionManagerAddress = await httpProvider.send(
+          'ovm_getExecutionManagerAddress',
+          []
+        )
+        const wallet = getWallet(httpProvider)
+        const simpleStorage = await deploySimpleStorage(wallet)
+        await setAndGetStorage(
+          simpleStorage,
+          httpProvider,
+          executionManagerAddress
+        )
+
+        const block = await httpProvider.getBlock('latest', true)
+        block.transactions[0].from.should.eq(wallet.address)
+        block.transactions[0].to.should.eq(simpleStorage.address)
+      })
+
+      it('should return the latest block with transaction hashes', async () => {
+        const executionManagerAddress = await httpProvider.send(
+          'ovm_getExecutionManagerAddress',
+          []
+        )
+        const wallet = getWallet(httpProvider)
+        const simpleStorage = await deploySimpleStorage(wallet)
+        await setAndGetStorage(
+          simpleStorage,
+          httpProvider,
+          executionManagerAddress
+        )
+
+        const block = await httpProvider.getBlock('latest', false)
+        hexStrToBuf(block.transactions[0]).length.should.eq(32)
+      })
     })
 
     describe('the getBlockByHash endpoint', () => {