diff --git a/deployments/optimism/usdc/migrations/1729593027_gov_marketupdates.ts b/deployments/optimism/usdc/migrations/1729593027_gov_marketupdates.ts index d7d6bc1..c0ca7ab 100644 --- a/deployments/optimism/usdc/migrations/1729593027_gov_marketupdates.ts +++ b/deployments/optimism/usdc/migrations/1729593027_gov_marketupdates.ts @@ -154,7 +154,7 @@ After discussing with OpenZeppelin, DoDAO and OZ together believe that given the }, async enacted(deploymentManager: DeploymentManager): Promise { - return true; + return false; }, async verify(deploymentManager: DeploymentManager) { diff --git a/scenario/RewardsScenario.ts b/scenario/RewardsScenario.ts index 2ed1bf0..fec2af9 100644 --- a/scenario/RewardsScenario.ts +++ b/scenario/RewardsScenario.ts @@ -261,10 +261,10 @@ async function testScalingReward(properties: CometProperties, context: CometCont ); await newRewards.connect(albert.signer).setRewardConfigWithMultiplier(comet.address, rewardTokenAddress, multiplier); await context.sourceTokens( - 100000, // maximum amount which can be sourced from transaction logs + world.base.network === 'scroll' ? 100000 : exp(1_000, rewardDecimals), // conditional check for scroll network: maximum amount which can be sourced from transaction logs on scroll rewardTokenAddress, // CometAsset newRewards.address, // Recipient's address - 2751700 // Block number to start searching for transfer event + world.base.network === 'scroll' ? 2751700 : undefined // conditional check for scroll network: Block number to start searching for transfer event on scroll ); await baseAsset.approve(albert, comet.address);