From 37d4adc75094a47aea9078b8af25cdd11f29cd63 Mon Sep 17 00:00:00 2001 From: Kevin Cheng Date: Thu, 21 Mar 2024 13:55:32 -0700 Subject: [PATCH] Fix adam branch (#835) --- deployments/base-sepolia/usdc/deploy.ts | 12 +++++++----- deployments/base-sepolia/usdc/relations.ts | 12 +++++++++++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/deployments/base-sepolia/usdc/deploy.ts b/deployments/base-sepolia/usdc/deploy.ts index 8344dd284..5c1b92552 100644 --- a/deployments/base-sepolia/usdc/deploy.ts +++ b/deployments/base-sepolia/usdc/deploy.ts @@ -1,5 +1,5 @@ import { Deployed, DeploymentManager } from '../../../plugins/deployment_manager'; -import { DeploySpec, deployComet } from '../../../src/deploy'; +import { DeploySpec, deployComet, exp } from '../../../src/deploy'; const SECONDS_PER_DAY = 24 * 60 * 60; @@ -27,7 +27,8 @@ async function deployContracts( const cbETH = await deploymentManager.existing( 'cbETH', '0x774eD9EDB0C5202dF9A86183804b5D9E99dC6CA3', - 'base-sepolia' + 'base-sepolia', + 'contracts/ERC20.sol:ERC20' ); const USDC = await deploymentManager.existing( @@ -39,7 +40,8 @@ async function deployContracts( const COMP = await deploymentManager.existing( 'COMP', '0x2f535da74048c0874400f0371Fba20DF983A56e2', - 'base-sepolia' + 'base-sepolia', + 'contracts/ERC20.sol:ERC20' ); const l2CrossDomainMessenger = await deploymentManager.existing( @@ -66,7 +68,7 @@ async function deployContracts( // Deploy ETH / USD SimplePriceFeed const ethToUSDPriceFeed = await deploymentManager.deploy( - 'WETH:simplePriceFeed', + 'WETH:priceFeed', 'test/SimplePriceFeed.sol', [ exp(3477.28, 8), // Latest answer on mainnet at block 19463076 @@ -75,7 +77,7 @@ async function deployContracts( ); const cbethToUSDPriceFeed = await deploymentManager.deploy( - 'cbETH:simplePriceFeed', + 'cbETH:priceFeed', 'test/SimplePriceFeed.sol', [ exp(3477.28, 8), // Latest answer on mainnet at block 19463076 diff --git a/deployments/base-sepolia/usdc/relations.ts b/deployments/base-sepolia/usdc/relations.ts index 5f5760eec..f6010d1ea 100644 --- a/deployments/base-sepolia/usdc/relations.ts +++ b/deployments/base-sepolia/usdc/relations.ts @@ -6,6 +6,16 @@ export default { artifact: 'contracts/bridges/optimism/OptimismBridgeReceiver.sol:OptimismBridgeReceiver' }, + // cbETH + '0x774ed9edb0c5202df9a86183804b5d9e99dc6ca3': { + artifact: 'contracts/ERC20.sol:ERC20', + }, + + // COMP + '0x2f535da74048c0874400f0371fba20df983a56e2': { + artifact: 'contracts/ERC20.sol:ERC20', + }, + l2CrossDomainMessenger: { delegates: { field: { @@ -13,7 +23,7 @@ export default { } } }, - + l2StandardBridge: { delegates: { field: {