-
Notifications
You must be signed in to change notification settings - Fork 167
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.
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
feat: remove all references to L1Network #453
Merged
Merged
Changes from 47 commits
Commits
Show all changes
54 commits
Select commit
Hold shift + click to select a range
4ce32a7
add parent chain property
spsjvc 90bdd4a
replace partner with parent chain id
spsjvc 19696c7
fix
spsjvc 7324182
format
spsjvc 98f3dac
make retryableLifetimeSeconds optional
spsjvc 4d20f80
remove explorerUrl
spsjvc 41627d3
rm import
spsjvc 4515489
remove nitro genesis l1 block
spsjvc b385dc3
remove deposit timeout
spsjvc 416ba67
revert stuff
spsjvc 100d7bf
revert more stuff
spsjvc 54308bc
oops
spsjvc 8ec5b12
use constants
spsjvc 710eb39
all the things
spsjvc 5d819d5
rm nitroGenesisBlock
spsjvc a5f7b1e
more stuff
spsjvc a40c701
reduce diff
spsjvc fe6989b
unused import
spsjvc c92086f
clean up
spsjvc f37e6c7
clean up
spsjvc 820a2b6
Merge branch 'v4' into feat-networks-change
spsjvc 07607c2
remove partnerChainIDs
spsjvc 7f87db2
add tests for getChildrenForNetwork and export
spsjvc 8bb58a5
fix
spsjvc fc76db8
add tests for isParentChain
spsjvc 142aa26
rename
spsjvc 408eeae
fix
spsjvc dd6489f
blah
spsjvc 5c768ee
Merge branch 'v4' into feat-networks-change-2
spsjvc 7fd7085
kill getL1Network
spsjvc 0201908
remove parent chain references
spsjvc 2a7c913
try
spsjvc 2b77f09
rm blockTime
spsjvc c356de7
rm addNetwork
spsjvc 4c4f3fa
sigh
spsjvc 75348df
add getMulticall
spsjvc 3e08de6
remove more l1Network stuff
spsjvc ed308fb
remove more stuff
spsjvc 48ec04c
rm more
spsjvc 88da0a4
more
spsjvc 5817677
better docs
spsjvc 42b910d
clean up tests
spsjvc 73924be
comment
spsjvc 410e55e
refactor: add function to get multicall address
spsjvc f8891e6
Merge branch 'feat-networks-change-2.1' into feat-networks-change-3
spsjvc e723915
will this work
spsjvc 88569d4
Merge branch 'v4' into feat-networks-change-3
spsjvc 2a64f99
fix
spsjvc be1f4f2
cleanups
spsjvc bd5bce7
lol
spsjvc cfe11da
type safe backwards compat
spsjvc c8b9a44
fix lint
spsjvc e5bc74c
fix
spsjvc 2f080da
move type
spsjvc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,11 +21,7 @@ import { constants } from 'ethers' | |
import { ParentContractTransaction } from '../message/ParentTransaction' | ||
import { ChildContractTransaction } from '../message/ChildTransaction' | ||
|
||
import { | ||
L1Network, | ||
ArbitrumNetwork, | ||
getParentForNetwork, | ||
} from '../dataEntities/networks' | ||
import { ArbitrumNetwork } from '../dataEntities/networks' | ||
import { | ||
SignerOrProvider, | ||
SignerProviderUtils, | ||
|
@@ -35,11 +31,6 @@ import { | |
* Base for bridging assets from parent-to-child and back | ||
*/ | ||
export abstract class AssetBridger<DepositParams, WithdrawParams> { | ||
/** | ||
* Parent chain for the given Arbitrum chain, can be an L1 or an L2 | ||
*/ | ||
public readonly parentChain: L1Network | ArbitrumNetwork | ||
|
||
/** | ||
* In case of a chain that uses ETH as its native/gas token, this is either `undefined` or the zero address | ||
* | ||
|
@@ -48,7 +39,6 @@ export abstract class AssetBridger<DepositParams, WithdrawParams> { | |
public readonly nativeToken?: string | ||
|
||
public constructor(public readonly childChain: ArbitrumNetwork) { | ||
this.parentChain = getParentForNetwork(childChain) | ||
this.nativeToken = childChain.nativeToken | ||
} | ||
|
||
|
@@ -57,7 +47,10 @@ export abstract class AssetBridger<DepositParams, WithdrawParams> { | |
* @param sop | ||
*/ | ||
protected async checkParentChain(sop: SignerOrProvider): Promise<void> { | ||
await SignerProviderUtils.checkNetworkMatches(sop, this.parentChain.chainID) | ||
await SignerProviderUtils.checkNetworkMatches( | ||
sop, | ||
this.childChain.parentChainId | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removed the parent chain reference, but we only need the chain id anyway |
||
) | ||
} | ||
|
||
/** | ||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got rid of
l1Network
, and validate thel2Network
by callinggetL2Network