@gooddollar/goodcollective-contracts 1.1.0 → 1.3.0

package/typechain-types/contracts/UBI/{UBIPool.sol/UBIPool.ts → UBIPool.ts}

@@ -26,23 +26,23 @@ import type {
   TypedListener,
   OnEvent,
   PromiseOrValue,
-} from "../../../common";
+} from "../../common";
+
+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 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 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;
   };
 }
 
@@ -101,7 +116,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;
@@ -114,8 +128,11 @@ export interface UBIPoolInterface extends utils.Interface {
     "claim()": FunctionFragment;
     "claimFor(address,bool)": FunctionFragment;
     "currentDayInCycle()": FunctionFragment;
+    "distributionFormula()": FunctionFragment;
     "estimateNextDailyUBI()": FunctionFragment;
+    "extendedSettings()": FunctionFragment;
     "getCurrentDay()": FunctionFragment;
+    "getManagerFee()": FunctionFragment;
     "getRealtimeContribution(address)": FunctionFragment;
     "getRealtimeStats()": FunctionFragment;
     "getRegistry()": FunctionFragment;
@@ -125,21 +142,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),(uint32,uint256,uint32),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),(uint32,uint256,uint32))": 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 +176,6 @@ export interface UBIPoolInterface extends utils.Interface {
       | "MEMBER_ROLE"
       | "MIN_FLOW_RATE"
       | "addMember"
-      | "addMemberByManager"
       | "afterAgreementCreated"
       | "afterAgreementTerminated"
       | "afterAgreementUpdated"
@@ -170,8 +188,11 @@ export interface UBIPoolInterface extends utils.Interface {
       | "claim"
       | "claimFor"
       | "currentDayInCycle"
+      | "distributionFormula"
       | "estimateNextDailyUBI"
+      | "extendedSettings"
       | "getCurrentDay"
+      | "getManagerFee"
       | "getRealtimeContribution"
       | "getRealtimeStats"
       | "getRegistry"
@@ -187,6 +208,7 @@ export interface UBIPoolInterface extends utils.Interface {
       | "onTokenTransfer"
       | "proxiableUUID"
       | "registry"
+      | "removeMember"
       | "renounceRole"
       | "revokeRole"
       | "setPoolSettings"
@@ -196,6 +218,7 @@ export interface UBIPoolInterface extends utils.Interface {
       | "status"
       | "superToken"
       | "support"
+      | "supportWithSwap"
       | "supporters"
       | "supportsInterface"
       | "swapRouter"
@@ -229,10 +252,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: [
@@ -314,14 +333,26 @@ export interface UBIPoolInterface extends utils.Interface {
     functionFragment: "currentDayInCycle",
     values?: undefined
   ): string;
+  encodeFunctionData(
+    functionFragment: "distributionFormula",
+    values?: undefined
+  ): string;
   encodeFunctionData(
     functionFragment: "estimateNextDailyUBI",
     values?: undefined
   ): string;
+  encodeFunctionData(
+    functionFragment: "extendedSettings",
+    values?: undefined
+  ): string;
   encodeFunctionData(
     functionFragment: "getCurrentDay",
     values?: undefined
   ): string;
+  encodeFunctionData(
+    functionFragment: "getManagerFee",
+    values?: undefined
+  ): string;
   encodeFunctionData(
     functionFragment: "getRealtimeContribution",
     values: [PromiseOrValue<string>]
@@ -362,8 +393,9 @@ export interface UBIPoolInterface extends utils.Interface {
   encodeFunctionData(
     functionFragment: "initialize",
     values: [
-      UBIPool.PoolSettingsStruct,
+      PoolSettingsStruct,
       UBIPool.UBISettingsStruct,
+      UBIPool.ExtendedSettingsStruct,
       PromiseOrValue<string>
     ]
   ): string;
@@ -388,6 +420,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>]
@@ -398,11 +434,11 @@ export interface UBIPoolInterface extends utils.Interface {
   ): string;
   encodeFunctionData(
     functionFragment: "setPoolSettings",
-    values: [UBIPool.PoolSettingsStruct]
+    values: [PoolSettingsStruct]
   ): string;
   encodeFunctionData(
     functionFragment: "setUBISettings",
-    values: [UBIPool.UBISettingsStruct]
+    values: [UBIPool.UBISettingsStruct, UBIPool.ExtendedSettingsStruct]
   ): string;
   encodeFunctionData(functionFragment: "settings", values?: undefined): string;
   encodeFunctionData(functionFragment: "stats", values?: undefined): string;
@@ -419,6 +455,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 +510,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
@@ -509,14 +549,26 @@ export interface UBIPoolInterface extends utils.Interface {
     functionFragment: "currentDayInCycle",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "distributionFormula",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "estimateNextDailyUBI",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "extendedSettings",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "getCurrentDay",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "getManagerFee",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "getRealtimeContribution",
     data: BytesLike
@@ -556,6 +608,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 +630,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",
@@ -654,10 +714,10 @@ export type InitializedEvent = TypedEvent<[number], InitializedEventObject>;
 export type InitializedEventFilter = TypedEventFilter<InitializedEvent>;
 
 export interface PoolSettingsChangedEventObject {
-  settings: UBIPool.PoolSettingsStructOutput;
+  settings: PoolSettingsStructOutput;
 }
 export type PoolSettingsChangedEvent = TypedEvent<
-  [UBIPool.PoolSettingsStructOutput],
+  [PoolSettingsStructOutput],
   PoolSettingsChangedEventObject
 >;
 
@@ -818,11 +878,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>,
@@ -903,10 +958,30 @@ export interface UBIPool extends BaseContract {
 
     currentDayInCycle(overrides?: CallOverrides): Promise<[BigNumber]>;
 
-    estimateNextDailyUBI(overrides?: CallOverrides): Promise<[BigNumber]>;
+    distributionFormula(
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>;
+
+    estimateNextDailyUBI(
+      overrides?: CallOverrides
+    ): Promise<[BigNumber] & { nextDailyUbi: BigNumber }>;
+
+    extendedSettings(
+      overrides?: CallOverrides
+    ): Promise<
+      [number, BigNumber, number] & {
+        maxPeriodClaimers: number;
+        minClaimAmount: BigNumber;
+        managerFeeBps: number;
+      }
+    >;
 
     getCurrentDay(overrides?: CallOverrides): Promise<[BigNumber]>;
 
+    getManagerFee(
+      overrides?: CallOverrides
+    ): Promise<[string, number] & { feeRecipient: string; feeBps: number }>;
+
     getRealtimeContribution(
       _user: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -915,11 +990,22 @@ export interface UBIPool extends BaseContract {
     getRealtimeStats(
       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;
       }
     >;
 
@@ -957,8 +1043,9 @@ export interface UBIPool extends BaseContract {
     host(overrides?: CallOverrides): Promise<[string]>;
 
     initialize(
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       _ubiSettings: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       _registry: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
@@ -981,6 +1068,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>,
@@ -994,12 +1086,13 @@ export interface UBIPool extends BaseContract {
     ): Promise<ContractTransaction>;
 
     setPoolSettings(
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
     setUBISettings(
       _ubiSettings: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
 
@@ -1017,12 +1110,24 @@ export interface UBIPool extends BaseContract {
     stats(
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber, BigNumber, string, BigNumber] & {
+      [
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        string,
+        BigNumber,
+        string,
+        BigNumber,
+        BigNumber
+      ] & {
         netIncome: BigNumber;
         totalFees: BigNumber;
         lastUpdate: BigNumber;
         lastFeeRecipient: string;
         lastIncomeRate: BigNumber;
+        lastManagerFeeRecipient: string;
+        protocolFees: BigNumber;
+        managerFees: BigNumber;
       }
     >;
 
@@ -1059,6 +1164,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 +1192,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;
+        onlyMembers: boolean;
       }
     >;
 
@@ -1123,11 +1236,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>,
@@ -1208,10 +1316,28 @@ export interface UBIPool extends BaseContract {
 
   currentDayInCycle(overrides?: CallOverrides): Promise<BigNumber>;
 
+  distributionFormula(
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>;
+
   estimateNextDailyUBI(overrides?: CallOverrides): Promise<BigNumber>;
 
+  extendedSettings(
+    overrides?: CallOverrides
+  ): Promise<
+    [number, BigNumber, number] & {
+      maxPeriodClaimers: number;
+      minClaimAmount: BigNumber;
+      managerFeeBps: number;
+    }
+  >;
+
   getCurrentDay(overrides?: CallOverrides): Promise<BigNumber>;
 
+  getManagerFee(
+    overrides?: CallOverrides
+  ): Promise<[string, number] & { feeRecipient: string; feeBps: number }>;
+
   getRealtimeContribution(
     _user: PromiseOrValue<string>,
     overrides?: CallOverrides
@@ -1220,11 +1346,22 @@ export interface UBIPool extends BaseContract {
   getRealtimeStats(
     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;
     }
   >;
 
@@ -1262,8 +1399,9 @@ export interface UBIPool extends BaseContract {
   host(overrides?: CallOverrides): Promise<string>;
 
   initialize(
-    _settings: UBIPool.PoolSettingsStruct,
+    _settings: PoolSettingsStruct,
     _ubiSettings: UBIPool.UBISettingsStruct,
+    _extendedSettings: UBIPool.ExtendedSettingsStruct,
     _registry: PromiseOrValue<string>,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
@@ -1286,6 +1424,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>,
@@ -1299,12 +1442,13 @@ export interface UBIPool extends BaseContract {
   ): Promise<ContractTransaction>;
 
   setPoolSettings(
-    _settings: UBIPool.PoolSettingsStruct,
+    _settings: PoolSettingsStruct,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
   setUBISettings(
     _ubiSettings: UBIPool.UBISettingsStruct,
+    _extendedSettings: UBIPool.ExtendedSettingsStruct,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
@@ -1322,12 +1466,24 @@ export interface UBIPool extends BaseContract {
   stats(
     overrides?: CallOverrides
   ): Promise<
-    [BigNumber, BigNumber, BigNumber, string, BigNumber] & {
+    [
+      BigNumber,
+      BigNumber,
+      BigNumber,
+      string,
+      BigNumber,
+      string,
+      BigNumber,
+      BigNumber
+    ] & {
       netIncome: BigNumber;
       totalFees: BigNumber;
       lastUpdate: BigNumber;
       lastFeeRecipient: string;
       lastIncomeRate: BigNumber;
+      lastManagerFeeRecipient: string;
+      protocolFees: BigNumber;
+      managerFees: BigNumber;
     }
   >;
 
@@ -1364,6 +1520,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 +1548,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;
+      onlyMembers: boolean;
     }
   >;
 
@@ -1428,11 +1592,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>,
@@ -1511,10 +1670,26 @@ export interface UBIPool extends BaseContract {
 
     currentDayInCycle(overrides?: CallOverrides): Promise<BigNumber>;
 
+    distributionFormula(overrides?: CallOverrides): Promise<BigNumber>;
+
     estimateNextDailyUBI(overrides?: CallOverrides): Promise<BigNumber>;
 
+    extendedSettings(
+      overrides?: CallOverrides
+    ): Promise<
+      [number, BigNumber, number] & {
+        maxPeriodClaimers: number;
+        minClaimAmount: BigNumber;
+        managerFeeBps: number;
+      }
+    >;
+
     getCurrentDay(overrides?: CallOverrides): Promise<BigNumber>;
 
+    getManagerFee(
+      overrides?: CallOverrides
+    ): Promise<[string, number] & { feeRecipient: string; feeBps: number }>;
+
     getRealtimeContribution(
       _user: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -1523,11 +1698,22 @@ export interface UBIPool extends BaseContract {
     getRealtimeStats(
       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;
       }
     >;
 
@@ -1565,8 +1751,9 @@ export interface UBIPool extends BaseContract {
     host(overrides?: CallOverrides): Promise<string>;
 
     initialize(
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       _ubiSettings: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       _registry: PromiseOrValue<string>,
       overrides?: CallOverrides
     ): Promise<void>;
@@ -1589,6 +1776,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>,
@@ -1602,12 +1794,13 @@ export interface UBIPool extends BaseContract {
     ): Promise<void>;
 
     setPoolSettings(
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       overrides?: CallOverrides
     ): Promise<void>;
 
     setUBISettings(
       _ubiSettings: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       overrides?: CallOverrides
     ): Promise<void>;
 
@@ -1625,12 +1818,24 @@ export interface UBIPool extends BaseContract {
     stats(
       overrides?: CallOverrides
     ): Promise<
-      [BigNumber, BigNumber, BigNumber, string, BigNumber] & {
+      [
+        BigNumber,
+        BigNumber,
+        BigNumber,
+        string,
+        BigNumber,
+        string,
+        BigNumber,
+        BigNumber
+      ] & {
         netIncome: BigNumber;
         totalFees: BigNumber;
         lastUpdate: BigNumber;
         lastFeeRecipient: string;
         lastIncomeRate: BigNumber;
+        lastManagerFeeRecipient: string;
+        protocolFees: BigNumber;
+        managerFees: BigNumber;
       }
     >;
 
@@ -1667,6 +1872,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 +1900,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;
+        onlyMembers: boolean;
       }
     >;
 
@@ -1857,11 +2070,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>,
@@ -1940,10 +2148,18 @@ export interface UBIPool extends BaseContract {
 
     currentDayInCycle(overrides?: CallOverrides): Promise<BigNumber>;
 
+    distributionFormula(
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>;
+
     estimateNextDailyUBI(overrides?: CallOverrides): Promise<BigNumber>;
 
+    extendedSettings(overrides?: CallOverrides): Promise<BigNumber>;
+
     getCurrentDay(overrides?: CallOverrides): Promise<BigNumber>;
 
+    getManagerFee(overrides?: CallOverrides): Promise<BigNumber>;
+
     getRealtimeContribution(
       _user: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -1985,8 +2201,9 @@ export interface UBIPool extends BaseContract {
     host(overrides?: CallOverrides): Promise<BigNumber>;
 
     initialize(
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       _ubiSettings: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       _registry: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
@@ -2009,6 +2226,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>,
@@ -2022,12 +2244,13 @@ export interface UBIPool extends BaseContract {
     ): Promise<BigNumber>;
 
     setPoolSettings(
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
     setUBISettings(
       _ubiSettings: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
 
@@ -2046,6 +2269,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 +2326,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>,
@@ -2181,12 +2406,20 @@ export interface UBIPool extends BaseContract {
 
     currentDayInCycle(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
+    distributionFormula(
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>;
+
     estimateNextDailyUBI(
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>;
 
+    extendedSettings(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     getCurrentDay(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
+    getManagerFee(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     getRealtimeContribution(
       _user: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -2228,8 +2461,9 @@ export interface UBIPool extends BaseContract {
     host(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     initialize(
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       _ubiSettings: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       _registry: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
@@ -2252,6 +2486,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>,
@@ -2265,12 +2504,13 @@ export interface UBIPool extends BaseContract {
     ): Promise<PopulatedTransaction>;
 
     setPoolSettings(
-      _settings: UBIPool.PoolSettingsStruct,
+      _settings: PoolSettingsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
     setUBISettings(
       _ubiSettings: UBIPool.UBISettingsStruct,
+      _extendedSettings: UBIPool.ExtendedSettingsStruct,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
 
@@ -2289,6 +2529,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