@trustvc/eip7702 1.1.0-beta.1 → 1.1.0-beta.2

package/contracts/Factory.sol

@@ -8,7 +8,6 @@ import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 contract PlatformAccountFactory is Ownable {
     address public tdocDeployer;
     address public paymasterImplementation;
-    mapping(address => address) public attachedPaymaster;
 
     event PlatformOnboarded(
         address indexed platformAddress,
@@ -27,13 +26,6 @@ contract PlatformAccountFactory is Ownable {
         paymasterImplementation = _paymasterImplementation;
     }
 
-    function setAttachedPaymaster(
-        address platformAddress
-    ) external view returns (address) {
-        address paymaster = attachedPaymaster[platformAddress];
-        return paymaster;
-    }
-
     function updateTdocDeployer(address _tdocDeployer) external onlyOwner {
         require(_tdocDeployer != address(0), "Zero address");
         tdocDeployer = _tdocDeployer;

package/contracts/PlatformPaymaster.sol

@@ -170,6 +170,12 @@ contract PlatformPaymaster is BasePaymaster {
         bytes calldata remark
     ) external returns (address titleEscrow) {
         require(authorizedRegistries[registry], "registry not authorized");
+        require(
+            authorizedCallers[msg.sender] ||
+                userWhitelist[msg.sender] > 0 ||
+                msg.sender == owner(),
+            "caller not authorized"
+        );
 
         titleEscrow = ITradeTrustToken(registry).mint(
             beneficiary,
@@ -291,7 +297,18 @@ contract PlatformPaymaster is BasePaymaster {
             }
 
             if (innerSel == MINT_DOCUMENT_SEL) {
-                // mintDocument: registry enforces MINTER_ROLE — no extra whitelist needed
+                if (
+                    !authorizedCallers[sender] &&
+                    userWhitelist[sender] == 0 &&
+                    sender != owner()
+                ) {
+                    emit UserOpRejected(sender, "caller not authorized");
+                    return ("", _packValidationData(true, 0, 0));
+                }
+                if (dailyLimit > 0 && dailySpend[sender] + maxCost > dailyLimit) {
+                    emit UserOpRejected(sender, "daily limit exceeded");
+                    return ("", _packValidationData(true, 0, 0));
+                }
                 return (
                     abi.encode(sender, maxCost, false),
                     _packValidationData(false, 0, 0)

package/dist/index.d.mts

@@ -320,20 +320,6 @@ declare const platformAccountFactoryAbi: readonly [{
     }];
     readonly name: "TdocDeployerUpdated";
     readonly type: "event";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "";
-        readonly type: "address";
-    }];
-    readonly name: "attachedPaymaster";
-    readonly outputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "";
-        readonly type: "address";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
 }, {
     readonly inputs: readonly [{
         readonly internalType: "bytes32";
@@ -396,20 +382,6 @@ declare const platformAccountFactoryAbi: readonly [{
     readonly outputs: readonly [];
     readonly stateMutability: "nonpayable";
     readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "platformAddress";
-        readonly type: "address";
-    }];
-    readonly name: "setAttachedPaymaster";
-    readonly outputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "";
-        readonly type: "address";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
 }, {
     readonly inputs: readonly [];
     readonly name: "tdocDeployer";
@@ -1167,11 +1139,17 @@ declare namespace index$1 {
 
 declare const ChainId: {
     readonly Sepolia: 11155111;
+    readonly Amoy: 80002;
 };
 /** Deployed contract addresses indexed by chainId */
 declare const contractAddress: {
+    readonly PaymasterImplementation: {
+        readonly 11155111: "0x5ca5652025ca77d13323ed4887b4cbee6098dd8f";
+        readonly 80002: "0xf47d58D3adc642DaD23966698A7A60b8b34D72f8";
+    };
     readonly PlatformAccountFactory: {
-        readonly 11155111: "0x5dcDf7fA6Ab8323F67FD66E89b6CeD4564f9F4Ff";
+        readonly 11155111: "0x1fe801f6af6e9a6c76431db08b121a7de70bc895";
+        readonly 80002: "0x2762abf6fa22314ebcab41dd4666836038d29341";
     };
 };
 

package/dist/index.d.ts

@@ -320,20 +320,6 @@ declare const platformAccountFactoryAbi: readonly [{
     }];
     readonly name: "TdocDeployerUpdated";
     readonly type: "event";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "";
-        readonly type: "address";
-    }];
-    readonly name: "attachedPaymaster";
-    readonly outputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "";
-        readonly type: "address";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
 }, {
     readonly inputs: readonly [{
         readonly internalType: "bytes32";
@@ -396,20 +382,6 @@ declare const platformAccountFactoryAbi: readonly [{
     readonly outputs: readonly [];
     readonly stateMutability: "nonpayable";
     readonly type: "function";
-}, {
-    readonly inputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "platformAddress";
-        readonly type: "address";
-    }];
-    readonly name: "setAttachedPaymaster";
-    readonly outputs: readonly [{
-        readonly internalType: "address";
-        readonly name: "";
-        readonly type: "address";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
 }, {
     readonly inputs: readonly [];
     readonly name: "tdocDeployer";
@@ -1167,11 +1139,17 @@ declare namespace index$1 {
 
 declare const ChainId: {
     readonly Sepolia: 11155111;
+    readonly Amoy: 80002;
 };
 /** Deployed contract addresses indexed by chainId */
 declare const contractAddress: {
+    readonly PaymasterImplementation: {
+        readonly 11155111: "0x5ca5652025ca77d13323ed4887b4cbee6098dd8f";
+        readonly 80002: "0xf47d58D3adc642DaD23966698A7A60b8b34D72f8";
+    };
     readonly PlatformAccountFactory: {
-        readonly 11155111: "0x5dcDf7fA6Ab8323F67FD66E89b6CeD4564f9F4Ff";
+        readonly 11155111: "0x1fe801f6af6e9a6c76431db08b121a7de70bc895";
+        readonly 80002: "0x2762abf6fa22314ebcab41dd4666836038d29341";
     };
 };
 

package/dist/index.js

@@ -438,25 +438,6 @@ var platformAccountFactoryAbi = [
     "name": "TdocDeployerUpdated",
     "type": "event"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "attachedPaymaster",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -538,25 +519,6 @@ var platformAccountFactoryAbi = [
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "platformAddress",
-        "type": "address"
-      }
-    ],
-    "name": "setAttachedPaymaster",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "tdocDeployer",
@@ -1529,11 +1491,17 @@ __export(constants_exports, {
   contractAddress: () => contractAddress
 });
 var ChainId = {
-  Sepolia: 11155111
+  Sepolia: 11155111,
+  Amoy: 80002
 };
 var contractAddress = {
+  PaymasterImplementation: {
+    [ChainId.Sepolia]: "0x5ca5652025ca77d13323ed4887b4cbee6098dd8f",
+    [ChainId.Amoy]: "0xf47d58D3adc642DaD23966698A7A60b8b34D72f8"
+  },
   PlatformAccountFactory: {
-    [ChainId.Sepolia]: "0x5dcDf7fA6Ab8323F67FD66E89b6CeD4564f9F4Ff"
+    [ChainId.Sepolia]: "0x1fe801f6af6e9a6c76431db08b121a7de70bc895",
+    [ChainId.Amoy]: "0x2762abf6fa22314ebcab41dd4666836038d29341"
   }
 };
 

package/dist/index.mjs

@@ -436,25 +436,6 @@ var platformAccountFactoryAbi = [
     "name": "TdocDeployerUpdated",
     "type": "event"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "attachedPaymaster",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -536,25 +517,6 @@ var platformAccountFactoryAbi = [
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "platformAddress",
-        "type": "address"
-      }
-    ],
-    "name": "setAttachedPaymaster",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "tdocDeployer",
@@ -1527,11 +1489,17 @@ __export(constants_exports, {
   contractAddress: () => contractAddress
 });
 var ChainId = {
-  Sepolia: 11155111
+  Sepolia: 11155111,
+  Amoy: 80002
 };
 var contractAddress = {
+  PaymasterImplementation: {
+    [ChainId.Sepolia]: "0x5ca5652025ca77d13323ed4887b4cbee6098dd8f",
+    [ChainId.Amoy]: "0xf47d58D3adc642DaD23966698A7A60b8b34D72f8"
+  },
   PlatformAccountFactory: {
-    [ChainId.Sepolia]: "0x5dcDf7fA6Ab8323F67FD66E89b6CeD4564f9F4Ff"
+    [ChainId.Sepolia]: "0x1fe801f6af6e9a6c76431db08b121a7de70bc895",
+    [ChainId.Amoy]: "0x2762abf6fa22314ebcab41dd4666836038d29341"
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trustvc/eip7702",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "description": "EIP-7702 smart account, platform paymaster, and factory contracts for TrustVC",
   "author": "DexTech",
   "license": "MIT",