Integrated more tests

packages/contracts/contracts/optimistic-ethereum/OVM/verification/OVM_FraudVerifier.sol

@@ -51,6 +51,29 @@ contract OVM_FraudVerifier is iOVM_FraudVerifier, Proxy_Resolver {
     }
 
 
+    /***************************************
+     * Public Functions: Transition Status *
+     ***************************************/
+
+    /**
+     * Retrieves the state transitioner for a given root.
+     * @param _preStateRoot State root to query a transitioner for.
+     * @return _transitioner Corresponding state transitioner contract.
+     */
+    function getStateTransitioner(
+        bytes32 _preStateRoot
+    )
+        override
+        public
+        view
+        returns (
+            iOVM_StateTransitioner _transitioner
+        )
+    {
+        return transitioners[_preStateRoot];
+    }
+
+
     /****************************************
      * Public Functions: Fraud Verification *
      ****************************************/

packages/contracts/contracts/optimistic-ethereum/iOVM/verification/iOVM_FraudVerifier.sol

@@ -5,11 +5,21 @@ pragma experimental ABIEncoderV2;
 /* Library Imports */
 import { Lib_OVMCodec } from "../../libraries/codec/Lib_OVMCodec.sol";
 
+/* Interface Imports */
+import { iOVM_StateTransitioner } from "./iOVM_StateTransitioner.sol";
+
 /**
  * @title iOVM_FraudVerifier
  */
 interface iOVM_FraudVerifier {
 
+    /***************************************
+     * Public Functions: Transition Status *
+     ***************************************/
+
+    function getStateTransitioner(bytes32 _preStateRoot) external view returns (iOVM_StateTransitioner _transitioner);
+
+
     /****************************************
      * Public Functions: Fraud Verification *
      ****************************************/

packages/contracts/contracts/optimistic-ethereum/libraries/codec/Lib_OVMCodec.sol

@@ -109,7 +109,7 @@ library Lib_OVMCodec {
     function encodeTransaction(
         Transaction memory _transaction
     )
-        public
+        internal
         pure
         returns (
             bytes memory _encoded
@@ -129,7 +129,7 @@ library Lib_OVMCodec {
     function hashTransaction(
         Transaction memory _transaction
     )
-        public
+        internal
         pure
         returns (
             bytes32 _hash

packages/contracts/package.json

@@ -7,7 +7,7 @@
     "build": "yarn run build:contracts",
     "build:contracts": "buidler compile",
     "test": "yarn run test:contracts",
-    "test:contracts": "buidler test \"test/contracts/OVM/chain/OVM_StateCommitmentChain.spec.ts\""
+    "test:contracts": "buidler test \"test/contracts/OVM/verification/OVM_FraudVerifier.spec.ts\""
   },
   "devDependencies": {
     "@nomiclabs/buidler": "^1.4.4",

packages/contracts/test/contracts/OVM/execution/OVM_SafetyChecker.spec.ts

+import { expect } from '../../../setup'
+
+/* External Imports */
+import { ethers } from '@nomiclabs/buidler'
+import { Contract } from 'ethers'
+
+/* Internal Imports */
+import { SAFETY_CHECKER_TEST_JSON } from '../../../helpers'
+
+describe('OVM_SafetyChecker', () => {
+  let OVM_SafetyChecker: Contract
+  before(async () => {
+    const Factory__OVM_SafetyChecker = await ethers.getContractFactory(
+      'OVM_SafetyChecker'
+    )
+
+    OVM_SafetyChecker = await Factory__OVM_SafetyChecker.deploy()
+  })
+
+  describe('isBytecodeSafe()', () => {
+    for (const testName of Object.keys(SAFETY_CHECKER_TEST_JSON)) {
+      const test = SAFETY_CHECKER_TEST_JSON[testName]
+      it(`should correctly classify: ${testName}`, async () => {
+        expect(
+          await OVM_SafetyChecker.isBytecodeSafe(test.in)
+        ).to.equal(test.out)
+      })
+    }
+  })
+})

packages/contracts/test/helpers/data/index.ts

+import { create2Tests } from './json/create2.test.json'
+import { rlpTests } from './json/rlp.test.json'
+import { safetyCheckerTests } from './json/safety-checker.test.json'
+
+export const RLP_TEST_JSON = rlpTests
+export const CREATE2_TEST_JSON = create2Tests
+export const SAFETY_CHECKER_TEST_JSON = safetyCheckerTests
\ No newline at end of file

packages/contracts/test/helpers/data/json/rlp.test.json

+{
+  "source": "https://github.com/ethereum/tests/blob/develop/RLPTests/rlptest.json",
+  "notes": "Removed BigInt test, since ethers does not support integers over 10^16: https://github.com/ethers-io/ethers.js/issues/418",
+  "latestcommit": "b2dcd19973637ac05e17646378dac9cbb2927075",
+  "date": "2020-01-08",
+  "rlpTests": {
+    "emptystring": {
+      "in": "",
+      "out": "0x80"
+    },
+    "bytestring00": {
+      "in": "\u0000",
+      "out": "0x00"
+    },
+    "bytestring01": {
+      "in": "\u0001",
+      "out": "0x01"
+    },
+    "bytestring7F": {
+      "in": "\u007F",
+      "out": "0x7f"
+    },
+    "shortstring": {
+      "in": "dog",
+      "out": "0x83646f67"
+    },
+    "shortstring2": {
+      "in": "Lorem ipsum dolor sit amet, consectetur adipisicing eli",
+      "out": "0xb74c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e7365637465747572206164697069736963696e6720656c69"
+    },
+    "longstring": {
+      "in": "Lorem ipsum dolor sit amet, consectetur adipisicing elit",
+      "out": "0xb8384c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e7365637465747572206164697069736963696e6720656c6974"
+    },
+    "longstring2": {
+    "in": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur mauris magna, suscipit sed vehicula non, iaculis faucibus tortor. Proin suscipit ultricies malesuada. Duis tortor elit, dictum quis tristique eu, ultrices at risus. Morbi a est imperdiet mi ullamcorper aliquet suscipit nec lorem. Aenean quis leo mollis, vulputate elit varius, consequat enim. Nulla ultrices turpis justo, et posuere urna consectetur nec. Proin non convallis metus. Donec tempor ipsum in mauris congue sollicitudin. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Suspendisse convallis sem vel massa faucibus, eget lacinia lacus tempor. Nulla quis ultricies purus. Proin auctor rhoncus nibh condimentum mollis. Aliquam consequat enim at metus luctus, a eleifend purus egestas. Curabitur at nibh metus. Nam bibendum, neque at auctor tristique, lorem libero aliquet arcu, non interdum tellus lectus sit amet eros. Cras rhoncus, metus ac ornare cursus, dolor justo ultrices metus, at ullamcorper volutpat",
+      "out": "0xb904004c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e73656374657475722061646970697363696e6720656c69742e20437572616269747572206d6175726973206d61676e612c20737573636970697420736564207665686963756c61206e6f6e2c20696163756c697320666175636962757320746f72746f722e2050726f696e20737573636970697420756c74726963696573206d616c6573756164612e204475697320746f72746f7220656c69742c2064696374756d2071756973207472697374697175652065752c20756c7472696365732061742072697375732e204d6f72626920612065737420696d70657264696574206d6920756c6c616d636f7270657220616c6971756574207375736369706974206e6563206c6f72656d2e2041656e65616e2071756973206c656f206d6f6c6c69732c2076756c70757461746520656c6974207661726975732c20636f6e73657175617420656e696d2e204e756c6c6120756c74726963657320747572706973206a7573746f2c20657420706f73756572652075726e6120636f6e7365637465747572206e65632e2050726f696e206e6f6e20636f6e76616c6c6973206d657475732e20446f6e65632074656d706f7220697073756d20696e206d617572697320636f6e67756520736f6c6c696369747564696e2e20566573746962756c756d20616e746520697073756d207072696d697320696e206661756369627573206f726369206c756374757320657420756c74726963657320706f737565726520637562696c69612043757261653b2053757370656e646973736520636f6e76616c6c69732073656d2076656c206d617373612066617563696275732c2065676574206c6163696e6961206c616375732074656d706f722e204e756c6c61207175697320756c747269636965732070757275732e2050726f696e20617563746f722072686f6e637573206e69626820636f6e64696d656e74756d206d6f6c6c69732e20416c697175616d20636f6e73657175617420656e696d206174206d65747573206c75637475732c206120656c656966656e6420707572757320656765737461732e20437572616269747572206174206e696268206d657475732e204e616d20626962656e64756d2c206e6571756520617420617563746f72207472697374697175652c206c6f72656d206c696265726f20616c697175657420617263752c206e6f6e20696e74657264756d2074656c6c7573206c65637475732073697420616d65742065726f732e20437261732072686f6e6375732c206d65747573206163206f726e617265206375727375732c20646f6c6f72206a7573746f20756c747269636573206d657475732c20617420756c6c616d636f7270657220766f6c7574706174"
+    },
+    "zero": {
+      "in": 0,
+      "out": "0x80"
+    },
+    "smallint": {
+      "in": 1,
+      "out": "0x01"
+    },
+    "smallint2": {
+      "in": 16,
+      "out": "0x10"
+    },
+    "smallint3": {
+      "in": 79,
+      "out": "0x4f"
+    },
+    "smallint4": {
+      "in": 127,
+      "out": "0x7f"
+    },
+    "mediumint1": {
+      "in": 128,
+      "out": "0x8180"
+    },
+    "mediumint2": {
+      "in": 1000,
+      "out": "0x8203e8"
+    },
+    "mediumint3": {
+      "in": 100000,
+      "out": "0x830186a0"
+    },
+    "mediumint4": {
+      "in": "#83729609699884896815286331701780722",
+      "out": "0x8f102030405060708090a0b0c0d0e0f2"
+    },
+    "mediumint5": {
+      "in": "#105315505618206987246253880190783558935785933862974822347068935681",
+      "out": "0x9c0100020003000400050006000700080009000a000b000c000d000e01"
+    },
+    "emptylist": {
+      "in": [],
+      "out": "0xc0"
+    },
+    "stringlist": {
+      "in": [ "dog", "god", "cat" ],
+      "out": "0xcc83646f6783676f6483636174"
+    },
+    "multilist": {
+      "in": [ "zw", [ 4 ], 1 ],
+      "out": "0xc6827a77c10401"
+    },
+    "shortListMax1": {
+      "in": [ "asdf", "qwer", "zxcv", "asdf","qwer", "zxcv", "asdf", "qwer", "zxcv", "asdf", "qwer"],
+      "out": "0xf784617364668471776572847a78637684617364668471776572847a78637684617364668471776572847a78637684617364668471776572"
+    },
+    "longList1" : {
+      "in" : [
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"]
+      ],
+      "out": "0xf840cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376"
+    },
+    "longList2" : {
+      "in" : [
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"],
+        ["asdf","qwer","zxcv"]
+      ],
+      "out": "0xf90200cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376"
+    },
+    "listsoflists": {
+      "in": [ [ [], [] ], [] ],
+      "out": "0xc4c2c0c0c0"
+    },
+    "listsoflists2": {
+      "in": [ [], [[]], [ [], [[]] ] ],
+      "out": "0xc7c0c1c0c3c0c1c0"
+    },
+    "dictTest1" : {
+      "in" : [
+        ["key1", "val1"],
+        ["key2", "val2"],
+        ["key3", "val3"],
+        ["key4", "val4"]
+      ],
+      "out" : "0xecca846b6579318476616c31ca846b6579328476616c32ca846b6579338476616c33ca846b6579348476616c34"
+    }
+  }
+}

packages/contracts/test/helpers/index.ts

@@ -6,3 +6,4 @@ export * from './mocks'
 export * from './buffer-utils'
 export * from './byte-utils'
 export * from './codec'
+export * from './data'
\ No newline at end of file