@gooddollar/goodcollective-contracts 1.1.0 → 1.3.0

package/typechain-types/contracts/UBI/UBIPoolFactory.ts

@@ -28,21 +28,21 @@ import type {
   PromiseOrValue,
 } from "../../common";
 
-export declare namespace UBIPool {
-  export type PoolSettingsStruct = {
-    manager: PromiseOrValue<string>;
-    membersValidator: PromiseOrValue<string>;
-    uniquenessValidator: PromiseOrValue<string>;
-    rewardToken: PromiseOrValue<string>;
-  };
-
-  export type PoolSettingsStructOutput = [string, string, string, string] & {
-    manager: string;
-    membersValidator: string;
-    uniquenessValidator: string;
-    rewardToken: string;
-  };
+export type PoolSettingsStruct = {
+  manager: PromiseOrValue<string>;
+  membersValidator: PromiseOrValue<string>;
+  uniquenessValidator: PromiseOrValue<string>;
+  rewardToken: PromiseOrValue<string>;
+};
+
+export type PoolSettingsStructOutput = [string, string, string, string] & {
+  manager: string;
+  membersValidator: string;
+  uniquenessValidator: string;
+  rewardToken: string;
+};
 
+export declare namespace UBIPool {
   export type UBISettingsStruct = {
     cycleLengthDays: PromiseOrValue<BigNumberish>;
     claimPeriodDays: PromiseOrValue<BigNumberish>;
@@ -50,6 +50,7 @@ export declare namespace UBIPool {
     claimForEnabled: PromiseOrValue<boolean>;
     maxClaimAmount: PromiseOrValue<BigNumberish>;
     maxMembers: PromiseOrValue<BigNumberish>;
+    onlyMembers: PromiseOrValue<boolean>;
   };
 
   export type UBISettingsStructOutput = [
@@ -58,7 +59,8 @@ export declare namespace UBIPool {
     number,
     boolean,
     BigNumber,
-    number
+    number,
+    boolean
   ] & {
     cycleLengthDays: number;
     claimPeriodDays: number;
@@ -66,6 +68,19 @@ export declare namespace UBIPool {
     claimForEnabled: boolean;
     maxClaimAmount: BigNumber;
     maxMembers: number;
+    onlyMembers: boolean;
+  };
+
+  export type ExtendedSettingsStruct = {
+    maxPeriodClaimers: PromiseOrValue<BigNumberish>;
+    minClaimAmount: PromiseOrValue<BigNumberish>;
+    managerFeeBps: PromiseOrValue<BigNumberish>;
+  };
+
+  export type ExtendedSettingsStructOutput = [number, BigNumber, number] & {
+    maxPeriodClaimers: number;
+    minClaimAmount: BigNumber;
+    managerFeeBps: number;
   };
 }
 
@@ -74,8 +89,8 @@ export interface UBIPoolFactoryInterface extends utils.Interface {
     "DEFAULT_ADMIN_ROLE()": FunctionFragment;
     "addMember(address)": FunctionFragment;
     "changePoolDetails(address,string)": FunctionFragment;
-    "createManagedPool(string,string,(address,address,address,address),(uint32,uint32,uint32,bool,uint256,uint32))": FunctionFragment;
-    "createPool(string,string,(address,address,address,address),(uint32,uint32,uint32,bool,uint256,uint32))": FunctionFragment;
+    "createManagedPool(string,string,(address,address,address,address),(uint32,uint32,uint32,bool,uint256,uint32,bool),(uint32,uint256,uint32))": FunctionFragment;
+    "createPool(string,string,(address,address,address,address),(uint32,uint32,uint32,bool,uint256,uint32,bool),(uint32,uint256,uint32))": FunctionFragment;
     "feeBps()": FunctionFragment;
     "feeRecipient()": FunctionFragment;
     "getMemberPools(address)": FunctionFragment;
@@ -89,6 +104,7 @@ export interface UBIPoolFactoryInterface extends utils.Interface {
     "projectIdToControlPool(bytes32)": FunctionFragment;
     "proxiableUUID()": FunctionFragment;
     "registry(address)": FunctionFragment;
+    "removeMember(address)": FunctionFragment;
     "renounceRole(bytes32,address)": FunctionFragment;
     "revokeRole(bytes32,address)": FunctionFragment;
     "setFeeInfo(address,uint32)": FunctionFragment;
@@ -119,6 +135,7 @@ export interface UBIPoolFactoryInterface extends utils.Interface {
       | "projectIdToControlPool"
       | "proxiableUUID"
       | "registry"
+      | "removeMember"
       | "renounceRole"
       | "revokeRole"
       | "setFeeInfo"
@@ -146,8 +163,9 @@ export interface UBIPoolFactoryInterface extends utils.Interface {
     values: [
       PromiseOrValue<string>,
       PromiseOrValue<string>,
-      UBIPool.PoolSettingsStruct,
-      UBIPool.UBISettingsStruct
+      PoolSettingsStruct,
+      UBIPool.UBISettingsStruct,
+      UBIPool.ExtendedSettingsStruct
     ]
   ): string;
   encodeFunctionData(
@@ -155,8 +173,9 @@ export interface UBIPoolFactoryInterface extends utils.Interface {
     values: [
       PromiseOrValue<string>,
       PromiseOrValue<string>,
-      UBIPool.PoolSettingsStruct,
-      UBIPool.UBISettingsStruct
+      PoolSettingsStruct,
+      UBIPool.UBISettingsStruct,
+      UBIPool.ExtendedSettingsStruct
     ]
   ): string;
   encodeFunctionData(functionFragment: "feeBps", values?: undefined): string;
@@ -210,6 +229,10 @@ export interface UBIPoolFactoryInterface extends utils.Interface {
     functionFragment: "registry",
     values: [PromiseOrValue<string>]
   ): string;
+  encodeFunctionData(
+    functionFragment: "removeMember",
+    values: [PromiseOrValue<string>]
+  ): string;
   encodeFunctionData(
     functionFragment: "renounceRole",
     values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>]
@@ -288,6 +311,10 @@ export interface UBIPoolFactoryInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "registry", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "removeMember",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "renounceRole",
     data: BytesLike
@@ -368,7 +395,7 @@ export interface PoolCreatedEventObject {
   pool: string;
   projectId: string;
   ipfs: string;
-  poolSettings: UBIPool.PoolSettingsStructOutput;
+  poolSettings: PoolSettingsStructOutput;
   poolLimits: UBIPool.UBISettingsStructOutput;
 }
 export type PoolCreatedEvent = TypedEvent<
@@ -376,7 +403,7 @@ export type PoolCreatedEvent = TypedEvent<
     string,
     string,
     string,
-    UBIPool.PoolSettingsStructOutput,
+    PoolSettingsStructOutput,
     UBIPool.UBISettingsStructOutput
   ],
   PoolCreatedEventObject
@@ -502,16 +529,18 @@ export interface UBIPoolFactory extends BaseContract {
     createManagedPool(
       _projectId: PromiseOrValue<string>,
       _ipfs: PromiseOrValue<string>,
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       _limits: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
     createPool(
       _projectId: PromiseOrValue<string>,
       _ipfs: PromiseOrValue<string>,
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       _limits: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
@@ -580,6 +609,11 @@ export interface UBIPoolFactory extends BaseContract {
       }
     >;
 
+    removeMember(
+      member: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>;
+
     renounceRole(
       role: PromiseOrValue<BytesLike>,
       account: PromiseOrValue<string>,
@@ -642,16 +676,18 @@ export interface UBIPoolFactory extends BaseContract {
   createManagedPool(
     _projectId: PromiseOrValue<string>,
     _ipfs: PromiseOrValue<string>,
-    _settings: UBIPool.PoolSettingsStruct,
+    _settings: PoolSettingsStruct,
     _limits: UBIPool.UBISettingsStruct,
+    _extendedSettings: UBIPool.ExtendedSettingsStruct,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
   createPool(
     _projectId: PromiseOrValue<string>,
     _ipfs: PromiseOrValue<string>,
-    _settings: UBIPool.PoolSettingsStruct,
+    _settings: PoolSettingsStruct,
     _limits: UBIPool.UBISettingsStruct,
+    _extendedSettings: UBIPool.ExtendedSettingsStruct,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
@@ -720,6 +756,11 @@ export interface UBIPoolFactory extends BaseContract {
     }
   >;
 
+  removeMember(
+    member: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>;
+
   renounceRole(
     role: PromiseOrValue<BytesLike>,
     account: PromiseOrValue<string>,
@@ -782,16 +823,18 @@ export interface UBIPoolFactory extends BaseContract {
     createManagedPool(
       _projectId: PromiseOrValue<string>,
       _ipfs: PromiseOrValue<string>,
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       _limits: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       overrides?: CallOverrides
     ): Promise<string>;
 
     createPool(
       _projectId: PromiseOrValue<string>,
       _ipfs: PromiseOrValue<string>,
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       _limits: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       overrides?: CallOverrides
     ): Promise<string>;
 
@@ -860,6 +903,11 @@ export interface UBIPoolFactory extends BaseContract {
       }
     >;
 
+    removeMember(
+      member: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
     renounceRole(
       role: PromiseOrValue<BytesLike>,
       account: PromiseOrValue<string>,
@@ -1022,16 +1070,18 @@ export interface UBIPoolFactory extends BaseContract {
     createManagedPool(
       _projectId: PromiseOrValue<string>,
       _ipfs: PromiseOrValue<string>,
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       _limits: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
     createPool(
       _projectId: PromiseOrValue<string>,
       _ipfs: PromiseOrValue<string>,
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       _limits: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
@@ -1094,6 +1144,11 @@ export interface UBIPoolFactory extends BaseContract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    removeMember(
+      member: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>;
+
     renounceRole(
       role: PromiseOrValue<BytesLike>,
       account: PromiseOrValue<string>,
@@ -1159,16 +1214,18 @@ export interface UBIPoolFactory extends BaseContract {
     createManagedPool(
       _projectId: PromiseOrValue<string>,
       _ipfs: PromiseOrValue<string>,
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       _limits: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
     createPool(
       _projectId: PromiseOrValue<string>,
       _ipfs: PromiseOrValue<string>,
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       _limits: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -1231,6 +1288,11 @@ export interface UBIPoolFactory extends BaseContract {
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    removeMember(
+      member: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>;
+
     renounceRole(
       role: PromiseOrValue<BytesLike>,
       account: PromiseOrValue<string>,

package/typechain-types/contracts/UBI/index.ts

@@ -1,8 +1,5 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-import type * as multiClaimModuleSol from "./MultiClaimModule.sol";
-export type { multiClaimModuleSol };
-import type * as ubiPoolSol from "./UBIPool.sol";
-export type { ubiPoolSol };
+export type { UBIPool } from "./UBIPool";
 export type { UBIPoolFactory } from "./UBIPoolFactory";

package/typechain-types/contracts/index.ts

@@ -5,7 +5,11 @@ import type * as directPayments from "./DirectPayments";
 export type { directPayments };
 import type * as goodCollective from "./GoodCollective";
 export type { goodCollective };
+import type * as interfacesSol from "./Interfaces.sol";
+export type { interfacesSol };
 import type * as ubi from "./UBI";
 export type { ubi };
+import type * as test from "./test";
+export type { test };
 import type * as utils from "./utils";
 export type { utils };

package/typechain-types/contracts/test/HelperLibraryTest.ts

@@ -0,0 +1,147 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from "ethers";
+import type { FunctionFragment, Result } from "@ethersproject/abi";
+import type { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+  PromiseOrValue,
+} from "../../common";
+
+export declare namespace HelperLibrary {
+  export type SwapDataStruct = {
+    swapFrom: PromiseOrValue<string>;
+    amount: PromiseOrValue<BigNumberish>;
+    minReturn: PromiseOrValue<BigNumberish>;
+    deadline: PromiseOrValue<BigNumberish>;
+    path: PromiseOrValue<BytesLike>;
+  };
+
+  export type SwapDataStructOutput = [
+    string,
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    string
+  ] & {
+    swapFrom: string;
+    amount: BigNumber;
+    minReturn: BigNumber;
+    deadline: BigNumber;
+    path: string;
+  };
+}
+
+export interface HelperLibraryTestInterface extends utils.Interface {
+  functions: {
+    "handleSwap(address,(address,uint256,uint256,uint256,bytes),address,address)": FunctionFragment;
+  };
+
+  getFunction(nameOrSignatureOrTopic: "handleSwap"): FunctionFragment;
+
+  encodeFunctionData(
+    functionFragment: "handleSwap",
+    values: [
+      PromiseOrValue<string>,
+      HelperLibrary.SwapDataStruct,
+      PromiseOrValue<string>,
+      PromiseOrValue<string>
+    ]
+  ): string;
+
+  decodeFunctionResult(functionFragment: "handleSwap", data: BytesLike): Result;
+
+  events: {};
+}
+
+export interface HelperLibraryTest extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: HelperLibraryTestInterface;
+
+  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: {
+    handleSwap(
+      swapRouter: PromiseOrValue<string>,
+      _customData: HelperLibrary.SwapDataStruct,
+      outTokenIfNoPath: PromiseOrValue<string>,
+      _sender: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>;
+  };
+
+  handleSwap(
+    swapRouter: PromiseOrValue<string>,
+    _customData: HelperLibrary.SwapDataStruct,
+    outTokenIfNoPath: PromiseOrValue<string>,
+    _sender: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>;
+
+  callStatic: {
+    handleSwap(
+      swapRouter: PromiseOrValue<string>,
+      _customData: HelperLibrary.SwapDataStruct,
+      outTokenIfNoPath: PromiseOrValue<string>,
+      _sender: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+  };
+
+  filters: {};
+
+  estimateGas: {
+    handleSwap(
+      swapRouter: PromiseOrValue<string>,
+      _customData: HelperLibrary.SwapDataStruct,
+      outTokenIfNoPath: PromiseOrValue<string>,
+      _sender: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>;
+  };
+
+  populateTransaction: {
+    handleSwap(
+      swapRouter: PromiseOrValue<string>,
+      _customData: HelperLibrary.SwapDataStruct,
+      outTokenIfNoPath: PromiseOrValue<string>,
+      _sender: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>;
+  };
+}

package/typechain-types/{@uniswap/v3-periphery/contracts/interfaces → contracts/test}/index.ts

@@ -1,4 +1,4 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-export type { ISwapRouter } from "./ISwapRouter";
+export type { HelperLibraryTest } from "./HelperLibraryTest";

package/typechain-types/contracts/utils/HelperLibrary.ts

@@ -28,6 +28,9 @@ export declare namespace IGoodCollectiveSuperApp {
     lastUpdate: PromiseOrValue<BigNumberish>;
     lastFeeRecipient: PromiseOrValue<string>;
     lastIncomeRate: PromiseOrValue<BigNumberish>;
+    lastManagerFeeRecipient: PromiseOrValue<string>;
+    protocolFees: PromiseOrValue<BigNumberish>;
+    managerFees: PromiseOrValue<BigNumberish>;
   };
 
   export type StatsStructOutput = [
@@ -35,6 +38,9 @@ export declare namespace IGoodCollectiveSuperApp {
     BigNumber,
     BigNumber,
     string,
+    BigNumber,
+    string,
+    BigNumber,
     BigNumber
   ] & {
     netIncome: BigNumber;
@@ -42,12 +48,15 @@ export declare namespace IGoodCollectiveSuperApp {
     lastUpdate: BigNumber;
     lastFeeRecipient: string;
     lastIncomeRate: BigNumber;
+    lastManagerFeeRecipient: string;
+    protocolFees: BigNumber;
+    managerFees: BigNumber;
   };
 }
 
 export interface HelperLibraryInterface extends utils.Interface {
   functions: {
-    "getRealtimeStats((uint256,uint256,uint256,address,int96),ISuperToken)": FunctionFragment;
+    "getRealtimeStats((uint256,uint256,uint256,address,int96,address,uint256,uint256),ISuperToken)": FunctionFragment;
   };
 
   getFunction(nameOrSignatureOrTopic: "getRealtimeStats"): FunctionFragment;
@@ -97,11 +106,22 @@ export interface HelperLibrary extends BaseContract {
       superToken: PromiseOrValue<string>,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber, BigNumber, BigNumber] & {
+      [
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber
+      ] & {
         netIncome: BigNumber;
         totalFees: BigNumber;
+        protocolFees: BigNumber;
+        managerFees: BigNumber;
         incomeFlowRate: BigNumber;
         feeRate: BigNumber;
+        managerFeeRate: BigNumber;
       }
     >;
   };
@@ -111,11 +131,22 @@ export interface HelperLibrary extends BaseContract {
     superToken: PromiseOrValue<string>,
     overrides?: CallOverrides
   ): Promise<
-    [BigNumber, BigNumber, BigNumber, BigNumber] & {
+    [
+      BigNumber,
+      BigNumber,
+      BigNumber,
+      BigNumber,
+      BigNumber,
+      BigNumber,
+      BigNumber
+    ] & {
       netIncome: BigNumber;
       totalFees: BigNumber;
+      protocolFees: BigNumber;
+      managerFees: BigNumber;
       incomeFlowRate: BigNumber;
       feeRate: BigNumber;
+      managerFeeRate: BigNumber;
     }
   >;
 
@@ -125,11 +156,22 @@ export interface HelperLibrary extends BaseContract {
       superToken: PromiseOrValue<string>,
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber, BigNumber, BigNumber] & {
+      [
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        BigNumber
+      ] & {
         netIncome: BigNumber;
         totalFees: BigNumber;
+        protocolFees: BigNumber;
+        managerFees: BigNumber;
         incomeFlowRate: BigNumber;
         feeRate: BigNumber;
+        managerFeeRate: BigNumber;
       }
     >;
   };

package/typechain-types/factories/@uniswap/index.ts

@@ -3,4 +3,3 @@
 /* eslint-disable */
 export * as swapRouterContracts from "./swap-router-contracts";
 export * as v3Core from "./v3-core";
-export * as v3Periphery from "./v3-periphery";