Skip to content

Commit

Permalink
Merge branch 'feat/adding-bridge-settings' of https://github.com/arag…
Browse files Browse the repository at this point in the history
…on/taiko-contracts into feat/adding-bridge-settings
  • Loading branch information
carlosgj94 committed Mar 22, 2024
2 parents 6282200 + eeb6515 commit 9ada900
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
7 changes: 3 additions & 4 deletions src/L2VetoAggregation.sol
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,12 @@ contract L2VetoAggregation is NonblockingLzApp {
bridgeSettings = _bridgeSettings;
__LzApp_init(bridgeSettings.bridge);

bytes memory remoteAndLocalAddresses = abi.encodePacked(
_bridgeSettings.l1Plugin,
address(this)
bytes memory remoteAddresses = abi.encodePacked(
_bridgeSettings.l1Plugin
);
setTrustedRemoteAddress(
_bridgeSettings.chainId,
remoteAndLocalAddresses
remoteAddresses
);
}

Expand Down
7 changes: 3 additions & 4 deletions src/OptimisticTokenVotingPlugin.sol
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,12 @@ contract OptimisticTokenVotingPlugin is
_updateOptimisticGovernanceSettings(_governanceSettings);

__LzApp_init(bridgeSettings.bridge);
bytes memory remoteAndLocalAddresses = abi.encodePacked(
_bridgeSettings.l2VotingAggregator,
address(this)
bytes memory remoteAddresses = abi.encodePacked(
_bridgeSettings.l2VotingAggregator
);
setTrustedRemoteAddress(
_bridgeSettings.chainId,
remoteAndLocalAddresses
remoteAddresses
);

emit MembershipContractAnnounced({definingContract: address(_token)});
Expand Down

0 comments on commit 9ada900

Please sign in to comment.