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

package/README.md

@@ -138,16 +138,54 @@ npx hardhat run scripts/mintDocumentGasless.ts --network sepolia
 
 ## Environment variables
 
+Deploy/registry/paymaster addresses are network-scoped — suffix the variable with `_SEPOLIA` or `_AMOY` (e.g. `FACTORY_ADDRESS_SEPOLIA`, `FACTORY_ADDRESS_AMOY`). `scripts/lib/network.ts` resolves the suffix from `--network <name>` (hardhat scripts) or the `NETWORK` env var (viem/permissionless scripts). See `.env.example` for the full annotated list.
+
+### Wallets & RPC
+
 | Variable | Description |
 | --- | --- |
-| `PRIVATE_KEY` | Deployer wallet private key |
+| `PRIVATE_KEY` | Deployer/gas-payer wallet — pays for deployments, delegation txs, staking |
+| `PRIVATE_KEY2` | Secondary wallet (optional — testing with a second account) |
+| `OWNER_PRIVATE_KEY` | Platform owner / whitelisted user — signs UserOps, needs no ETH for gasless ops |
 | `SEPOLIA_RPC_URL` | Sepolia RPC endpoint |
+| `AMOY_RPC_URL` | Polygon Amoy RPC endpoint |
 | `PIMLICO_API_KEY` | Pimlico bundler API key |
-| `TDOC_DEPLOYER_ADDRESS` | Deployed TDocDeployer address |
-| `PAYMASTER_IMPLEMENTATION` | PlatformPaymaster implementation address |
-| `FACTORY_ADDRESS` | PlatformAccountFactory address |
-| `PAYMASTER_ADDRESS` | Deployed paymaster clone address |
-| `EIP7702_IMPL_ADDRESS` | EIP7702Implementation address |
+| `NETWORK` | `sepolia` \| `amoy` — target network for viem/permissionless scripts (default: `sepolia`) |
+| `ENTRY_POINT` | EntryPoint v0.8 address (default: `0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108`, same on all supported chains) |
+
+### Deployed addresses (network-suffixed)
+
+| Variable | Description |
+| --- | --- |
+| `EIP7702_IMPL_ADDRESS_<NETWORK>` | Deployed `EIP7702Implementation` address |
+| `PAYMASTER_IMPLEMENTATION_<NETWORK>` | Deployed `PlatformPaymaster` implementation address |
+| `FACTORY_ADDRESS_<NETWORK>` | Deployed `PlatformAccountFactory` address |
+| `PAYMASTER_ADDRESS_<NETWORK>` | Deployed paymaster clone address |
+| `TDOC_DEPLOYER_ADDRESS_<NETWORK>` | TrustVC `TDocDeployer` address (pre-deployed infra) |
+| `TDOC_IMPLEMENTATION_<NETWORK>` | TDoc implementation to clone via `deployRegistry` |
+| `REGISTRY_ADDRESS_<NETWORK>` | Registry deployed via `deployRegistryGasless.ts` |
+| `TITLE_ESCROW_ADDRESS_<NETWORK>` | Title escrow captured via `mintDocumentGasless.ts` |
+
+### Gasless script inputs
+
+| Variable | Description |
+| --- | --- |
+| `TOKEN_NAME` / `TOKEN_SYMBOL` | Name/symbol for the TradeTrust token registry (`deployRegistryGasless.ts`) |
+| `TOKEN_ID` | Document token ID as `uint256` (`mintDocumentGasless.ts`) |
+| `BENEFICIARY_ADDRESS` / `HOLDER_ADDRESS` | Document beneficiary/holder (`mintDocumentGasless.ts`) |
+| `REMARK` | Optional remark bytes/text attached to the document |
+| `NOMINEE_ADDR` / `NEW_HOLDER_ADDR` | Used by the `scripts/trFunctions/*` title-escrow helpers |
+
+### Optional deploy/stake overrides
+
+| Variable | Description |
+| --- | --- |
+| `PLATFORM_ADDRESS` | Paymaster owner EOA for `deployPlatformPaymaster.ts` (default: deployer) |
+| `DAILY_LIMIT_ETH` | Per-user daily gas limit in ETH (default: `0` = unlimited) |
+| `DEPLOY_SALT` | Hex `bytes32` CREATE2 salt (default: random) |
+| `STAKE_AMOUNT_ETH` | ETH locked as EntryPoint stake (default: `0.01`) |
+| `DEPOSIT_AMOUNT_ETH` | ETH deposited into the gas pool (default: `0.05`) |
+| `UNSTAKE_DELAY_SEC` | Stake lock period in seconds (default: `86400` = 1 day) |
 
 ## Tech stack
 

package/contracts/Factory.sol

@@ -8,8 +8,12 @@ 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, address indexed paymaster);
+    event PlatformOnboarded(
+        address indexed platformAddress,
+        address indexed paymaster
+    );
     event TdocDeployerUpdated(address indexed newDeployer);
     event ImplementationUpdated(address indexed newImplementation);
 
@@ -17,10 +21,19 @@ contract PlatformAccountFactory is Ownable {
         address _tdocDeployer,
         address _paymasterImplementation
     ) Ownable(msg.sender) {
+        require(_tdocDeployer != address(0), "Zero address");
+        require(_paymasterImplementation != address(0), "Zero address");
         tdocDeployer = _tdocDeployer;
         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;
@@ -39,12 +52,23 @@ contract PlatformAccountFactory is Ownable {
         bytes32 salt
     ) external returns (address paymaster) {
         paymaster = Clones.cloneDeterministic(paymasterImplementation, salt);
-        PlatformPaymaster(payable(paymaster)).initialize(platformAddress, dailyLimit, tdocDeployer);
+        PlatformPaymaster(payable(paymaster)).initialize(
+            platformAddress,
+            dailyLimit,
+            tdocDeployer
+        );
         emit PlatformOnboarded(platformAddress, paymaster);
     }
 
     // Address is determined solely by implementation + salt (not by constructor args).
-    function computePaymasterAddress(bytes32 salt) external view returns (address) {
-        return Clones.predictDeterministicAddress(paymasterImplementation, salt, address(this));
+    function computePaymasterAddress(
+        bytes32 salt
+    ) external view returns (address) {
+        return
+            Clones.predictDeterministicAddress(
+                paymasterImplementation,
+                salt,
+                address(this)
+            );
     }
 }

package/contracts/PlatformPaymaster.sol

@@ -49,6 +49,9 @@ contract PlatformPaymaster is BasePaymaster {
         );
 
     bytes32 private constant DEFAULT_ADMIN_ROLE = bytes32(0);
+    bytes32 private constant RESTORER_ROLE = keccak256("RESTORER_ROLE");
+    bytes32 private constant ACCEPTER_ROLE = keccak256("ACCEPTER_ROLE");
+    bytes32 private constant MINTER_ROLE = keccak256("MINTER_ROLE");
 
     ITDocDeployer public tdocDeployer;
 
@@ -141,13 +144,11 @@ contract PlatformPaymaster is BasePaymaster {
         bytes memory params = abi.encode(name, symbol, address(this));
         deployed = tdocDeployer.deploy(implementation, params);
 
-        // Hand admin to the calling EOA
         IAccessControl(deployed).grantRole(DEFAULT_ADMIN_ROLE, msg.sender);
+        IAccessControl(deployed).grantRole(RESTORER_ROLE, msg.sender);
+        IAccessControl(deployed).grantRole(ACCEPTER_ROLE, msg.sender);
+        IAccessControl(deployed).grantRole(MINTER_ROLE, msg.sender);
 
-        // Paymaster keeps only the operational roles it needs
-        // (MINTER_ROLE, RESTORER_ROLE, ACCEPTER_ROLE were granted to address(this) via initialize)
-
-        // Relinquish admin — EOA is now sole admin
         IAccessControl(deployed).renounceRole(
             DEFAULT_ADMIN_ROLE,
             address(this)

package/dist/index.d.mts

@@ -320,6 +320,20 @@ 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";
@@ -382,6 +396,20 @@ 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";

package/dist/index.d.ts

@@ -320,6 +320,20 @@ 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";
@@ -382,6 +396,20 @@ 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";

package/dist/index.js

@@ -438,6 +438,25 @@ 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": [
       {
@@ -519,6 +538,25 @@ 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",

package/dist/index.mjs

@@ -436,6 +436,25 @@ 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": [
       {
@@ -517,6 +536,25 @@ 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",

package/package.json

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