Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
barrasso committed Jul 28, 2023
2 parents 56787cf + b4738e1 commit 169c86e
Show file tree
Hide file tree
Showing 13 changed files with 3,200 additions and 16 deletions.
336 changes: 336 additions & 0 deletions contracts/migrations/Migration_AnkaaOptimismStep1.sol

Large diffs are not rendered by default.

278 changes: 278 additions & 0 deletions contracts/migrations/Migration_AnkaaOptimismStep2.sol

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "synthetix",
"version": "2.90.1",
"version": "2.91.1",
"license": "MIT",
"author": "Synthetix",
"description": "The smart contracts which make up the Synthetix system. (synthetix.io)",
Expand Down
168 changes: 168 additions & 0 deletions publish/deployed/goerli-ovm/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -1264,5 +1264,173 @@
},
"PerpsV2MarketViewsSTETHPERP": {
"deploy": false
},
"PerpsV2ProxyETHBTCPERP": {
"deploy": false
},
"PerpsV2MarketStateETHBTCPERP": {
"deploy": false
},
"PerpsV2MarketETHBTCPERP": {
"deploy": false
},
"PerpsV2MarketLiquidateETHBTCPERP": {
"deploy": false
},
"PerpsV2DelayedIntentETHBTCPERP": {
"deploy": false
},
"PerpsV2DelayedExecutionETHBTCPERP": {
"deploy": false
},
"PerpsV2MarketViewsETHBTCPERP": {
"deploy": false
},
"PerpsV2ProxyETCPERP": {
"deploy": false
},
"PerpsV2MarketStateETCPERP": {
"deploy": false
},
"PerpsV2MarketETCPERP": {
"deploy": false
},
"PerpsV2MarketLiquidateETCPERP": {
"deploy": false
},
"PerpsV2DelayedIntentETCPERP": {
"deploy": false
},
"PerpsV2DelayedExecutionETCPERP": {
"deploy": false
},
"PerpsV2MarketViewsETCPERP": {
"deploy": false
},
"PerpsV2ProxyCOMPPERP": {
"deploy": false
},
"PerpsV2MarketStateCOMPPERP": {
"deploy": false
},
"PerpsV2MarketCOMPPERP": {
"deploy": false
},
"PerpsV2MarketLiquidateCOMPPERP": {
"deploy": false
},
"PerpsV2DelayedIntentCOMPPERP": {
"deploy": false
},
"PerpsV2DelayedExecutionCOMPPERP": {
"deploy": false
},
"PerpsV2MarketViewsCOMPPERP": {
"deploy": false
},
"PerpsV2ProxyMKRPERP": {
"deploy": false
},
"PerpsV2MarketStateMKRPERP": {
"deploy": false
},
"PerpsV2MarketMKRPERP": {
"deploy": false
},
"PerpsV2MarketLiquidateMKRPERP": {
"deploy": false
},
"PerpsV2DelayedIntentMKRPERP": {
"deploy": false
},
"PerpsV2DelayedExecutionMKRPERP": {
"deploy": false
},
"PerpsV2MarketViewsMKRPERP": {
"deploy": false
},
"PerpsV2ProxyXMRPERP": {
"deploy": false
},
"PerpsV2MarketStateXMRPERP": {
"deploy": false
},
"PerpsV2MarketXMRPERP": {
"deploy": false
},
"PerpsV2MarketLiquidateXMRPERP": {
"deploy": false
},
"PerpsV2DelayedIntentXMRPERP": {
"deploy": false
},
"PerpsV2DelayedExecutionXMRPERP": {
"deploy": false
},
"PerpsV2MarketViewsXMRPERP": {
"deploy": false
},
"PerpsV2ProxyYFIPERP": {
"deploy": false
},
"PerpsV2MarketStateYFIPERP": {
"deploy": false
},
"PerpsV2MarketYFIPERP": {
"deploy": false
},
"PerpsV2MarketLiquidateYFIPERP": {
"deploy": false
},
"PerpsV2DelayedIntentYFIPERP": {
"deploy": false
},
"PerpsV2DelayedExecutionYFIPERP": {
"deploy": false
},
"PerpsV2MarketViewsYFIPERP": {
"deploy": false
},
"PerpsV2ProxyMAVPERP": {
"deploy": false
},
"PerpsV2MarketStateMAVPERP": {
"deploy": false
},
"PerpsV2MarketMAVPERP": {
"deploy": false
},
"PerpsV2MarketLiquidateMAVPERP": {
"deploy": false
},
"PerpsV2DelayedIntentMAVPERP": {
"deploy": false
},
"PerpsV2DelayedExecutionMAVPERP": {
"deploy": false
},
"PerpsV2MarketViewsMAVPERP": {
"deploy": false
},
"PerpsV2ProxyRPLPERP": {
"deploy": false
},
"PerpsV2MarketStateRPLPERP": {
"deploy": false
},
"PerpsV2MarketRPLPERP": {
"deploy": false
},
"PerpsV2MarketLiquidateRPLPERP": {
"deploy": false
},
"PerpsV2DelayedIntentRPLPERP": {
"deploy": false
},
"PerpsV2DelayedExecutionRPLPERP": {
"deploy": false
},
"PerpsV2MarketViewsRPLPERP": {
"deploy": false
}
}
Loading

0 comments on commit 169c86e

Please sign in to comment.