fix: Allow fee withdrawal to owner's address (#65)

AxLabs · Feb 18, 2025 · 3451dad · 3451dad
1 parent 73bf39d
commit 3451dad
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/openzeppelin-contracts-upgradeable b/lib/openzeppelin-contracts-upgradeable
diff --git a/src/main/solidity/GrantSharesRelayer.sol b/src/main/solidity/GrantSharesRelayer.sol
@@ -5,8 +5,11 @@ import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/acces
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/PausableUpgradeable.sol";
 import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 
 contract GrantSharesRelayer is Ownable2StepUpgradeable, PausableUpgradeable, UUPSUpgradeable {
+    using Address for address payable;
+
     //0xfc512fde
     error InvalidPaymentAmount();
 
@@ -90,6 +93,14 @@ contract GrantSharesRelayer is Ownable2StepUpgradeable, PausableUpgradeable, UUP
         return _getGSStorage();
     }
 
+    /**
+     * @dev Withdraws the fees accumulated in the contract to the owner's address
+     */
+    function withdrawFees() external onlyOwner {
+        // no reentrancy guard b/c owner is trusted
+        payable(owner()).sendValue(address(this).balance);
+    }
+
     /**
      * @dev Pauses the contract
      */
+2 −0		foundry.toml
+1 −1		package.json
+24 −0		src/StdChains.sol
+0 −17		src/StdUtils.sol
+21 −3		src/Vm.sol
+0 −234		src/mocks/MockERC20.sol
+0 −231		src/mocks/MockERC721.sol
+0 −4		test/StdAssertions.t.sol
+3 −3		test/StdChains.t.sol
+20 −3		test/StdStorage.t.sol
+1 −1		test/Vm.t.sol
+0 −441		test/mocks/MockERC20.t.sol
+0 −721		test/mocks/MockERC721.t.sol
+0 −5		.changeset/brave-islands-sparkle.md
+0 −5		.changeset/cyan-taxis-travel.md
+0 −5		.changeset/famous-timers-compare.md
+0 −5		.changeset/good-cameras-serve.md
+0 −5		.changeset/long-walls-draw.md
+0 −5		.changeset/seven-insects-taste.md
+0 −5		.changeset/ten-fishes-fold.md
+0 −5		.changeset/thin-eels-cross.md
+8 −0		.githooks/pre-push
+5 −1		.github/workflows/checks.yml
+1 −1		.github/workflows/formal-verification.yml
+0 −2		.husky/pre-commit
+1 −1		CHANGELOG.md
+ −		audits/2024-12-v5.2.pdf
+8 −9		audits/README.md
+18 −26		certora/run.js
+1 −1		contracts/access/AccessControl.sol
+10 −3		contracts/account/utils/draft-ERC4337Utils.sol
+6 −19		contracts/governance/Governor.sol
+1 −14		contracts/governance/IGovernor.sol
+2 −2		contracts/governance/README.adoc
+0 −76		contracts/governance/extensions/GovernorSequentialProposalId.sol
+1 −1		contracts/governance/extensions/GovernorTimelockCompound.sol
+0 −123		contracts/interfaces/draft-IERC6909.sol
+1 −4		contracts/metatx/ERC2771Forwarder.sol
+0 −39		contracts/mocks/governance/GovernorSequentialProposalIdMock.sol
+5 −5		contracts/token/ERC20/extensions/ERC4626.sol
+1 −1		contracts/token/ERC721/README.adoc
+0 −24		contracts/utils/Calldata.sol
+2 −11		contracts/utils/README.adoc
+1 −1		contracts/utils/ReentrancyGuardTransient.sol
+2 −2		contracts/utils/cryptography/MessageHashUtils.sol
+57 −49		contracts/utils/math/Math.sol
+2 −2		contracts/utils/structs/MerkleTree.sol
+1 −1		docs/modules/ROOT/pages/access-control.adoc
+1 −1		docs/modules/ROOT/pages/erc1155.adoc
+1 −1		docs/modules/ROOT/pages/index.adoc
+1 −1		fv-requirements.txt
+0 −31		hardhat/common-contracts.js
+1 −1		lib/forge-std
+88 −882		package-lock.json
+7 −19		package.json
+0 −2		scripts/checks/coverage.sh
+1 −1		scripts/checks/inheritance-ordering.js
+1 −1		scripts/checks/pragma-consistency.js
+1 −1		scripts/generate/templates/Checkpoints.t.js
+4 −4		scripts/generate/templates/SlotDerivation.t.js
+1 −1		scripts/prepare-docs.sh
+5 −0		scripts/prepare.sh
+0 −10		scripts/set-max-old-space-size.sh
+1 −4		scripts/solhint-custom/package.json
+2 −1		slither.config.json
+1 −1		solhint.config.js
+1 −1		test/TESTING.md
+49 −48		test/account/utils/draft-ERC4337Utils.test.js
+28 −31		test/account/utils/draft-ERC7579Utils.test.js
+2 −6		test/governance/Governor.t.sol
+1 −1		test/governance/Governor.test.js
+1 −1		test/governance/extensions/GovernorCountingFractional.test.js
+1 −1		test/governance/extensions/GovernorERC721.test.js
+1 −1		test/governance/extensions/GovernorPreventLateQuorum.test.js
+0 −202		test/governance/extensions/GovernorSequentialProposalId.test.js
+1 −1		test/governance/extensions/GovernorStorage.test.js
+1 −1		test/governance/extensions/GovernorTimelockAccess.test.js
+1 −1		test/governance/extensions/GovernorTimelockCompound.test.js
+1 −1		test/governance/extensions/GovernorTimelockControl.test.js
+1 −1		test/governance/extensions/GovernorVotesQuorumFraction.test.js
+1 −1		test/governance/extensions/GovernorWithParams.test.js
+31 −0		test/helpers/erc4337-entrypoint.js
+12 −14		test/helpers/governance.js
+2 −7		test/helpers/iterate.js
+1 −1		test/metatx/ERC2771Context.test.js
+3 −3		test/proxy/Clones.t.sol
+3 −3		test/utils/Arrays.t.sol
+2 −2		test/utils/Base64.t.sol
+0 −22		test/utils/Calldata.test.js
+1 −1		test/utils/Create2.t.sol
+25 −25		test/utils/Nonces.behavior.js
+6 −6		test/utils/ShortStrings.t.sol
+14 −14		test/utils/SlotDerivation.t.sol
+4 −4		test/utils/Strings.t.sol
+2 −2		test/utils/cryptography/P256.t.sol
+33 −45		test/utils/introspection/SupportsInterface.behavior.js
+16 −16		test/utils/math/Math.t.sol
+7 −7		test/utils/math/SignedMath.t.sol
+3 −3		test/utils/structs/Checkpoints.t.sol
+1 −1		test/utils/structs/Heap.t.sol