Merge develop into futures-implementation #1326
Merged
Conversation
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
Contributor
liamzebedee
commented
Jun 9, 2021
•
liamzebedee
commented
- Merges the updates from develop, including the new deploy script format and new integration tests.
- Adds futures to deploy script, configures releases.json.
- Deploys EmptyFuturesMarketManager on L1.
- Some misc fixes to get deployment passing for L1/L2.
* Introducing integration tests in CI * Improved integration tests in CI and removed redundant prod tests * Bugfix on integration test task * More verbose on deployer error
* Clean state on dual integration tests plus slightly better exchange tests * Minor fix to integration tests * Disable some exchanging integration tests for now
* Add issuance prod tests * Add erc20 behavior * Tweaks on incoming integration tests * Minor fix to integrationt ests Co-authored-by: Alejandro Santander <Palebluedot@gmail.com>
* Basic integration tests for L2 deposits * Basic integration tests for L2 deposits * Polish deposit integration tests * Progress porting withdrawal integration tests * Working withdrawals in new integration tests * Using watcher tool more * Unify action and actionTo in integration tests * Progress porting integration tests * Remove comment * Implemented exchanges in new integration tests * Bugfix in integrationt est task * Basic forking in integration tests * Include fork tests in CI * Minor fixes for prod tests * port migrateEscrow test to integration dual * Fix CI * Fix CI Co-authored-by: Leonardo Massazza <lmassazza+github@gmail.com> Co-authored-by: Yannis <i.stamelakos@gmail.com>
* Better way to get SNX * 2192
* Introduces forking with integration tests * Compile and deploy on fork tests * Fix old ovm prod tests
* add wrapper object to hold web3 and ethers * Replace web3-utils with ethers * - replace web3.utils with ethers counterpart - create account with ethers instead of web3 * corrections to failed tests * propagate Deploy changes fix (test:publish green) * document the provider addition to Deployer * document the provider addition to Deployer * fix require * fix require * Clean install * Update to develop Co-authored-by: Alejandro Santander <Palebluedot@gmail.com>
* Updated optimism deps * Update usage of dep in code * Add hardhat-ethers dep required by smock * Add await in unit test
* Updated optimism deps * Update usage of dep in code * Add hardhat-ethers dep required by smock * Removed @gas-skip * Add await in unit test
* Support settlements in exchanging behavior * Testing claims in integration tests * Address PR feedback, increase timeouts, improve test for forking * Bigger tolerance for debt comparison * Approve bridge tokens during bootstrap
* Add support to SynthsUSD in L1 and L2 integration tests * Add support to SynthsUSD in L1 and L2 integration tests * style fixes Co-authored-by: Alejandro Santander <Palebluedot@gmail.com>
* ported. Some tests still failing * wip * migrateEscrow test ported * accept multiples hashes in watchers * Reduce migrateEscrow dual test to dual scope * ported depositAndMigrateEscrow test * update test wording Co-authored-by: Alejandro Santander <Palebluedot@gmail.com>
* Basic integration tests for ether wrapper * Fix timeout in integration tests * Abstract eth wrapper behavior in integration tests * Support ether wrapper integration tests in mainnet forks * Pin ops to a particular commit that is known to work in CI * Processed Leo's feeedback on PR
* Enables separate folder compilation for integration tests * Clean install
…es-implementation
Since we modify a couple L1 contracts, such as the DebtCache, to incorporate futures debt, we need to deploy a FuturesMarketManager on L1. This uses our empty contract pattern we have in other places, eg EmptyEtherCollateral.
This check calls Issuer.availableCurrencyKeys, which will miss some assets that are required to have exchange rates but aren't technically enabled for issuing yet on L2.
liamzebedee
force-pushed
the
futures-implementation-merge-develop
branch
from
dcedeea
to
fa876b1
Compare
liamzebedee
force-pushed
the
futures-implementation-merge-develop
branch
from
fa876b1
to
87c667d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.