Added changes to make state transitioner work (#91)

ethereum-optimism · Dec 3, 2020 · 3273df8 · 3273df8
1 parent d824abc
commit 3273df8
Show file tree

Hide file tree

Showing 7 changed files with 412 additions and 485 deletions.
diff --git a/packages/contracts/contracts/optimistic-ethereum/OVM/verification/OVM_StateTransitioner.sol b/packages/contracts/contracts/optimistic-ethereum/OVM/verification/OVM_StateTransitioner.sol
@@ -7,6 +7,8 @@ import { Lib_OVMCodec } from "../../libraries/codec/Lib_OVMCodec.sol";
 import { Lib_AddressResolver } from "../../libraries/resolver/Lib_AddressResolver.sol";
 import { Lib_EthUtils } from "../../libraries/utils/Lib_EthUtils.sol";
 import { Lib_SecureMerkleTrie } from "../../libraries/trie/Lib_SecureMerkleTrie.sol";
+import { Lib_RLPWriter } from "../../libraries/rlp/Lib_RLPWriter.sol";
+import { Lib_RLPReader } from "../../libraries/rlp/Lib_RLPReader.sol";
 
 /* Interface Imports */
 import { iOVM_StateTransitioner } from "../../iOVM/verification/iOVM_StateTransitioner.sol";
@@ -266,13 +268,15 @@ contract OVM_StateTransitioner is Lib_AddressResolver, OVM_FraudContributor, iOV
 
         (
             bool exists,
-            bytes memory value
+            bytes memory encodedValue
         ) = Lib_SecureMerkleTrie.get(
             abi.encodePacked(_key),
             _storageTrieWitness,
             ovmStateManager.getAccountStorageRoot(_ovmContractAddress)
         );
 
+        bytes memory value = Lib_RLPReader.readBytes(encodedValue);
+
         if (exists == true) {
             require(
                 keccak256(value) == keccak256(abi.encodePacked(_value)),
@@ -393,7 +397,9 @@ contract OVM_StateTransitioner is Lib_AddressResolver, OVM_FraudContributor, iOV
 
         account.storageRoot = Lib_SecureMerkleTrie.update(
             abi.encodePacked(_key),
-            abi.encodePacked(value),
+            Lib_RLPWriter.writeBytes(
+                abi.encodePacked(value)
+            ),
             _storageTrieWitness,
             account.storageRoot
         );

diff --git a/packages/contracts/test/bond.ts b/packages/contracts/test/bond.ts
@@ -302,11 +302,7 @@ describe('BondManager', () => {
 
         // a dispute is created about a block that intersects
         const disputeTimestamp = withdrawalTimestamp - 100
-        await fraudVerifier.finalize(
-          preStateRoot,
-          sender,
-          disputeTimestamp
-        )
+        await fraudVerifier.finalize(preStateRoot, sender, disputeTimestamp)
 
         await mineBlock(deployer.provider, timestamp)
         await expect(bondManager.finalizeWithdrawal()).to.be.revertedWith(
@@ -321,11 +317,7 @@ describe('BondManager', () => {
         // a dispute is created, but since the fraud period is already over
         // it doesn't matter
         const disputeTimestamp = withdrawalTimestamp - ONE_WEEK - 1
-        await fraudVerifier.finalize(
-          preStateRoot,
-          sender,
-          disputeTimestamp
-        )
+        await fraudVerifier.finalize(preStateRoot, sender, disputeTimestamp)
 
         const finalizeWithdrawalTimestamp = withdrawalTimestamp + ONE_WEEK
         await mineBlock(deployer.provider, finalizeWithdrawalTimestamp)

diff --git a/packages/contracts/test/contracts/OVM/accounts/OVM_ECDSAContractAccount.spec.ts b/packages/contracts/test/contracts/OVM/accounts/OVM_ECDSAContractAccount.spec.ts
@@ -214,7 +214,7 @@ describe('OVM_ECDSAContractAccount', () => {
     it(`should revert on incorrect chainId`, async () => {
       const alteredChainIdTx = {
         ...DEFAULT_EIP155_TX,
-        chainId : 421
+        chainId: 421,
       }
       const message = serializeNativeTransaction(alteredChainIdTx)
       const sig = await signNativeTransaction(wallet, alteredChainIdTx)