@gooddollar/goodprotocol 2.0.11 → 2.0.13

package/test/utils/AdminWallet.test.ts

@@ -24,35 +24,23 @@ describe("AdminWallet", () => {
     stranger,
     stranger2,
     blacklisted,
-    identity;
+    identity,
+    gooddollar;
 
   before(async () => {
     signers = await ethers.getSigners();
     founder = signers[0];
-    [
-      whitelisted,
-      stranger,
-      stranger2,
-      blacklisted,
-      newUser,
-      newUser2,
-      admin,
-      admin2,
-      toWhitelist
-    ] = signers.slice(10);
-    let { identity: id, nameService } = await loadFixture(createDAO);
+    [whitelisted, stranger, stranger2, blacklisted, newUser, newUser2, admin, admin2, toWhitelist] = signers.slice(10);
+    let { identity: id, nameService, gd } = await loadFixture(createDAO);
     identity = await ethers.getContractAt("IdentityV2", id);
-
+    gooddollar = await ethers.getContractAt("GoodDollar", gd);
     adminWallet = (await upgrades.deployProxy(
       await ethers.getContractFactory("AdminWallet"),
       [[], nameService.address, signers[0].address, 1e10],
       { kind: "uups" }
     )) as AdminWallet;
 
-    await identity.grantRole(
-      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("identity_admin")),
-      adminWallet.address
-    );
+    await identity.grantRole(ethers.utils.keccak256(ethers.utils.toUtf8Bytes("identity_admin")), adminWallet.address);
 
     toppingTimes = await adminWallet.toppingTimes();
     toppingAmount = await adminWallet.toppingAmount();
@@ -92,21 +80,15 @@ describe("AdminWallet", () => {
   });
 
   it("should have owner", async () => {
-    expect(
-      await adminWallet.hasRole(ethers.constants.HashZero, signers[0].address)
-    ).to.eq(true);
+    expect(await adminWallet.hasRole(ethers.constants.HashZero, signers[0].address)).to.eq(true);
   });
 
   it("should not top admin list when empty", async () => {
-    await expect(adminWallet["topAdmins(uint256)"](0)).revertedWith(
-      "Admin list is empty"
-    );
+    await expect(adminWallet["topAdmins(uint256)"](0)).revertedWith("Admin list is empty");
   });
 
   it("should add admins", async () => {
-    await adminWallet.addAdmins(
-      [whitelisted, admin, admin2].map(_ => _.address)
-    );
+    await adminWallet.addAdmins([whitelisted, admin, admin2].map(_ => _.address));
     expect(await adminWallet.isAdmin(whitelisted.address)).true;
     expect(await adminWallet.isAdmin(admin.address)).to.true;
     expect(await adminWallet.isAdmin(admin2.address)).to.true;
@@ -123,22 +105,14 @@ describe("AdminWallet", () => {
     expect(await ethers.provider.getBalance(admin2.address)).eq(0);
     await adminWallet["topAdmins(uint256)"](0);
     const newBalance = await ethers.provider.getBalance(admin2.address);
-    const adminTopAmount = await adminWallet
-      .adminToppingAmount()
-      .then(_ => _.toString());
+    const adminTopAmount = await adminWallet.adminToppingAmount().then(_ => _.toString());
     expect(newBalance).to.be.equal(adminTopAmount);
   });
 
   it("should reimburse gas for admins", async () => {
-    const expectedTopping = await adminWallet
-      .adminToppingAmount()
-      .then(_ => _.toString());
-    const adminWalletBalance = await ethers.provider.getBalance(
-      adminWallet.address
-    );
-    expect(expectedTopping).to.be.equal(
-      ethers.utils.parseUnits("90000000", "gwei")
-    );
+    const expectedTopping = await adminWallet.adminToppingAmount().then(_ => _.toString());
+    const adminWalletBalance = await ethers.provider.getBalance(adminWallet.address);
+    expect(expectedTopping).to.be.equal(ethers.utils.parseUnits("90000000", "gwei"));
     expect(adminWalletBalance).gt(1);
     let oldBalance = await ethers.provider.getBalance(admin2.address);
     let toTransfer = oldBalance.div(2);
@@ -150,12 +124,7 @@ describe("AdminWallet", () => {
     oldBalance = await ethers.provider.getBalance(admin2.address);
     expect(oldBalance).to.be.lte(toTransfer);
 
-    await adminWallet
-      .connect(admin2)
-      ["whitelist(address,string)"](
-        toWhitelist.address,
-        "did:test" + Math.random()
-      );
+    await adminWallet.connect(admin2)["whitelist(address,string)"](toWhitelist.address, "did:test" + Math.random());
     const newBalance = await ethers.provider.getBalance(admin2.address);
     expect(newBalance).to.be.gte(expectedTopping);
   });
@@ -167,9 +136,7 @@ describe("AdminWallet", () => {
 
   it("should allow admin to whitelist and remove whitelist", async () => {
     expect(await identity.isWhitelisted(whitelisted.address)).to.false;
-    await adminWallet
-      .connect(admin)
-      ["whitelist(address,string)"](whitelisted.address, "did:test");
+    await adminWallet.connect(admin)["whitelist(address,string)"](whitelisted.address, "did:test");
 
     expect(await identity.isWhitelisted(whitelisted.address)).to.true;
     await adminWallet.connect(admin).removeWhitelist(whitelisted.address);
@@ -179,18 +146,14 @@ describe("AdminWallet", () => {
   it("should not allow non-admin to whitelist and remove whitelist", async () => {
     expect(await identity.isWhitelisted(whitelisted.address)).to.false;
     await expect(
-      adminWallet
-        .connect(stranger)
-        ["whitelist(address,string)"](whitelisted.address, "did:test")
+      adminWallet.connect(stranger)["whitelist(address,string)"](whitelisted.address, "did:test")
     ).revertedWith("Caller is not admin");
     expect(await identity.isWhitelisted(whitelisted.address)).to.false;
-    await adminWallet
-      .connect(admin)
-      ["whitelist(address,string)"](whitelisted.address, "did:test");
+    await adminWallet.connect(admin)["whitelist(address,string)"](whitelisted.address, "did:test");
     expect(await identity.isWhitelisted(whitelisted.address)).to.true;
-    await expect(
-      adminWallet.connect(stranger).removeWhitelist(whitelisted.address)
-    ).revertedWith("Caller is not admin");
+    await expect(adminWallet.connect(stranger).removeWhitelist(whitelisted.address)).revertedWith(
+      "Caller is not admin"
+    );
     expect(await identity.isWhitelisted(whitelisted.address)).to.true;
   });
 
@@ -205,15 +168,13 @@ describe("AdminWallet", () => {
 
   it("should not allow non-admin to blacklist and remove blacklist", async () => {
     expect(await identity.isBlacklisted(blacklisted.address)).to.false;
-    await expect(
-      adminWallet.connect(stranger).blacklist(blacklisted.address)
-    ).revertedWith("Caller is not admin");
+    await expect(adminWallet.connect(stranger).blacklist(blacklisted.address)).revertedWith("Caller is not admin");
     expect(await identity.isBlacklisted(blacklisted.address)).to.false;
     await adminWallet.connect(admin).blacklist(blacklisted.address);
     expect(await identity.isBlacklisted(blacklisted.address)).to.true;
-    await expect(
-      adminWallet.connect(stranger).removeBlacklist(blacklisted.address)
-    ).revertedWith("Caller is not admin");
+    await expect(adminWallet.connect(stranger).removeBlacklist(blacklisted.address)).revertedWith(
+      "Caller is not admin"
+    );
     expect(await identity.isBlacklisted(blacklisted.address)).to.true;
     await adminWallet.connect(admin).removeBlacklist(blacklisted.address);
     expect(await identity.isBlacklisted(blacklisted.address)).to.false;
@@ -221,18 +182,20 @@ describe("AdminWallet", () => {
 
   it("should not allow to top wallet if user balance is too high", async () => {
     const walletBalance = await ethers.provider.getBalance(adminWallet.address);
-    const tx = await (
-      await adminWallet.connect(admin).topWallet(whitelisted.address)
-    ).wait();
-    const walletBalanceAfter = await ethers.provider.getBalance(
-      adminWallet.address
-    );
+    const tx = await (await adminWallet.connect(admin).topWallet(whitelisted.address)).wait();
+    const walletBalanceAfter = await ethers.provider.getBalance(adminWallet.address);
     expect(walletBalance).eq(walletBalanceAfter);
     expect(tx.logs.length).eq(0);
   });
 
-  it("should allow to top wallet", async () => {
+  it("should not allow to top wallet if user gd balance unchanged", async () => {
     expect(await ethers.provider.getBalance(newUser.address)).eq(0);
+    await expect(adminWallet.connect(admin).topWallet(newUser.address)).revertedWith("User has not used G$");
+  });
+
+  it("should allow to top wallet if user gd balance changed", async () => {
+    expect(await ethers.provider.getBalance(newUser.address)).eq(0);
+    await gooddollar.mint(newUser.address, 1);
     await adminWallet.connect(admin).topWallet(newUser.address);
     expect(await ethers.provider.getBalance(newUser.address)).gt(0);
     await newUser.sendTransaction({
@@ -242,6 +205,7 @@ describe("AdminWallet", () => {
   });
 
   it("should not allow to top wallet more than three times", async () => {
+    await gooddollar.mint(newUser.address, 1);
     await adminWallet.connect(admin).topWallet(newUser.address);
     await newUser.sendTransaction({
       to: adminWallet.address,
@@ -251,56 +215,40 @@ describe("AdminWallet", () => {
       to: admin2.address,
       value: toppingAmount / 5
     });
+    await gooddollar.mint(newUser.address, 1);
     await adminWallet.connect(admin).topWallet(newUser.address);
     await newUser.sendTransaction({
       to: adminWallet.address,
       value: toppingAmount * 0.9
     });
 
-    await expect(
-      adminWallet.connect(admin).topWallet(newUser.address)
-    ).revertedWith("User wallet has been topped too many times today");
+    await gooddollar.mint(newUser.address, 1);
+    await expect(adminWallet.connect(admin).topWallet(newUser.address)).revertedWith(
+      "User wallet has been topped too many times today"
+    );
   });
 
   it("should whitelist user", async () => {
     expect(await identity.isWhitelisted(stranger2.address)).to.false;
-    await adminWallet
-      .connect(admin2)
-      ["whitelist(address,string)"](stranger2.address, "did:test3");
+    await adminWallet.connect(admin2)["whitelist(address,string)"](stranger2.address, "did:test3");
     expect(await identity.isWhitelisted(stranger2.address)).to.true;
   });
 
   it("should not allow whitelisting with existing did", async () => {
-    await expect(
-      adminWallet
-        .connect(admin2)
-        ["whitelist(address,string)"](stranger.address, "did:test")
-    ).revertedWith("DID already registered");
+    await expect(adminWallet.connect(admin2)["whitelist(address,string)"](stranger.address, "did:test")).revertedWith(
+      "DID already registered"
+    );
   });
 
   it("should not allow anyone to upgrade", async () => {
-    await expect(
-      adminWallet.connect(admin2).upgradeTo(adminWallet.address)
-    ).revertedWith("not owner");
+    await expect(adminWallet.connect(admin2).upgradeTo(adminWallet.address)).revertedWith("not owner");
   });
 
   it("should allow owner to upgrade", async () => {
-    const newver = await (
-      await ethers.getContractFactory("AdminWallet")
-    ).deploy();
-    await expect(adminWallet.connect(founder).upgradeTo(newver.address)).not
-      .reverted;
-
-    await upgrades.forceImport(
-      adminWallet.address,
-      await ethers.getContractFactory("AdminWallet"),
-      { kind: "uups" }
-    );
-    await expect(
-      upgrades.upgradeProxy(
-        adminWallet.address,
-        await ethers.getContractFactory("AdminWallet")
-      )
-    ).not.throws;
+    const newver = await (await ethers.getContractFactory("AdminWallet")).deploy();
+    await expect(adminWallet.connect(founder).upgradeTo(newver.address)).not.reverted;
+
+    await upgrades.forceImport(adminWallet.address, await ethers.getContractFactory("AdminWallet"), { kind: "uups" });
+    await expect(upgrades.upgradeProxy(adminWallet.address, await ethers.getContractFactory("AdminWallet"))).not.throws;
   });
 });

package/types/AdminWallet.ts

@@ -34,6 +34,7 @@ export interface AdminWalletInterface extends ethers.utils.Interface {
     "blacklist(address)": FunctionFragment;
     "day()": FunctionFragment;
     "gasPrice()": FunctionFragment;
+    "gd()": FunctionFragment;
     "genericCall(address,bytes,uint256)": FunctionFragment;
     "getIdentity()": FunctionFragment;
     "getRoleAdmin(bytes32)": FunctionFragment;
@@ -41,6 +42,7 @@ export interface AdminWalletInterface extends ethers.utils.Interface {
     "hasRole(bytes32,address)": FunctionFragment;
     "initialize(address[],address,address,uint256)": FunctionFragment;
     "isAdmin(address)": FunctionFragment;
+    "lastGdBalance(address)": FunctionFragment;
     "maxDailyNewWallets()": FunctionFragment;
     "nameService()": FunctionFragment;
     "proxiableUUID()": FunctionFragment;
@@ -55,6 +57,7 @@ export interface AdminWalletInterface extends ethers.utils.Interface {
     "topWallet(address)": FunctionFragment;
     "toppingAmount()": FunctionFragment;
     "toppingTimes()": FunctionFragment;
+    "upgrade()": FunctionFragment;
     "upgradeTo(address)": FunctionFragment;
     "upgradeToAndCall(address,bytes)": FunctionFragment;
     "whitelist(address,string)": FunctionFragment;
@@ -76,6 +79,7 @@ export interface AdminWalletInterface extends ethers.utils.Interface {
   encodeFunctionData(functionFragment: "blacklist", values: [string]): string;
   encodeFunctionData(functionFragment: "day", values?: undefined): string;
   encodeFunctionData(functionFragment: "gasPrice", values?: undefined): string;
+  encodeFunctionData(functionFragment: "gd", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "genericCall",
     values: [string, BytesLike, BigNumberish]
@@ -101,6 +105,10 @@ export interface AdminWalletInterface extends ethers.utils.Interface {
     values: [string[], string, string, BigNumberish]
   ): string;
   encodeFunctionData(functionFragment: "isAdmin", values: [string]): string;
+  encodeFunctionData(
+    functionFragment: "lastGdBalance",
+    values: [string]
+  ): string;
   encodeFunctionData(
     functionFragment: "maxDailyNewWallets",
     values?: undefined
@@ -154,6 +162,7 @@ export interface AdminWalletInterface extends ethers.utils.Interface {
     functionFragment: "toppingTimes",
     values?: undefined
   ): string;
+  encodeFunctionData(functionFragment: "upgrade", values?: undefined): string;
   encodeFunctionData(functionFragment: "upgradeTo", values: [string]): string;
   encodeFunctionData(
     functionFragment: "upgradeToAndCall",
@@ -180,6 +189,7 @@ export interface AdminWalletInterface extends ethers.utils.Interface {
   decodeFunctionResult(functionFragment: "blacklist", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "day", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "gasPrice", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "gd", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "genericCall",
     data: BytesLike
@@ -196,6 +206,10 @@ export interface AdminWalletInterface extends ethers.utils.Interface {
   decodeFunctionResult(functionFragment: "hasRole", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "isAdmin", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "lastGdBalance",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "maxDailyNewWallets",
     data: BytesLike
@@ -243,6 +257,7 @@ export interface AdminWalletInterface extends ethers.utils.Interface {
     functionFragment: "toppingTimes",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "upgrade", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "upgradeTo", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "upgradeToAndCall",
@@ -387,6 +402,8 @@ export interface AdminWallet extends BaseContract {
 
     gasPrice(overrides?: CallOverrides): Promise<[BigNumber]>;
 
+    gd(overrides?: CallOverrides): Promise<[string]>;
+
     genericCall(
       _contract: string,
       _data: BytesLike,
@@ -420,6 +437,11 @@ export interface AdminWallet extends BaseContract {
 
     isAdmin(_user: string, overrides?: CallOverrides): Promise<[boolean]>;
 
+    lastGdBalance(
+      arg0: string,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>;
+
     maxDailyNewWallets(overrides?: CallOverrides): Promise<[BigNumber]>;
 
     nameService(overrides?: CallOverrides): Promise<[string]>;
@@ -486,6 +508,10 @@ export interface AdminWallet extends BaseContract {
 
     toppingTimes(overrides?: CallOverrides): Promise<[BigNumber]>;
 
+    upgrade(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
     upgradeTo(
       newImplementation: string,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -532,6 +558,8 @@ export interface AdminWallet extends BaseContract {
 
   gasPrice(overrides?: CallOverrides): Promise<BigNumber>;
 
+  gd(overrides?: CallOverrides): Promise<string>;
+
   genericCall(
     _contract: string,
     _data: BytesLike,
@@ -565,6 +593,8 @@ export interface AdminWallet extends BaseContract {
 
   isAdmin(_user: string, overrides?: CallOverrides): Promise<boolean>;
 
+  lastGdBalance(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
+
   maxDailyNewWallets(overrides?: CallOverrides): Promise<BigNumber>;
 
   nameService(overrides?: CallOverrides): Promise<string>;
@@ -631,6 +661,10 @@ export interface AdminWallet extends BaseContract {
 
   toppingTimes(overrides?: CallOverrides): Promise<BigNumber>;
 
+  upgrade(
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
   upgradeTo(
     newImplementation: string,
     overrides?: Overrides & { from?: string | Promise<string> }
@@ -671,6 +705,8 @@ export interface AdminWallet extends BaseContract {
 
     gasPrice(overrides?: CallOverrides): Promise<BigNumber>;
 
+    gd(overrides?: CallOverrides): Promise<string>;
+
     genericCall(
       _contract: string,
       _data: BytesLike,
@@ -704,6 +740,8 @@ export interface AdminWallet extends BaseContract {
 
     isAdmin(_user: string, overrides?: CallOverrides): Promise<boolean>;
 
+    lastGdBalance(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
+
     maxDailyNewWallets(overrides?: CallOverrides): Promise<BigNumber>;
 
     nameService(overrides?: CallOverrides): Promise<string>;
@@ -758,6 +796,8 @@ export interface AdminWallet extends BaseContract {
 
     toppingTimes(overrides?: CallOverrides): Promise<BigNumber>;
 
+    upgrade(overrides?: CallOverrides): Promise<void>;
+
     upgradeTo(
       newImplementation: string,
       overrides?: CallOverrides
@@ -887,6 +927,8 @@ export interface AdminWallet extends BaseContract {
 
     gasPrice(overrides?: CallOverrides): Promise<BigNumber>;
 
+    gd(overrides?: CallOverrides): Promise<BigNumber>;
+
     genericCall(
       _contract: string,
       _data: BytesLike,
@@ -923,6 +965,8 @@ export interface AdminWallet extends BaseContract {
 
     isAdmin(_user: string, overrides?: CallOverrides): Promise<BigNumber>;
 
+    lastGdBalance(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
+
     maxDailyNewWallets(overrides?: CallOverrides): Promise<BigNumber>;
 
     nameService(overrides?: CallOverrides): Promise<BigNumber>;
@@ -989,6 +1033,10 @@ export interface AdminWallet extends BaseContract {
 
     toppingTimes(overrides?: CallOverrides): Promise<BigNumber>;
 
+    upgrade(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
     upgradeTo(
       newImplementation: string,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -1040,6 +1088,8 @@ export interface AdminWallet extends BaseContract {
 
     gasPrice(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
+    gd(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     genericCall(
       _contract: string,
       _data: BytesLike,
@@ -1079,6 +1129,11 @@ export interface AdminWallet extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    lastGdBalance(
+      arg0: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
     maxDailyNewWallets(
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
@@ -1147,6 +1202,10 @@ export interface AdminWallet extends BaseContract {
 
     toppingTimes(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
+    upgrade(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
     upgradeTo(
       newImplementation: string,
       overrides?: Overrides & { from?: string | Promise<string> }

package/types/AdminWalletFuse.ts

@@ -34,6 +34,7 @@ export interface AdminWalletFuseInterface extends ethers.utils.Interface {
     "blacklist(address)": FunctionFragment;
     "day()": FunctionFragment;
     "gasPrice()": FunctionFragment;
+    "gd()": FunctionFragment;
     "genericCall(address,bytes,uint256)": FunctionFragment;
     "getIdentity()": FunctionFragment;
     "getRoleAdmin(bytes32)": FunctionFragment;
@@ -41,6 +42,7 @@ export interface AdminWalletFuseInterface extends ethers.utils.Interface {
     "hasRole(bytes32,address)": FunctionFragment;
     "initialize(address[],address,address,uint256)": FunctionFragment;
     "isAdmin(address)": FunctionFragment;
+    "lastGdBalance(address)": FunctionFragment;
     "maxDailyNewWallets()": FunctionFragment;
     "nameService()": FunctionFragment;
     "owner()": FunctionFragment;
@@ -58,7 +60,7 @@ export interface AdminWalletFuseInterface extends ethers.utils.Interface {
     "toppingAmount()": FunctionFragment;
     "toppingTimes()": FunctionFragment;
     "transferOwnership(address)": FunctionFragment;
-    "upgrade(address)": FunctionFragment;
+    "upgrade()": FunctionFragment;
     "upgradeTo(address)": FunctionFragment;
     "upgradeToAndCall(address,bytes)": FunctionFragment;
     "version()": FunctionFragment;
@@ -81,6 +83,7 @@ export interface AdminWalletFuseInterface extends ethers.utils.Interface {
   encodeFunctionData(functionFragment: "blacklist", values: [string]): string;
   encodeFunctionData(functionFragment: "day", values?: undefined): string;
   encodeFunctionData(functionFragment: "gasPrice", values?: undefined): string;
+  encodeFunctionData(functionFragment: "gd", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "genericCall",
     values: [string, BytesLike, BigNumberish]
@@ -106,6 +109,10 @@ export interface AdminWalletFuseInterface extends ethers.utils.Interface {
     values: [string[], string, string, BigNumberish]
   ): string;
   encodeFunctionData(functionFragment: "isAdmin", values: [string]): string;
+  encodeFunctionData(
+    functionFragment: "lastGdBalance",
+    values: [string]
+  ): string;
   encodeFunctionData(
     functionFragment: "maxDailyNewWallets",
     values?: undefined
@@ -168,7 +175,7 @@ export interface AdminWalletFuseInterface extends ethers.utils.Interface {
     functionFragment: "transferOwnership",
     values: [string]
   ): string;
-  encodeFunctionData(functionFragment: "upgrade", values: [string]): string;
+  encodeFunctionData(functionFragment: "upgrade", values?: undefined): string;
   encodeFunctionData(functionFragment: "upgradeTo", values: [string]): string;
   encodeFunctionData(
     functionFragment: "upgradeToAndCall",
@@ -196,6 +203,7 @@ export interface AdminWalletFuseInterface extends ethers.utils.Interface {
   decodeFunctionResult(functionFragment: "blacklist", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "day", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "gasPrice", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "gd", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "genericCall",
     data: BytesLike
@@ -212,6 +220,10 @@ export interface AdminWalletFuseInterface extends ethers.utils.Interface {
   decodeFunctionResult(functionFragment: "hasRole", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "isAdmin", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "lastGdBalance",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "maxDailyNewWallets",
     data: BytesLike
@@ -424,6 +436,8 @@ export interface AdminWalletFuse extends BaseContract {
 
     gasPrice(overrides?: CallOverrides): Promise<[BigNumber]>;
 
+    gd(overrides?: CallOverrides): Promise<[string]>;
+
     genericCall(
       _contract: string,
       _data: BytesLike,
@@ -457,6 +471,11 @@ export interface AdminWalletFuse extends BaseContract {
 
     isAdmin(_user: string, overrides?: CallOverrides): Promise<[boolean]>;
 
+    lastGdBalance(
+      arg0: string,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>;
+
     maxDailyNewWallets(overrides?: CallOverrides): Promise<[BigNumber]>;
 
     nameService(overrides?: CallOverrides): Promise<[string]>;
@@ -535,7 +554,6 @@ export interface AdminWalletFuse extends BaseContract {
     ): Promise<ContractTransaction>;
 
     upgrade(
-      _ns: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
@@ -587,6 +605,8 @@ export interface AdminWalletFuse extends BaseContract {
 
   gasPrice(overrides?: CallOverrides): Promise<BigNumber>;
 
+  gd(overrides?: CallOverrides): Promise<string>;
+
   genericCall(
     _contract: string,
     _data: BytesLike,
@@ -620,6 +640,8 @@ export interface AdminWalletFuse extends BaseContract {
 
   isAdmin(_user: string, overrides?: CallOverrides): Promise<boolean>;
 
+  lastGdBalance(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
+
   maxDailyNewWallets(overrides?: CallOverrides): Promise<BigNumber>;
 
   nameService(overrides?: CallOverrides): Promise<string>;
@@ -698,7 +720,6 @@ export interface AdminWalletFuse extends BaseContract {
   ): Promise<ContractTransaction>;
 
   upgrade(
-    _ns: string,
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
@@ -744,6 +765,8 @@ export interface AdminWalletFuse extends BaseContract {
 
     gasPrice(overrides?: CallOverrides): Promise<BigNumber>;
 
+    gd(overrides?: CallOverrides): Promise<string>;
+
     genericCall(
       _contract: string,
       _data: BytesLike,
@@ -777,6 +800,8 @@ export interface AdminWalletFuse extends BaseContract {
 
     isAdmin(_user: string, overrides?: CallOverrides): Promise<boolean>;
 
+    lastGdBalance(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
+
     maxDailyNewWallets(overrides?: CallOverrides): Promise<BigNumber>;
 
     nameService(overrides?: CallOverrides): Promise<string>;
@@ -840,7 +865,7 @@ export interface AdminWalletFuse extends BaseContract {
       overrides?: CallOverrides
     ): Promise<void>;
 
-    upgrade(_ns: string, overrides?: CallOverrides): Promise<void>;
+    upgrade(overrides?: CallOverrides): Promise<void>;
 
     upgradeTo(
       newImplementation: string,
@@ -982,6 +1007,8 @@ export interface AdminWalletFuse extends BaseContract {
 
     gasPrice(overrides?: CallOverrides): Promise<BigNumber>;
 
+    gd(overrides?: CallOverrides): Promise<BigNumber>;
+
     genericCall(
       _contract: string,
       _data: BytesLike,
@@ -1018,6 +1045,8 @@ export interface AdminWalletFuse extends BaseContract {
 
     isAdmin(_user: string, overrides?: CallOverrides): Promise<BigNumber>;
 
+    lastGdBalance(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
+
     maxDailyNewWallets(overrides?: CallOverrides): Promise<BigNumber>;
 
     nameService(overrides?: CallOverrides): Promise<BigNumber>;
@@ -1096,7 +1125,6 @@ export interface AdminWalletFuse extends BaseContract {
     ): Promise<BigNumber>;
 
     upgrade(
-      _ns: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
@@ -1153,6 +1181,8 @@ export interface AdminWalletFuse extends BaseContract {
 
     gasPrice(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
+    gd(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     genericCall(
       _contract: string,
       _data: BytesLike,
@@ -1192,6 +1222,11 @@ export interface AdminWalletFuse extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    lastGdBalance(
+      arg0: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
     maxDailyNewWallets(
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
@@ -1272,7 +1307,6 @@ export interface AdminWalletFuse extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     upgrade(
-      _ns: string,
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;