Feature/paymaster

abi/IPaymaster.json

@@ -18,6 +18,11 @@
         "internalType": "uint256",
         "name": "amount",
         "type": "uint256"
+      },
+      {
+        "internalType": "address",
+        "name": "originalSender",
+        "type": "address"
       }
     ],
     "name": "coverCost",

abi/Paymaster.json

@@ -5,6 +5,11 @@
         "internalType": "address",
         "name": "hubAddress",
         "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "initialOwner",
+        "type": "address"
       }
     ],
     "stateMutability": "nonpayable",
@@ -146,6 +151,11 @@
         "internalType": "uint256",
         "name": "amount",
         "type": "uint256"
+      },
+      {
+        "internalType": "address",
+        "name": "_originalSender",
+        "type": "address"
       }
     ],
     "name": "coverCost",

contracts/KnowledgeCollection.sol

@@ -118,7 +118,7 @@ contract KnowledgeCollection is INamed, IVersioned, ContractStatus, IInitializab
         es.addTokensToEpochRange(1, currentEpoch, currentEpoch + epochs + 1, tokenAmount);
         es.addEpochProducedKnowledgeValue(publisherNodeIdentityId, currentEpoch, tokenAmount);
 
-        _addTokens(tokenAmount, paymaster);
+        _addTokens(tokenAmount, paymaster, msg.sender);
 
         return id;
     }
@@ -223,7 +223,7 @@ contract KnowledgeCollection is INamed, IVersioned, ContractStatus, IInitializab
 
         epochStorage.addTokensToEpochRange(1, endEpoch, endEpoch + epochs, tokenAmount);
 
-        _addTokens(tokenAmount, paymaster);
+        _addTokens(tokenAmount, paymaster, msg.sender);
 
         ParanetKnowledgeCollectionsRegistry pkar = paranetKnowledgeCollectionsRegistry;
 
@@ -300,11 +300,11 @@ contract KnowledgeCollection is INamed, IVersioned, ContractStatus, IInitializab
         }
     }
 
-    function _addTokens(uint96 tokenAmount, address paymaster) internal {
+    function _addTokens(uint96 tokenAmount, address paymaster, address originalSender) internal {
         IERC20 token = tokenContract;
 
         if (paymasterManager.validPaymasters(paymaster)) {
-            IPaymaster(paymaster).coverCost(tokenAmount);
+            IPaymaster(paymaster).coverCost(tokenAmount, originalSender);
         } else {
             if (token.allowance(msg.sender, address(this)) < tokenAmount) {
                 revert TokenLib.TooLowAllowance(

contracts/Paymaster.sol

@@ -7,32 +7,39 @@ import {TokenLib} from "./libraries/TokenLib.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-contract Paymaster is Ownable(msg.sender) {
+contract Paymaster is Ownable {
     error NotAllowed();
 
     Hub public hub;
     IERC20 public tokenContract;
 
     mapping(address => bool) public allowedAddresses;
 
-    modifier onlyAllowed() {
-        if (!allowedAddresses[msg.sender]) {
+    event AllowedAddressAdded(address _address);
+    event AllowedAddressRemoved(address _address);
+    event FundsAdded(address sender, uint256 amount);
+    event WhitdrawalMade(address recipient, uint256 amount);
+
+    modifier onlyAllowed(address _originalSender) {
+        if (!allowedAddresses[_originalSender]) {
             revert NotAllowed();
         }
         _;
     }
 
-    constructor(address hubAddress) {
+    constructor(address hubAddress, address initialOwner) Ownable(initialOwner) {
         hub = Hub(hubAddress);
         tokenContract = IERC20(hub.getContractAddress("Token"));
     }
 
     function addAllowedAddress(address _address) external onlyOwner {
         allowedAddresses[_address] = true;
+        emit AllowedAddressAdded(_address);
     }
 
     function removeAllowedAddress(address _address) external onlyOwner {
         allowedAddresses[_address] = false;
+        emit AllowedAddressRemoved(_address);
     }
 
     function fundPaymaster(uint256 amount) external {
@@ -53,14 +60,23 @@ contract Paymaster is Ownable(msg.sender) {
         if (!tokenContract.transferFrom(msg.sender, address(this), amount)) {
             revert TokenLib.TransferFailed();
         }
+
+        emit FundsAdded(msg.sender, amount);
     }
 
     function withdraw(address recipient, uint256 amount) external onlyOwner {
         _transferTokens(recipient, amount);
+        emit WhitdrawalMade(recipient, amount);
     }
 
-    function coverCost(uint256 amount) external onlyAllowed {
-        _transferTokens(hub.getContractAddress("KnowledgeCollection"), amount);
+    function coverCost(uint256 amount, address _originalSender) external onlyAllowed(_originalSender) {
+        address knowledgeCollectionAddress = hub.getContractAddress("KnowledgeCollection");
+
+        if (msg.sender != knowledgeCollectionAddress) {
+            revert("Sender is not the KnowledgeCollection contract");
+        }
+
+        _transferTokens(knowledgeCollectionAddress, amount);
     }
 
     function _transferTokens(address to, uint256 amount) internal {

contracts/interfaces/IPaymaster.sol

@@ -9,5 +9,5 @@ interface IPaymaster {
 
     function fundPaymaster(uint256 amount) external;
 
-    function coverCost(uint256 amount) external;
+    function coverCost(uint256 amount, address originalSender) external;
 }

contracts/storage/PaymasterManager.sol

@@ -27,7 +27,7 @@ contract PaymasterManager is INamed, IVersioned, ContractStatus {
     }
 
     function deployPaymaster() external {
-        address paymasterAddress = address(new Paymaster(address(hub)));
+        address paymasterAddress = address(new Paymaster(address(hub), msg.sender));
 
         validPaymasters[paymasterAddress] = true;
         deployedPaymasters[msg.sender].push(paymasterAddress);

test/helpers/paymaster-helpers.ts

@@ -0,0 +1,32 @@
+import { SignerWithAddress } from '@nomicfoundation/hardhat-ethers/signers';
+import { PaymasterManager } from '../../typechain';
+
+export async function createPaymaster(
+  paymasterCreator: SignerWithAddress,
+  paymasterManager: PaymasterManager
+) {
+  const tx = await paymasterManager.connect(paymasterCreator).deployPaymaster();
+  const receipt = await tx.wait();
+
+  const paymasterDeployedEvent = receipt!.logs.find(
+    log => log.topics[0] === paymasterManager.interface.getEvent('PaymasterDeployed').topicHash
+  );
+
+  if (!paymasterDeployedEvent) {
+    throw new Error('PaymasterDeployed event not found in transaction logs');
+  }
+
+  const parsedEvent = paymasterManager.interface.parseLog({
+    topics: paymasterDeployedEvent.topics as string[],
+    data: paymasterDeployedEvent.data
+  });
+
+  if (!parsedEvent) {
+    throw new Error('Failed to parse PaymasterDeployed event');
+  }
+
+  const deployer = parsedEvent.args.deployer;
+  const paymasterAddress = parsedEvent.args.paymasterAddress;
+
+  return {deployer, paymasterAddress}
+};