Skip to content

Commit a9a35d3

Browse files
Jaiclaude
andcommitted
chore: remove MultiPythOracleAdapter for Euler launch
Deletes the multi-feed Pyth oracle adapter and its deployer: - src/concrete/oracle/MultiPythOracleAdapter.sol - src/concrete/deploy/MultiPythOracleAdapterBeaconSetDeployer.sol - src/concrete/deploy/MultiOracleUnifiedDeployer.sol - All test/src/concrete/oracle/MultiPythOracleAdapter.*.t.sol files - test/src/concrete/deploy/MultiOracleUnifiedDeployer.t.sol Drops references throughout: - script/Deploy.sol: removes deploy fns and DEPLOYMENT_SUITE_MULTI_* constants - src/lib/LibProdDeploy.sol: drops MULTI_PYTH_ORACLE_ADAPTER_BEACON_SET_DEPLOYER + MULTI_ORACLE_UNIFIED_DEPLOYER constants - test/src/concrete/ProdFork.t.sol: deletes wtCOIN-multi prod-fork test block and WTCOIN_MULTI_* address constants - subgraph/{subgraph.yaml,schema.graphql,networks.json,src/{deployer.ts,oracle-adapter.ts},tests/{handlers/handle-oracle-adapter.test.ts,event-mocks.test.ts}}: drops MultiPyth and MultiOracleUnified data sources, entities, handlers, mocks. Subsumes PR #227 (MultiPyth cascade narrow-catch) since the entire surface area it constrained is gone. Also fixes stale OLD-style soldeer imports in test/src/concrete/protocol/AutoPausePropagation.t.sol that survived the migration rebase. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
1 parent 6fdcad4 commit a9a35d3

19 files changed

Lines changed: 7 additions & 2339 deletions

script/Deploy.sol

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ import {
2626
OracleRegistryBeaconSetDeployer,
2727
OracleRegistryBeaconSetDeployerConfig
2828
} from "src/concrete/deploy/OracleRegistryBeaconSetDeployer.sol";
29-
import {MultiPythOracleAdapter} from "src/concrete/oracle/MultiPythOracleAdapter.sol";
30-
import {
31-
MultiPythOracleAdapterBeaconSetDeployer,
32-
MultiPythOracleAdapterBeaconSetDeployerConfig
33-
} from "src/concrete/deploy/MultiPythOracleAdapterBeaconSetDeployer.sol";
34-
import {MultiOracleUnifiedDeployer} from "src/concrete/deploy/MultiOracleUnifiedDeployer.sol";
3529

3630
/// @dev The deployment suite name for the pyth oracle adapter beacon set.
3731
bytes32 constant DEPLOYMENT_SUITE_PYTH_ORACLE_ADAPTER_BEACON_SET = keccak256("pyth-oracle-adapter-beacon-set");
@@ -50,13 +44,6 @@ bytes32 constant DEPLOYMENT_SUITE_ORACLE_UNIFIED_DEPLOYER = keccak256("oracle-un
5044
/// @dev The deployment suite name for the oracle registry beacon set.
5145
bytes32 constant DEPLOYMENT_SUITE_ORACLE_REGISTRY_BEACON_SET = keccak256("oracle-registry-beacon-set");
5246

53-
/// @dev The deployment suite name for the multi pyth oracle adapter beacon set.
54-
bytes32 constant DEPLOYMENT_SUITE_MULTI_PYTH_ORACLE_ADAPTER_BEACON_SET =
55-
keccak256("multi-pyth-oracle-adapter-beacon-set");
56-
57-
/// @dev The deployment suite name for the multi oracle unified deployer.
58-
bytes32 constant DEPLOYMENT_SUITE_MULTI_ORACLE_UNIFIED_DEPLOYER = keccak256("multi-oracle-unified-deployer");
59-
6047
contract Deploy is Script {
6148
/// @notice Deploys the PythOracleAdapterBeaconSetDeployer contract.
6249
/// Creates a PythOracleAdapter anew for the initial implementation.
@@ -135,32 +122,6 @@ contract Deploy is Script {
135122
vm.stopBroadcast();
136123
}
137124

138-
/// @notice Deploys the MultiPythOracleAdapterBeaconSetDeployer contract.
139-
/// Creates a MultiPythOracleAdapter anew for the initial implementation.
140-
/// Initial owner is set to the BEACON_INITIAL_OWNER constant in
141-
/// LibProdDeploy.
142-
function deployMultiPythOracleAdapterBeaconSet(uint256 deploymentKey) internal {
143-
vm.startBroadcast(deploymentKey);
144-
145-
new MultiPythOracleAdapterBeaconSetDeployer(
146-
MultiPythOracleAdapterBeaconSetDeployerConfig({
147-
initialOwner: LibProdDeploy.BEACON_INITIAL_OWNER,
148-
initialMultiPythOracleAdapterImplementation: address(new MultiPythOracleAdapter())
149-
})
150-
);
151-
152-
vm.stopBroadcast();
153-
}
154-
155-
/// @notice Deploys the MultiOracleUnifiedDeployer contract.
156-
function deployMultiOracleUnifiedDeployer(uint256 deploymentKey) internal {
157-
vm.startBroadcast(deploymentKey);
158-
159-
new MultiOracleUnifiedDeployer();
160-
161-
vm.stopBroadcast();
162-
}
163-
164125
/// @notice Entry point for the deployment script. Dispatches to the
165126
/// appropriate deployment function based on the DEPLOYMENT_SUITE environment
166127
/// variable.
@@ -178,10 +139,6 @@ contract Deploy is Script {
178139
deployOracleUnifiedDeployer(deployerPrivateKey);
179140
} else if (suite == DEPLOYMENT_SUITE_ORACLE_REGISTRY_BEACON_SET) {
180141
deployOracleRegistryBeaconSet(deployerPrivateKey);
181-
} else if (suite == DEPLOYMENT_SUITE_MULTI_PYTH_ORACLE_ADAPTER_BEACON_SET) {
182-
deployMultiPythOracleAdapterBeaconSet(deployerPrivateKey);
183-
} else if (suite == DEPLOYMENT_SUITE_MULTI_ORACLE_UNIFIED_DEPLOYER) {
184-
deployMultiOracleUnifiedDeployer(deployerPrivateKey);
185142
} else {
186143
revert("Unknown deployment suite");
187144
}

src/abstract/BasePythOracleAdapter.sol

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,11 @@ abstract contract BasePythOracleAdapter is AggregatorV3Interface {
106106
/// pausing. Immutable.
107107
uint64 public pauseTimeAfter;
108108

109+
/// @dev Reserved storage to avoid shifting subclass slot positions when
110+
/// new base-class state is introduced in future versions. Decrement
111+
/// `__gap.length` by 1 for each `uint256`-equivalent slot added above.
112+
uint256[50] private __gap;
113+
109114
/// @dev Emitted when the manual pause state changes.
110115
event PauseSet(bool isPaused);
111116
/// @dev Emitted when the admin is changed.

src/concrete/deploy/MultiOracleUnifiedDeployer.sol

Lines changed: 0 additions & 76 deletions
This file was deleted.

src/concrete/deploy/MultiPythOracleAdapterBeaconSetDeployer.sol

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)