wip

remappings.txt

@@ -1,4 +1,4 @@
 @openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
 @openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
 @vibc-core-smart-contracts/=lib/vibc-core-smart-contracts/
-@solady/=lib/solady/src/
+@solady/=lib/solady/src/

src/interfaces/IInvoiceManager.sol

@@ -63,15 +63,15 @@ interface IInvoiceManager {
         address account;
         uint256 nonce;
         address paymaster;
-        string sponsorChainId;
+        uint256 sponsorChainId;
     }
 
     /// @notice Struct to represent the invoice.
     struct InvoiceWithRepayTokens {
         address account;
         uint256 nonce;
         address paymaster;
-        string sponsorChainId;
+        uint256 sponsorChainId;
         RepayTokenInfo[] repayTokenInfos;
     }
 
@@ -141,7 +141,7 @@ interface IInvoiceManager {
         address account,
         address paymaster,
         uint256 nonce,
-        string sponsorChainId,
+        uint256 sponsorChainId,
         RepayTokenInfo[] calldata repayTokenInfos
     ) external view returns (bytes32);
 }

src/interfaces/IPaymasterVerifier.sol

@@ -14,6 +14,7 @@ interface IPaymasterVerifier {
     /// @notice Emitted when an invoice is verified.
     event InvoiceVerified(bytes32 indexed invoiceId);
 
+
     /// @notice The struct of the sponsor token.
     struct SponsorToken {
         address token;

src/paymasters/CABPaymaster.sol

@@ -13,7 +13,8 @@ import {IVault} from "../interfaces/IVault.sol";
 import {IPaymasterVerifier} from "../interfaces/IPaymasterVerifier.sol";
 import {ICrossL2Prover} from "@vibc-core-smart-contracts/contracts/interfaces/ICrossL2Prover.sol";
 
-import {LibBytes} from "@solady/src/utils/LibBytes.sol";
+import {LibBytes} from "@solady/utils/LibBytes.sol";
+
 
 /**
  * @title CABPaymaster
@@ -54,27 +55,18 @@ contract CABPaymaster is IPaymasterVerifier, BasePaymaster {
             _invoice.account, _invoice.paymaster, _invoice.nonce, _invoice.sponsorChainId, _invoice.repayTokenInfos
         );
 
-        // validateEvent(uint256 ,logIndex, bytes calldata proof) returns (bytes32 chainId, address emittingContract, bytes[] memory topics, bytes memory unindexedData)
-
         if (invoiceId != _invoiceId) return false;
 
         (uint256 logIndex, bytes memory proof) = abi.decode(_proof, (uint256, bytes));
 
         (string memory proofChainId, address emittingContract, bytes[] memory topics, bytes memory unindexedData) =
-            prover.validateEvent(logIndex, proof);
-
-        if (!Bytes.equal(bytes(abi.encodePacked(_invoice.sponsorChainId)), bytes(proofChainId))) {
-            revert invalidChainId();
-        }
-        if (emittingContract != expectedEmitter) {
-            revert invalidEventSender();
-        }
+            crossL2Prover.validateEvent(logIndex, proof);
 
-        if (!Bytes.equal(abi.encode(topics), abi.encode(expectedTopics))) {
-            revert invalidCounterpartyEvent();
-        }
-        if (!Bytes.equal(unindexedData, expectedUnindexedData)) {
-            revert invalidCounterpartyEvent();
+        bytes[] memory expectedTopics = new bytes[](2);
+        expectedTopics[0] = abi.encode(keccak256("InvoiceCreated(bytes32)"));
+        expectedTopics[1] = abi.encode(invoiceId);
+        if (!LibBytes.eq(abi.encode(topics), abi.encode(expectedTopics))) {
+            return false;
         }
 
         emit InvoiceVerified(invoiceId);