finish implementing all claim methods (still need to add batch tests …

…& fix issues)
Uniswap · Oct 20, 2024 · 4cac73e · 4cac73e
1 parent 661a715
commit 4cac73e
Show file tree

Hide file tree

Showing 3 changed files with 362 additions and 15 deletions.
diff --git a/foundry.toml b/foundry.toml
@@ -3,7 +3,7 @@ solc = '0.8.28'
 evm_version='cancun'
 via_ir = true
 # optimizer_runs = 4_294_967_295
-optimizer_runs = 200
+optimizer_runs = 1_000
 bytecode_hash = 'none'
 src = "src"
 out = "out"

diff --git a/src/TheCompact.sol b/src/TheCompact.sol
@@ -675,6 +675,54 @@ contract TheCompact is ITheCompact, ERC6909, Extsload {
         return _processExogenousBatchMultichainClaim(claimPayload, _withdraw);
     }
 
+    function claim(QualifiedBatchMultichainClaim calldata claimPayload) external returns (bool) {
+        return _processQualifiedBatchMultichainClaim(claimPayload, _release);
+    }
+
+    function claimAndWithdraw(QualifiedBatchMultichainClaim calldata claimPayload) external returns (bool) {
+        return _processQualifiedBatchMultichainClaim(claimPayload, _withdraw);
+    }
+
+    function claim(ExogenousQualifiedBatchMultichainClaim calldata claimPayload) external returns (bool) {
+        return _processExogenousQualifiedBatchMultichainClaim(claimPayload, _release);
+    }
+
+    function claimAndWithdraw(ExogenousQualifiedBatchMultichainClaim calldata claimPayload) external returns (bool) {
+        return _processExogenousQualifiedBatchMultichainClaim(claimPayload, _withdraw);
+    }
+
+    function claim(BatchMultichainClaimWithWitness calldata claimPayload) external returns (bool) {
+        return _processBatchMultichainClaimWithWitness(claimPayload, _release);
+    }
+
+    function claimAndWithdraw(BatchMultichainClaimWithWitness calldata claimPayload) external returns (bool) {
+        return _processBatchMultichainClaimWithWitness(claimPayload, _withdraw);
+    }
+
+    function claim(ExogenousBatchMultichainClaimWithWitness calldata claimPayload) external returns (bool) {
+        return _processExogenousBatchMultichainClaimWithWitness(claimPayload, _release);
+    }
+
+    function claimAndWithdraw(ExogenousBatchMultichainClaimWithWitness calldata claimPayload) external returns (bool) {
+        return _processExogenousBatchMultichainClaimWithWitness(claimPayload, _withdraw);
+    }
+
+    function claim(QualifiedBatchMultichainClaimWithWitness calldata claimPayload) external returns (bool) {
+        return _processQualifiedBatchMultichainClaimWithWitness(claimPayload, _release);
+    }
+
+    function claimAndWithdraw(QualifiedBatchMultichainClaimWithWitness calldata claimPayload) external returns (bool) {
+        return _processQualifiedBatchMultichainClaimWithWitness(claimPayload, _withdraw);
+    }
+
+    function claim(ExogenousQualifiedBatchMultichainClaimWithWitness calldata claimPayload) external returns (bool) {
+        return _processExogenousQualifiedBatchMultichainClaimWithWitness(claimPayload, _release);
+    }
+
+    function claimAndWithdraw(ExogenousQualifiedBatchMultichainClaimWithWitness calldata claimPayload) external returns (bool) {
+        return _processExogenousQualifiedBatchMultichainClaimWithWitness(claimPayload, _withdraw);
+    }
+
     function claim(SplitBatchMultichainClaim calldata claimPayload) external returns (bool) {
         return _processSplitBatchMultichainClaim(claimPayload, _release);
     }
@@ -1341,6 +1389,58 @@ contract TheCompact is ITheCompact, ERC6909, Extsload {
         return _processSimpleBatchClaim.usingBatchMultichainClaim()(claimPayload.toMessageHash(), claimPayload, 0xc0, operation);
     }
 
+    function _processQualifiedBatchMultichainClaim(QualifiedBatchMultichainClaim calldata claimPayload, function(address, address, uint256, uint256) internal returns (bool) operation)
+        internal
+        returns (bool)
+    {
+        (bytes32 messageHash, bytes32 qualificationMessageHash) = claimPayload.toMessageHash();
+        return _processBatchClaimWithQualification.usingQualifiedBatchMultichainClaim()(messageHash, qualificationMessageHash, claimPayload, 0xe0, operation);
+    }
+
+    function _processBatchMultichainClaimWithWitness(BatchMultichainClaimWithWitness calldata claimPayload, function(address, address, uint256, uint256) internal returns (bool) operation)
+        internal
+        returns (bool)
+    {
+        return _processSimpleBatchClaim.usingBatchMultichainClaimWithWitness()(claimPayload.toMessageHash(), claimPayload, 0xe0, operation);
+    }
+
+    function _processQualifiedBatchMultichainClaimWithWitness(
+        QualifiedBatchMultichainClaimWithWitness calldata claimPayload,
+        function(address, address, uint256, uint256) internal returns (bool) operation
+    ) internal returns (bool) {
+        (bytes32 messageHash, bytes32 qualificationMessageHash) = claimPayload.toMessageHash();
+        return _processBatchClaimWithQualification.usingQualifiedBatchMultichainClaimWithWitness()(messageHash, qualificationMessageHash, claimPayload, 0x120, operation);
+    }
+
+    function _processExogenousQualifiedBatchMultichainClaim(
+        ExogenousQualifiedBatchMultichainClaim calldata claimPayload,
+        function(address, address, uint256, uint256) internal returns (bool) operation
+    ) internal returns (bool) {
+        (bytes32 messageHash, bytes32 qualificationMessageHash) = claimPayload.toMessageHash();
+        return _processBatchClaimWithQualificationAndSponsorDomain.usingExogenousQualifiedBatchMultichainClaim()(
+            messageHash, qualificationMessageHash, claimPayload, 0x120, claimPayload.notarizedChainId.toNotarizedDomainSeparator(), operation
+        );
+    }
+
+    function _processExogenousBatchMultichainClaimWithWitness(
+        ExogenousBatchMultichainClaimWithWitness calldata claimPayload,
+        function(address, address, uint256, uint256) internal returns (bool) operation
+    ) internal returns (bool) {
+        return _processBatchClaimWithSponsorDomain.usingExogenousBatchMultichainClaimWithWitness()(
+            claimPayload.toMessageHash(), claimPayload, 0x120, claimPayload.notarizedChainId.toNotarizedDomainSeparator(), operation
+        );
+    }
+
+    function _processExogenousQualifiedBatchMultichainClaimWithWitness(
+        ExogenousQualifiedBatchMultichainClaimWithWitness calldata claimPayload,
+        function(address, address, uint256, uint256) internal returns (bool) operation
+    ) internal returns (bool) {
+        (bytes32 messageHash, bytes32 qualificationMessageHash) = claimPayload.toMessageHash();
+        return _processBatchClaimWithQualificationAndSponsorDomain.usingExogenousQualifiedBatchMultichainClaimWithWitness()(
+            messageHash, qualificationMessageHash, claimPayload, 0x160, claimPayload.notarizedChainId.toNotarizedDomainSeparator(), operation
+        );
+    }
+
     function _processExogenousMultichainClaim(ExogenousMultichainClaim calldata claimPayload, function(address, address, uint256, uint256) internal returns (bool) operation) internal returns (bool) {
         return _processClaimWithSponsorDomain.usingExogenousMultichainClaim()(claimPayload.toMessageHash(), claimPayload, 0x100, claimPayload.notarizedChainId.toNotarizedDomainSeparator(), operation);
     }