@gooddollar/goodcollective-contracts 1.1.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;
@@ -72,6 +73,7 @@ export interface GoodCollectiveSuperAppInterface extends utils.Interface {
     "stats()": FunctionFragment;
     "superToken()": FunctionFragment;
     "support(address,uint256,bytes)": FunctionFragment;
+    "supportWithSwap(address,(address,uint256,uint256,uint256,bytes),bytes)": FunctionFragment;
     "supporters(address)": FunctionFragment;
     "swapRouter()": FunctionFragment;
   };
@@ -87,6 +89,7 @@ export interface GoodCollectiveSuperAppInterface extends utils.Interface {
       | "beforeAgreementTerminated"
       | "beforeAgreementUpdated"
       | "cfaV1"
+      | "getManagerFee"
       | "getRealtimeContribution"
       | "getRealtimeStats"
       | "getRegistry"
@@ -97,6 +100,7 @@ export interface GoodCollectiveSuperAppInterface extends utils.Interface {
       | "stats"
       | "superToken"
       | "support"
+      | "supportWithSwap"
       | "supporters"
       | "swapRouter"
   ): FunctionFragment;
@@ -173,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>]
@@ -219,6 +227,14 @@ export interface GoodCollectiveSuperAppInterface extends utils.Interface {
       PromiseOrValue<BytesLike>
     ]
   ): string;
+  encodeFunctionData(
+    functionFragment: "supportWithSwap",
+    values: [
+      PromiseOrValue<string>,
+      HelperLibrary.SwapDataStruct,
+      PromiseOrValue<BytesLike>
+    ]
+  ): string;
   encodeFunctionData(
     functionFragment: "supporters",
     values: [PromiseOrValue<string>]
@@ -258,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
@@ -283,6 +303,10 @@ export interface GoodCollectiveSuperAppInterface extends utils.Interface {
   decodeFunctionResult(functionFragment: "stats", 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: "swapRouter", data: BytesLike): Result;
 
@@ -401,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
@@ -409,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;
       }
     >;
 
@@ -443,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;
       }
     >;
 
@@ -461,6 +512,13 @@ export interface GoodCollectiveSuperApp 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
@@ -540,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
@@ -548,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;
     }
   >;
 
@@ -582,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;
     }
   >;
 
@@ -600,6 +685,13 @@ export interface GoodCollectiveSuperApp 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
@@ -679,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
@@ -687,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;
       }
     >;
 
@@ -721,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;
       }
     >;
 
@@ -739,6 +858,13 @@ export interface GoodCollectiveSuperApp 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
@@ -836,6 +962,8 @@ export interface GoodCollectiveSuperApp extends BaseContract {
 
     cfaV1(overrides?: CallOverrides): Promise<BigNumber>;
 
+    getManagerFee(overrides?: CallOverrides): Promise<BigNumber>;
+
     getRealtimeContribution(
       _user: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -877,6 +1005,13 @@ export interface GoodCollectiveSuperApp 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
@@ -949,6 +1084,8 @@ export interface GoodCollectiveSuperApp extends BaseContract {
 
     cfaV1(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
+    getManagerFee(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+
     getRealtimeContribution(
       _user: PromiseOrValue<string>,
       overrides?: CallOverrides
@@ -990,6 +1127,13 @@ export interface GoodCollectiveSuperApp 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/MultiClaimModule.sol/IClaimable.ts → GoodCollective/IGoodCollectiveSuperApp.sol/IGoodCollectiveSuperApp.ts}

@@ -6,8 +6,6 @@ import type {
   BigNumber,
   BytesLike,
   CallOverrides,
-  ContractTransaction,
-  Overrides,
   PopulatedTransaction,
   Signer,
   utils,
@@ -19,29 +17,34 @@ import type {
   TypedEvent,
   TypedListener,
   OnEvent,
-  PromiseOrValue,
 } from "../../../common";
 
-export interface IClaimableInterface extends utils.Interface {
+export interface IGoodCollectiveSuperAppInterface extends utils.Interface {
   functions: {
-    "claim()": FunctionFragment;
+    "getAdminFee()": FunctionFragment;
   };
 
-  getFunction(nameOrSignatureOrTopic: "claim"): FunctionFragment;
+  getFunction(nameOrSignatureOrTopic: "getAdminFee"): FunctionFragment;
 
-  encodeFunctionData(functionFragment: "claim", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "getAdminFee",
+    values?: undefined
+  ): string;
 
-  decodeFunctionResult(functionFragment: "claim", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "getAdminFee",
+    data: BytesLike
+  ): Result;
 
   events: {};
 }
 
-export interface IClaimable extends BaseContract {
+export interface IGoodCollectiveSuperApp extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this;
   attach(addressOrName: string): this;
   deployed(): Promise<this>;
 
-  interface: IClaimableInterface;
+  interface: IGoodCollectiveSuperAppInterface;
 
   queryFilter<TEvent extends TypedEvent>(
     event: TypedEventFilter<TEvent>,
@@ -63,30 +66,28 @@ export interface IClaimable extends BaseContract {
   removeListener: OnEvent<this>;
 
   functions: {
-    claim(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
+    getAdminFee(
+      overrides?: CallOverrides
+    ): Promise<[string, number] & { admin: string; feeBps: number }>;
   };
 
-  claim(
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
+  getAdminFee(
+    overrides?: CallOverrides
+  ): Promise<[string, number] & { admin: string; feeBps: number }>;
 
   callStatic: {
-    claim(overrides?: CallOverrides): Promise<void>;
+    getAdminFee(
+      overrides?: CallOverrides
+    ): Promise<[string, number] & { admin: string; feeBps: number }>;
   };
 
   filters: {};
 
   estimateGas: {
-    claim(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
+    getAdminFee(overrides?: CallOverrides): Promise<BigNumber>;
   };
 
   populateTransaction: {
-    claim(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
+    getAdminFee(overrides?: CallOverrides): Promise<PopulatedTransaction>;
   };
 }

package/typechain-types/contracts/GoodCollective/{GoodCollectiveSuperApp.sol → IGoodCollectiveSuperApp.sol}/index.ts

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

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

@@ -1,6 +1,7 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-import type * as goodCollectiveSuperAppSol from "./GoodCollectiveSuperApp.sol";
-export type { goodCollectiveSuperAppSol };
+import type * as iGoodCollectiveSuperAppSol from "./IGoodCollectiveSuperApp.sol";
+export type { iGoodCollectiveSuperAppSol };
+export type { GoodCollectiveSuperApp } from "./GoodCollectiveSuperApp";
 export type { SuperAppBaseFlow } from "./SuperAppBaseFlow";

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";