feat: pull update with fixes

woof-software · Jul 8, 2024 · 8fe77af · 8fe77af
1 parent e0706a1
commit 8fe77af
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/deployments/mainnet/weth/migrations/1719835184_update_rseth_and_weth_pricefeed.ts b/deployments/mainnet/weth/migrations/1719835184_update_rseth_and_weth_pricefeed.ts
@@ -72,7 +72,7 @@ export default migration('1719835184_update_rseth_and_weth_pricefeed', {
   },
 
   async enacted(): Promise<boolean> {
-    return false;
+    return true;
   },
 
   async verify(deploymentManager: DeploymentManager) {

diff --git a/...ons/1718352598_add_ezeth_as_collateral.ts → ...ons/1720438454_add_ezeth_as_collateral.ts b/...ons/1718352598_add_ezeth_as_collateral.ts → ...ons/1720438454_add_ezeth_as_collateral.ts
@@ -6,7 +6,7 @@ import { exp, proposal } from '../../../../src/deploy';
 const EZETH_ADDRESS = '0xbf5495Efe5DB9ce00f80364C8B423567e58d2110';
 const EZETH_PRICE_FEED_ADDRESS = '0x387dBc0fB00b26fb085aa658527D5BE98302c84C';
 
-export default migration('1718352598_add_ezeth_as_collateral', {
+export default migration('1720438454_add_ezeth_as_collateral', {
   async prepare(deploymentManager: DeploymentManager) {
     const _ezETHScalingPriceFeed = await deploymentManager.deploy(
       'ezETH:priceFeed',

diff --git a/scenario/constraints/MigrationConstraint.ts b/scenario/constraints/MigrationConstraint.ts
@@ -1,7 +1,7 @@
 import { StaticConstraint, Solution, World, debug } from '../../plugins/scenario';
 import { CometContext, MigrationData } from '../context/CometContext';
 import { Migration, loadMigrations, Actions } from '../../plugins/deployment_manager/Migration';
-import { modifiedPaths, subsets } from '../utils';
+import { modifiedPaths } from '../utils';
 import { DeploymentManager } from '../../plugins/deployment_manager';
 import { impersonateAddress } from '../../plugins/scenario/utils';
 import { exp } from '../../test/helpers';
@@ -22,7 +22,7 @@ export class MigrationConstraint<T extends CometContext> implements StaticConstr
   async solve(world: World) {
     const label = `[${world.base.name}] {MigrationConstraint}`;
     const solutions: Solution<T>[] = [];
-    const migrationPaths = [...subsets(await getMigrations(world))];
+    const migrationPaths = [await getMigrations(world)];
 
     for (const migrationList of migrationPaths) {
       if (migrationList.length == 0 && migrationPaths.length > 1) {