@gooddollar/goodcollective-contracts 1.1.0 → 1.2.0

package/typechain-types/contracts/UBI/UBIPool.sol/UBIPool.ts

@@ -49,7 +49,8 @@ export declare namespace UBIPool {
     minActiveUsers: PromiseOrValue<BigNumberish>;
     claimForEnabled: PromiseOrValue<boolean>;
     maxClaimAmount: PromiseOrValue<BigNumberish>;
-    maxMembers: PromiseOrValue<BigNumberish>;
+    maxClaimers: PromiseOrValue<BigNumberish>;
+    onlyMembers: PromiseOrValue<boolean>;
   };
 
   export type UBISettingsStructOutput = [
@@ -58,14 +59,16 @@ export declare namespace UBIPool {
     number,
     boolean,
     BigNumber,
-    number
+    number,
+    boolean
   ] & {
     cycleLengthDays: number;
     claimPeriodDays: number;
     minActiveUsers: number;
     claimForEnabled: boolean;
     maxClaimAmount: BigNumber;
-    maxMembers: number;
+    maxClaimers: number;
+    onlyMembers: boolean;
   };
 }
 
@@ -101,7 +104,6 @@ export interface UBIPoolInterface extends utils.Interface {
     "MEMBER_ROLE()": FunctionFragment;
     "MIN_FLOW_RATE()": FunctionFragment;
     "addMember(address,bytes)": FunctionFragment;
-    "addMemberByManager(address)": FunctionFragment;
     "afterAgreementCreated(address,address,bytes32,bytes,bytes,bytes)": FunctionFragment;
     "afterAgreementTerminated(address,address,bytes32,bytes,bytes,bytes)": FunctionFragment;
     "afterAgreementUpdated(address,address,bytes32,bytes,bytes,bytes)": FunctionFragment;
@@ -125,21 +127,23 @@ export interface UBIPoolInterface extends utils.Interface {
     "hasClaimed(address)": FunctionFragment;
     "hasRole(bytes32,address)": FunctionFragment;
     "host()": FunctionFragment;
-    "initialize((address,address,address,address),(uint32,uint32,uint32,bool,uint256,uint32),address)": FunctionFragment;
+    "initialize((address,address,address,address),(uint32,uint32,uint32,bool,uint256,uint32,bool),address)": FunctionFragment;
     "isAcceptedSuperToken(address)": FunctionFragment;
     "nextClaimTime()": FunctionFragment;
     "onTokenTransfer(address,uint256,bytes)": FunctionFragment;
     "proxiableUUID()": FunctionFragment;
     "registry()": FunctionFragment;
+    "removeMember(address)": FunctionFragment;
     "renounceRole(bytes32,address)": FunctionFragment;
     "revokeRole(bytes32,address)": FunctionFragment;
     "setPoolSettings((address,address,address,address))": FunctionFragment;
-    "setUBISettings((uint32,uint32,uint32,bool,uint256,uint32))": FunctionFragment;
+    "setUBISettings((uint32,uint32,uint32,bool,uint256,uint32,bool))": FunctionFragment;
     "settings()": FunctionFragment;
     "stats()": FunctionFragment;
     "status()": FunctionFragment;
     "superToken()": FunctionFragment;
     "support(address,uint256,bytes)": FunctionFragment;
+    "supportWithSwap(address,(address,uint256,uint256,uint256,bytes),bytes)": FunctionFragment;
     "supporters(address)": FunctionFragment;
     "supportsInterface(bytes4)": FunctionFragment;
     "swapRouter()": FunctionFragment;
@@ -157,7 +161,6 @@ export interface UBIPoolInterface extends utils.Interface {
       | "MEMBER_ROLE"
       | "MIN_FLOW_RATE"
       | "addMember"
-      | "addMemberByManager"
       | "afterAgreementCreated"
       | "afterAgreementTerminated"
       | "afterAgreementUpdated"
@@ -187,6 +190,7 @@ export interface UBIPoolInterface extends utils.Interface {
       | "onTokenTransfer"
       | "proxiableUUID"
       | "registry"
+      | "removeMember"
       | "renounceRole"
       | "revokeRole"
       | "setPoolSettings"
@@ -196,6 +200,7 @@ export interface UBIPoolInterface extends utils.Interface {
       | "status"
       | "superToken"
       | "support"
+      | "supportWithSwap"
       | "supporters"
       | "supportsInterface"
       | "swapRouter"
@@ -229,10 +234,6 @@ export interface UBIPoolInterface extends utils.Interface {
     functionFragment: "addMember",
     values: [PromiseOrValue<string>, PromiseOrValue<BytesLike>]
   ): string;
-  encodeFunctionData(
-    functionFragment: "addMemberByManager",
-    values: [PromiseOrValue<string>]
-  ): string;
   encodeFunctionData(
     functionFragment: "afterAgreementCreated",
     values: [
@@ -388,6 +389,10 @@ export interface UBIPoolInterface extends utils.Interface {
     values?: undefined
   ): string;
   encodeFunctionData(functionFragment: "registry", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "removeMember",
+    values: [PromiseOrValue<string>]
+  ): string;
   encodeFunctionData(
     functionFragment: "renounceRole",
     values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>]
@@ -419,6 +424,14 @@ export interface UBIPoolInterface extends utils.Interface {
       PromiseOrValue<BytesLike>
     ]
   ): string;
+  encodeFunctionData(
+    functionFragment: "supportWithSwap",
+    values: [
+      PromiseOrValue<string>,
+      HelperLibrary.SwapDataStruct,
+      PromiseOrValue<BytesLike>
+    ]
+  ): string;
   encodeFunctionData(
     functionFragment: "supporters",
     values: [PromiseOrValue<string>]
@@ -466,10 +479,6 @@ export interface UBIPoolInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "addMember", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "addMemberByManager",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "afterAgreementCreated",
     data: BytesLike
@@ -556,6 +565,10 @@ export interface UBIPoolInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "registry", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "removeMember",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "renounceRole",
     data: BytesLike
@@ -574,6 +587,10 @@ export interface UBIPoolInterface extends utils.Interface {
   decodeFunctionResult(functionFragment: "status", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "superToken", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "support", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "supportWithSwap",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(functionFragment: "supporters", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "supportsInterface",
@@ -818,11 +835,6 @@ export interface UBIPool extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
-    addMemberByManager(
-      member: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
     afterAgreementCreated(
       superToken: PromiseOrValue<string>,
       arg1: PromiseOrValue<string>,
@@ -981,6 +993,11 @@ export interface UBIPool extends BaseContract {
 
     registry(overrides?: CallOverrides): Promise<[string]>;
 
+    removeMember(
+      member: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>;
+
     renounceRole(
       role: PromiseOrValue<BytesLike>,
       account: PromiseOrValue<string>,
@@ -1046,7 +1063,7 @@ export interface UBIPool extends BaseContract {
         currentCycleLength: BigNumber;
         periodClaimers: BigNumber;
         periodDistributed: BigNumber;
-        membersCount: number;
+        claimersCount: number;
       }
     >;
 
@@ -1059,6 +1076,13 @@ export interface UBIPool extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
+    supportWithSwap(
+      _sender: PromiseOrValue<string>,
+      _customData: HelperLibrary.SwapDataStruct,
+      _ctx: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>;
+
     supporters(
       arg0: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -1080,13 +1104,14 @@ export interface UBIPool extends BaseContract {
     ubiSettings(
       overrides?: CallOverrides
     ): Promise<
-      [number, number, number, boolean, BigNumber, number] & {
+      [number, number, number, boolean, BigNumber, number, boolean] & {
         cycleLengthDays: number;
         claimPeriodDays: number;
         minActiveUsers: number;
         claimForEnabled: boolean;
         maxClaimAmount: BigNumber;
-        maxMembers: number;
+        maxClaimers: number;
+        onlyMembers: boolean;
       }
     >;
 
@@ -1123,11 +1148,6 @@ export interface UBIPool extends BaseContract {
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
-  addMemberByManager(
-    member: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
   afterAgreementCreated(
     superToken: PromiseOrValue<string>,
     arg1: PromiseOrValue<string>,
@@ -1286,6 +1306,11 @@ export interface UBIPool extends BaseContract {
 
   registry(overrides?: CallOverrides): Promise<string>;
 
+  removeMember(
+    member: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>;
+
   renounceRole(
     role: PromiseOrValue<BytesLike>,
     account: PromiseOrValue<string>,
@@ -1351,7 +1376,7 @@ export interface UBIPool extends BaseContract {
       currentCycleLength: BigNumber;
       periodClaimers: BigNumber;
       periodDistributed: BigNumber;
-      membersCount: number;
+      claimersCount: number;
     }
   >;
 
@@ -1364,6 +1389,13 @@ export interface UBIPool extends BaseContract {
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
+  supportWithSwap(
+    _sender: PromiseOrValue<string>,
+    _customData: HelperLibrary.SwapDataStruct,
+    _ctx: PromiseOrValue<BytesLike>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>;
+
   supporters(
     arg0: PromiseOrValue<string>,
     overrides?: CallOverrides
@@ -1385,13 +1417,14 @@ export interface UBIPool extends BaseContract {
   ubiSettings(
     overrides?: CallOverrides
   ): Promise<
-    [number, number, number, boolean, BigNumber, number] & {
+    [number, number, number, boolean, BigNumber, number, boolean] & {
       cycleLengthDays: number;
       claimPeriodDays: number;
       minActiveUsers: number;
       claimForEnabled: boolean;
       maxClaimAmount: BigNumber;
-      maxMembers: number;
+      maxClaimers: number;
+      onlyMembers: boolean;
     }
   >;
 
@@ -1428,11 +1461,6 @@ export interface UBIPool extends BaseContract {
       overrides?: CallOverrides
     ): Promise<boolean>;
 
-    addMemberByManager(
-      member: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
     afterAgreementCreated(
       superToken: PromiseOrValue<string>,
       arg1: PromiseOrValue<string>,
@@ -1589,6 +1617,11 @@ export interface UBIPool extends BaseContract {
 
     registry(overrides?: CallOverrides): Promise<string>;
 
+    removeMember(
+      member: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
     renounceRole(
       role: PromiseOrValue<BytesLike>,
       account: PromiseOrValue<string>,
@@ -1654,7 +1687,7 @@ export interface UBIPool extends BaseContract {
         currentCycleLength: BigNumber;
         periodClaimers: BigNumber;
         periodDistributed: BigNumber;
-        membersCount: number;
+        claimersCount: number;
       }
     >;
 
@@ -1667,6 +1700,13 @@ export interface UBIPool extends BaseContract {
       overrides?: CallOverrides
     ): Promise<string>;
 
+    supportWithSwap(
+      _sender: PromiseOrValue<string>,
+      _customData: HelperLibrary.SwapDataStruct,
+      _ctx: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<string>;
+
     supporters(
       arg0: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -1688,13 +1728,14 @@ export interface UBIPool extends BaseContract {
     ubiSettings(
       overrides?: CallOverrides
     ): Promise<
-      [number, number, number, boolean, BigNumber, number] & {
+      [number, number, number, boolean, BigNumber, number, boolean] & {
         cycleLengthDays: number;
         claimPeriodDays: number;
         minActiveUsers: number;
         claimForEnabled: boolean;
         maxClaimAmount: BigNumber;
-        maxMembers: number;
+        maxClaimers: number;
+        onlyMembers: boolean;
       }
     >;
 
@@ -1857,11 +1898,6 @@ export interface UBIPool extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
-    addMemberByManager(
-      member: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
     afterAgreementCreated(
       superToken: PromiseOrValue<string>,
       arg1: PromiseOrValue<string>,
@@ -2009,6 +2045,11 @@ export interface UBIPool extends BaseContract {
 
     registry(overrides?: CallOverrides): Promise<BigNumber>;
 
+    removeMember(
+      member: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>;
+
     renounceRole(
       role: PromiseOrValue<BytesLike>,
       account: PromiseOrValue<string>,
@@ -2046,6 +2087,13 @@ export interface UBIPool extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
+    supportWithSwap(
+      _sender: PromiseOrValue<string>,
+      _customData: HelperLibrary.SwapDataStruct,
+      _ctx: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>;
+
     supporters(
       arg0: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -2096,11 +2144,6 @@ export interface UBIPool extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
-    addMemberByManager(
-      member: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
     afterAgreementCreated(
       superToken: PromiseOrValue<string>,
       arg1: PromiseOrValue<string>,
@@ -2252,6 +2295,11 @@ export interface UBIPool extends BaseContract {
 
     registry(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
+    removeMember(
+      member: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>;
+
     renounceRole(
       role: PromiseOrValue<BytesLike>,
       account: PromiseOrValue<string>,
@@ -2289,6 +2337,13 @@ export interface UBIPool extends BaseContract {
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
+    supportWithSwap(
+      _sender: PromiseOrValue<string>,
+      _customData: HelperLibrary.SwapDataStruct,
+      _ctx: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>;
+
     supporters(
       arg0: PromiseOrValue<string>,
       overrides?: CallOverrides

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

@@ -49,7 +49,8 @@ export declare namespace UBIPool {
     minActiveUsers: PromiseOrValue<BigNumberish>;
     claimForEnabled: PromiseOrValue<boolean>;
     maxClaimAmount: PromiseOrValue<BigNumberish>;
-    maxMembers: PromiseOrValue<BigNumberish>;
+    maxClaimers: PromiseOrValue<BigNumberish>;
+    onlyMembers: PromiseOrValue<boolean>;
   };
 
   export type UBISettingsStructOutput = [
@@ -58,14 +59,16 @@ export declare namespace UBIPool {
     number,
     boolean,
     BigNumber,
-    number
+    number,
+    boolean
   ] & {
     cycleLengthDays: number;
     claimPeriodDays: number;
     minActiveUsers: number;
     claimForEnabled: boolean;
     maxClaimAmount: BigNumber;
-    maxMembers: number;
+    maxClaimers: number;
+    onlyMembers: boolean;
   };
 }
 
@@ -74,8 +77,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))": FunctionFragment;
+    "createPool(string,string,(address,address,address,address),(uint32,uint32,uint32,bool,uint256,uint32,bool))": FunctionFragment;
     "feeBps()": FunctionFragment;
     "feeRecipient()": FunctionFragment;
     "getMemberPools(address)": FunctionFragment;
@@ -89,6 +92,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 +123,7 @@ export interface UBIPoolFactoryInterface extends utils.Interface {
       | "projectIdToControlPool"
       | "proxiableUUID"
       | "registry"
+      | "removeMember"
       | "renounceRole"
       | "revokeRole"
       | "setFeeInfo"
@@ -210,6 +215,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 +297,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
@@ -580,6 +593,11 @@ export interface UBIPoolFactory extends BaseContract {
       }
     >;
 
+    removeMember(
+      member: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>;
+
     renounceRole(
       role: PromiseOrValue<BytesLike>,
       account: PromiseOrValue<string>,
@@ -720,6 +738,11 @@ export interface UBIPoolFactory extends BaseContract {
     }
   >;
 
+  removeMember(
+    member: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>;
+
   renounceRole(
     role: PromiseOrValue<BytesLike>,
     account: PromiseOrValue<string>,
@@ -860,6 +883,11 @@ export interface UBIPoolFactory extends BaseContract {
       }
     >;
 
+    removeMember(
+      member: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
     renounceRole(
       role: PromiseOrValue<BytesLike>,
       account: PromiseOrValue<string>,
@@ -1094,6 +1122,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>,
@@ -1231,6 +1264,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,6 @@
 /* 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 { UBIPoolFactory } from "./UBIPoolFactory";

package/typechain-types/contracts/index.ts

@@ -7,5 +7,7 @@ import type * as goodCollective from "./GoodCollective";
 export type { goodCollective };
 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 };