Fix failing CI - update all func params expecting SignerWithAddress to SignerWithAddress | Wallet

tasks/helpers/proposeCharityApplication.ts

@@ -1,5 +1,5 @@
 import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers";
-import {BytesLike} from "ethers";
+import {BytesLike, Wallet} from "ethers";
 import {CharityApplications__factory} from "typechain-types";
 import {AccountMessages} from "typechain-types/contracts/multisigs/CharityApplications";
 import {filterEvents, logger} from "utils";
@@ -14,7 +14,7 @@ import {filterEvents, logger} from "utils";
  */
 export async function proposeCharityApplication(
   charAppsAddress: string,
-  owner: SignerWithAddress,
+  owner: SignerWithAddress | Wallet,
   applicationRequest: AccountMessages.CreateEndowmentRequestStruct,
   metadata: BytesLike = "0x"
 ): Promise<boolean> {

tasks/manage/changeProxyAdmin.ts

@@ -8,6 +8,7 @@ import {
 } from "typechain-types";
 import {AddressObj, confirmAction, getAddresses, getProxyAdminOwner, logger} from "utils";
 import {submitMultiSigTx} from "../helpers";
+import {Wallet} from "ethers";
 
 type TaskArgs = {
   apTeamSignerPkey?: string;
@@ -62,7 +63,7 @@ task("manage:changeProxyAdmin", "Will update the proxy admin for all proxy contr
   });
 
 async function transferAccountOwnership(
-  proxyAdminOwner: SignerWithAddress,
+  proxyAdminOwner: SignerWithAddress | Wallet,
   newProxyAdmin: string,
   addresses: AddressObj,
   hre: HardhatRuntimeEnvironment
@@ -97,7 +98,7 @@ async function transferAccountOwnership(
  * will never revert, but will nevertheless NOT update the admin.
  */
 async function changeProxiesAdmin(
-  proxyAdminOwner: SignerWithAddress,
+  proxyAdminOwner: SignerWithAddress | Wallet,
   newProxyAdmin: string,
   addresses: AddressObj,
   hre: HardhatRuntimeEnvironment

tasks/upgrade/upgradeFacets/cutDiamond.ts

@@ -3,11 +3,12 @@ import {submitMultiSigTx} from "tasks/helpers";
 import {DiamondCutFacet__factory, DiamondInit__factory} from "typechain-types";
 import {logger} from "utils";
 import {FacetCut} from "./types";
+import {Wallet} from "ethers";
 
 export default async function cutDiamond(
   diamondAddress: string,
   proxyAdminMultiSig: string,
-  proxyAdmin: SignerWithAddress,
+  proxyAdmin: SignerWithAddress | Wallet,
   facetCuts: FacetCut[]
 ) {
   logger.out("Updating Diamond with new facet addresses...");

test/core/IndexFund.ts

@@ -2,6 +2,7 @@ import {FakeContract, smock} from "@defi-wonderland/smock";
 import {impersonateAccount, setBalance, time} from "@nomicfoundation/hardhat-network-helpers";
 import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers";
 import {expect} from "chai";
+import {Wallet} from "ethers";
 import hre from "hardhat";
 import {deployFacetAsProxy} from "test/core/accounts/utils/deployTestFacet";
 import {DEFAULT_CHARITY_ENDOWMENT, DEFAULT_REGISTRAR_CONFIG, wait} from "test/utils";
@@ -28,7 +29,7 @@ describe("IndexFund", function () {
   const MAX_ENDOWMENT_MEMBERS = 10;
 
   let owner: SignerWithAddress;
-  let proxyAdmin: SignerWithAddress;
+  let proxyAdmin: SignerWithAddress | Wallet;
   let user: SignerWithAddress;
 
   let registrar: FakeContract<Registrar>;

test/core/accounts/AccountsAllowance.ts

@@ -13,6 +13,7 @@ import {
 import {genWallet, getProxyAdminOwner, getSigners} from "utils";
 import {deployFacetAsProxy} from "./utils";
 import {time} from "@nomicfoundation/hardhat-network-helpers";
+import {Wallet} from "ethers";
 
 describe("AccountsAllowance", function () {
   const {ethers} = hre;
@@ -21,7 +22,7 @@ describe("AccountsAllowance", function () {
 
   let accOwner: SignerWithAddress;
   let endowOwner: SignerWithAddress;
-  let proxyAdmin: SignerWithAddress;
+  let proxyAdmin: SignerWithAddress | Wallet;
   let user: SignerWithAddress;
 
   let facet: AccountsAllowance;

test/core/accounts/AccountsCreateEndowment.ts

@@ -1,7 +1,7 @@
 import {FakeContract, smock} from "@defi-wonderland/smock";
 import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers";
 import {expect, use} from "chai";
-import {BigNumber} from "ethers";
+import {BigNumber, Wallet} from "ethers";
 import hre from "hardhat";
 import {DEFAULT_REGISTRAR_CONFIG, wait} from "test/utils";
 import {
@@ -30,7 +30,7 @@ describe("AccountsCreateEndowment", function () {
   const expectedNextAccountId = 1;
 
   let owner: SignerWithAddress;
-  let proxyAdmin: SignerWithAddress;
+  let proxyAdmin: SignerWithAddress | Wallet;
   let charityApplications: SignerWithAddress;
   let facet: AccountsCreateEndowment;
   let state: TestFacetProxyContract;

test/core/accounts/AccountsDepositWithdrawEndowments.ts

@@ -2,7 +2,7 @@ import {FakeContract, smock} from "@defi-wonderland/smock";
 import {impersonateAccount, setBalance, time} from "@nomicfoundation/hardhat-network-helpers";
 import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers";
 import {expect, use} from "chai";
-import {BigNumber} from "ethers";
+import {BigNumber, Wallet} from "ethers";
 import hre from "hardhat";
 import {DEFAULT_CHARITY_ENDOWMENT, DEFAULT_REGISTRAR_CONFIG, wait} from "test/utils";
 import {
@@ -53,7 +53,7 @@ describe("AccountsDepositWithdrawEndowments", function () {
   };
 
   let accOwner: SignerWithAddress;
-  let proxyAdmin: SignerWithAddress;
+  let proxyAdmin: SignerWithAddress | Wallet;
   let endowOwner: SignerWithAddress;
   let indexFund: SignerWithAddress;
 

test/core/accounts/AccountsGasManager.ts

@@ -21,12 +21,13 @@ import {
 import {VaultType} from "types";
 import {getProxyAdminOwner, getSigners} from "utils";
 import {deployFacetAsProxy} from "./utils";
+import {Wallet} from "ethers";
 
 use(smock.matchers);
 
 describe("AccountsGasManager", function () {
   let owner: SignerWithAddress;
-  let proxyAdmin: SignerWithAddress;
+  let proxyAdmin: SignerWithAddress | Wallet;
   let user: SignerWithAddress;
   let impl: AccountsGasManager;
   let token: FakeContract<IERC20>;

test/core/accounts/AccountsQueryEndowments.ts

@@ -1,6 +1,6 @@
 import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers";
 import {expect} from "chai";
-import {BigNumber} from "ethers";
+import {BigNumber, Wallet} from "ethers";
 import hre from "hardhat";
 import {DEFAULT_ACCOUNTS_CONFIG, DEFAULT_CHARITY_ENDOWMENT, wait} from "test/utils";
 import {
@@ -17,7 +17,7 @@ describe("AccountsQueryEndowments", function () {
   const {ethers} = hre;
 
   let owner: SignerWithAddress;
-  let proxyAdmin: SignerWithAddress;
+  let proxyAdmin: SignerWithAddress | Wallet;
 
   let facet: AccountsQueryEndowments;
   let state: TestFacetProxyContract;

test/core/accounts/AccountsStrategy.ts

@@ -1,7 +1,7 @@
 import {FakeContract, smock} from "@defi-wonderland/smock";
 import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers";
 import {expect, use} from "chai";
-import {BigNumber} from "ethers";
+import {BigNumber, Wallet} from "ethers";
 import hre from "hardhat";
 import {
   DEFAULT_ACCOUNTS_CONFIG,
@@ -63,7 +63,7 @@ describe("AccountsStrategy", function () {
   const NET_NAME_THAT = "ThatNet";
 
   let owner: SignerWithAddress;
-  let admin: SignerWithAddress;
+  let admin: SignerWithAddress | Wallet;
   let user: SignerWithAddress;
 
   let gasFwd: FakeContract<GasFwd>;

test/core/accounts/AccountsSwapRouter.ts

@@ -28,13 +28,14 @@ import {
 import {VaultType} from "types";
 import {genWallet, getProxyAdminOwner, getSigners} from "utils";
 import {deployFacetAsProxy} from "./utils";
+import {Wallet} from "ethers";
 
 use(smock.matchers);
 
 describe("AccountsSwapRouter", function () {
   const {ethers} = hre;
   let owner: SignerWithAddress;
-  let proxyAdmin: SignerWithAddress;
+  let proxyAdmin: SignerWithAddress | Wallet;
   let user: SignerWithAddress;
   let facet: AccountsSwapRouter;
   let facetImpl: AccountsSwapRouter;

test/core/accounts/AccountsUpdate.ts

@@ -7,12 +7,13 @@ import {AccountStorage} from "typechain-types/contracts/test/accounts/TestFacetP
 import {EndowmentType} from "types";
 import {getProxyAdminOwner, getSigners} from "utils";
 import {deployFacetAsProxy} from "./utils";
+import {Wallet} from "ethers";
 
 describe("AccountsUpdate", function () {
   const {ethers} = hre;
 
   let owner: SignerWithAddress;
-  let proxyAdmin: SignerWithAddress;
+  let proxyAdmin: SignerWithAddress | Wallet;
   let user: SignerWithAddress;
 
   let facet: AccountsUpdate;

test/core/accounts/AccountsUpdateEndowmentSettingsController.ts

@@ -16,6 +16,7 @@ import {
 } from "typechain-types/contracts/test/accounts/TestFacetProxyContract";
 import {genWallet, getProxyAdminOwner, getSigners} from "utils";
 import {deployFacetAsProxy, updateAllSettings} from "./utils";
+import {Wallet} from "ethers";
 
 use(smock.matchers);
 
@@ -26,7 +27,7 @@ describe("AccountsUpdateEndowmentSettingsController", function () {
   const normalEndowId = 2;
 
   let owner: SignerWithAddress;
-  let proxyAdmin: SignerWithAddress;
+  let proxyAdmin: SignerWithAddress | Wallet;
   let endowOwner: SignerWithAddress;
 
   let facet: AccountsUpdateEndowmentSettingsController;

test/core/accounts/AccountsUpdateEndowments.ts

@@ -1,7 +1,7 @@
 import {smock} from "@defi-wonderland/smock";
 import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers";
 import {expect, use} from "chai";
-import {BigNumberish} from "ethers";
+import {BigNumberish, Wallet} from "ethers";
 import hre from "hardhat";
 import {DEFAULT_CHARITY_ENDOWMENT, wait} from "test/utils";
 import {
@@ -30,7 +30,7 @@ describe("AccountsUpdateEndowments", function () {
   const normalEndowId = 2;
 
   let accOwner: SignerWithAddress;
-  let proxyAdmin: SignerWithAddress;
+  let proxyAdmin: SignerWithAddress | Wallet;
   let endowOwner: SignerWithAddress;
   let delegate: SignerWithAddress;
 

test/core/accounts/AccountsUpdateStatusEndowments.ts

@@ -23,6 +23,7 @@ import {AccountStorage} from "typechain-types/contracts/test/accounts/TestFacetP
 import {BeneficiaryEnum, EndowmentType} from "types";
 import {genWallet, getProxyAdminOwner, getSigners} from "utils";
 import {deployFacetAsProxy} from "./utils";
+import {Wallet} from "ethers";
 
 use(smock.matchers);
 
@@ -43,7 +44,7 @@ describe("AccountsUpdateStatusEndowments", function () {
   );
 
   let accOwner: SignerWithAddress;
-  let proxyAdmin: SignerWithAddress;
+  let proxyAdmin: SignerWithAddress | Wallet;
   let endowOwner: SignerWithAddress;
 
   let facet: AccountsUpdateStatusEndowments;

test/core/accounts/utils/deployTestFacet.ts

@@ -1,10 +1,11 @@
 import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers";
+import {Wallet} from "ethers";
 import {HardhatRuntimeEnvironment} from "hardhat/types";
 import {TestFacetProxyContract__factory, TestFacetProxyContract} from "typechain-types";
 export async function deployFacetAsProxy(
   hre: HardhatRuntimeEnvironment,
-  deployer: SignerWithAddress,
-  proxyAdmin: SignerWithAddress,
+  deployer: SignerWithAddress | Wallet,
+  proxyAdmin: SignerWithAddress | Wallet,
   implementation: string
 ): Promise<TestFacetProxyContract> {
   let Proxy = new TestFacetProxyContract__factory(deployer);

test/core/gasFwd/GasFwd.ts

@@ -1,6 +1,7 @@
 import {FakeContract, smock} from "@defi-wonderland/smock";
 import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers";
 import {expect, use} from "chai";
+import {Wallet} from "ethers";
 import hre from "hardhat";
 import {
   GasFwd,
@@ -17,15 +18,15 @@ describe("GasFwd", function () {
   const BALANCE = 1000;
 
   let owner: SignerWithAddress;
-  let admin: SignerWithAddress;
+  let admin: SignerWithAddress | Wallet;
   let accounts: SignerWithAddress;
 
   let token: FakeContract<IERC20>;
   let gasFwd: GasFwd;
 
   async function deployGasFwdAsProxy(
     owner: SignerWithAddress,
-    admin: SignerWithAddress,
+    admin: SignerWithAddress | Wallet,
     accounts: SignerWithAddress
   ): Promise<GasFwd> {
     let GasFwd = new GasFwd__factory(admin);

test/core/gasFwd/GasFwdFactory.ts

@@ -1,6 +1,7 @@
 import {FakeContract, smock} from "@defi-wonderland/smock";
 import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers";
 import {expect, use} from "chai";
+import {Wallet} from "ethers";
 import hre from "hardhat";
 import {DEFAULT_REGISTRAR_CONFIG} from "test/utils";
 import {
@@ -17,13 +18,13 @@ use(smock.matchers);
 describe("GasFwdFactory", function () {
   const {ethers} = hre;
   let owner: SignerWithAddress;
-  let admin: SignerWithAddress;
+  let admin: SignerWithAddress | Wallet;
   let user: SignerWithAddress;
   let registrarFake: FakeContract<Registrar>;
 
   async function deployGasFwdFactory(
     owner: SignerWithAddress,
-    admin: SignerWithAddress,
+    admin: SignerWithAddress | Wallet,
     registrar: string
   ): Promise<GasFwdFactory> {
     let GasFwd = new GasFwd__factory(admin);

test/core/router/Router.ts

@@ -1,6 +1,7 @@
 import {FakeContract, smock} from "@defi-wonderland/smock";
 import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers";
 import {expect, use} from "chai";
+import {Wallet} from "ethers";
 import hre from "hardhat";
 import {
   DEFAULT_ACTION_DATA,
@@ -32,7 +33,7 @@ use(smock.matchers);
 describe("Router", function () {
   const {ethers} = hre;
   let owner: SignerWithAddress;
-  let admin: SignerWithAddress;
+  let admin: SignerWithAddress | Wallet;
   let user: SignerWithAddress;
   let collector: SignerWithAddress;
   let deadAddr = "0x000000000000000000000000000000000000dead";
@@ -66,7 +67,7 @@ describe("Router", function () {
     return Router__factory.connect(RouterProxy.address, owner);
   }
 
-  async function upgradeProxy(signer: SignerWithAddress, routerProxy: string) {
+  async function upgradeProxy(signer: SignerWithAddress | Wallet, routerProxy: string) {
     const RouterFactory = new Router__factory(owner);
     const RouterImpl = await RouterFactory.deploy();
     await RouterImpl.deployed();

test/core/vault/Vault.ts

@@ -1,7 +1,7 @@
 import {FakeContract, smock} from "@defi-wonderland/smock";
 import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers";
 import {expect, use} from "chai";
-import {BigNumber} from "ethers";
+import {BigNumber, Wallet} from "ethers";
 import hre from "hardhat";
 import {
   DEFAULT_NETWORK,
@@ -38,7 +38,7 @@ describe("Vault", function () {
 
   let owner: SignerWithAddress;
   let user: SignerWithAddress;
-  let admin: SignerWithAddress;
+  let admin: SignerWithAddress | Wallet;
   let collector: SignerWithAddress;
 
   async function deployVault(

test/halo/Halo.ts

@@ -1,6 +1,6 @@
 import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers";
 import {expect} from "chai";
-import {BigNumber} from "ethers";
+import {BigNumber, Wallet} from "ethers";
 import hre from "hardhat";
 import {Halo, Halo__factory} from "typechain-types";
 import {getProxyAdminOwner, getSigners} from "utils";
@@ -9,7 +9,7 @@ describe("Halo token", function () {
   let Halo: Halo__factory;
 
   let deployer: SignerWithAddress;
-  let proxyAdmin: SignerWithAddress;
+  let proxyAdmin: SignerWithAddress | Wallet;
   let user: SignerWithAddress;
 
   describe("upon Deployment", async function () {

utils/signers/getCharityApplicationsOwner.ts

@@ -2,11 +2,12 @@ import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers";
 import {HardhatRuntimeEnvironment} from "hardhat/types";
 import {connectSignerFromPkey} from "./connectSignerFromPkey";
 import {getSigners} from "./getSigners";
+import {Wallet} from "ethers";
 
 export async function getCharityApplicationsOwner(
   hre: HardhatRuntimeEnvironment,
   pkey?: string
-): Promise<SignerWithAddress> {
+): Promise<SignerWithAddress | Wallet> {
   if (pkey) {
     return await connectSignerFromPkey(pkey, hre);
   }