@gooddollar/goodcollective-contracts 1.2.0 → 1.3.0

package/typechain-types/contracts/GoodCollective/GoodCollectiveSuperApp.ts

@@ -62,6 +62,7 @@ export interface GoodCollectiveSuperAppInterface extends utils.Interface {
     "beforeAgreementTerminated(address,address,bytes32,bytes,bytes)": FunctionFragment;
     "beforeAgreementUpdated(address,address,bytes32,bytes,bytes)": FunctionFragment;
     "cfaV1()": FunctionFragment;
+    "getManagerFee()": FunctionFragment;
     "getRealtimeContribution(address)": FunctionFragment;
     "getRealtimeStats()": FunctionFragment;
     "getRegistry()": FunctionFragment;
@@ -88,6 +89,7 @@ export interface GoodCollectiveSuperAppInterface extends utils.Interface {
       | "beforeAgreementTerminated"
       | "beforeAgreementUpdated"
       | "cfaV1"
+      | "getManagerFee"
       | "getRealtimeContribution"
       | "getRealtimeStats"
       | "getRegistry"
@@ -175,6 +177,10 @@ export interface GoodCollectiveSuperAppInterface extends utils.Interface {
     ]
   ): string;
   encodeFunctionData(functionFragment: "cfaV1", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "getManagerFee",
+    values?: undefined
+  ): string;
   encodeFunctionData(
     functionFragment: "getRealtimeContribution",
     values: [PromiseOrValue<string>]
@@ -268,6 +274,10 @@ export interface GoodCollectiveSuperAppInterface extends utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "cfaV1", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "getManagerFee",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "getRealtimeContribution",
     data: BytesLike
@@ -415,6 +425,10 @@ export interface GoodCollectiveSuperApp extends BaseContract {
       overrides?: CallOverrides
     ): Promise<[string, string] & { host: string; cfa: string }>;
 
+    getManagerFee(
+      overrides?: CallOverrides
+    ): Promise<[string, number] & { admin: string; feeBps: number }>;
+
     getRealtimeContribution(
       _user: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -423,11 +437,22 @@ export interface GoodCollectiveSuperApp 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;
       }
     >;
 
@@ -457,12 +482,24 @@ export interface GoodCollectiveSuperApp 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;
       }
     >;
 
@@ -561,6 +598,10 @@ export interface GoodCollectiveSuperApp extends BaseContract {
     overrides?: CallOverrides
   ): Promise<[string, string] & { host: string; cfa: string }>;
 
+  getManagerFee(
+    overrides?: CallOverrides
+  ): Promise<[string, number] & { admin: string; feeBps: number }>;
+
   getRealtimeContribution(
     _user: PromiseOrValue<string>,
     overrides?: CallOverrides
@@ -569,11 +610,22 @@ export interface GoodCollectiveSuperApp 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;
     }
   >;
 
@@ -603,12 +655,24 @@ export interface GoodCollectiveSuperApp 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;
     }
   >;
 
@@ -707,6 +771,10 @@ export interface GoodCollectiveSuperApp extends BaseContract {
       overrides?: CallOverrides
     ): Promise<[string, string] & { host: string; cfa: string }>;
 
+    getManagerFee(
+      overrides?: CallOverrides
+    ): Promise<[string, number] & { admin: string; feeBps: number }>;
+
     getRealtimeContribution(
       _user: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -715,11 +783,22 @@ export interface GoodCollectiveSuperApp 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;
       }
     >;
 
@@ -749,12 +828,24 @@ export interface GoodCollectiveSuperApp 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;
       }
     >;
 
@@ -871,6 +962,8 @@ export interface GoodCollectiveSuperApp extends BaseContract {
 
     cfaV1(overrides?: CallOverrides): Promise<BigNumber>;
 
+    getManagerFee(overrides?: CallOverrides): Promise<BigNumber>;
+
     getRealtimeContribution(
       _user: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -991,6 +1084,8 @@ export interface GoodCollectiveSuperApp extends BaseContract {
 
     cfaV1(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
+    getManagerFee(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     getRealtimeContribution(
       _user: PromiseOrValue<string>,
       overrides?: CallOverrides

package/typechain-types/contracts/{DirectPayments/DirectPaymentsFactory.sol/IRegistry.ts → GoodCollective/IGoodCollectiveSuperApp.sol/IGoodCollectiveSuperApp.ts}

@@ -19,37 +19,32 @@ import type {
   OnEvent,
 } from "../../../common";
 
-export interface IRegistryInterface extends utils.Interface {
+export interface IGoodCollectiveSuperAppInterface extends utils.Interface {
   functions: {
-    "feeBps()": FunctionFragment;
-    "feeRecipient()": FunctionFragment;
+    "getAdminFee()": FunctionFragment;
   };
 
-  getFunction(
-    nameOrSignatureOrTopic: "feeBps" | "feeRecipient"
-  ): FunctionFragment;
+  getFunction(nameOrSignatureOrTopic: "getAdminFee"): FunctionFragment;
 
-  encodeFunctionData(functionFragment: "feeBps", values?: undefined): string;
   encodeFunctionData(
-    functionFragment: "feeRecipient",
+    functionFragment: "getAdminFee",
     values?: undefined
   ): string;
 
-  decodeFunctionResult(functionFragment: "feeBps", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "feeRecipient",
+    functionFragment: "getAdminFee",
     data: BytesLike
   ): Result;
 
   events: {};
 }
 
-export interface IRegistry extends BaseContract {
+export interface IGoodCollectiveSuperApp extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: IRegistryInterface;
+  interface: IGoodCollectiveSuperAppInterface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,
@@ -71,32 +66,28 @@ export interface IRegistry extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    feeBps(overrides?: CallOverrides): Promise<[number]>;
-
-    feeRecipient(overrides?: CallOverrides): Promise<[string]>;
+    getAdminFee(
+      overrides?: CallOverrides
+    ): Promise<[string, number] & { admin: string; feeBps: number }>;
   };
 
-  feeBps(overrides?: CallOverrides): Promise<number>;
-
-  feeRecipient(overrides?: CallOverrides): Promise<string>;
+  getAdminFee(
+    overrides?: CallOverrides
+  ): Promise<[string, number] & { admin: string; feeBps: number }>;
 
   callStatic: {
-    feeBps(overrides?: CallOverrides): Promise<number>;
-
-    feeRecipient(overrides?: CallOverrides): Promise<string>;
+    getAdminFee(
+      overrides?: CallOverrides
+    ): Promise<[string, number] & { admin: string; feeBps: number }>;
   };
 
   filters: {};
 
   estimateGas: {
-    feeBps(overrides?: CallOverrides): Promise<BigNumber>;
-
-    feeRecipient(overrides?: CallOverrides): Promise<BigNumber>;
+    getAdminFee(overrides?: CallOverrides): Promise<BigNumber>;
   };
 
   populateTransaction: {
-    feeBps(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    feeRecipient(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    getAdminFee(overrides?: CallOverrides): Promise<PopulatedTransaction>;
   };
 }

package/typechain-types/contracts/GoodCollective/IGoodCollectiveSuperApp.sol/index.ts

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

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

@@ -18,7 +18,7 @@ import type {
   TypedListener,
   OnEvent,
   PromiseOrValue,
-} from "../../../common";
+} from "../../common";
 
 export interface IIdentityV2Interface extends utils.Interface {
   functions: {

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

@@ -20,7 +20,7 @@ import type {
   TypedListener,
   OnEvent,
   PromiseOrValue,
-} from "../../../common";
+} from "../../common";
 
 export interface IMembersValidatorInterface extends utils.Interface {
   functions: {

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

@@ -3,4 +3,3 @@
 /* eslint-disable */
 export type { IIdentityV2 } from "./IIdentityV2";
 export type { IMembersValidator } from "./IMembersValidator";
-export type { UBIPool } from "./UBIPool";