sip-2044-2045 (#2188)

* sip-2044-2045 initial commit * fix releases.json * lower ordi mmv * add missing assets * fix hh fork missing log --------- Co-authored-by: Leonardo Massazza <[email protected]>
Synthetixio · Jan 22, 2024 · ccbed96 · ccbed96
1 parent 3e8e31f
commit ccbed96
Show file tree

Hide file tree

Showing 9 changed files with 187 additions and 5 deletions.
diff --git a/publish/assets.json b/publish/assets.json
@@ -729,6 +729,17 @@
 		"category": "crypto",
 		"sign": "",
 		"description": "Wrapped stETH"
+	},
+	"JTO": {
+		"asset": "JTO",
+		"category": "crypto",
+		"sign": "",
+		"description": "Jito"
+	},
+	"ORDI": {
+		"asset": "ORDI",
+		"category": "crypto",
+		"sign": "",
+		"description": "ORDI"
 	}
-
-}	
+}
diff --git a/publish/deployed/goerli-ovm/feeds.json b/publish/deployed/goerli-ovm/feeds.json
@@ -342,5 +342,15 @@
 		"asset": "BONK",
 		"feed": "0xc6cC2F2eB966E9bfc1A91f79ae1f557F2eC7201E",
 		"fakeFeed": true
+	},
+	"JTO": {
+		"asset": "JTO",
+		"feed": "0x9755f74E6a1a39C0b082Bf56Df8fb6B154368334",
+		"fakeFeed": true
+	},
+	"ORDI": {
+		"asset": "ORDI",
+		"feed": "0x025600F206C83854D33209Adceb23840f2963700",
+		"fakeFeed": true
 	}
 }
diff --git a/publish/deployed/goerli-ovm/offchain-feeds.json b/publish/deployed/goerli-ovm/offchain-feeds.json
@@ -501,5 +501,17 @@
 		"oracle": "0xff1a0f4744e8582DF1aE09D5611b887B6a12925C",
 		"asset": "BONK",
 		"feedId": "0x53377a90ac8ddbd1cad1a65dd705f12eeba0be01510777a1e25fcd03f295572d"
+	},
+	{
+		"kind": "pyth",
+		"oracle": "0xff1a0f4744e8582DF1aE09D5611b887B6a12925C",
+		"asset": "ORDI",
+		"feedId": "0x2b4c2ab4993d0472b73b29f6598cb716d2be452389a9964f8db6cbec1bea3899"
+	},
+	{
+		"kind": "pyth",
+		"oracle": "0xff1a0f4744e8582DF1aE09D5611b887B6a12925C",
+		"asset": "JITO",
+		"feedId": "0x1126fc5add7272eca2c168bf6393b1f82376a749db15ee63791b843f39867592"
 	}
 ]
diff --git a/publish/deployed/goerli-ovm/perpsv2-markets.json b/publish/deployed/goerli-ovm/perpsv2-markets.json
@@ -2324,5 +2324,61 @@
 		"maxLiquidationDelta": "0.0012",
 		"paused": false,
 		"offchainPaused": false
+	},
+	{
+		"marketKey": "sJTOPERP",
+		"asset": "JTO",
+		"makerFee": "0.3",
+		"takerFee": "0.3",
+		"takerFeeDelayedOrder": "0.3",
+		"makerFeeDelayedOrder": "0.3",
+		"takerFeeOffchainDelayedOrder": "0.0010",
+		"makerFeeOffchainDelayedOrder": "0.0002",
+		"nextPriceConfirmWindow": "2",
+		"delayedOrderConfirmWindow": "120",
+		"minDelayTimeDelta": "60",
+		"maxDelayTimeDelta": "6000",
+		"offchainDelayedOrderMinAge": "2",
+		"offchainDelayedOrderMaxAge": "60",
+		"maxLeverage": "27.5",
+		"maxMarketValue": "550000",
+		"maxFundingVelocity": "36",
+		"skewScale": "8000000",
+		"offchainPriceDivergence": "0.99",
+		"liquidationPremiumMultiplier": "3",
+		"offchainMarketKey": "ocJTOPERP",
+		"liquidationBufferRatio": "0.0150",
+		"maxPD": "0.0024",
+		"maxLiquidationDelta": "0.0012",
+		"paused": true,
+		"offchainPaused": true
+	},
+	{
+		"marketKey": "sORDIPERP",
+		"asset": "ORDI",
+		"makerFee": "0.3",
+		"takerFee": "0.3",
+		"takerFeeDelayedOrder": "0.3",
+		"makerFeeDelayedOrder": "0.3",
+		"takerFeeOffchainDelayedOrder": "0.0010",
+		"makerFeeOffchainDelayedOrder": "0.0002",
+		"nextPriceConfirmWindow": "2",
+		"delayedOrderConfirmWindow": "120",
+		"minDelayTimeDelta": "60",
+		"maxDelayTimeDelta": "6000",
+		"offchainDelayedOrderMinAge": "2",
+		"offchainDelayedOrderMaxAge": "60",
+		"maxLeverage": "27.5",
+		"maxMarketValue": "20000",
+		"maxFundingVelocity": "36",
+		"skewScale": "750000",
+		"offchainPriceDivergence": "0.99",
+		"liquidationPremiumMultiplier": "3",
+		"offchainMarketKey": "ocORDIPERP",
+		"liquidationBufferRatio": "0.0150",
+		"maxPD": "0.0024",
+		"maxLiquidationDelta": "0.0012",
+		"paused": true,
+		"offchainPaused": true
 	}
 ]
diff --git a/publish/deployed/mainnet-ovm/feeds.json b/publish/deployed/mainnet-ovm/feeds.json
@@ -343,5 +343,13 @@
 	"BONK": {
 		"asset": "BONK",
 		"feed": "0xec236454209A76a6deCdf5C1183aE2Eb5e82a829"
+	},
+	"JTO": {
+		"asset": "JTO",
+		"feed": "0xFC3b7bd4368b2919f67E437f8c6Ca42C7FD55dd5"
+	},
+	"ORDI": {
+		"asset": "ORDI",
+		"feed": "0x30795BeACc0f43920EF1288dB6676B5e205AE288"
 	}
 }
diff --git a/publish/deployed/mainnet-ovm/offchain-feeds.json b/publish/deployed/mainnet-ovm/offchain-feeds.json
@@ -500,5 +500,17 @@
 		"oracle": "0xff1a0f4744e8582DF1aE09D5611b887B6a12925C",
 		"asset": "BONK",
 		"feedId": "0x72b021217ca3fe68922a19aaf990109cb9d84e9ad004b4d2025ad6f529314419"
+	},
+	{
+		"kind": "pyth",
+		"oracle": "0xff1a0f4744e8582DF1aE09D5611b887B6a12925C",
+		"asset": "JTO",
+		"feedId": "0xb43660a5f790c69354b0729a5ef9d50d68f1df92107540210b9cccba1f947cc2"
+	},
+	{
+		"kind": "pyth",
+		"oracle": "0xff1a0f4744e8582DF1aE09D5611b887B6a12925C",
+		"asset": "ORDI",
+		"feedId": "0x193c739db502aadcef37c2589738b1e37bdb257d58cf1ab3c7ebc8e6df4e3ec0"
 	}
 ]
diff --git a/publish/deployed/mainnet-ovm/perpsv2-markets.json b/publish/deployed/mainnet-ovm/perpsv2-markets.json
@@ -2324,5 +2324,61 @@
 		"maxLiquidationDelta": "0.0012",
 		"paused": false,
 		"offchainPaused": false
+	},
+	{
+		"marketKey": "sJTOPERP",
+		"asset": "JTO",
+		"makerFee": "0.3",
+		"takerFee": "0.3",
+		"takerFeeDelayedOrder": "0.3",
+		"makerFeeDelayedOrder": "0.3",
+		"takerFeeOffchainDelayedOrder": "0.0010",
+		"makerFeeOffchainDelayedOrder": "0.0002",
+		"nextPriceConfirmWindow": "2",
+		"delayedOrderConfirmWindow": "120",
+		"minDelayTimeDelta": "60",
+		"maxDelayTimeDelta": "6000",
+		"offchainDelayedOrderMinAge": "2",
+		"offchainDelayedOrderMaxAge": "60",
+		"maxLeverage": "27.5",
+		"maxMarketValue": "550000",
+		"maxFundingVelocity": "36",
+		"skewScale": "8000000",
+		"offchainPriceDivergence": "0.10",
+		"liquidationPremiumMultiplier": "3",
+		"offchainMarketKey": "ocJTOPERP",
+		"liquidationBufferRatio": "0.0150",
+		"maxPD": "0.0024",
+		"maxLiquidationDelta": "0.0012",
+		"paused": true,
+		"offchainPaused": true
+	},
+	{
+		"marketKey": "sORDIPERP",
+		"asset": "ORDI",
+		"makerFee": "0.3",
+		"takerFee": "0.3",
+		"takerFeeDelayedOrder": "0.3",
+		"makerFeeDelayedOrder": "0.3",
+		"takerFeeOffchainDelayedOrder": "0.0010",
+		"makerFeeOffchainDelayedOrder": "0.0002",
+		"nextPriceConfirmWindow": "2",
+		"delayedOrderConfirmWindow": "120",
+		"minDelayTimeDelta": "60",
+		"maxDelayTimeDelta": "6000",
+		"offchainDelayedOrderMinAge": "2",
+		"offchainDelayedOrderMaxAge": "60",
+		"maxLeverage": "27.5",
+		"maxMarketValue": "20000",
+		"maxFundingVelocity": "36",
+		"skewScale": "750000",
+		"offchainPriceDivergence": "0.10",
+		"liquidationPremiumMultiplier": "3",
+		"offchainMarketKey": "ocORDIPERP",
+		"liquidationBufferRatio": "0.0150",
+		"maxPD": "0.0024",
+		"maxLiquidationDelta": "0.0012",
+		"paused": true,
+		"offchainPaused": true
 	}
 ]
diff --git a/publish/releases.json b/publish/releases.json
@@ -1032,6 +1032,16 @@
 			"layer": "ovm",
 			"sources": [],
 			"released": "ovm"
+		},
+		{
+			"sip": 2044,
+			"layer": "ovm",
+			"sources": []
+		},
+		{
+			"sip": 2045,
+			"layer": "ovm",
+			"sources": []
 		}
 	],
 	"releases": [
@@ -1927,6 +1937,15 @@
 			},
 			"sips": [2035, 2037, 2039, 2040, 2041, 2042],
 			"released": true
+		},
+		{
+			"name": "Markeb (Optimism)",
+			"ovm": true,
+			"version": {
+				"major": 2,
+				"minor": 98
+			},
+			"sips": [2044, 2045]
 		}
 	]
 }
diff --git a/publish/src/commands/deploy/rebuild-resolver-caches.js b/publish/src/commands/deploy/rebuild-resolver-caches.js
@@ -78,9 +78,7 @@ module.exports = async ({
 					'Warning: Cannot fetch logs on this network. Known limitation on Tenderly Fork - cannot search back greater than 1k blocks'
 				)
 			);
-		} else if (
-			/eth_getLogs and eth_newFilter are limited to a 10000 blocks range/.test(err.message)
-		) {
+		} else if (/eth_getLogs is limited to a 10,000 range/.test(err.message)) {
 			console.log(
 				yellow.bold(
 					'Warning: Cannot fetch logs on this network. Known limitation on hh fork - cannot search back greater than 10k blocks'