Fix Conflicts (#970)

* Adds a new script to connect l2 bridge (#894)

* Adds a new script to connect l2 bridge

* Bugfix on new command

* Skip vsynth prod test (#895)

* Adds a --clean-build flag to the build command (#896)

* Fix lint pre-commit hook (#900)

* Disable etherscan checks in CI (#897)

* Skip vsynth prod test (#902)

* Adds a few options to connect-bridge (#906)

* Adds a few options to connect-bridge

* Fix connect-bridge pks

* Minor fix

* Another minor fix

* Fix

* Logging more output

* Fix

* Fix

* Fixing prod test for vSynth and verifying more rinkeby contracts in etherscan

* remove aggregator feed for BCH prices (#905)

* Prepublish step

* 2.32.2-sip-95-remove-BCH-aggregator

* Prepublish step

* 2.32.3

* Develop - Merge master into develop (#911)

* Address list renamed to address set and make adding elements idempotent. (#917)

* Preparations for L2 Phase C deployment (#901)

* Improved lint pre-commit hook (#918)

* Build circleci config with Mustache (#883)

* L2 Phase C Release (#919)

* Prepublish step

* 2.33.0-ovm

* Updating versions for ovm

* Add circleci paths to prettierignore for pretty-quick (#921)

* Do not ignore dotfiles in js linter (#923)

* reset iETH prices (#922)

* reset iETH prices

* update StakingRewardsiETH address and ABI

* merge master into develop (#926)


* reset iETH prices (#922) and update StakingRewardsiETH address and ABI

Co-authored-by: Alejandro Santander <Palebluedot@gmail.com>
Co-authored-by: justin j. moses <justinjmoses@gmail.com>
Co-authored-by: Synthetix Team <team@synthetix.io>

* Prepublish step

* 2.33.1

* Added dockerhub authetication to circleci (#924)

* Improved connect-bridge script (#928)

* sip99 (#936)

* Prepublish step

* 2.33.2

* sip 98 double swing trade exchange fees (#935)

* update calculation of exchangeFeeRate for swing trades from long <-> short synths without sUSD step

* fix audit findings on missing exchangeFeeRate assignment and update Exchanger tests

* release adhara 2.33.0 adhara (#939)

* release adhara kovan 2.33.0

* release Exchanger 2.33.0 Adhara to mainnet

* Prepublish step

* 2.33.0

* Prepublish step

* 2.34.0

* Version fix for master along with some fork fixes (#941)

* Fixing versions

* merge 2.34.0 release into develop (#940)

* Add 0-debt requirement for withdrawals (#942)

* Deploy bug fix: adding synths (#920)

* Deployed fix for SynthetixBridgeToBase (#945)

* Prepublish step

* 2.34.1-ovm

* reset iSynths (#946)

* Prepublish step

* 2.34.2

* Adding Shaula entry on releases

* Prepublish step

* 2.35.0-ovm

* Disable coverage in ci until its fixed (#950)

* SIP 100 Resolver & cache improvements (#951)

* Connect-bridge command: Check if resolver needs imports and if bridge needs sync separately (#944)

* Prevent withdrawals on a suspended L2 system (#949)

* Prevent withdrawals on a suspended L2 system

* Also mocking SystemStatus on MintableSynthetix tests

Co-authored-by: justin j. moses <justin@synthetix.io>

* Adds a command that deploys an OVM pair of instances on local chains (#954)

* Adding a new command to deploy an ovm instance pair for testing

* Minor lint fix

* Progress detecting unsafe deployments

* More robust OVM safety checks

* First OVM local deploy

* Working

* Predict deploy addresses in L2 deploys

* Tidier output in connect-bridge

* Remove log

* Renamed some L2 functions (#961)

* New command: migrate-bridge (#925)

* Linter fixes

* Migrate bridge cmd uses getVersions

* Get latest bridge version directly from deployments

* Update to develop

* Added SystemSettings.crossDomainMessageGasLimit (#962)

* Added a system setting

* Minor fixes

* Added FlexibleStorage in L2 bridge unit tests

* Updates deploy-ovm-pair cmd to latest optimism-integration (#964)

Co-authored-by: Alejandro Santander <Palebluedot@gmail.com>
Co-authored-by: justin j. moses <justinjmoses@gmail.com>
Co-authored-by: Jackson <jackosmacko@gmail.com>
Co-authored-by: Synthetix Team <team@synthetix.io>
Co-authored-by: Anton Jurisevic <zyzek@users.noreply.github.com>
Co-authored-by: Clinton Ennis <clinton@synthetix.io>
Co-authored-by: justin j. moses <justin@synthetix.io>

contracts/interfaces/ISynthetixBridgeToBase.sol

@@ -5,9 +5,6 @@ import "./IRewardEscrowV2.sol";
 
 
 interface ISynthetixBridgeToBase {
-    // invoked by users on L2
-    function initiateWithdrawal(uint amount) external;
-
     // invoked by the xDomain messenger on L2
     function completeDeposit(
         address account,
@@ -24,4 +21,7 @@ interface ISynthetixBridgeToBase {
         uint256 escrowedAmount,
         VestingEntries.VestingEntry[] calldata vestingEntries
     ) external;
+
+    // invoked by users on L2
+    function initiateWithdrawal(uint amount) external;
 }

contracts/interfaces/ISynthetixBridgeToOptimism.sol

@@ -5,9 +5,9 @@ interface ISynthetixBridgeToOptimism {
     // invoked by the relayer on L1
     function completeWithdrawal(address account, uint amount) external;
 
-    // invoked by users on L1
-    function initiateDeposit(uint amount) external;
-
     // invoked users on L1
     function depositAndMigrateEscrow(uint256 depositAmount, uint256[] calldata entryIDs) external;
+
+    // invoked by users on L1
+    function initiateDeposit(uint amount) external;
 }