Merge branch 'woof-software/rewards-v2-multiple-rewards' of github.co…

…m:woof-software/comet into woof-software/rewards-v2-multiple-rewards

deployments/arbitrum/usdc.e/migrations/1732300426_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732300426_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});

deployments/arbitrum/usdc/migrations/1732300422_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732300422_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});

deployments/arbitrum/usdt/migrations/1732300432_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732300432_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});

deployments/arbitrum/weth/migrations/1732300439_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732300439_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});

deployments/base/aero/migrations/1732300459_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732300459_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});

deployments/base/usdbc/migrations/1732300468_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732300468_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});

deployments/base/usdc/migrations/1732300475_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732300475_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});

deployments/base/weth/migrations/1732300480_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732300480_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});

deployments/goerli/usdc/migrations/1732299867_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732299867_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});

deployments/mainnet/usdc/migrations/1730282660_add_rewards_v2.ts → deployments/mainnet/usdc/migrations/1732299881_deploy_rewards_v2.ts

@@ -2,9 +2,9 @@ import { expect } from 'chai';
 import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
 import { migration } from '../../../../plugins/deployment_manager/Migration';
 
-const MULTISIG_ADDRESS = "0xbbf3f1421D886E9b2c5D716B5192aC998af2012c"
+const MULTISIG_ADDRESS = '0xbbf3f1421D886E9b2c5D716B5192aC998af2012c';
 
-export default migration('1730282660_add_rewards_v2', {
+export default migration('1732299881_deploy_rewards_v2', {
   async prepare(deploymentManager: DeploymentManager) {
     const cometRewardsV2 = await deploymentManager.deploy(
       'CometRewardsV2',
@@ -16,7 +16,8 @@ export default migration('1730282660_add_rewards_v2', {
     return { cometRewardsV2Address: cometRewardsV2.address };
   },
 
-  enact: async (deploymentManager: DeploymentManager, _, { cometRewardsV2Address }) => {
+  enact: async () => {
+    //
   },
 
   async enacted(): Promise<boolean> {

deployments/mainnet/usds/migrations/1732299900_deploy_rewards_v2.ts

@@ -0,0 +1,31 @@
+import { expect } from 'chai';
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+const MULTISIG_ADDRESS = '0xbbf3f1421D886E9b2c5D716B5192aC998af2012c';
+
+export default migration('1732299881_deploy_rewards_v2', {
+  async prepare(deploymentManager: DeploymentManager) {
+    const cometRewardsV2 = await deploymentManager.deploy(
+      'CometRewardsV2',
+      'CometRewardsV2.sol',
+      [
+        MULTISIG_ADDRESS,   // The governor who will control the contract
+      ]
+    );
+    return { cometRewardsV2Address: cometRewardsV2.address };
+  },
+
+  enact: async () => {
+    //
+  },
+
+  async enacted(): Promise<boolean> {
+    return false;
+  },
+
+  async verify(deploymentManager: DeploymentManager) {
+    const cometRewardsV2 = await deploymentManager.fromDep('CometRewardsV2', 'mainnet', 'usds');
+    expect(MULTISIG_ADDRESS).to.be.equal(await cometRewardsV2.governor());
+  },
+});

deployments/mainnet/usdt/migrations/1732299887_deploy_rewards_v2.ts

@@ -0,0 +1,31 @@
+import { expect } from 'chai';
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+const MULTISIG_ADDRESS = '0xbbf3f1421D886E9b2c5D716B5192aC998af2012c';
+
+export default migration('1732299881_deploy_rewards_v2', {
+  async prepare(deploymentManager: DeploymentManager) {
+    const cometRewardsV2 = await deploymentManager.deploy(
+      'CometRewardsV2',
+      'CometRewardsV2.sol',
+      [
+        MULTISIG_ADDRESS,   // The governor who will control the contract
+      ]
+    );
+    return { cometRewardsV2Address: cometRewardsV2.address };
+  },
+
+  enact: async () => {
+    //
+  },
+
+  async enacted(): Promise<boolean> {
+    return false;
+  },
+
+  async verify(deploymentManager: DeploymentManager) {
+    const cometRewardsV2 = await deploymentManager.fromDep('CometRewardsV2', 'mainnet', 'usdt');
+    expect(MULTISIG_ADDRESS).to.be.equal(await cometRewardsV2.governor());
+  },
+});

deployments/mainnet/weth/migrations/1732299893_deploy_rewards_v2.ts

@@ -0,0 +1,31 @@
+import { expect } from 'chai';
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+const MULTISIG_ADDRESS = '0xbbf3f1421D886E9b2c5D716B5192aC998af2012c';
+
+export default migration('1732299881_deploy_rewards_v2', {
+  async prepare(deploymentManager: DeploymentManager) {
+    const cometRewardsV2 = await deploymentManager.deploy(
+      'CometRewardsV2',
+      'CometRewardsV2.sol',
+      [
+        MULTISIG_ADDRESS,   // The governor who will control the contract
+      ]
+    );
+    return { cometRewardsV2Address: cometRewardsV2.address };
+  },
+
+  enact: async () => {
+    //
+  },
+
+  async enacted(): Promise<boolean> {
+    return false;
+  },
+
+  async verify(deploymentManager: DeploymentManager) {
+    const cometRewardsV2 = await deploymentManager.fromDep('CometRewardsV2', 'mainnet', 'weth');
+    expect(MULTISIG_ADDRESS).to.be.equal(await cometRewardsV2.governor());
+  },
+});

deployments/mainnet/wsteth/migrations/1732299907_deploy_rewards_v2.ts

@@ -0,0 +1,31 @@
+import { expect } from 'chai';
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+const MULTISIG_ADDRESS = '0xbbf3f1421D886E9b2c5D716B5192aC998af2012c';
+
+export default migration('1732299881_deploy_rewards_v2', {
+  async prepare(deploymentManager: DeploymentManager) {
+    const cometRewardsV2 = await deploymentManager.deploy(
+      'CometRewardsV2',
+      'CometRewardsV2.sol',
+      [
+        MULTISIG_ADDRESS,   // The governor who will control the contract
+      ]
+    );
+    return { cometRewardsV2Address: cometRewardsV2.address };
+  },
+
+  enact: async () => {
+    //
+  },
+
+  async enacted(): Promise<boolean> {
+    return false;
+  },
+
+  async verify(deploymentManager: DeploymentManager) {
+    const cometRewardsV2 = await deploymentManager.fromDep('CometRewardsV2', 'mainnet', 'wsteth');
+    expect(MULTISIG_ADDRESS).to.be.equal(await cometRewardsV2.governor());
+  },
+});

deployments/mantle/usde/migrations/1732300504_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732300504_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});

deployments/optimism/usdc/migrations/1732300527_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732300527_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});

deployments/optimism/usdt/migrations/1732300533_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732300533_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});

deployments/optimism/weth/migrations/1732300537_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732300537_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});

deployments/polygon/usdc/migrations/1732300555_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732300555_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});

deployments/polygon/usdt/migrations/1732300559_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732300559_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});

deployments/scroll/usdc/migrations/1732300573_deploy_rewards_v2.ts

@@ -0,0 +1,14 @@
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+
+interface Vars {};
+
+export default migration('1732300573_deploy_rewards_v2', {
+  prepare: async (deploymentManager: DeploymentManager) => {
+    return {};
+  },
+
+  enact: async (deploymentManager: DeploymentManager, govDeploymentManager: DeploymentManager, vars: Vars) => {
+    // No governance changes
+  }
+});