@gooddollar/goodprotocol 2.0.7-beta.1 → 2.0.7-beta.2

package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
+  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
 }

package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
+  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
 }

package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
+  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
 }

package/artifacts/contracts/utils/OneTimePaymentsV2.sol/OneTimePaymentsV2.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
+  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
 }

package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
+  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
 }

package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
+  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
 }

package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
+  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
 }

package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
+  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
 }

package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
+  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
 }

package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
+  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
 }

package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
+  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
 }

package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/14aec2cd44120ed14a5386eb1f2f4abd.json"
+  "buildInfo": "../../../build-info/e242334daf6949c15ec78719b8a396c7.json"
 }

package/contracts/utils/GDFaucet.sol

@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.8.0;
+
+import "./DAOContract.sol";
+
+contract GDFaucet is DAOContract {
+	uint256 public dripAmount;
+	mapping(address => uint256) public lastDripTime;
+
+	constructor(INameService _dao, uint256 _dripAmount) {
+		setDAO(_dao);
+		dripAmount = _dripAmount;
+	}
+
+	function drip() external {
+		require(
+			block.timestamp - lastDripTime[msg.sender] >= 24 hours,
+			"drip limit"
+		);
+		lastDripTime[msg.sender] = block.timestamp;
+		uint decimals = nativeToken().decimals();
+		require(
+			dao.mintTokens(dripAmount * (10 ** decimals), msg.sender, dao.avatar()),
+			"mint failed"
+		);
+	}
+}

package/hardhat.config.ts

@@ -59,7 +59,8 @@ const hhconfig: HardhatUserConfig = {
   etherscan: {
     apiKey: {
       mainnet: etherscan_key,
-      celo: celoscan_key
+      celo: celoscan_key,
+      alfajores: celoscan_key
     },
     customChains: [
       {
@@ -69,6 +70,14 @@ const hhconfig: HardhatUserConfig = {
           apiURL: "https://api.celoscan.io/api",
           browserURL: "https://celoscan.io/"
         }
+      },
+      {
+        network: "alfajores",
+        chainId: 44787,
+        urls: {
+          apiURL: "https://api.alfajores.celoscan.io/api",
+          browserURL: "https://alfajores.celoscan.io/"
+        }
       }
     ]
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.7-beta.1",
+  "version": "2.0.7-beta.2",
   "description": "GoodDollar Protocol",
   "engines": {
     "node": "18.x"

package/releases/deployment.json

@@ -479,7 +479,8 @@
         "Invites": "0x36829D1Cda92FFF5782d5d48991620664FC857d3",
         "UBIScheme": "0x43d72Ff17701B2DA814620735C39C620Ce0ea4A1",
         "OneTimePayments": "0xB27D247f5C2a61D2Cb6b6E67FEE51d839447e97d",
-        "SwapHelper": "0xE45CaB86609a16dFaDec112FDd61E4EA80EdaA8D"
+        "SwapHelper": "0xE45CaB86609a16dFaDec112FDd61E4EA80EdaA8D",
+        "UniswapV3Router": "0x5615CDAb10dc425a742d643d949a7F474C01abc4"
     },
     "gnosis": {
         "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8"
@@ -506,7 +507,8 @@
         "CompoundVotingMachine": "0xC2C303131939370ed75c95686F691f290b56Be66",
         "GuardiansSafe": "0x84C10B45fE51bfB4f86c19A47Fdbc187d4572Fb8",
         "OneTimePayments": "0xB23e54fd8c2f35F9d38884Fc1611F5e9004f10ea",
-        "OneTimePaymentsV2": "0x2cb1c7d50371e277d7a36B171c0ACe9B157518EE"
+        "OneTimePaymentsV2": "0x2cb1c7d50371e277d7a36B171c0ACe9B157518EE",
+        "UniswapV3Router": "0x5615CDAb10dc425a742d643d949a7F474C01abc4"
     },
     "staging-celo": {
         "network": "staging-celo",
@@ -530,7 +532,8 @@
         "CompoundVotingMachine": "0xCd25fB84AB22582F1034bcd80c399a3126f2E775",
         "GuardiansSafe": "0x84C10B45fE51bfB4f86c19A47Fdbc187d4572Fb8",
         "OneTimePayments": "0x514820Af2DaE5F537dE16E576471528176318113",
-        "OneTimePaymentsV2": "0x963E7B4c970626Bb103c61fA16b002AFf6E6c2C7"
+        "OneTimePaymentsV2": "0x963E7B4c970626Bb103c61fA16b002AFf6E6c2C7",
+        "UniswapV3Router": "0x5615CDAb10dc425a742d643d949a7F474C01abc4"
     },
     "development-goerli": {
         "ProxyFactory": "0x65D8eACBCd9618b8780C4b444081915a5D54D611",
@@ -555,6 +558,8 @@
         "GReputation": "0x3647469733C01713A7d9bdf6834bd4aBd59D66fa",
         "DAOCreator": "0x35ea7176cfde2D35Dff3E688F7bA45D1d5dF0A76",
         "SuperFluidResolver": "0x6e9CaBE4172344Db81a1E1D735a6AD763700064A",
-        "SuperFluidHost": "0x14764E92A63e73a2Dac1fF08F35A64647fB50C91"
+        "SuperFluidHost": "0x14764E92A63e73a2Dac1fF08F35A64647fB50C91",
+        "UniswapV3Router": "0x5615CDAb10dc425a742d643d949a7F474C01abc4",
+        "GDFaucet": "0x8986F9C6b3D0b9A8b92ef7f1eF7EB9e767D414e1"
     }
 }

package/scripts/multichain-deploy/6_testnetFaucet.ts

@@ -0,0 +1,85 @@
+/***
+ * Deploy helper contracts
+ * AdminWallet, Faucet, Invites
+ */
+import { network, ethers, upgrades, run } from "hardhat";
+import { Contract } from "ethers";
+import { defaultsDeep } from "lodash";
+import { getImplementationAddress } from "@openzeppelin/upgrades-core";
+import { deployDeterministic, verifyProductionSigner, verifyContract } from "./helpers";
+import releaser from "../releaser";
+import ProtocolSettings from "../../releases/deploy-settings.json";
+import dao from "../../releases/deployment.json";
+import { TransactionResponse } from "@ethersproject/providers";
+
+const { name } = network;
+
+const printDeploy = async (c: Contract | TransactionResponse): Promise<Contract | TransactionResponse> => {
+  if (c instanceof Contract) {
+    await c.deployed();
+    console.log("deployed to: ", c.address);
+  }
+  if (c.wait) {
+    await c.wait();
+    console.log("tx done:", c.hash);
+  }
+  return c;
+};
+
+export const deployHelpers = async () => {
+  let protocolSettings = defaultsDeep({}, ProtocolSettings[network.name], ProtocolSettings["default"]);
+
+  let release: { [key: string]: any } = dao[network.name];
+
+  let [root] = await ethers.getSigners();
+  const isProduction = network.name.includes("production");
+
+  if (isProduction) verifyProductionSigner(root);
+
+  //generic call permissions
+  let schemeMock = root;
+
+  console.log("got signers:", {
+    network,
+    root: root.address,
+    schemeMock: schemeMock.address,
+    balance: await ethers.provider.getBalance(root.address).then(_ => _.toString())
+  });
+
+  const GDFaucet = release.GDFaucet
+    ? await ethers.getContractAt("GDFaucet", release.GDFaucet)
+    : ((await deployDeterministic(
+        {
+          name: "GDFaucet",
+          salt: "GDFaucet",
+          isUpgradeable: false
+        },
+        [release.NameService, 10000]
+      ).then(printDeploy)) as Contract);
+
+  const torelease = {
+    GDFaucet: GDFaucet.address
+  };
+  await releaser(torelease, network.name, "deployment", false);
+
+  const controller = await ethers.getContractAt("Controller", release.Controller);
+
+  const tx = await controller
+    .registerScheme(GDFaucet.address, ethers.constants.HashZero, "0x00000001", release.Avatar)
+    .then(printDeploy);
+
+  console.log("TokenFaucet deployed and registered as a scheme via the controller");
+
+  await verifyContract(
+    GDFaucet.address,
+    "GDFaucet",
+    network.name,
+    undefined,
+    ethers.utils.defaultAbiCoder.encode(["address", "uint"], [release.NameService, 10000])
+  );
+};
+
+export const main = async () => {
+  await deployHelpers();
+};
+if (process.argv[1].includes("6_testnetFaucet")) main();

package/scripts/multichain-deploy/helpers.ts

@@ -332,7 +332,7 @@ export const verifyContract = async (
   proxyName?: string,
   forcedConstructorArguments?: string
 ) => {
-  let networkProvider = network.name.includes("-") ? network.name.split("-")[1] : "fuse";
+  let networkProvider = network.name.includes("-") ? network.name.split("-")[1] : network.name;
   networkProvider = networkProvider === "mainnet" ? "ethereum" : networkProvider;
   console.log("truffle compile...");
   await exec("npx truffle compile");

package/truffle-config.js

@@ -103,6 +103,14 @@ module.exports = {
       confirmations: 1, // # of confs to wait between deployments. (default: 0)
       timeoutBlocks: 20, // # of blocks before a deployment times out  (minimum/default: 50)
       skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
+    },
+    alfajores: {
+      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)
+      timeoutBlocks: 20, // # of blocks before a deployment times out  (minimum/default: 50)
+      skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
     }
 
     // Useful for private networks

package/types/GDFaucet.ts

@@ -0,0 +1,221 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import {
+  ethers,
+  EventFilter,
+  Signer,
+  BigNumber,
+  BigNumberish,
+  PopulatedTransaction,
+  BaseContract,
+  ContractTransaction,
+  Overrides,
+  CallOverrides,
+} from "ethers";
+import { BytesLike } from "@ethersproject/bytes";
+import { Listener, Provider } from "@ethersproject/providers";
+import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "./common";
+
+export interface GDFaucetInterface extends ethers.utils.Interface {
+  functions: {
+    "avatar()": FunctionFragment;
+    "dao()": FunctionFragment;
+    "drip()": FunctionFragment;
+    "dripAmount()": FunctionFragment;
+    "lastDripTime(address)": FunctionFragment;
+    "nameService()": FunctionFragment;
+    "nativeToken()": FunctionFragment;
+    "updateAvatar()": FunctionFragment;
+  };
+
+  encodeFunctionData(functionFragment: "avatar", values?: undefined): string;
+  encodeFunctionData(functionFragment: "dao", values?: undefined): string;
+  encodeFunctionData(functionFragment: "drip", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "dripAmount",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "lastDripTime",
+    values: [string]
+  ): string;
+  encodeFunctionData(
+    functionFragment: "nameService",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "nativeToken",
+    values?: undefined
+  ): string;
+  encodeFunctionData(
+    functionFragment: "updateAvatar",
+    values?: undefined
+  ): string;
+
+  decodeFunctionResult(functionFragment: "avatar", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "dao", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "drip", data: BytesLike): Result;
+  decodeFunctionResult(functionFragment: "dripAmount", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "lastDripTime",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "nameService",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "nativeToken",
+    data: BytesLike
+  ): Result;
+  decodeFunctionResult(
+    functionFragment: "updateAvatar",
+    data: BytesLike
+  ): Result;
+
+  events: {};
+}
+
+export interface GDFaucet extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: GDFaucetInterface;
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>;
+
+  listeners<TEvent extends TypedEvent>(
+    eventFilter?: TypedEventFilter<TEvent>
+  ): Array<TypedListener<TEvent>>;
+  listeners(eventName?: string): Array<Listener>;
+  removeAllListeners<TEvent extends TypedEvent>(
+    eventFilter: TypedEventFilter<TEvent>
+  ): this;
+  removeAllListeners(eventName?: string): this;
+  off: OnEvent<this>;
+  on: OnEvent<this>;
+  once: OnEvent<this>;
+  removeListener: OnEvent<this>;
+
+  functions: {
+    avatar(overrides?: CallOverrides): Promise<[string]>;
+
+    dao(overrides?: CallOverrides): Promise<[string]>;
+
+    drip(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+
+    dripAmount(overrides?: CallOverrides): Promise<[BigNumber]>;
+
+    lastDripTime(arg0: string, overrides?: CallOverrides): Promise<[BigNumber]>;
+
+    nameService(overrides?: CallOverrides): Promise<[string]>;
+
+    nativeToken(overrides?: CallOverrides): Promise<[string]>;
+
+    updateAvatar(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<ContractTransaction>;
+  };
+
+  avatar(overrides?: CallOverrides): Promise<string>;
+
+  dao(overrides?: CallOverrides): Promise<string>;
+
+  drip(
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  dripAmount(overrides?: CallOverrides): Promise<BigNumber>;
+
+  lastDripTime(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
+
+  nameService(overrides?: CallOverrides): Promise<string>;
+
+  nativeToken(overrides?: CallOverrides): Promise<string>;
+
+  updateAvatar(
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<ContractTransaction>;
+
+  callStatic: {
+    avatar(overrides?: CallOverrides): Promise<string>;
+
+    dao(overrides?: CallOverrides): Promise<string>;
+
+    drip(overrides?: CallOverrides): Promise<void>;
+
+    dripAmount(overrides?: CallOverrides): Promise<BigNumber>;
+
+    lastDripTime(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
+
+    nameService(overrides?: CallOverrides): Promise<string>;
+
+    nativeToken(overrides?: CallOverrides): Promise<string>;
+
+    updateAvatar(overrides?: CallOverrides): Promise<void>;
+  };
+
+  filters: {};
+
+  estimateGas: {
+    avatar(overrides?: CallOverrides): Promise<BigNumber>;
+
+    dao(overrides?: CallOverrides): Promise<BigNumber>;
+
+    drip(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+
+    dripAmount(overrides?: CallOverrides): Promise<BigNumber>;
+
+    lastDripTime(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
+
+    nameService(overrides?: CallOverrides): Promise<BigNumber>;
+
+    nativeToken(overrides?: CallOverrides): Promise<BigNumber>;
+
+    updateAvatar(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    avatar(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    dao(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    drip(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+
+    dripAmount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    lastDripTime(
+      arg0: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
+    nameService(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    nativeToken(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
+    updateAvatar(
+      overrides?: Overrides & { from?: string | Promise<string> }
+    ): Promise<PopulatedTransaction>;
+  };
+}