From 87206a260bb38729ebcfd1aac3d5aa0792678f24 Mon Sep 17 00:00:00 2001
From: James Duncombe <james.duncombe@consilienceventures.com>
Date: Mon, 5 Feb 2024 16:08:33 +0000
Subject: [PATCH] Updates Paymaster tasks.

---
 tasks/paymaster.ts | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/tasks/paymaster.ts b/tasks/paymaster.ts
index 17d25efa..bb3e8e0a 100644
--- a/tasks/paymaster.ts
+++ b/tasks/paymaster.ts
@@ -1,6 +1,6 @@
 import { task, types } from "hardhat/config";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
-import { deploymentSalt } from "../src/utils";
+import { ZERO_ADDRESS, deploymentSalt } from "../src/utils";
 import { Paymaster } from "../typechain/hardhat-diamond-abi/HardhatDiamondABI.sol";
 import { RelayHub } from "@opengsn/contracts";
 import { BigNumber } from "ethers";
@@ -31,6 +31,9 @@ task("paymaster-update-facets", "Updates facets of our Paymaster")
       facets: PAYMASTER_FACETS,
       deterministicSalt: deploymentSalt(hre),
       log: true,
+      excludeSelectors: {
+        "PaymasterTopFacet": ["supportsInterface"]
+      }
     });
   });
 
@@ -52,14 +55,21 @@ task("paymaster-fund", "Funds the Paymaster")
 
     // Get the relay hub address using the address stored in the paymaster.
     const relayHubAddress = await paymaster.getRelayHub();
+
+    if (relayHubAddress === ZERO_ADDRESS) {
+      throw Error("Paymaster's RelayHub address has not been set!");
+    }
+
     const relayHub = await ethers.getContractAt<RelayHub>("RelayHub", relayHubAddress);
 
+    console.log(`Funding RelayHub ${relayHubAddress} with ${params.amount} MATIC...`);
+
     // Fund the paymaster.
     const tx = await issuerPaymaster.deposit({ value: params.amount });
     await tx.wait();
 
-    console.log('Paymaster balance with relay hub:', await relayHub.balanceOf(paymaster.address));
-    console.log('Admin wallet balance:', (await issuerMemberSigner.getBalance()).toString());
+    console.log(`Paymaster balance with relay hub: ${await relayHub.balanceOf(paymaster.address)}`);
+    console.log(`Admin wallet balance: ${await issuerMemberSigner.getBalance()}`);
   });
 
 // Reusable functions and constants.