diff --git a/hardhat.config.ts b/hardhat.config.ts index 47f7450a6..81c5a6b90 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -160,7 +160,7 @@ const networkConfigs: NetworkConfig[] = [ { network: 'scroll', chainId: 534352, - url: 'https://rpc.scroll.io', + url: `https://rpc.ankr.com/scroll/${ANKR_KEY}`, }, { network: 'linea', diff --git a/plugins/deployment_manager/Migration.ts b/plugins/deployment_manager/Migration.ts index b9d89eb1c..eae311d96 100644 --- a/plugins/deployment_manager/Migration.ts +++ b/plugins/deployment_manager/Migration.ts @@ -28,7 +28,8 @@ export async function loadMigration(path: string): Promise> { export async function loadMigrations(paths: string[]): Promise[]> { const migrations = []; for (const path of paths) { - migrations.push(await loadMigration(path)); + if(!await (await loadMigration(path)).actions.enacted(undefined, undefined)) + migrations.push(await loadMigration(path)); } return migrations; } diff --git a/scenario/constraints/MigrationConstraint.ts b/scenario/constraints/MigrationConstraint.ts index a0c2b16a2..30fbd4fcf 100644 --- a/scenario/constraints/MigrationConstraint.ts +++ b/scenario/constraints/MigrationConstraint.ts @@ -22,7 +22,7 @@ export class MigrationConstraint implements StaticConstr async solve(world: World) { const label = `[${world.base.name}] {MigrationConstraint}`; const solutions: Solution[] = []; - const migrationPaths = [...subsets(await getMigrations(world))]; + const migrationPaths = [await getMigrations(world)]; for (const migrationList of migrationPaths) { if (migrationList.length == 0 && migrationPaths.length > 1) { diff --git a/scenario/utils/scenarioHelper.ts b/scenario/utils/scenarioHelper.ts index 8c1ef8b3b..65db50b97 100644 --- a/scenario/utils/scenarioHelper.ts +++ b/scenario/utils/scenarioHelper.ts @@ -65,6 +65,7 @@ export function getConfigForScenario(ctx: CometContext) { config.liquidationBase = 100000; config.liquidationBase1 = 50000; config.liquidationAsset = 10000; + config.withdrawAsset = 10000; } if (ctx.world.base.network === 'polygon' && ctx.world.base.deployment === 'usdc') {