Skip to content

improve(buildSampleTree): Make script more customizable #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 8, 2022
Merged

improve(buildSampleTree): Make script more customizable #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea1c15d
improve(buildSampleTree): Make script more customizable
nicholaspai Mar 4, 2022
4e96869
Merge branch 'master' of https://github.com/across-protocol/contracts…
nicholaspai Mar 7, 2022
84dd079
nice
nicholaspai Mar 7, 2022
3b90507
Create setupOptimismSpokePool.ts
nicholaspai Mar 8, 2022
b455123
redeploy
nicholaspai Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions deploy/002_deploy_optimism_adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ import { L1_ADDRESS_MAP } from "./consts";

const func = async function (hre: any) {
const { deployments, getNamedAccounts, getChainId } = hre;
const { deploy, get } = deployments;
const { deploy } = deployments;

const { deployer } = await getNamedAccounts();

const hubPoolAddress = (await get("HubPool")).address;

const chainId = await getChainId();

await deploy("Optimism_Adapter", {
Expand All @@ -19,7 +17,6 @@ const func = async function (hre: any) {
skipIfAlreadyDeployed: true,
args: [
L1_ADDRESS_MAP[chainId].weth,
hubPoolAddress,
L1_ADDRESS_MAP[chainId].optimismCrossDomainMessenger,
L1_ADDRESS_MAP[chainId].optimismStandardBridge,
],
Expand Down
4 changes: 1 addition & 3 deletions deploy/003_deploy_optimism_spokepool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ const func = async function (hre: any) {

// Grab L1 addresses:
const { deployments: l1Deployments } = companionNetworks.l1;
const adapter = await l1Deployments.get("Optimism_Adapter");
console.log(`Using l1 adapter @ ${adapter.address}`);
const hubPool = await l1Deployments.get("HubPool");
console.log(`Using l1 hub pool @ ${hubPool.address}`);

Expand All @@ -16,7 +14,7 @@ const func = async function (hre: any) {
log: true,
skipIfAlreadyDeployed: true,
args: [
adapter.address, // Set adapter as cross domain admin
hubPool.address, // Set hub pool as cross domain admin since it delegatecalls the Optimism_Adapter logic.
hubPool.address,
"0x0000000000000000000000000000000000000000",
],
Expand Down
6 changes: 2 additions & 4 deletions deploy/004_deploy_arbitrum_adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,17 @@ import { L1_ADDRESS_MAP } from "./consts";

const func = async function (hre: any) {
const { deployments, getNamedAccounts, getChainId } = hre;
const { deploy, get } = deployments;
const { deploy } = deployments;

const { deployer } = await getNamedAccounts();

const hubPoolAddress = (await get("HubPool")).address;

const chainId = await getChainId();

await deploy("Arbitrum_Adapter", {
from: deployer,
log: true,
skipIfAlreadyDeployed: true,
args: [hubPoolAddress, L1_ADDRESS_MAP[chainId].l1ArbitrumInbox, L1_ADDRESS_MAP[chainId].l1ERC20Gateway],
args: [L1_ADDRESS_MAP[chainId].l1ArbitrumInbox, L1_ADDRESS_MAP[chainId].l1ERC20Gateway],
});
};

Expand Down
6 changes: 2 additions & 4 deletions deploy/005_deploy_arbitrum_spokepool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ const func = async function (hre: any) {

// Grab L1 addresses:
const { deployments: l1Deployments } = companionNetworks.l1;
const adapter = await l1Deployments.get("Arbitrum_Adapter");
console.log(`Using l1 adapter @ ${adapter.address}`);
const hubPool = await l1Deployments.get("HubPool");
console.log(`Using l1 hub pool @ ${hubPool.address}`);

Expand All @@ -20,8 +18,8 @@ const func = async function (hre: any) {
log: true,
skipIfAlreadyDeployed: true,
args: [
L2_ADDRESS_MAP[chainId].l2GatewayRouter, //_l2GatewayRouter
adapter.address, // Set adapter as cross domain admin
L2_ADDRESS_MAP[chainId].l2GatewayRouter, // _l2GatewayRouter
hubPool.address, // Set hub pool as cross domain admin since it delegatecalls the Optimism_Adapter logic.
hubPool.address,
L2_ADDRESS_MAP[chainId].l2Weth, // l2Weth
"0x0000000000000000000000000000000000000000",
Expand Down
6 changes: 2 additions & 4 deletions deploy/006_deploy_ethereum_adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
const func = async function (hre: any) {
const { deployments, getNamedAccounts } = hre;
const { deploy, get } = deployments;
const { deploy } = deployments;

const { deployer } = await getNamedAccounts();

const hubPoolAddress = (await get("HubPool")).address;

await deploy("Ethereum_Adapter", {
from: deployer,
log: true,
skipIfAlreadyDeployed: true,
args: [hubPoolAddress],
args: [],
});
};

Expand Down
210 changes: 40 additions & 170 deletions deployments/kovan/Ethereum_Adapter.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading