Created verification folder

packages/contracts/contracts/optimistic-ethereum/OVM/chain/OVM_StateCommitmentChain.sol

@@ -9,9 +9,9 @@ import { Proxy_Resolver } from "../../proxy/Proxy_Resolver.sol";
 import { Lib_OVMCodec } from "../../libraries/codec/Lib_OVMCodec.sol";
 
 /* Interface Imports */
+import { iOVM_FraudVerifier } from "../../iOVM/verification/iOVM_FraudVerifier.sol";
 import { iOVM_StateCommitmentChain } from "../../iOVM/chain/iOVM_StateCommitmentChain.sol";
 import { iOVM_CanonicalTransactionChain } from "../../iOVM/chain/iOVM_CanonicalTransactionChain.sol";
-import { iOVM_FraudVerifier } from "../../iOVM/execution/iOVM_FraudVerifier.sol";
 
 /* Contract Imports */
 import { OVM_BaseChain } from "./OVM_BaseChain.sol";

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

@@ -9,10 +9,10 @@ import { Proxy_Resolver } from "../../proxy/Proxy_Resolver.sol";
 import { Lib_OVMCodec } from "../../libraries/codec/Lib_OVMCodec.sol";
 
 /* Interface Imports */
-import { iOVM_FraudVerifier } from "../../iOVM/execution/iOVM_FraudVerifier.sol";
+import { iOVM_FraudVerifier } from "../../iOVM/verification/iOVM_FraudVerifier.sol";
+import { iOVM_StateTransitioner } from "../../iOVM/verification/iOVM_StateTransitioner.sol";
+import { iOVM_StateTransitionerFactory } from "../../iOVM/verification/iOVM_StateTransitionerFactory.sol";
 import { iOVM_ExecutionManager } from "../../iOVM/execution/iOVM_ExecutionManager.sol";
-import { iOVM_StateTransitioner } from "../../iOVM/execution/iOVM_StateTransitioner.sol";
-import { iOVM_StateTransitionerFactory } from "../../iOVM/execution/iOVM_StateTransitionerFactory.sol";
 import { iOVM_StateManagerFactory } from "../../iOVM/execution/iOVM_StateManagerFactory.sol";
 import { iOVM_StateCommitmentChain } from "../../iOVM/chain/iOVM_StateCommitmentChain.sol";
 import { iOVM_CanonicalTransactionChain } from "../../iOVM/chain/iOVM_CanonicalTransactionChain.sol";

packages/contracts/contracts/optimistic-ethereum/OVM/execution/OVM_StateTransitioner.sol → packages/contracts/contracts/optimistic-ethereum/OVM/verification/OVM_StateTransitioner.sol

@@ -11,10 +11,10 @@ import { Lib_EthUtils } from "../../libraries/utils/Lib_EthUtils.sol";
 import { Lib_EthMerkleTrie } from "../../libraries/trie/Lib_EthMerkleTrie.sol";
 
 /* Interface Imports */
+import { iOVM_StateTransitioner } from "../../iOVM/verification/iOVM_StateTransitioner.sol";
 import { iOVM_ExecutionManager } from "../../iOVM/execution/iOVM_ExecutionManager.sol";
 import { iOVM_StateManager } from "../../iOVM/execution/iOVM_StateManager.sol";
 import { iOVM_StateManagerFactory } from "../../iOVM/execution/iOVM_StateManagerFactory.sol";
-import { iOVM_StateTransitioner } from "../../iOVM/execution/iOVM_StateTransitioner.sol";
 
 /**
  * @title OVM_StateTransitioner

packages/contracts/contracts/optimistic-ethereum/OVM/execution/OVM_StateTransitionerFactory.sol → packages/contracts/contracts/optimistic-ethereum/OVM/verification/OVM_StateTransitionerFactory.sol

@@ -2,8 +2,8 @@
 pragma solidity ^0.7.0;
 
 /* Interface Imports */
-import { iOVM_StateTransitioner } from "../../iOVM/execution/iOVM_StateTransitioner.sol";
-import { iOVM_StateTransitionerFactory } from "../../iOVM/execution/iOVM_StateTransitionerFactory.sol";
+import { iOVM_StateTransitioner } from "../../iOVM/verification/iOVM_StateTransitioner.sol";
+import { iOVM_StateTransitionerFactory } from "../../iOVM/verification/iOVM_StateTransitionerFactory.sol";
 
 /* Contract Imports */
 import { OVM_StateTransitioner } from "./OVM_StateTransitioner.sol";

packages/contracts/test/helpers/proxy/proxy-manager.ts

@@ -2,27 +2,6 @@
 import { ethers } from '@nomiclabs/buidler'
 import { Contract } from 'ethers'
 
-const getLibraryConfig = (ProxyManager: Contract): any => {
-  return [
-    {
-      name: 'Lib_ByteUtils',
-      params: []
-    },
-    {
-      name: 'Lib_EthUtils',
-      params: [ProxyManager.address]
-    },
-    {
-      name: 'Lib_RLPReader',
-      params: []
-    },
-    {
-      name: 'Lib_RLPWriter',
-      params: []
-    }
-  ]
-}
-
 export const makeProxies = async (
   Proxy_Manager: Contract,
   names: string[]
@@ -61,34 +40,7 @@ export const setProxyTarget = async (
 }
 
 export const getProxyManager = async (): Promise<Contract> => {
-  const Factory__Proxy_Manager = await ethers.getContractFactory(
+  return (await ethers.getContractFactory(
     'Proxy_Manager'
-  )
-
-  const Proxy_Manager = await Factory__Proxy_Manager.deploy()
-
-  const libraryConfig = getLibraryConfig(Proxy_Manager)
-
-  await makeProxies(
-    Proxy_Manager,
-    libraryConfig.map((config) => {
-      return config.name
-    })
-  )
-
-  for (const config of libraryConfig) {
-    const Factory__Lib_Contract = await ethers.getContractFactory(
-      config.name
-    )
-    const Lib_Contract = await Factory__Lib_Contract.deploy(
-      ...config.params
-    )
-
-    await Proxy_Manager.setTarget(
-      config.name,
-      Lib_Contract.address
-    )
-  }
-
-  return Proxy_Manager
+  )).deploy()
 }