From a813564d8370a3f72e553a666dfc39dfdc23a736 Mon Sep 17 00:00:00 2001 From: Andreas Bigger Date: Mon, 26 Jun 2023 15:30:58 -0400 Subject: [PATCH] Remove contract defs utils --- packages/contracts-bedrock/src/index.ts | 1 - packages/{contracts-bedrock => sdk}/src/contract-defs.ts | 0 packages/sdk/src/index.ts | 1 + packages/sdk/tasks/deposit-erc20.ts | 6 ++---- packages/sdk/tasks/deposit-eth.ts | 6 ++---- 5 files changed, 5 insertions(+), 9 deletions(-) rename packages/{contracts-bedrock => sdk}/src/contract-defs.ts (100%) diff --git a/packages/contracts-bedrock/src/index.ts b/packages/contracts-bedrock/src/index.ts index 6cba13dfe589..f87cf0102a14 100644 --- a/packages/contracts-bedrock/src/index.ts +++ b/packages/contracts-bedrock/src/index.ts @@ -1,2 +1 @@ export * from './constants' -export * from './contract-defs' diff --git a/packages/contracts-bedrock/src/contract-defs.ts b/packages/sdk/src/contract-defs.ts similarity index 100% rename from packages/contracts-bedrock/src/contract-defs.ts rename to packages/sdk/src/contract-defs.ts diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts index aeceec8a2264..f9d7a477d6b0 100644 --- a/packages/sdk/src/index.ts +++ b/packages/sdk/src/index.ts @@ -3,3 +3,4 @@ export * from './utils' export * from './cross-chain-messenger' export * from './adapters' export * from './l2-provider' +export * from './contract-defs' diff --git a/packages/sdk/tasks/deposit-erc20.ts b/packages/sdk/tasks/deposit-erc20.ts index 0e2de64c8512..62da8ef37bc7 100644 --- a/packages/sdk/tasks/deposit-erc20.ts +++ b/packages/sdk/tasks/deposit-erc20.ts @@ -5,15 +5,13 @@ import { HardhatRuntimeEnvironment } from 'hardhat/types' import '@nomiclabs/hardhat-ethers' import 'hardhat-deploy' import { Event, Contract, Wallet, providers, utils } from 'ethers' -import { - predeploys, - getContractDefinition, -} from '@eth-optimism/contracts-bedrock' +import { predeploys } from '@eth-optimism/contracts-bedrock' import { sleep } from '@eth-optimism/core-utils' import { CrossChainMessenger, MessageStatus, + getContractDefinition, CONTRACT_ADDRESSES, OEContractsLike, DEFAULT_L2_CONTRACT_ADDRESSES, diff --git a/packages/sdk/tasks/deposit-eth.ts b/packages/sdk/tasks/deposit-eth.ts index 4e70ca62684c..4c511f0cdf76 100644 --- a/packages/sdk/tasks/deposit-eth.ts +++ b/packages/sdk/tasks/deposit-eth.ts @@ -4,15 +4,13 @@ import { task, types } from 'hardhat/config' import '@nomiclabs/hardhat-ethers' import 'hardhat-deploy' import { Deployment } from 'hardhat-deploy/types' -import { - predeploys, - getContractDefinition, -} from '@eth-optimism/contracts-bedrock' +import { predeploys } from '@eth-optimism/contracts-bedrock' import { providers, utils, ethers } from 'ethers' import { CrossChainMessenger, MessageStatus, + getContractDefinition, CONTRACT_ADDRESSES, OEContractsLike, DEFAULT_L2_CONTRACT_ADDRESSES,