Merge branch 'master' into indexfund-cleanup

AngelProtocolFinance · Jul 28, 2023 · 19ad89d · 19ad89d
2 parents 173bd0c + 746ff55
commit 19ad89d
Show file tree

Hide file tree

Showing 29 changed files with 595 additions and 297 deletions.
diff --git a/compile.sh b/compile.sh
@@ -5,7 +5,7 @@ set -x;
 # Shuttle `tasks/index.ts` file to temp file before cleaning/compiling starts
 mv -n ./tasks/index.ts ./tasks/temp_index.ts && touch ./tasks/index.ts;
 # Clean and compile all contracts.
-hardhat clean && hardhat compile;
+hardhat compile;
 # Shuttle `tasks/index.ts` file from temp file to orig location after cleaning/compiling ends
 # Run regardless of above line's failure or sucesss
 mv ./tasks/temp_index.ts ./tasks/index.ts;

diff --git a/contract-address.json b/contract-address.json
@@ -104,10 +104,6 @@
       "implementation": "",
       "proxy": ""
     },
-    "libraries": {
-      "angelCoreStruct": "",
-      "stringArray": ""
-    },
     "multiSig": {
       "charityApplications": {
         "implementation": "",
@@ -261,10 +257,6 @@
       "implementation": "0x59c7E6B2c565Ff92B762523BD6B778CE66dC0302",
       "proxy": "0x9A676e781A523b5d0C0e43731313A708CB607508"
     },
-    "libraries": {
-      "angelCoreStruct": "",
-      "stringArray": ""
-    },
     "multiSig": {
       "charityApplications": {
         "implementation": "0x9687796759CAbecC1674A4Aaf23889fC9EC2FCA2",
@@ -418,10 +410,6 @@
       "implementation": "0x73cF9763985f5617AaF635A8707d89E3B697e112",
       "proxy": "0xf6B32b4a0371050321fC01672FDfad76aF55603f"
     },
-    "libraries": {
-      "angelCoreStruct": "",
-      "stringArray": ""
-    },
     "multiSig": {
       "charityApplications": {
         "implementation": "0xA89d149De8F8785c2a6c7ea99B6cC3De5A4c29Af",
@@ -433,7 +421,7 @@
       },
       "endowment": {
         "emitter": {
-          "implementation": "0xf1bBE8aCdd30E2998D1Db8eEaACE95E86DFE7a0a",
+          "implementation": "0x366478C1e2895017FaCb12Ea682CfcBF85720BAC",
           "proxy": "0x8a87385765871bD85d96B7675A3F1Fb663146E4d"
         },
         "factory": "0xc4150f28a33a04B79B60560Bd4684d521edB99AE",

diff --git a/contracts/accessory/gift-cards/GiftCards.sol b/contracts/accessory/gift-cards/GiftCards.sol
@@ -186,7 +186,8 @@ contract GiftCards is Storage, Initializable, OwnableUpgradeable, ReentrancyGuar
       AccountMessages.DepositRequest({
         id: endowmentId,
         lockedPercentage: lockedPercentage,
-        liquidPercentage: liquidPercentage
+        liquidPercentage: liquidPercentage,
+        donationMatch: msg.sender
       }),
       tokenAddress,
       amount

diff --git a/contracts/core/accounts/facets/AccountsDepositWithdrawEndowments.sol b/contracts/core/accounts/facets/AccountsDepositWithdrawEndowments.sol
@@ -115,7 +115,6 @@ contract AccountsDepositWithdrawEndowments is
     uint256 liquidSplitPercent = details.liquidPercentage;
 
     require(registrar_config.indexFundContract != address(0), "No Index Fund");
-
     if (msg.sender != registrar_config.indexFundContract) {
       if (tempEndowment.endowType == LibAccounts.EndowmentType.Charity) {
         // use the Registrar default split for Charities
@@ -139,27 +138,28 @@ contract AccountsDepositWithdrawEndowments is
     uint256 lockedAmount = (amount.mul(lockedSplitPercent)).div(LibAccounts.PERCENT_BASIS);
     uint256 liquidAmount = (amount.mul(liquidSplitPercent)).div(LibAccounts.PERCENT_BASIS);
 
-    //donation matching flow
-    //execute donor match will always be called on an EOA
+    // donation matching flow
     if (lockedAmount > 0) {
+      address donationMatch = details.donationMatch;
+      if (donationMatch == address(0)) {
+        donationMatch = msg.sender;
+      }
+
       if (
         tempEndowment.endowType == LibAccounts.EndowmentType.Charity &&
         registrar_config.donationMatchCharitesContract != address(0)
       ) {
         IDonationMatching(registrar_config.donationMatchCharitesContract).executeDonorMatch(
           details.id,
           lockedAmount,
-          tx.origin,
+          donationMatch,
           registrar_config.haloToken
         );
-      } else if (
-        tempEndowment.endowType == LibAccounts.EndowmentType.Normal &&
-        tempEndowment.donationMatchContract != address(0)
-      ) {
+      } else if (tempEndowment.donationMatchContract != address(0)) {
         IDonationMatching(tempEndowment.donationMatchContract).executeDonorMatch(
           details.id,
           lockedAmount,
-          tx.origin,
+          donationMatch,
           tempEndowment.daoToken
         );
       }
@@ -330,7 +330,8 @@ contract AccountsDepositWithdrawEndowments is
           AccountMessages.DepositRequest({
             id: beneficiaryEndowId,
             lockedPercentage: 0,
-            liquidPercentage: 100
+            liquidPercentage: 100,
+            donationMatch: address(this) // all liquid so won't trigger a match
           }),
           tokens[t].addr,
           (amountLeftover - withdrawFeeEndow)

diff --git a/contracts/core/accounts/message.sol b/contracts/core/accounts/message.sol
@@ -121,6 +121,7 @@ library AccountMessages {
     uint32 id;
     uint256 lockedPercentage;
     uint256 liquidPercentage;
+    address donationMatch;
   }
 
   struct InvestRequest {

diff --git a/contracts/multisigs/CharityApplications.sol b/contracts/multisigs/CharityApplications.sol
@@ -239,7 +239,8 @@ contract CharityApplications is MultiSigGeneric, StorageApplications, ICharityAp
           AccountMessages.DepositRequest({
             id: endowmentId,
             lockedPercentage: 100 - config.seedSplitToLiquid,
-            liquidPercentage: config.seedSplitToLiquid
+            liquidPercentage: config.seedSplitToLiquid,
+            donationMatch: address(this)
           }),
           config.seedAsset,
           config.seedAmount

diff --git a/eth-sdk/eth-sdk.config.ts b/eth-sdk/eth-sdk.config.ts
@@ -82,10 +82,6 @@ export default defineConfig({
         implementation: parseAddress(mumbaiData.indexFund.implementation),
         proxy: parseAddress(mumbaiData.indexFund.proxy),
       },
-      libraries: {
-        angelCoreStruct: parseAddress(mumbaiData.libraries.angelCoreStruct),
-        stringArray: parseAddress(mumbaiData.libraries.stringArray),
-      },
       multiSig: {
         apTeam: {
           implementation: parseAddress(mumbaiData.multiSig.apTeam.implementation),

diff --git a/tasks/deploy/deployAccountsDiamond.ts b/tasks/deploy/deployAccountsDiamond.ts
@@ -1,7 +1,6 @@
 import {deployAccountsDiamond} from "contracts/core/accounts/scripts/deploy";
 import {task} from "hardhat/config";
 import {confirmAction, getAddresses, isLocalNetwork, logger, verify} from "utils";
-import {updateRegistrarConfig} from "../helpers";
 
 type TaskArgs = {
   apTeamMultisig?: string;
@@ -38,12 +37,10 @@ task("AccountsDiamond", "It will deploy accounts diamond contracts")
         return;
       }
 
-      await updateRegistrarConfig(
-        registrar,
-        apTeam,
-        {accountsContract: deployData.diamond.address},
-        hre
-      );
+      await hre.run("manage:registrar:updateConfig", {
+        accountsContract: deployData.diamond.address,
+        yes: true,
+      });
       await hre.run("manage:CharityApplications:updateConfig", {
         accountsDiamond: deployData.diamond.address,
         yes: true,

diff --git a/tasks/deploy/deployAngelProtocol.ts b/tasks/deploy/deployAngelProtocol.ts
@@ -21,11 +21,7 @@ import {deployEndowmentMultiSig} from "contracts/normalized_endowment/endowment-
 // import {deployImplementation} from "contracts/normalized_endowment/scripts/deployImplementation";
 
 import {deployGasFwd} from "contracts/core/gasFwd/scripts/deploy";
-import {
-  getOrDeployThirdPartyContracts,
-  updateRegistrarConfig,
-  updateRegistrarNetworkConnections,
-} from "../helpers";
+import {getOrDeployThirdPartyContracts, updateRegistrarNetworkConnections} from "../helpers";
 
 task("deploy:AngelProtocol", "Will deploy complete Angel Protocol")
   .addFlag("skipVerify", "Skip contract verification")
@@ -97,29 +93,25 @@ task("deploy:AngelProtocol", "Will deploy complete Angel Protocol")
 
       const endowmentMultiSig = await deployEndowmentMultiSig(hre);
 
-      await updateRegistrarConfig(
-        registrar?.address,
-        apTeamMultisig?.address,
-        {
-          accountsContract: accounts?.diamond.address, //Address
-          splitMax: config.REGISTRAR_DATA.splitToLiquid.max, //uint256
-          splitMin: config.REGISTRAR_DATA.splitToLiquid.min, //uint256
-          splitDefault: config.REGISTRAR_DATA.splitToLiquid.defaultSplit, //uint256
-          collectorShare: config.REGISTRAR_UPDATE_CONFIG.collectorShare, //uint256
-          indexFundContract: indexFund?.address, //address
-          treasury: treasury.address,
-          uniswapRouter: thirdPartyAddresses.uniswap.swapRouter.address, //address
-          uniswapFactory: thirdPartyAddresses.uniswap.factory.address, //address
-          multisigFactory: endowmentMultiSig?.factory.address, //address
-          multisigEmitter: endowmentMultiSig?.emitter.address, //address
-          charityApplications: charityApplications?.address, //address
-          proxyAdmin: proxyAdmin.address, //address
-          usdcAddress: thirdPartyAddresses.usdcToken.address,
-          wMaticAddress: thirdPartyAddresses.wmaticToken.address,
-          gasFwdFactory: gasFwd?.factory.address,
-        },
-        hre
-      );
+      await hre.run("manage:registrar:updateConfig", {
+        accountsContract: accounts?.diamond.address, //Address
+        splitMax: config.REGISTRAR_DATA.splitToLiquid.max, //uint256
+        splitMin: config.REGISTRAR_DATA.splitToLiquid.min, //uint256
+        splitDefault: config.REGISTRAR_DATA.splitToLiquid.defaultSplit, //uint256
+        collectorShare: config.REGISTRAR_UPDATE_CONFIG.collectorShare, //uint256
+        indexFundContract: indexFund?.address, //address
+        treasury: treasury.address,
+        uniswapRouter: thirdPartyAddresses.uniswap.swapRouter.address, //address
+        uniswapFactory: thirdPartyAddresses.uniswap.factory.address, //address
+        multisigFactory: endowmentMultiSig?.factory.address, //address
+        multisigEmitter: endowmentMultiSig?.emitter.address, //address
+        charityApplications: charityApplications?.address, //address
+        proxyAdmin: proxyAdmin.address, //address
+        usdcAddress: thirdPartyAddresses.usdcToken.address,
+        wMaticAddress: thirdPartyAddresses.wmaticToken.address,
+        gasFwdFactory: gasFwd?.factory.address,
+        yes: true,
+      });
 
       // Registrar NetworkInfo's Router address must be updated for the current network
       if (router) {

diff --git a/tasks/deploy/deployCharityApplications.ts b/tasks/deploy/deployCharityApplications.ts
@@ -1,13 +1,10 @@
 import {deployCharityApplications} from "contracts/multisigs/scripts/deployCharityApplications";
 import {task} from "hardhat/config";
 import {confirmAction, getAddresses, isLocalNetwork, logger, verify} from "utils";
-import {updateRegistrarConfig} from "../helpers";
 
 type TaskArgs = {
   accountsDiamond?: string;
-  apTeamMultisig?: string;
   charityApplications?: string;
-  registrar?: string;
   skipVerify: boolean;
   yes: boolean;
 };
@@ -17,14 +14,6 @@ task("deploy:CharityApplications", "Will deploy CharityApplication contract")
     "accountsDiamond",
     "Accounts Diamond contract address. Will do a local lookup from contract-address.json if none is provided."
   )
-  .addOptionalParam(
-    "apTeamMultisig",
-    "APTeamMultiSig contract address. Will do a local lookup from contract-address.json if none is provided."
-  )
-  .addOptionalParam(
-    "registrar",
-    "Registrar contract address. Will do a local lookup from contract-address.json if none is provided."
-  )
   .addFlag("skipVerify", "Skip contract verification")
   .addFlag("yes", "Automatic yes to prompt.")
   .setAction(async (taskArgs: TaskArgs, hre) => {
@@ -37,8 +26,6 @@ task("deploy:CharityApplications", "Will deploy CharityApplication contract")
       const addresses = await getAddresses(hre);
 
       const accountsDiamond = taskArgs.accountsDiamond || addresses.accounts.diamond;
-      const apTeamMultiSig = taskArgs.apTeamMultisig || addresses.multiSig.apTeam.proxy;
-      const registrar = taskArgs.registrar || addresses.registrar.proxy;
 
       const charityApplications = await deployCharityApplications(
         accountsDiamond,
@@ -50,12 +37,10 @@ task("deploy:CharityApplications", "Will deploy CharityApplication contract")
         return;
       }
 
-      await updateRegistrarConfig(
-        registrar,
-        apTeamMultiSig,
-        {charityApplications: charityApplications.address},
-        hre
-      );
+      await hre.run("manage:registrar:updateConfig", {
+        charityApplications: charityApplications.address,
+        yes: true,
+      });
 
       if (!isLocalNetwork(hre) && !taskArgs.skipVerify) {
         await verify(hre, charityApplications);

diff --git a/tasks/deploy/deployEndowmentMultisig.ts b/tasks/deploy/deployEndowmentMultisig.ts
@@ -1,24 +1,13 @@
 import {deployEndowmentMultiSig} from "contracts/normalized_endowment/endowment-multisig/scripts/deploy";
 import {task} from "hardhat/config";
-import {confirmAction, getAddresses, isLocalNetwork, logger, verify} from "utils";
-import {updateRegistrarConfig} from "../helpers";
+import {confirmAction, isLocalNetwork, logger, verify} from "utils";
 
 type TaskArgs = {
-  apTeamMultisig?: string;
-  registrar?: string;
   skipVerify: boolean;
   yes: boolean;
 };
 
 task("deploy:EndowmentMultiSig", "Will deploy EndowmentMultiSig contract")
-  .addOptionalParam(
-    "apTeamMultisig",
-    "APTeamMultiSig contract address. Will do a local lookup from contract-address.json if none is provided."
-  )
-  .addOptionalParam(
-    "registrar",
-    "Registrar contract address. Will do a local lookup from contract-address.json if none is provided."
-  )
   .addFlag("skipVerify", "Skip contract verification")
   .addFlag("yes", "Automatic yes to prompt.")
   .setAction(async (taskArgs: TaskArgs, hre) => {
@@ -28,26 +17,17 @@ task("deploy:EndowmentMultiSig", "Will deploy EndowmentMultiSig contract")
         return logger.out("Confirmation denied.", logger.Level.Warn);
       }
 
-      const addresses = await getAddresses(hre);
-
-      const apTeamMultiSig = taskArgs.apTeamMultisig || addresses.multiSig.apTeam.proxy;
-      const registrar = taskArgs.registrar || addresses.registrar.proxy;
-
       const deployData = await deployEndowmentMultiSig(hre);
 
       if (!deployData) {
         return;
       }
 
-      await updateRegistrarConfig(
-        registrar,
-        apTeamMultiSig,
-        {
-          multisigFactory: deployData.factory.address,
-          multisigEmitter: deployData.emitter.address,
-        },
-        hre
-      );
+      await hre.run("manage:registrar:updateConfig", {
+        multisigFactory: deployData.factory.address,
+        multisigEmitter: deployData.emitter.address,
+        yes: true,
+      });
 
       if (!isLocalNetwork(hre) && !taskArgs.skipVerify) {
         await verify(hre, deployData.emitter);

diff --git a/tasks/deploy/deployGasFwd.ts b/tasks/deploy/deployGasFwd.ts
@@ -1,7 +1,6 @@
 import {deployGasFwd} from "contracts/core/gasFwd/scripts/deploy";
 import {task} from "hardhat/config";
-import {updateRegistrarConfig} from "tasks/helpers";
-import {getSigners, getAddresses, isLocalNetwork, logger, verify} from "utils";
+import {getAddresses, getSigners, isLocalNetwork, logger, verify} from "utils";
 
 type TaskArgs = {
   skipVerify: boolean;
@@ -23,12 +22,10 @@ task("deploy:GasFwd", "Will deploy the GasFwd implementation and factory")
         return;
       }
 
-      await updateRegistrarConfig(
-        addresses.registrar.proxy,
-        addresses.multiSig.apTeam.proxy,
-        {gasFwdFactory: gasFwdDeployment.factory.address},
-        hre
-      );
+      await hre.run("manage:registrar:updateConfig", {
+        gasFwdFactory: gasFwdDeployment.factory.address,
+        yes: true,
+      });
 
       if (!isLocalNetwork(hre) && !taskArgs.skipVerify) {
         await verify(hre, gasFwdDeployment.implementation);