Futures merge develop by liamzebedee · Pull Request #1399 · Synthetixio/synthetix

liamzebedee · 2021-07-12T05:30:00Z

No description provided.

* Remove bridge migrator (#1257) * Skips multicollateral prod tests if max debt has been reached (#1259) * SIP-136: MultiCollateral/CollateralEth debt is not excluded correctly from debt calculations (#1243) * SIP-112: EtherWrapper (#1178) * Deploy 2.45 to kovan (#1260) * Prepublish step * 2.45.0-alpha * set mint fee and burn fee per sccp 100 Co-authored-by: Alejandro Santander <Palebluedot@gmail.com> Co-authored-by: Synthetix Team <team@synthetix.io> Co-authored-by: Jackson C <jackosmacko@gmail.com>

* 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

* Progress removing web3 from test for deploy script * Progress removing web3 from test for deploy script * Almost done removing web3 from deploy tests

* Add optimism scripts to npm * fix variable naming * Add harhat task to build and start ops * remove ops scripts from packages.json * - check status to run the right steps - order jobs - cleanup messages * Update circleCI * change docker command to test on circleCI * keep chain atached and add detach option * Tweak CI for integration tests * Keep ops start task open Co-authored-by: Alejandro Santander <Palebluedot@gmail.com>

…1331)

* Progress removing web3 from nominate script * Applies nominate test to L2 * Ported nominate script to ethers * Fix

* Remove web3 * Remove wallet (only read from contracts)

* Using owner script in integration tests * Removed web3 from owner script * Manually setting isContract in owner script

This was added some time ago, I guess we never removed it form the futures branch

* Makes l2 standalone integration tests pass * Refresh ops tool cache in CI * Possible fix to hardhat ops task * Undo bad fix, but with small tidy up * Try to build ops image manually * Update CI build * Small bugfix on ci * Another attempt at building ops tool on ci * Undo all changes to CI * Disabled ops tool in CI * Disable ops tool build * Showing a different name while integration tests are simplified * Pins a newer ops tool version

* use docker 20.10.6 in CI * duh... * fix bootstrap.js issue on dual

…es-implementation-merge-develop

zyzek · 2021-07-12T05:59:16Z

contracts/DebtCache.sol

            require(cachedSum <= debt, "Cached synth sum exceeds total debt");
            debt = debt.sub(cachedSum).add(currentSum);

+            // TODO: is this the right place to relocate this, @Anton?


This needs to be where it was, outside the if (cachedSum != currentSum) conditional, as it is a positive contribution to the system debt which isn't bugged out like the excluded debt component

zyzek · 2021-07-12T05:59:36Z

index.js

 	ETHER_WRAPPER_MINT_FEE_RATE: w3utils.toWei('0.02'), // 200 bps
 	ETHER_WRAPPER_BURN_FEE_RATE: w3utils.toWei('0.0005'), // 5 bps
+
+	FUTURES_ASSETS: ['BTC', 'ETH', 'LINK'],


Might as well use this if we're gunna include it here.

Relevant deleted line: f4175a1#diff-16319ff3ce6ffd9de269997039bf84eeb9070081570dd338bcb851101818be94L51

…tix into futures-merge-develop

liamzebedee and others added 30 commits May 13, 2021 20:52

Merge branch 'develop' into staging

759d201

Introducing new integration tests in CI (#1287)

f3a6076

* 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

Refactoring of Exchanger.sol to reduce size on OVM (#1291)

00df930

Minor fix for integration tests (#1295)

6d89deb

* Clean state on dual integration tests plus slightly better exchange tests * Minor fix to integration tests * Disable some exchanging integration tests for now

Extra prod tests (#1299)

786b356

* 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>

Audit feedback and spring cleaning (#1300)

cf8577c

Better way to get SNX in integration tests (#1303)

4081f23

* Better way to get SNX * 2192

Introduces forking via integration tests (#1307)

d624758

* Introduces forking with integration tests * Compile and deploy on fork tests * Fix old ovm prod tests

Updates optimism dependencies (#1308)

e54c27b

* Updated optimism deps * Update usage of dep in code * Add hardhat-ethers dep required by smock * Add await in unit test

Removed @gas-skip (#1309)

20e0257

* Updated optimism deps * Update usage of dep in code * Add hardhat-ethers dep required by smock * Removed @gas-skip * Add await in unit test

Disables prod tests from CI (#1311)

008a1aa

Reordering the deploy script for sanity (#1304)

3a1273a

Add integration tests for settle and claim (#1310)

ecd3ccf

* 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 SynthsUSD integration (L1 and L2) tests (#1312)

7f90694

* 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>

Migration for bulk staking reward upgrade (#1301)

492656b

Deleted everything related to prod tests (#1315)

169115c

Enables separate folder compilation for integration tests (#1322)

347a914

* Enables separate folder compilation for integration tests * Clean install

Merge all integration test tasks into one (#1323)

142ec3f

Remove web3 from the deploy script test (#1328)

22938e0

* Progress removing web3 from test for deploy script * Progress removing web3 from test for deploy script * Almost done removing web3 from deploy tests

Unpins the usage of the Optimism ops tool and starts managing L2 gas (#…

504d916

…1331)

Removes web3 from nominate script (#1332)

99ac93d

* Progress removing web3 from nominate script * Applies nominate test to L2 * Ported nominate script to ethers * Fix

Removed web3 from settle script (#1334)

109c914

Removed web3 from extract-staking-balances (#1335)

024675e

* Remove web3 * Remove wallet (only read from contracts)

Removes web3 from the owner script (#1336)

5b63890

* Using owner script in integration tests * Removed web3 from owner script * Manually setting isContract in owner script

Synthetix Team and others added 23 commits June 30, 2021 01:57

Prepublish step

b6711f6

2.46.0-alpha-ovm

ed84006

Fixing local dev to properly only deploy WETH the first time (#1384)

9acf98c

Removing 145 and 150 from Alnitak (#1386)

e33e440

Fix fork-tests to work and surface errors correctly (#1385)

dc37f6a

OVM gas limit fixes (#1382)

6ccd733

Merge branch 'develop' into staging

457939c

Mainnet deploy of Alnitak contracts and migration (#1383)

19a7f66

Prepublish step

c3d8be7

2.46.0

2660ebd

Alnitak release optimism (#1390)

059a1d3

Prepublish step

6f19ab0

2.46.0-ovm

df1e463

Merge branch 'develop' into futures-implementation

aeab466

add comment

3b81cb0

remove kovan-main network

97540f1

This was added some time ago, I guess we never removed it form the futures branch

move futuresAssets config into package index.js

02f0839

move futures parameters together

99a67d1

fix: revert fee is greater than min margin in L1 CI

f4f327f

Re-enable ops-tool in CI (#1395)

fa291a7

* use docker 20.10.6 in CI * duh... * fix bootstrap.js issue on dual

Merge branch 'develop' of github.com:Synthetixio/synthetix into futur…

2ff91d9

…es-implementation-merge-develop

Merge branch 'futures-implementation' into futures-merge-develop

f4175a1

zyzek suggested changes Jul 12, 2021

View reviewed changes

liamzebedee added 3 commits July 12, 2021 16:04

revert moving this block

a7a877e

Merge branch 'futures-merge-develop' of github.com:Synthetixio/synthe…

41cc4b5

…tix into futures-merge-develop

import FUTURES_ASSETS from config

41b8243

zyzek merged commit a4b8cbb into futures-implementation Jul 12, 2021

zyzek deleted the futures-merge-develop branch July 12, 2021 06:09

liamzebedee mentioned this pull request Aug 5, 2021

Fix merge history for futures-implementation #1445

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Futures merge develop#1399

Futures merge develop#1399
zyzek merged 99 commits intofutures-implementationfrom
futures-merge-develop

liamzebedee commented Jul 12, 2021

Uh oh!

zyzek Jul 12, 2021

Uh oh!

zyzek Jul 12, 2021

Uh oh!

zyzek Jul 12, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Conversation

liamzebedee commented Jul 12, 2021

Uh oh!

zyzek Jul 12, 2021

Choose a reason for hiding this comment

Uh oh!

zyzek Jul 12, 2021

Choose a reason for hiding this comment

Uh oh!

zyzek Jul 12, 2021

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants