From 8fb899311cfa832ffbe34ba5208db114fc20a723 Mon Sep 17 00:00:00 2001
From: gabin54 <59560717+gabin54@users.noreply.github.com>
Date: Thu, 19 Dec 2024 14:15:19 +0100
Subject: [PATCH] fix(conflicts): Reserve Incentives Base and Mainnet  (#95)

* Reserve Incentives Base and Mainnet (#92)

* Reserve rewards eUSD vaults

* Reserve rewards eUSD markets

* Reserve borrow incentives bsdETH/ETH market Base

* Reserve borrow incentives bsdETH/ETH market Base

* Reserve borrow incentives bsdETH/ETH market Base

* Reserve supply incentives ETH+/ETH market Ethereum mainnet

* eUSD incentives in Gauntlet and Re7 WETH vaults on Base

* eUSD incentives in Gauntlet and Re7 WETH vaults on Base

---------

Signed-off-by: bigq <99990370+yum0e@users.noreply.github.com>
Signed-off-by: gabin54 <59560717+gabin54@users.noreply.github.com>
Co-authored-by: Ivan Camps <ivanca@sas.upenn.edu>
Co-authored-by: bigq <99990370+yum0e@users.noreply.github.com>
Co-authored-by: gabin54 <59560717+gabin54@users.noreply.github.com>

* fix: vaul program lint

* fix: timestamp

---------

Signed-off-by: bigq <99990370+yum0e@users.noreply.github.com>
Signed-off-by: gabin54 <59560717+gabin54@users.noreply.github.com>
Co-authored-by: ivancamps <79596228+ivancamps@users.noreply.github.com>
Co-authored-by: Ivan Camps <ivanca@sas.upenn.edu>
Co-authored-by: bigq <99990370+yum0e@users.noreply.github.com>
---
 src/market-programs.ts | 60 ++++++++++++++++++++++++++++++++++++++++++
 src/vault-programs.ts  | 44 +++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/src/market-programs.ts b/src/market-programs.ts
index 24b165a..31a5b5b 100644
--- a/src/market-programs.ts
+++ b/src/market-programs.ts
@@ -1571,4 +1571,64 @@ export const marketPrograms: MarketRewardProgramArgs[] = [
     },
     chainId: ChainId.BASE,
   },
+  // bsdETH/eUSD Base 3,000 eUSD 12/20-1/20 6pm GMT
+  {
+    start: 1734717600n,
+    end: 1737396000n,
+    fundsSender: "0x03d03A026E71979BE3b08D44B01eAe4C5FF9da99",
+    urdAddress: "0x5400dBb270c956E8985184335A1C62AcA6Ce1333",
+    tokenAddress: "0xCfA3Ef56d303AE4fAabA0592388F19d7C3399FB4",
+    marketId: "0xf9ed1dba3b6ba1ede10e2115a9554e9c52091c9f1b1af21f9e0fecc855ee74bf",
+    rewardAmount: {
+      supply: 0n,
+      borrow: parseUnits("3000", 18),
+      collateral: 0n,
+    },
+    chainId: ChainId.BASE,
+  },
+  // hyUSD/eUSD Base 3,000 eUSD 12/20-1/20 6pm GMT
+  {
+    start: 1734717600n,
+    end: 1737396000n,
+    fundsSender: "0x03d03A026E71979BE3b08D44B01eAe4C5FF9da99",
+    urdAddress: "0x5400dBb270c956E8985184335A1C62AcA6Ce1333",
+    tokenAddress: "0xCfA3Ef56d303AE4fAabA0592388F19d7C3399FB4",
+    marketId: "0x3a5bdf0be8d820c1303654b078b14f8fc6d715efaeca56cec150b934bdcbff31",
+    rewardAmount: {
+      supply: 0n,
+      borrow: parseUnits("3000", 18),
+      collateral: 0n,
+    },
+    chainId: ChainId.BASE,
+  },
+  // ETH+/eUSD Mainnet 2,500 eUSD 12/20-1/20 6pm GMT
+  {
+    start: 1734717600n,
+    end: 1737396000n,
+    fundsSender: "0x03d03A026E71979BE3b08D44B01eAe4C5FF9da99",
+    urdAddress: "0x330eefa8a787552DC5cAd3C3cA644844B1E61Ddb",
+    tokenAddress: "0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F",
+    marketId: "0x3f4d007982a480dd99052c05d811cf6838ce61b2a2be8dc52fca107f783d1f15",
+    rewardAmount: {
+      supply: 0n,
+      borrow: parseUnits("2500", 18),
+      collateral: 0n,
+    },
+    chainId: ChainId.MAINNET,
+  },
+  // USD3/eUSD Mainnet 2,500 eUSD 12/20-1/20 6pm GMT
+  {
+    start: 1734717600n,
+    end: 1737396000n,
+    fundsSender: "0x03d03A026E71979BE3b08D44B01eAe4C5FF9da99",
+    urdAddress: "0x330eefa8a787552DC5cAd3C3cA644844B1E61Ddb",
+    tokenAddress: "0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F",
+    marketId: "0xf6422731a8f84d9ab7e8b6da15ab9ecc243e12a78200dfb7fd1cdf2391e38068",
+    rewardAmount: {
+      supply: 0n,
+      borrow: parseUnits("2500", 18),
+      collateral: 0n,
+    },
+    chainId: ChainId.MAINNET,
+  },
 ];
diff --git a/src/vault-programs.ts b/src/vault-programs.ts
index 995a6fc..7aa8a72 100644
--- a/src/vault-programs.ts
+++ b/src/vault-programs.ts
@@ -492,6 +492,50 @@ export const vaultPrograms: VaultRewardProgramArgs[] = [
     amount: parseUnits("325415", 18),
     chainId: ChainId.BASE,
   },
+  // Re7 eUSD Vault - 43,750 eUSD 12/20-1/20 6pm GMT
+  {
+    start: 1734717600n,
+    end: 1737396000n,
+    fundsSender: "0x03d03A026E71979BE3b08D44B01eAe4C5FF9da99",
+    urdAddress: "0x5400dbb270c956e8985184335a1c62aca6ce1333",
+    tokenAddress: "0xCfA3Ef56d303AE4fAabA0592388F19d7C3399FB4",
+    vault: "0xbb819D845b573B5D7C538F5b85057160cfb5f313",
+    amount: parseUnits("43750", 18),
+    chainId: ChainId.BASE,
+  },
+  // Gauntlet eUSD Core Vault - 60,000 eUSD 12/20-1/20 6pm GMT
+  {
+    start: 1734717600n,
+    end: 1737396000n,
+    fundsSender: "0x03d03A026E71979BE3b08D44B01eAe4C5FF9da99",
+    urdAddress: "0x330eefa8a787552DC5cAd3C3cA644844B1E61Ddb",
+    tokenAddress: "0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F",
+    vault: "0xc080f56504e0278828A403269DB945F6c6D6E014",
+    amount: parseUnits("60000", 18),
+    chainId: ChainId.MAINNET,
+  },
+  // Re7 WETH Vault (Base) - 20,000 eUSD 12/24-1/24 6pm GMT
+  {
+    start: 1735063200n,
+    end: 1737741600n,
+    fundsSender: "0x03d03A026E71979BE3b08D44B01eAe4C5FF9da99",
+    urdAddress: "0x5400dbb270c956e8985184335a1c62aca6ce1333",
+    tokenAddress: "0xCfA3Ef56d303AE4fAabA0592388F19d7C3399FB4",
+    vault: "0xA2Cac0023a4797b4729Db94783405189a4203AFc",
+    amount: parseUnits("20000", 18),
+    chainId: ChainId.BASE,
+  },
+  // Gauntlet WETH Core Vault (Base) - 20,000 eUSD 12/24-1/24 6pm GMT
+  {
+    start: 1735063200n,
+    end: 1737741600n,
+    fundsSender: "0x03d03A026E71979BE3b08D44B01eAe4C5FF9da99",
+    urdAddress: "0x5400dbb270c956e8985184335a1c62aca6ce1333",
+    tokenAddress: "0xCfA3Ef56d303AE4fAabA0592388F19d7C3399FB4",
+    vault: "0x6b13c060F13Af1fdB319F52315BbbF3fb1D88844",
+    amount: parseUnits("20000", 18),
+    chainId: ChainId.BASE,
+  },
   // Moonwell Flagship USDC - Monnwell rewards - month 1
   {
     start: 1734372000n, //Mon Dec 16 2024 18:00:00 GMT+0000