@gooddollar/goodprotocol 2.0.12 → 2.0.14-beta.0

package/test/token/CeloGasToken.test.ts

@@ -0,0 +1,108 @@
+import { ethers } from "hardhat";
+import { loadFixture } from "@nomicfoundation/hardhat-network-helpers";
+import { expect } from "chai";
+import { SuperGoodDollar } from "../../types";
+import { createDAO } from "../helpers";
+import { BigNumber } from "ethers";
+
+const BN = ethers.BigNumber;
+
+describe("Celo Gas Token", () => {
+  let token: SuperGoodDollar, founder;
+  let signers;
+
+  const initialState = async () => {};
+
+  before(async () => {
+    [founder, ...signers] = await ethers.getSigners();
+
+    let { gd: gooddollar } = await loadFixture(createDAO);
+
+    token = (await ethers.getContractAt(
+      "SuperGoodDollar",
+      gooddollar
+    )) as SuperGoodDollar;
+    await token.mint(founder.address, ethers.constants.WeiPerEther.mul(100));
+  });
+
+  it("should debit sender for gas fees", async () => {
+    await loadFixture(initialState);
+
+    await founder.sendTransaction({
+      to: ethers.constants.AddressZero,
+      value: ethers.constants.WeiPerEther
+    });
+    const vm = await ethers.getImpersonatedSigner(ethers.constants.AddressZero);
+    let ts = await token.totalSupply();
+    let balance = await token.balanceOf(founder.address);
+    const fee = ethers.constants.WeiPerEther.div(100);
+    await token.connect(vm).debitGasFees(founder.address, BigNumber.from(fee));
+    expect(await token.balanceOf(founder.address)).eq(balance.sub(fee));
+    expect(await token.totalSupply()).eq(ts.sub(fee));
+  });
+
+  it("should credit sender for gas fees", async () => {
+    await loadFixture(initialState);
+
+    await founder.sendTransaction({
+      to: ethers.constants.AddressZero,
+      value: ethers.constants.WeiPerEther
+    });
+    const vm = await ethers.getImpersonatedSigner(ethers.constants.AddressZero);
+    let ts = await token.totalSupply();
+    let balance = await token.balanceOf(founder.address);
+    const fee = ethers.constants.WeiPerEther.div(100);
+
+    const [recipient, gateway, fund] = signers;
+    const [refund, recipientFee, gatewayFee, fundFee] = [
+      fee.div(10),
+      fee.div(100),
+      fee.div(200),
+      fee.div(300)
+    ];
+
+    await token.connect(vm).debitGasFees(founder.address, BigNumber.from(fee));
+    await token
+      .connect(vm)
+      .creditGasFees(
+        founder.address,
+        recipient.address,
+        gateway.address,
+        fund.address,
+        refund,
+        recipientFee,
+        gatewayFee,
+        fundFee
+      );
+
+    expect(await token.balanceOf(founder.address)).eq(
+      balance.sub(fee).add(refund)
+    );
+    expect(await token.balanceOf(recipient.address)).eq(recipientFee);
+    expect(await token.balanceOf(gateway.address)).eq(gatewayFee);
+    expect(await token.balanceOf(fund.address)).eq(fundFee);
+    expect(await token.totalSupply()).eq(
+      ts.sub(fee).add(refund).add(recipientFee).add(gatewayFee).add(fundFee)
+    );
+  });
+
+  it("should only be callable by VM", async () => {
+    await loadFixture(initialState);
+
+    await expect(
+      token.debitGasFees(founder.address, BigNumber.from(1))
+    ).revertedWith("VM");
+    await expect(
+      token.creditGasFees(
+        founder.address,
+        founder.address,
+        founder.address,
+        founder.address,
+        1,
+        1,
+        1,
+        1
+      )
+    ).revertedWith("VM");
+  });
+});

package/test/token/SuperGoodDollar.test.ts

@@ -15,7 +15,7 @@ let sf,
   newHost,
   identityMock,
   receiverMock,
-  sgd, // stands for "SuperGoodDollar"
+  sgd: ISuperGoodDollar, // stands for "SuperGoodDollar"
   feesFormula10PctMock;
 
 const alotOfDollars = ethers.utils.parseEther("100000");
@@ -65,7 +65,8 @@ before(async function () {
     founder
   ).deploy();
 
-  sgd = await deploySuperGoodDollar(sfContracts, [
+  console.log("deploying test supergooddollar...");
+  sgd = (await deploySuperGoodDollar(sfContracts, [
     "SuperGoodDollar",
     "SGD",
     0, // cap
@@ -73,7 +74,7 @@ before(async function () {
     identityMock.address,
     receiverMock.address,
     founder.address
-  ]);
+  ])) as ISuperGoodDollar;
 
   await sgd.mint(founder.address, alotOfDollars);
 });
@@ -244,13 +245,17 @@ describe("SuperGoodDollar", async function () {
   it("should not be able to initialize again", async () => {
     await loadFixture(initialState);
     await expect(
-      sgd["initialize(string,string,uint256,address,address,address,address)"](
+      sgd[
+        "initialize(string,string,uint256,address,address,address,address,address,address)"
+      ](
         "x",
         "y",
         1,
         ethers.constants.AddressZero,
         ethers.constants.AddressZero,
         ethers.constants.AddressZero,
+        ethers.constants.AddressZero,
+        ethers.constants.AddressZero,
         ethers.constants.AddressZero
       )
     ).revertedWith("Initializable: contract is already initialized");
@@ -268,7 +273,7 @@ describe("SuperGoodDollar", async function () {
   it("update the GoodDollar logic", async function () {
     await loadFixture(initialState);
     const sgdProxiable = await ethers.getContractAt(
-      "UUPSProxiable",
+      "contracts/token/superfluid/UUPSProxiable.sol:UUPSProxiable",
       sgd.address,
       founder.signer
     );
@@ -295,13 +300,17 @@ describe("SuperGoodDollar", async function () {
 
     expect(await sgd.getHost()).equal(newHost.address);
     await expect(
-      sgd["initialize(string,string,uint256,address,address,address,address)"](
+      sgd[
+        "initialize(string,string,uint256,address,address,address,address,address,address)"
+      ](
         "x",
         "y",
         1,
         ethers.constants.AddressZero,
         ethers.constants.AddressZero,
         ethers.constants.AddressZero,
+        ethers.constants.AddressZero,
+        ethers.constants.AddressZero,
         ethers.constants.AddressZero
       )
     ).revertedWith("Initializable: contract is already initialized");

package/test/utils/AdminWallet.test.ts

@@ -24,7 +24,8 @@ describe("AdminWallet", () => {
     stranger,
     stranger2,
     blacklisted,
-    identity;
+    identity,
+    gooddollar;
 
   before(async () => {
     signers = await ethers.getSigners();
@@ -40,9 +41,9 @@ describe("AdminWallet", () => {
       admin2,
       toWhitelist
     ] = signers.slice(10);
-    let { identity: id, nameService } = await loadFixture(createDAO);
+    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],
@@ -221,18 +222,21 @@ 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
-    );
-    expect(walletBalance).eq(walletBalanceAfter);
-    expect(tx.logs.length).eq(0);
+    await expect(
+      adminWallet.connect(admin).topWallet(whitelisted.address)
+    ).revertedWith("hasBalance");
+  });
+
+  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", async () => {
+  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 +246,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,12 +256,14 @@ 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 gooddollar.mint(newUser.address, 1);
     await expect(
       adminWallet.connect(admin).topWallet(newUser.address)
     ).revertedWith("User wallet has been topped too many times today");

package/test/utils/BuyAndBridgeHelper.test.ts

@@ -1,26 +1,14 @@
 import { ethers, upgrades } from "hardhat";
 import { loadFixture } from "@nomicfoundation/hardhat-network-helpers";
 import { expect } from "chai";
-import {
-  GoodReserveCDai,
-  DistributionBridgeMock,
-  IGoodDollar
-} from "../../types";
+import { GoodReserveCDai, DistributionBridgeMock, IGoodDollar } from "../../types";
 import { createDAO } from "../helpers";
 
 export const NULL_ADDRESS = ethers.constants.AddressZero;
 
-describe("BuyAndBridgeHelper ", () => {
+xdescribe("BuyAndBridgeHelper ", () => {
   let goodReserve: GoodReserveCDai;
-  let goodDollar: IGoodDollar,
-    deployedDAO,
-    genericCall,
-    avatar,
-    founder,
-    signers,
-    setDAOAddress,
-    nameService,
-    cDai;
+  let goodDollar: IGoodDollar, deployedDAO, genericCall, avatar, founder, signers, setDAOAddress, nameService, cDai;
 
   before(async () => {
     [founder, ...signers] = await ethers.getSigners();
@@ -58,16 +46,10 @@ describe("BuyAndBridgeHelper ", () => {
 
     await setDAOAddress("UNISWAP_ROUTER", signers[0].address);
 
-    const exchangeHelperFactory = await ethers.getContractFactory(
-      "ExchangeHelper"
-    );
+    const exchangeHelperFactory = await ethers.getContractFactory("ExchangeHelper");
     const bnbFactory = await ethers.getContractFactory("BuyAndBridgeHelper");
 
-    const exchangeHelper = await upgrades.deployProxy(
-      exchangeHelperFactory,
-      [nameService.address],
-      { kind: "uups" }
-    );
+    const exchangeHelper = await upgrades.deployProxy(exchangeHelperFactory, [nameService.address], { kind: "uups" });
 
     await setDAOAddress("EXCHANGE_HELPER", exchangeHelper.address);
 
@@ -87,9 +69,7 @@ describe("BuyAndBridgeHelper ", () => {
     expect(await exchangeHelper.gd()).equal(goodDollar.address);
     expect(await exchangeHelper.fuseBridge()).equal(bridge.address);
     expect(await exchangeHelper.multiChainBridge()).equal(bridge.address);
-    expect(await exchangeHelper.anyGoodDollar()).equal(
-      ethers.constants.AddressZero
-    );
+    expect(await exchangeHelper.anyGoodDollar()).equal(ethers.constants.AddressZero);
   });
 
   it("should buy and bridge to Fuse", async () => {
@@ -124,9 +104,7 @@ describe("BuyAndBridgeHelper ", () => {
     const priceAfter = await goodReserve["currentPrice()"]();
     const gdxBalanceAfter = await goodReserve.balanceOf(founder.address);
     const bridgeBalanceAfter = await goodDollar.balanceOf(bridge.address);
-    const helperGdBalanceAfter = await goodDollar.balanceOf(
-      exchangeHelper.address
-    );
+    const helperGdBalanceAfter = await goodDollar.balanceOf(exchangeHelper.address);
 
     expect(helperGdBalanceAfter).eq(0); //G$s should be at the fuse bridge
     expect(helperBalanceAfter).equal(0);
@@ -143,7 +121,7 @@ describe("BuyAndBridgeHelper ", () => {
     expect(events[0].args.data).to.equal(founder.address.toLowerCase());
   });
 
-  it("should buy and bridge to Celo", async () => {
+  xit("should buy and bridge to Celo", async () => {
     const { exchangeHelper, bridge } = await loadFixture(fixture);
     let daiAmount = ethers.utils.parseEther("100");
     const dai = await ethers.getContractAt("DAIMock", deployedDAO.daiAddress);
@@ -176,9 +154,7 @@ describe("BuyAndBridgeHelper ", () => {
     const priceAfter = await goodReserve["currentPrice()"]();
     const gdxBalanceAfter = await goodReserve.balanceOf(founder.address);
     const bridgeBalanceAfter = await goodDollar.balanceOf(bridge.address);
-    const helperGdBalanceAfter = await goodDollar.balanceOf(
-      exchangeHelper.address
-    );
+    const helperGdBalanceAfter = await goodDollar.balanceOf(exchangeHelper.address);
 
     expect(helperGdBalanceAfter).gt(0); //in case of the mock it doesnt call transferFrom, so bought G$s stay in helper when testing multichain
     expect(helperBalanceAfter).equal(0);

package/truffle-config.js

@@ -63,7 +63,10 @@ module.exports = {
       network_id: 1
     },
     kovan: {
-      provider: () => new Web3.providers.HttpProvider(`https://ropsten.infura.io/v3/YOUR-PROJECT-ID`),
+      provider: () =>
+        new Web3.providers.HttpProvider(
+          `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`
+        ),
       network_id: 42, // Ropsten's id
       gas: 5500000, // Ropsten has a lower block limit than mainnet
       confirmations: 2, // # of confs to wait between deployments. (default: 0)
@@ -71,7 +74,10 @@ module.exports = {
       skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
     },
     ropsten: {
-      provider: () => new Web3.providers.HttpProvider(`https://ropsten.infura.io/v3/YOUR-PROJECT-ID`),
+      provider: () =>
+        new Web3.providers.HttpProvider(
+          `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`
+        ),
       network_id: 3, // Ropsten's id
       gas: 5000000, // Ropsten has a lower block limit than mainnet
       confirmations: 2, // # of confs to wait between deployments. (default: 0)
@@ -79,7 +85,8 @@ module.exports = {
       skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
     },
     goerli: {
-      provider: () => new Web3.providers.HttpProvider(`https://rpc.ankr.io/eth_goerli`),
+      provider: () =>
+        new Web3.providers.HttpProvider(`https://rpc.ankr.io/eth_goerli`),
       network_id: 5, // Ropsten's id
       gas: 3000000, // Ropsten has a lower block limit than mainnet
       skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
@@ -93,7 +100,8 @@ module.exports = {
       skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
     },
     fusespark: {
-      provider: () => new Web3.providers.HttpProvider(`https://rpc.fusespark.io`),
+      provider: () =>
+        new Web3.providers.HttpProvider(`https://rpc.fusespark.io`),
       network_id: 123, // Ropsten's id
       gas: 8000000, // Ropsten has a lower block limit than mainnet
       confirmations: 1, // # of confs to wait between deployments. (default: 0)
@@ -108,8 +116,18 @@ module.exports = {
       timeoutBlocks: 20, // # of blocks before a deployment times out  (minimum/default: 50)
       skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
     },
+    mainnet: {
+      provider: () =>
+        new Web3.providers.HttpProvider(`https://cloudflare-eth.com`),
+      network_id: 1,
+      gas: 150000,
+      skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
+    },
     alfajores: {
-      provider: () => new Web3.providers.HttpProvider(`https://alfajores-forno.celo-testnet.org`),
+      provider: () =>
+        new Web3.providers.HttpProvider(
+          `https://alfajores-forno.celo-testnet.org`
+        ),
       network_id: 44787, // Ropsten's id
       gas: 150000, // Ropsten has a lower block limit than mainnet
       confirmations: 1, // # of confs to wait between deployments. (default: 0)
@@ -133,7 +151,7 @@ module.exports = {
   // Configure your compilers
   compilers: {
     solc: {
-      version: "0.8.16", // Fetch exact version from solc-bin (default: truffle's version)
+      version: "0.8.19", // Fetch exact version from solc-bin (default: truffle's version)
       settings: {
         // See the solidity docs for advice about optimization and evmVersion
         optimizer: {

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> }