diff --git a/sdk/src/constants/perpMarkets.ts b/sdk/src/constants/perpMarkets.ts
index 0c78d7740..aab110708 100644
--- a/sdk/src/constants/perpMarkets.ts
+++ b/sdk/src/constants/perpMarkets.ts
@@ -396,9 +396,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'MATIC-PERP',
 		baseAssetSymbol: 'MATIC',
 		marketIndex: 5,
-		oracle: new PublicKey('7KVswB9vkCgeM3SHP7aGDijvdRAHK8P5wi9JXViCrtYh'),
+		oracle: new PublicKey('5Wf1WrXLeNJghU8WRo5odvwAjpjSSF4THbjdxbKmwVsi'),
 		launchTs: 1677690149000, //todo
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x5de33a9112c2b700b8d30b8a3402c103578ccfa2765696471cc672bd5cf6ac52',
 	},
@@ -408,9 +408,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'ARB-PERP',
 		baseAssetSymbol: 'ARB',
 		marketIndex: 6,
-		oracle: new PublicKey('5HRrdmghsnU3i2u5StaKaydS7eq3vnKVKwXMzCNKsc4C'),
+		oracle: new PublicKey('8ocfAdqVRnzvfdubQaTxar4Kz5HJhNbPNmkLxswqiHUD'),
 		launchTs: 1679501812000, //todo
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x3fa4252848f9f0a1480be62745a4629d9eb1322aebab8a791e344b3b9c1adcf5',
 	},
@@ -432,9 +432,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'BNB-PERP',
 		baseAssetSymbol: 'BNB',
 		marketIndex: 8,
-		oracle: new PublicKey('4CkQJBxhU8EZ2UjhigbtdaPbpTe6mqf811fipYBFbSYN'),
+		oracle: new PublicKey('Dk8eWjuQHMbxJAwB9Sg7pXQPH4kgbg8qZGcUrWcD9gTm'),
 		launchTs: 1680808053000,
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x2f95862b045670cd22bee3114c39763a4a08beeb663b145d283c31d7d1101c4f',
 	},
@@ -504,9 +504,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'HNT-PERP',
 		baseAssetSymbol: 'HNT',
 		marketIndex: 14,
-		oracle: new PublicKey('7moA1i5vQUpfDwSpK6Pw9s56ahB7WFGidtbL2ujWrVvm'),
+		oracle: new PublicKey('9b1rcK9RUPK2vAqwNYCYEG34gUVpS2WGs2YCZZy2X5Tb'),
 		launchTs: 1692294955000,
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x649fdd7ec08e8e2a20f425729854e90293dcbe2376abc47197a14da6ff339756',
 	},
@@ -528,9 +528,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'LINK-PERP',
 		baseAssetSymbol: 'LINK',
 		marketIndex: 16,
-		oracle: new PublicKey('ALdkqQDMfHNg77oCNskfX751kHys4KE7SFuZzuKaN536'),
+		oracle: new PublicKey('Gwvob7yoLMgQRVWjScCRyQFMsgpRKrSAYisYEyjDJwEp'),
 		launchTs: 1698074659000,
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x8ac0c70fff57e9aefdf5edf44b51d62c2d433653cbb2cf5cc06bb115af04d221',
 	},
@@ -576,9 +576,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'JTO-PERP',
 		baseAssetSymbol: 'JTO',
 		marketIndex: 20,
-		oracle: new PublicKey('D8UUgr8a3aR3yUeHLu7v8FWK7E8Y5sSU7qrYBXUJXBQ5'),
+		oracle: new PublicKey('Ffq6ACJ17NAgaxC6ocfMzVXL3K61qxB2xHg6WUawWPfP'),
 		launchTs: 1701967240000,
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0xb43660a5f790c69354b0729a5ef9d50d68f1df92107540210b9cccba1f947cc2',
 	},
@@ -588,9 +588,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'SEI-PERP',
 		baseAssetSymbol: 'SEI',
 		marketIndex: 21,
-		oracle: new PublicKey('6cUuAyAX3eXoiWkjFF77RQBEUF15AAMQ7d1hm4EPd3tv'),
+		oracle: new PublicKey('EVyoxFo5jWpv1vV7p6KVjDWwVqtTqvrZ4JMFkieVkVsD'),
 		launchTs: 1703173331000,
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x53614f1cb0c031d4af66c04cb9c756234adad0e1cee85303795091499a4084eb',
 	},
@@ -600,9 +600,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'AVAX-PERP',
 		baseAssetSymbol: 'AVAX',
 		marketIndex: 22,
-		oracle: new PublicKey('Ax9ujW5B9oqcv59N8m6f1BpTBq2rGeGaBcpKjC5UYsXU'),
+		oracle: new PublicKey('FgBGHNex4urrBmNbSj8ntNQDGqeHcWewKtkvL6JE6dEX'),
 		launchTs: 1704209558000,
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x93da3352f9f1d105fdfe4971cfa80e9dd777bfc5d0f683ebb6e1294b92137bb7',
 	},
@@ -660,9 +660,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'W-PERP',
 		baseAssetSymbol: 'W',
 		marketIndex: 27,
-		oracle: new PublicKey('H9j8CT1bFiWHaZUPMooEaxMRHdWdJ5T9CzFn41z96JHW'),
+		oracle: new PublicKey('4HbitGsdcFbtFotmYscikQFAAKJ3nYx4t7sV7fTvsk8U'),
 		launchTs: 1710418343000,
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0xeff7446475e218517566ea99e72a4abec2e1bd8498b43b7d8331e29dcb059389',
 	},
@@ -684,9 +684,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'TNSR-PERP',
 		baseAssetSymbol: 'TNSR',
 		marketIndex: 29,
-		oracle: new PublicKey('7Cfyymx49ipGsgEsCA2XygAB2DUsan4C6Cyb5c8oR5st'),
+		oracle: new PublicKey('13jpjpVyU5hGpjsZ4HzCcmBo85wze4N8Au7U6cC3GMip'),
 		launchTs: 1712593532000,
-		oracleSource: OracleSource.SWITCHBOARD,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x05ecd4597cd48fe13d6cc3596c62af4f9675aee06e2e0b94c06d8bee2b659e05',
 	},
@@ -730,9 +730,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'ZEX-PERP',
 		baseAssetSymbol: 'ZEX',
 		marketIndex: 33,
-		oracle: new PublicKey('4gdbqxkMrF1bYVeEJKRmTqCCvJjRCZrRhxvriGY6SwLj'),
+		oracle: new PublicKey('HVwBCaR4GEB1fHrp7xCTzbYoZXL3V8b1aek2swPrmGx3'),
 		launchTs: 1719415157000,
-		oracleSource: OracleSource.SWITCHBOARD,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x3d63be09d1b88f6dffe6585d0170670592124fd9fa4e0fe8a09ff18464f05e3a',
 	},
diff --git a/sdk/src/constants/spotMarkets.ts b/sdk/src/constants/spotMarkets.ts
index 57a8afd83..c2d0c97f6 100644
--- a/sdk/src/constants/spotMarkets.ts
+++ b/sdk/src/constants/spotMarkets.ts
@@ -192,8 +192,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'JTO',
 		marketIndex: 9,
-		oracle: new PublicKey('D8UUgr8a3aR3yUeHLu7v8FWK7E8Y5sSU7qrYBXUJXBQ5'),
-		oracleSource: OracleSource.PYTH,
+		oracle: new PublicKey('Ffq6ACJ17NAgaxC6ocfMzVXL3K61qxB2xHg6WUawWPfP'),
+		oracleSource: OracleSource.PYTH_PULL,
 		mint: new PublicKey('jtojtomepa8beP8AuQc6eXt5FriJwfFMwQx2v2f9mCL'),
 		precision: new BN(10).pow(NINE),
 		precisionExp: NINE,
@@ -250,8 +250,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'W',
 		marketIndex: 13,
-		oracle: new PublicKey('H9j8CT1bFiWHaZUPMooEaxMRHdWdJ5T9CzFn41z96JHW'),
-		oracleSource: OracleSource.PYTH,
+		oracle: new PublicKey('4HbitGsdcFbtFotmYscikQFAAKJ3nYx4t7sV7fTvsk8U'),
+		oracleSource: OracleSource.PYTH_PULL,
 		mint: new PublicKey('85VBFQZC9TZkfaptBWjvUw7YbZjy52A6mjtPGjstQAmQ'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
@@ -265,8 +265,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'TNSR',
 		marketIndex: 14,
-		oracle: new PublicKey('7Cfyymx49ipGsgEsCA2XygAB2DUsan4C6Cyb5c8oR5st'),
-		oracleSource: OracleSource.SWITCHBOARD,
+		oracle: new PublicKey('13jpjpVyU5hGpjsZ4HzCcmBo85wze4N8Au7U6cC3GMip'),
+		oracleSource: OracleSource.PYTH_PULL,
 		mint: new PublicKey('TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6'),
 		precision: new BN(10).pow(NINE),
 		precisionExp: NINE,