diff --git a/421614-main/AllErrors.json b/421614-main/AllErrors.json
index c9449211d..88f9fd239 100644
--- a/421614-main/AllErrors.json
+++ b/421614-main/AllErrors.json
@@ -1549,5 +1549,25 @@
         "name": "shareRatioD18"
       }
     ]
+  },
+  {
+    "type": "error",
+    "name": "FeeRequired",
+    "inputs": [
+      {
+        "type": "uint256",
+        "name": "amount"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "NotSupported",
+    "inputs": [
+      {
+        "type": "uint8",
+        "name": "updateType"
+      }
+    ]
   }
 ]
\ No newline at end of file
diff --git a/421614-main/AllErrors.readable.json b/421614-main/AllErrors.readable.json
index 59e661837..9de288166 100644
--- a/421614-main/AllErrors.readable.json
+++ b/421614-main/AllErrors.readable.json
@@ -145,5 +145,7 @@
   "error AcceptablePriceNotExceeded(uint256 fillPrice, uint256 acceptablePrice)",
   "error NotEligibleForLiquidation(uint128 accountId)",
   "error InvalidInterestRateParameters(uint128 lowUtilizationInterestRateGradient, uint128 highUtilizationInterestRateGradient)",
-  "error InvalidReferrerShareRatio(uint256 shareRatioD18)"
+  "error InvalidReferrerShareRatio(uint256 shareRatioD18)",
+  "error FeeRequired(uint256 amount)",
+  "error NotSupported(uint8 updateType)"
 ]
\ No newline at end of file
diff --git a/421614-main/PythERC7412Wrapper.json b/421614-main/PythERC7412Wrapper.json
new file mode 100644
index 000000000..790007457
--- /dev/null
+++ b/421614-main/PythERC7412Wrapper.json
@@ -0,0 +1,140 @@
+[
+  {
+    "type": "constructor",
+    "payable": false,
+    "inputs": [
+      {
+        "type": "address",
+        "name": "_pythAddress"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "FeeRequired",
+    "inputs": [
+      {
+        "type": "uint256",
+        "name": "amount"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "NotSupported",
+    "inputs": [
+      {
+        "type": "uint8",
+        "name": "updateType"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "OracleDataRequired",
+    "inputs": [
+      {
+        "type": "address",
+        "name": "oracleContract"
+      },
+      {
+        "type": "bytes",
+        "name": "oracleQuery"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "OverflowInt256ToUint256",
+    "inputs": []
+  },
+  {
+    "type": "error",
+    "name": "OverflowUint256ToInt256",
+    "inputs": []
+  },
+  {
+    "type": "function",
+    "name": "fulfillOracleQuery",
+    "constant": false,
+    "stateMutability": "payable",
+    "payable": true,
+    "inputs": [
+      {
+        "type": "bytes",
+        "name": "signedOffchainData"
+      }
+    ],
+    "outputs": []
+  },
+  {
+    "type": "function",
+    "name": "getBenchmarkPrice",
+    "constant": true,
+    "stateMutability": "view",
+    "payable": false,
+    "inputs": [
+      {
+        "type": "bytes32",
+        "name": "priceId"
+      },
+      {
+        "type": "uint64",
+        "name": "requestedTime"
+      }
+    ],
+    "outputs": [
+      {
+        "type": "int256"
+      }
+    ]
+  },
+  {
+    "type": "function",
+    "name": "getLatestPrice",
+    "constant": true,
+    "stateMutability": "view",
+    "payable": false,
+    "inputs": [
+      {
+        "type": "bytes32",
+        "name": "priceId"
+      },
+      {
+        "type": "uint256",
+        "name": "stalenessTolerance"
+      }
+    ],
+    "outputs": [
+      {
+        "type": "int256"
+      }
+    ]
+  },
+  {
+    "type": "function",
+    "name": "oracleId",
+    "constant": true,
+    "stateMutability": "pure",
+    "payable": false,
+    "inputs": [],
+    "outputs": [
+      {
+        "type": "bytes32"
+      }
+    ]
+  },
+  {
+    "type": "function",
+    "name": "pythAddress",
+    "constant": true,
+    "stateMutability": "view",
+    "payable": false,
+    "inputs": [],
+    "outputs": [
+      {
+        "type": "address"
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/421614-main/PythERC7412Wrapper.readable.json b/421614-main/PythERC7412Wrapper.readable.json
new file mode 100644
index 000000000..a0840505b
--- /dev/null
+++ b/421614-main/PythERC7412Wrapper.readable.json
@@ -0,0 +1,13 @@
+[
+  "constructor(address _pythAddress)",
+  "error FeeRequired(uint256 amount)",
+  "error NotSupported(uint8 updateType)",
+  "error OracleDataRequired(address oracleContract, bytes oracleQuery)",
+  "error OverflowInt256ToUint256()",
+  "error OverflowUint256ToInt256()",
+  "function fulfillOracleQuery(bytes signedOffchainData) payable",
+  "function getBenchmarkPrice(bytes32 priceId, uint64 requestedTime) view returns (int256)",
+  "function getLatestPrice(bytes32 priceId, uint256 stalenessTolerance) view returns (int256)",
+  "function oracleId() pure returns (bytes32)",
+  "function pythAddress() view returns (address)"
+]
\ No newline at end of file
diff --git a/421614-main/cannon.json b/421614-main/cannon.json
index fd88f42cf..c47fe9b44 100644
--- a/421614-main/cannon.json
+++ b/421614-main/cannon.json
@@ -208,61 +208,10 @@
         },
         "depends": [
           "provision.system",
-          "setting.spot_market_package",
-          "setting.target_preset",
-          "setting.owner",
-          "setting.owner",
-          "setting.salt",
-          "setting.snx_package",
-          "setting.target_preset",
-          "setting.target_preset",
-          "setting.spot_market_package",
-          "setting.target_preset",
-          "setting.owner",
-          "setting.owner",
-          "setting.salt",
-          "setting.snx_package",
-          "setting.target_preset",
-          "setting.target_preset",
-          "setting.spot_market_package",
-          "setting.target_preset",
-          "setting.owner",
-          "setting.owner",
-          "setting.salt",
-          "setting.snx_package",
-          "setting.target_preset",
-          "setting.target_preset",
-          "setting.spot_market_package",
-          "setting.target_preset",
-          "setting.owner",
           "setting.owner",
           "setting.salt",
           "setting.snx_package",
-          "setting.target_preset",
-          "setting.target_preset",
           "setting.spot_market_package",
-          "setting.target_preset",
-          "setting.owner",
-          "setting.owner",
-          "setting.salt",
-          "setting.snx_package",
-          "setting.target_preset",
-          "setting.target_preset",
-          "setting.spot_market_package",
-          "setting.target_preset",
-          "setting.owner",
-          "setting.owner",
-          "setting.salt",
-          "setting.snx_package",
-          "setting.target_preset",
-          "setting.target_preset",
-          "setting.spot_market_package",
-          "setting.target_preset",
-          "setting.owner",
-          "setting.owner",
-          "setting.salt",
-          "setting.snx_package",
-          "setting.target_preset",
           "setting.target_preset"
         ]
       },
@@ -278,67 +227,10 @@
         },
         "depends": [
           "provision.spotFactory",
-          "setting.perps_market_package",
-          "setting.target_preset",
-          "setting.owner",
           "setting.owner",
-          "setting.salt",
-          "setting.snx_package",
-          "setting.target_preset",
-          "setting.spot_market_package",
-          "setting.target_preset",
-          "setting.perps_market_package",
-          "setting.target_preset",
-          "setting.owner",
-          "setting.owner",
-          "setting.salt",
-          "setting.snx_package",
-          "setting.target_preset",
-          "setting.spot_market_package",
-          "setting.target_preset",
-          "setting.perps_market_package",
-          "setting.target_preset",
-          "setting.owner",
-          "setting.owner",
-          "setting.salt",
-          "setting.snx_package",
-          "setting.target_preset",
-          "setting.spot_market_package",
-          "setting.target_preset",
-          "setting.perps_market_package",
-          "setting.target_preset",
-          "setting.owner",
-          "setting.owner",
-          "setting.salt",
-          "setting.snx_package",
-          "setting.target_preset",
-          "setting.spot_market_package",
-          "setting.target_preset",
-          "setting.perps_market_package",
-          "setting.target_preset",
-          "setting.owner",
-          "setting.owner",
-          "setting.salt",
-          "setting.snx_package",
-          "setting.target_preset",
-          "setting.spot_market_package",
-          "setting.target_preset",
           "setting.perps_market_package",
-          "setting.target_preset",
-          "setting.owner",
-          "setting.owner",
           "setting.salt",
           "setting.snx_package",
-          "setting.target_preset",
-          "setting.spot_market_package",
-          "setting.target_preset",
-          "setting.perps_market_package",
-          "setting.target_preset",
-          "setting.owner",
-          "setting.owner",
-          "setting.salt",
-          "setting.snx_package",
-          "setting.target_preset",
           "setting.spot_market_package",
           "setting.target_preset"
         ]
@@ -650,34 +542,10 @@
         },
         "depends": [
           "invoke.CoreProxy_addToFeatureFlagAllowlist_createPool_deployer",
-          "setting.deployer",
-          "provision.system",
-          "setting.spartan_council_pool_id_setting",
-          "setting.pool_owner",
-          "setting.deployer",
-          "provision.system",
-          "setting.spartan_council_pool_id_setting",
-          "setting.pool_owner",
-          "setting.deployer",
-          "provision.system",
-          "setting.spartan_council_pool_id_setting",
-          "setting.pool_owner",
-          "setting.deployer",
-          "provision.system",
-          "setting.spartan_council_pool_id_setting",
-          "setting.pool_owner",
-          "setting.deployer",
           "provision.system",
-          "setting.spartan_council_pool_id_setting",
-          "setting.pool_owner",
           "setting.deployer",
-          "provision.system",
-          "setting.spartan_council_pool_id_setting",
           "setting.pool_owner",
-          "setting.deployer",
-          "provision.system",
-          "setting.spartan_council_pool_id_setting",
-          "setting.pool_owner"
+          "setting.spartan_council_pool_id_setting"
         ]
       },
       "CoreProxy_setPoolName_SpartanCouncil": {
@@ -727,29 +595,8 @@
         },
         "depends": [
           "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_usdc",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_usdc",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_usdc",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_usdc",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_usdc",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_usdc",
-          "provision.system",
-          "setting.pyth_price_verification_address",
           "setting.pyth_feed_id_usdc",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_usdc"
+          "setting.pyth_price_verification_address"
         ]
       },
       "OracleManagerProxy_registerNode_pyth_offchain_lookup_usdc": {
@@ -770,38 +617,10 @@
           }
         },
         "depends": [
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_usdc",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_usdc",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_usdc",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_usdc",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_usdc",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
           "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_usdc",
-          "setting.big_cap_default_staleness_tolerance",
           "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_usdc",
           "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_usdc",
-          "setting.big_cap_default_staleness_tolerance"
+          "setting.pyth_feed_id_usdc"
         ]
       },
       "OracleManagerProxy_registerNode_staleness_usdc": {
@@ -1018,29 +837,8 @@
         },
         "depends": [
           "provision.system",
-          "setting.pyth_price_verification_address",
           "setting.pyth_feed_id_dai",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_dai",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_dai",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_dai",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_dai",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_dai",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_dai",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_dai"
+          "setting.pyth_price_verification_address"
         ]
       },
       "OracleManagerProxy_registerNode_pyth_offchain_lookup_dai": {
@@ -1061,38 +859,10 @@
           }
         },
         "depends": [
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_dai",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_dai",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_dai",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_dai",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_dai",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
           "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_dai",
-          "setting.big_cap_default_staleness_tolerance",
           "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_dai",
           "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_dai",
-          "setting.big_cap_default_staleness_tolerance"
+          "setting.pyth_feed_id_dai"
         ]
       },
       "OracleManagerProxy_registerNode_staleness_dai": {
@@ -1309,29 +1079,8 @@
         },
         "depends": [
           "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_arb",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_arb",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_arb",
-          "provision.system",
-          "setting.pyth_price_verification_address",
           "setting.pyth_feed_id_arb",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_arb",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_arb",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_arb",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_arb"
+          "setting.pyth_price_verification_address"
         ]
       },
       "OracleManagerProxy_registerNode_pyth_offchain_lookup_arb": {
@@ -1352,38 +1101,10 @@
           }
         },
         "depends": [
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_arb",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_arb",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_arb",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_arb",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_arb",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
           "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_arb",
-          "setting.big_cap_default_staleness_tolerance",
           "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_arb",
           "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_arb",
-          "setting.big_cap_default_staleness_tolerance"
+          "setting.pyth_feed_id_arb"
         ]
       },
       "OracleManagerProxy_registerNode_staleness_arb": {
@@ -1462,29 +1183,8 @@
         },
         "depends": [
           "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_eth",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_eth",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_eth",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_eth",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_eth",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_eth",
-          "provision.system",
-          "setting.pyth_price_verification_address",
           "setting.pyth_feed_id_eth",
-          "provision.system",
-          "setting.pyth_price_verification_address",
-          "setting.pyth_feed_id_eth"
+          "setting.pyth_price_verification_address"
         ]
       },
       "OracleManagerProxy_registerNode_pyth_offchain_lookup_eth": {
@@ -1505,38 +1205,10 @@
           }
         },
         "depends": [
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_eth",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_eth",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_eth",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
           "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_eth",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_eth",
-          "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_eth",
-          "setting.big_cap_default_staleness_tolerance",
           "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_eth",
           "setting.big_cap_default_staleness_tolerance",
-          "provision.system",
-          "provision.pyth_erc7412_wrapper",
-          "setting.pyth_feed_id_eth",
-          "setting.big_cap_default_staleness_tolerance"
+          "setting.pyth_feed_id_eth"
         ]
       },
       "OracleManagerProxy_registerNode_staleness_eth": {
diff --git a/421614-main/meta.json b/421614-main/meta.json
index 6e80fc5c2..af696c2f3 100644
--- a/421614-main/meta.json
+++ b/421614-main/meta.json
@@ -15,6 +15,7 @@
     "SpotMarketProxy": "0x93d645c42A0CA3e08E9552367B8c454765fff041",
     "PerpsMarketProxy": "0x111BAbcdd66b1B60A20152a2D3D06d36F8B5703c",
     "PerpsAccountProxy": "0xEAb7b75508B4F06FB9c6a328bEC0F23cC64FFac2",
+    "PythERC7412Wrapper": "0x0eA49b2e23387cD99ceceBDa52041c604e40992E",
     "FakeCollateralfDAI": "0xda7b438d762110083602AbC497b1Ec8Bc6605eC9",
     "FakeCollateralfARB": "0x7b356eEdABc1035834cd1f714658627fcb4820E3",
     "USDCToken": "0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d",