diff --git a/.changeset/healthy-otters-yawn.md b/.changeset/healthy-otters-yawn.md new file mode 100644 index 0000000000000..bc98850e581ca --- /dev/null +++ b/.changeset/healthy-otters-yawn.md @@ -0,0 +1,5 @@ +--- +'@eth-optimism/contracts': patch +--- + +Removes outdated functions and constants from the contracts package diff --git a/packages/contracts/src/contract-defs.ts b/packages/contracts/src/contract-defs.ts index 34690b594349c..54e61eb7dcf0e 100644 --- a/packages/contracts/src/contract-defs.ts +++ b/packages/contracts/src/contract-defs.ts @@ -30,31 +30,3 @@ export const getContractFactory = ( signer ) } - -export const loadContract = ( - name: string, - address: string, - provider: ethers.providers.JsonRpcProvider -): ethers.Contract => { - return new ethers.Contract( - address, - getContractInterface(name) as any, - provider - ) -} - -export const loadContractFromManager = async (args: { - name: string - proxy?: string - Lib_AddressManager: ethers.Contract - provider: ethers.providers.JsonRpcProvider -}): Promise => { - const { name, proxy, Lib_AddressManager, provider } = args - const address = await Lib_AddressManager.getAddress(proxy ? proxy : name) - if (address === ethers.constants.AddressZero) { - throw new Error( - `Lib_AddressManager does not have a record for a contract named: ${name}` - ) - } - return loadContract(name, address, provider) -} diff --git a/packages/contracts/test/helpers/constants.ts b/packages/contracts/test/helpers/constants.ts index f8e9f057b7298..381496354128b 100644 --- a/packages/contracts/test/helpers/constants.ts +++ b/packages/contracts/test/helpers/constants.ts @@ -1,7 +1,6 @@ /* External Imports */ import { defaultAccounts } from 'ethereum-waffle' -export const DEFAULT_ACCOUNTS = defaultAccounts export const DEFAULT_ACCOUNTS_HARDHAT = defaultAccounts.map((account) => { return { balance: account.balance, @@ -10,10 +9,8 @@ export const DEFAULT_ACCOUNTS_HARDHAT = defaultAccounts.map((account) => { }) export const RUN_OVM_TEST_GAS = 20_000_000 -export const FORCE_INCLUSION_PERIOD_SECONDS = 600 export const L2_GAS_DISCOUNT_DIVISOR = 32 export const ENQUEUE_GAS_COST = 60_000 -export const FORCE_INCLUSION_PERIOD_BLOCKS = 600 / 12 export const NON_NULL_BYTES32 = '0x1111111111111111111111111111111111111111111111111111111111111111' diff --git a/packages/contracts/test/helpers/trie/trie-test-generator.ts b/packages/contracts/test/helpers/trie/trie-test-generator.ts index e9dcefe6e4e2c..e9eb1dd539357 100644 --- a/packages/contracts/test/helpers/trie/trie-test-generator.ts +++ b/packages/contracts/test/helpers/trie/trie-test-generator.ts @@ -5,23 +5,23 @@ import { SecureTrie, BaseTrie } from 'merkle-patricia-tree' import { fromHexString, toHexString } from '@eth-optimism/core-utils' import { ethers } from 'ethers' -export interface TrieNode { +interface TrieNode { key: string val: string } -export interface InclusionProofTest { +interface InclusionProofTest { key: string val: string proof: string root: string } -export interface NodeUpdateTest extends InclusionProofTest { +interface NodeUpdateTest extends InclusionProofTest { newRoot: string } -export interface EthereumAccount { +interface EthereumAccount { address?: string nonce: number balance: number @@ -30,14 +30,14 @@ export interface EthereumAccount { storage?: TrieNode[] } -export interface AccountProofTest { +interface AccountProofTest { address: string account: EthereumAccount accountTrieWitness: string accountTrieRoot: string } -export interface AccountUpdateTest extends AccountProofTest { +interface AccountUpdateTest extends AccountProofTest { newAccountTrieRoot: string } diff --git a/packages/contracts/test/helpers/utils/eth-time.ts b/packages/contracts/test/helpers/utils/eth-time.ts index 1400dc18a31c7..08aaf4dda9305 100644 --- a/packages/contracts/test/helpers/utils/eth-time.ts +++ b/packages/contracts/test/helpers/utils/eth-time.ts @@ -17,24 +17,10 @@ export const increaseEthTime = async ( await mineBlock(provider) } -export const mineBlock = async ( - provider: any, - timestamp?: number -): Promise => { +const mineBlock = async (provider: any, timestamp?: number): Promise => { await provider.send('evm_mine', timestamp ? [timestamp] : []) } -export const getBlockTime = async ( - provider: any, - block?: number -): Promise => { - await mineBlock(provider) - if (!!block) { - block = await getNextBlockNumber(provider) - } - return (await provider.getBlock(block)).timestamp -} - export const getNextBlockNumber = async (provider: any): Promise => { return (await provider.getBlock('latest')).number + 1 }