Skip to content

fix: mainnet re-deployment #161

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 14 commits into from
May 24, 2022
Merged

fix: mainnet re-deployment #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d93bb8e
WIP
chrismaree May 21, 2022
ab52ba7
Merge branch 'master' into chrismaree/mainnet-re-deploy
chrismaree May 21, 2022
8df8f03
wip
chrismaree May 21, 2022
be00157
wip
chrismaree May 21, 2022
aa0a6e1
correct deployments
mrice32 May 23, 2022
1622e7e
wip
chrismaree May 23, 2022
09ea504
Merge branch 'chrismaree/mainnet-re-deploy' of github.com:across-prot…
chrismaree May 23, 2022
fa345d8
fix tests
chrismaree May 23, 2022
80b4842
Update README.md
mrice32 May 23, 2022
4ccf86f
fix: address param ordering issue
chrismaree May 23, 2022
caef6f8
Merge branch 'chrismaree/fix-boba' into chrismaree/mainnet-re-deploy
chrismaree May 23, 2022
5c236c4
update boba
chrismaree May 23, 2022
09a121f
wip
chrismaree May 24, 2022
7678055
wip
chrismaree May 24, 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
4 changes: 2 additions & 2 deletions contracts/Boba_SpokePool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ contract Boba_SpokePool is Ovm_SpokePool {
Ovm_SpokePool(
_crossDomainAdmin,
_hubPool,
timerAddress,
0x4200000000000000000000000000000000000006,
0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000
0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000,
timerAddress
)
{}
}
2 changes: 1 addition & 1 deletion contracts/HubPool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ contract HubPool is HubPoolInterface, Testable, Lockable, MultiCaller, Ownable {
uint32 public liveness = 7200;

// When root bundles are disputed a price request is enqueued with the DVM to resolve the resolution.
bytes32 public identifier = "IS_ACROSS_V2_BUNDLE_VALID";
bytes32 public identifier = "ACROSS-V2";

// Interest rate payment that scales the amount of pending fees per second paid to LPs. 0.0000015e18 will pay out
// the full amount of fees entitled to LPs in ~ 7.72 days assuming no contract interactions. If someone interacts
Expand Down
1 change: 0 additions & 1 deletion deploy/005_deploy_arbitrum_spokepool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,4 @@ const func = async function (hre: HardhatRuntimeEnvironment) {
});
};
module.exports = func;
func.dependencies = ["HubPool"];
func.tags = ["ArbitrumSpokePool", "arbitrum"];
16 changes: 8 additions & 8 deletions deployments/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
| Contract Name | Address |
| ------------------- | --------------------------------------------------------------------------------------------------------------------- |
| LPTokenFactory | [0x7dB69eb9F52eD773E9b03f5068A1ea0275b2fD9d](https://etherscan.io/address/0x7dB69eb9F52eD773E9b03f5068A1ea0275b2fD9d) |
| HubPool | [0x6Bb9910c5529Cb3b32c4f0e13E8bC38F903b2534](https://etherscan.io/address/0x6Bb9910c5529Cb3b32c4f0e13E8bC38F903b2534) |
| HubPool | [0xc186fA914353c44b2E33eBE05f21846F1048bEda](https://etherscan.io/address/0xc186fA914353c44b2E33eBE05f21846F1048bEda) |
| Optimism_Adapter | [0x22eD83A9eE26236486F57cE8385A247E5bFB71fF](https://etherscan.io/address/0x22eD83A9eE26236486F57cE8385A247E5bFB71fF) |
| Boba_Adapter | [0x33B0Ec794c15D6Cc705818E70d4CaCe7bCfB5Af3](https://etherscan.io/address/0x33B0Ec794c15D6Cc705818E70d4CaCe7bCfB5Af3) |
| Arbitrum_Adapter | [0x937958992799bF4A9a656E6596FD10d7Da5c2216](https://etherscan.io/address/0x937958992799bF4A9a656E6596FD10d7Da5c2216) |
| Ethereum_Adapter | [0x527E872a5c3f0C7c24Fe33F2593cFB890a285084](https://etherscan.io/address/0x527E872a5c3f0C7c24Fe33F2593cFB890a285084) |
| Ethereum_SpokePool | [0x931A43528779034ac9eb77df799d133557406176](https://etherscan.io/address/0x931A43528779034ac9eb77df799d133557406176) |
| Ethereum_SpokePool | [0x4D9079Bb4165aeb4084c526a32695dCfd2F77381](https://etherscan.io/address/0x4D9079Bb4165aeb4084c526a32695dCfd2F77381) |
| PolygonTokenBridger | [0x48d990AbDA20afa1fD1da713AbC041B60a922c65](https://etherscan.io/address/0x48d990AbDA20afa1fD1da713AbC041B60a922c65) |
| Polygon_Adapter | [0x3E94e8d4316a1eBfb2245E45E6F0B8724094CE1A](https://etherscan.io/address/0x3E94e8d4316a1eBfb2245E45E6F0B8724094CE1A) |
| AcrossConfigStore | [0x3B03509645713718B78951126E0A6de6f10043f5](https://etherscan.io/address/0x3B03509645713718B78951126E0A6de6f10043f5) |
Expand All @@ -19,23 +19,23 @@

| Contract Name | Address |
| ------------------ | -------------------------------------------------------------------------------------------------------------------------------- |
| Optimism_SpokePool | [0x59485d57EEcc4058F7831f46eE83a7078276b4AE](https://optimistic.etherscan.io/address/0x59485d57EEcc4058F7831f46eE83a7078276b4AE) |
| Optimism_SpokePool | [0xa420b2d1c0841415A695b81E5B867BCD07Dff8C9](https://optimistic.etherscan.io/address/0xa420b2d1c0841415A695b81E5B867BCD07Dff8C9) |

## Polygon mainnet(137)

| Contract Name | Address |
| ------------------- | ------------------------------------------------------------------------------------------------------------------------ |
| PolygonTokenBridger | [0x48d990AbDA20afa1fD1da713AbC041B60a922c65](https://polygonscan.com/address/0x48d990AbDA20afa1fD1da713AbC041B60a922c65) |
| Polygon_SpokePool | [0xD3ddAcAe5aFb00F9B9cD36EF0Ed7115d7f0b584c](https://polygonscan.com/address/0xD3ddAcAe5aFb00F9B9cD36EF0Ed7115d7f0b584c) |
| Polygon_SpokePool | [0x69B5c72837769eF1e7C164Abc6515DcFf217F920](https://polygonscan.com/address/0x69B5c72837769eF1e7C164Abc6515DcFf217F920) |

## Boba mainnet (288)

| Contract Name | Address |
| -------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
| Boba_SpokePool | [0x7229405a2f0c550Ce35182EE1658302B65672443](https://blockexplorer.boba.network/address/0x7229405a2f0c550Ce35182EE1658302B65672443/contracts) |
| Contract Name | Address |
| -------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
| Boba_SpokePool | [0xBbc6009fEfFc27ce705322832Cb2068F8C1e0A58](https://blockexplorer.boba.network/address/0xBbc6009fEfFc27ce705322832Cb2068F8C1e0A58) |

## Arbitrum mainnet (42161)

| Contract Name | Address |
| ------------------ | -------------------------------------------------------------------------------------------------------------------- |
| Arbitrum_SpokePool | [0xe1C367e2b576Ac421a9f46C9cC624935730c36aa](https://arbiscan.io/address/0xe1C367e2b576Ac421a9f46C9cC624935730c36aa) |
| Arbitrum_SpokePool | [0xB88690461dDbaB6f04Dfad7df66B7725942FEb9C](https://arbiscan.io/address/0xB88690461dDbaB6f04Dfad7df66B7725942FEb9C) |
92 changes: 46 additions & 46 deletions deployments/arbitrum/Arbitrum_SpokePool.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading