Skip to content

Commit

Permalink
feat: update airdrop refund address to Mento Treasury (#166)
Browse files Browse the repository at this point in the history
  • Loading branch information
philbow61 authored Apr 3, 2024
1 parent c806929 commit 2fa3efd
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion lib/mento-core-2.3.0
Submodule mento-core-2.3.0 updated 52 files
+0 −170 .github/workflows/ci.yml
+50 −0 .github/workflows/echidna.yaml
+57 −0 .github/workflows/lint_test.yaml
+41 −0 .github/workflows/slither.yaml
+38 −0 .github/workflows/storage-layout.yaml
+13 −1 .prettierrc.yml
+0 −0 contracts/common/SortedOracles.sol
+11 −18 contracts/governance/Airgrab.sol
+17 −7 contracts/governance/Emission.sol
+38 −30 contracts/governance/GovernanceFactory.sol
+24 −7 contracts/governance/MentoGovernor.sol
+3 −1 contracts/governance/TimelockController.sol
+3 −3 contracts/governance/deployers/AirgrabDeployerLib.sol
+3 −1 contracts/governance/deployers/ProxyDeployerLib.sol
+85 −38 contracts/governance/locking/Locking.sol
+158 −70 contracts/governance/locking/LockingBase.sol
+43 −1 contracts/governance/locking/LockingRelock.sol
+15 −0 contracts/governance/locking/interfaces/ILocking.sol
+0 −13 contracts/governance/locking/interfaces/INextVersionLock.sol
+97 −10 contracts/governance/locking/libs/LibBrokenLine.sol
+16 −0 contracts/governance/locking/libs/LibIntMapping.sol
+20 −0 contracts/oracles/BreakerBox.sol
+1 −0 contracts/oracles/breakers/MedianDeltaBreaker.sol
+1 −0 contracts/oracles/breakers/ValueDeltaBreaker.sol
+3 −0 contracts/swap/BiPoolManager.sol
+2 −0 contracts/swap/Broker.sol
+7 −0 contracts/swap/Reserve.sol
+3 −0 contracts/tokens/StableTokenV2.sol
+2 −0 contracts/tokens/patched/ERC20PermitUpgradeable.sol
+6 −0 contracts/tokens/patched/ERC20Upgradeable.sol
+5 −1 echidna.yaml
+4 −5 package.json
+5 −0 slither.config.json
+0 −1 slither.db.json
+4 −3 test/fork-tests/BaseForkTest.t.sol
+5 −0 test/fork-tests/TestAsserts.t.sol
+1 −0 test/fork-tests/TokenUpgrade.t.sol
+1 −1 test/fork-tests/Utils.t.sol
+13 −13 test/governance/Airgrab.t.sol
+1 −1 test/governance/Emission.t.sol
+2 −3 test/governance/GovernanceFactory.t.sol
+32 −20 test/governance/IntegrationTests/GovernanceIntegration.t.sol
+169 −0 test/governance/IntegrationTests/LockingIntegration.fuzz.t.sol
+39 −15 test/governance/Locking/delegateTo.t.sol
+119 −137 test/governance/Locking/locking.t.sol
+63 −42 test/governance/Locking/relock.t.sol
+1 −1 test/oracles/SortedOracles.t.sol
+0 −1 test/tokens/StableTokenV2.t.sol
+1 −0 test/utils/BaseTest.next.sol
+1 −0 test/utils/BaseTest.t.sol
+4 −3 test/utils/Factory.sol
+1 −1 test/utils/IntegrationTest.t.sol
1 change: 0 additions & 1 deletion script/upgrades/MUGOV/MUGOV.sol
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ contract MUGOV is IMentoUpgrade, GovernanceScript {
abi.encodeWithSelector(
IGovernanceFactory(0).createGovernance.selector,
contracts.dependency("WatchdogMultisig"),
contracts.celoRegistry("Governance"),
readAirgrabMerkleRoot(),
contracts.dependency("FractalSigner"),
allocationParams
Expand Down
6 changes: 1 addition & 5 deletions script/upgrades/MUGOV/MUGOVChecks.sol
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,7 @@ contract MUGOVChecks is GovernanceScript, Test {
assertEq(uint256(airgrab.cliffPeriod()), 0, "Airgrab cliff period is incorrect");
assertEq(airgrab.token(), address(mentoToken), "Airgrab token is incorrect");
assertEq(airgrab.locking(), address(locking), "Airgrab locking is incorrect");
assertEq(
airgrab.celoCommunityFund(),
contracts.celoRegistry("Governance"),
"Airgrab celo community fund is incorrect"
);
assertEq(airgrab.mentoTreasury(), address(governanceTimelock), "Airgrab Mento Treasury is incorrect");
console.log("🟢 Airgrab setup correctly");

// Timelock Checks
Expand Down
2 changes: 1 addition & 1 deletion script/upgrades/MUGOV/interfaces.sol
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ interface IAirgrab {

function locking() external view returns (address);

function celoCommunityFund() external view returns (address);
function mentoTreasury() external view returns (address);
}

interface ITimelock {
Expand Down

0 comments on commit 2fa3efd

Please sign in to comment.