@gooddollar/goodcollective-contracts 1.1.0 → 1.3.0

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

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

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

@@ -3,5 +3,7 @@
 /* eslint-disable */
 export * as directPayments from "./DirectPayments";
 export * as goodCollective from "./GoodCollective";
+export * as interfacesSol from "./Interfaces.sol";
 export * as ubi from "./UBI";
+export * as test from "./test";
 export * as utils from "./utils";

package/typechain-types/factories/contracts/test/HelperLibraryTest__factory.ts

@@ -0,0 +1,154 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import { Signer, utils, Contract, ContractFactory, Overrides } from "ethers";
+import type { Provider, TransactionRequest } from "@ethersproject/providers";
+import type { PromiseOrValue } from "../../../common";
+import type {
+  HelperLibraryTest,
+  HelperLibraryTestInterface,
+} from "../../../contracts/test/HelperLibraryTest";
+
+const _abi = [
+  {
+    inputs: [
+      {
+        internalType: "contract IV3SwapRouter",
+        name: "swapRouter",
+        type: "address",
+      },
+      {
+        components: [
+          {
+            internalType: "address",
+            name: "swapFrom",
+            type: "address",
+          },
+          {
+            internalType: "uint256",
+            name: "amount",
+            type: "uint256",
+          },
+          {
+            internalType: "uint256",
+            name: "minReturn",
+            type: "uint256",
+          },
+          {
+            internalType: "uint256",
+            name: "deadline",
+            type: "uint256",
+          },
+          {
+            internalType: "bytes",
+            name: "path",
+            type: "bytes",
+          },
+        ],
+        internalType: "struct HelperLibrary.SwapData",
+        name: "_customData",
+        type: "tuple",
+      },
+      {
+        internalType: "address",
+        name: "outTokenIfNoPath",
+        type: "address",
+      },
+      {
+        internalType: "address",
+        name: "_sender",
+        type: "address",
+      },
+    ],
+    name: "handleSwap",
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "amountOut",
+        type: "uint256",
+      },
+    ],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+] as const;
+
+const _bytecode =
+  "0x608060405234801561001057600080fd5b506103bf806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80630f39b88814610030575b600080fd5b61004361003e366004610177565b610055565b60405190815260200160405180910390f35b6040516321437a5360e01b815260009073__$0d78a42341742155da77b97d7f993534c7$__906321437a539061009790889088908890889081906004016102ab565b602060405180830381865af41580156100b4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100d89190610370565b95945050505050565b6001600160a01b03811681146100f657600080fd5b50565b634e487b7160e01b600052604160045260246000fd5b60405160a081016001600160401b0381118282101715610131576101316100f9565b60405290565b604051601f8201601f191681016001600160401b038111828210171561015f5761015f6100f9565b604052919050565b8035610172816100e1565b919050565b6000806000806080858703121561018d57600080fd5b8435610198816100e1565b93506020858101356001600160401b03808211156101b557600080fd5b9087019060a0828a0312156101c957600080fd5b6101d161010f565b82356101dc816100e1565b808252508383013584820152604083013560408201526060830135606082015260808301358281111561020e57600080fd5b80840193505089601f84011261022357600080fd5b823582811115610235576102356100f9565b610247601f8201601f19168601610137565b92508083528a8582860101111561025d57600080fd5b8085850186850137600090830190940193909352608083015250925061028560408601610167565b915061029360608601610167565b905092959194509250565b6001600160a01b03169052565b600060018060a01b038088168352602060a0818501528188511660a08501528088015160c0850152604088015160e085015260608801516101008501526080880151915060a061012085015281518061014086015260005b818110156103205783810183015186820161016001528201610303565b506101609250600083828701015282601f19601f830116860101935050505061034c604083018661029e565b610359606083018561029e565b610366608083018461029e565b9695505050505050565b60006020828403121561038257600080fd5b505191905056fea2646970667358221220cd1aa17405a213bbfb55cb6738929d050881064d6ecf1c817200530703b2fa4164736f6c63430008130033";
+
+type HelperLibraryTestConstructorParams =
+  | [linkLibraryAddresses: HelperLibraryTestLibraryAddresses, signer?: Signer]
+  | ConstructorParameters<typeof ContractFactory>;
+
+const isSuperArgs = (
+  xs: HelperLibraryTestConstructorParams
+): xs is ConstructorParameters<typeof ContractFactory> => {
+  return (
+    typeof xs[0] === "string" ||
+    (Array.isArray as (arg: any) => arg is readonly any[])(xs[0]) ||
+    "_isInterface" in xs[0]
+  );
+};
+
+export class HelperLibraryTest__factory extends ContractFactory {
+  constructor(...args: HelperLibraryTestConstructorParams) {
+    if (isSuperArgs(args)) {
+      super(...args);
+    } else {
+      const [linkLibraryAddresses, signer] = args;
+      super(
+        _abi,
+        HelperLibraryTest__factory.linkBytecode(linkLibraryAddresses),
+        signer
+      );
+    }
+  }
+
+  static linkBytecode(
+    linkLibraryAddresses: HelperLibraryTestLibraryAddresses
+  ): string {
+    let linkedBytecode = _bytecode;
+
+    linkedBytecode = linkedBytecode.replace(
+      new RegExp("__\\$0d78a42341742155da77b97d7f993534c7\\$__", "g"),
+      linkLibraryAddresses["contracts/utils/HelperLibrary.sol:HelperLibrary"]
+        .replace(/^0x/, "")
+        .toLowerCase()
+    );
+
+    return linkedBytecode;
+  }
+
+  override deploy(
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<HelperLibraryTest> {
+    return super.deploy(overrides || {}) as Promise<HelperLibraryTest>;
+  }
+  override getDeployTransaction(
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): TransactionRequest {
+    return super.getDeployTransaction(overrides || {});
+  }
+  override attach(address: string): HelperLibraryTest {
+    return super.attach(address) as HelperLibraryTest;
+  }
+  override connect(signer: Signer): HelperLibraryTest__factory {
+    return super.connect(signer) as HelperLibraryTest__factory;
+  }
+
+  static readonly bytecode = _bytecode;
+  static readonly abi = _abi;
+  static createInterface(): HelperLibraryTestInterface {
+    return new utils.Interface(_abi) as HelperLibraryTestInterface;
+  }
+  static connect(
+    address: string,
+    signerOrProvider: Signer | Provider
+  ): HelperLibraryTest {
+    return new Contract(address, _abi, signerOrProvider) as HelperLibraryTest;
+  }
+}
+
+export interface HelperLibraryTestLibraryAddresses {
+  ["contracts/utils/HelperLibrary.sol:HelperLibrary"]: string;
+}

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

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

package/typechain-types/factories/contracts/utils/HelperLibrary__factory.ts

@@ -39,6 +39,21 @@ const _abi = [
             name: "lastIncomeRate",
             type: "int96",
           },
+          {
+            internalType: "address",
+            name: "lastManagerFeeRecipient",
+            type: "address",
+          },
+          {
+            internalType: "uint256",
+            name: "protocolFees",
+            type: "uint256",
+          },
+          {
+            internalType: "uint256",
+            name: "managerFees",
+            type: "uint256",
+          },
         ],
         internalType: "struct IGoodCollectiveSuperApp.Stats",
         name: "stats",
@@ -62,6 +77,16 @@ const _abi = [
         name: "totalFees",
         type: "uint256",
       },
+      {
+        internalType: "uint256",
+        name: "protocolFees",
+        type: "uint256",
+      },
+      {
+        internalType: "uint256",
+        name: "managerFees",
+        type: "uint256",
+      },
       {
         internalType: "int96",
         name: "incomeFlowRate",
@@ -72,6 +97,11 @@ const _abi = [
         name: "feeRate",
         type: "int96",
       },
+      {
+        internalType: "int96",
+        name: "managerFeeRate",
+        type: "int96",
+      },
     ],
     stateMutability: "view",
     type: "function",
@@ -79,7 +109,7 @@ const _abi = [
 ] as const;
 
 const _bytecode =
-  "0x610b8861003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100405760003560e01c806358c0dacb14610045578063b2f918a114610067575b600080fd5b81801561005157600080fd5b506100656100603660046107e6565b6100a4565b005b61007a61007536600461091c565b610273565b604080519485526020850193909352600b91820b84840152900b6060830152519081900360800190f35b6100b8836000015182308660200151610330565b6100cb8360000151858560200151610437565b6080830151511561017957604080516080808201835285015181526001600160a01b0380841660208084019190915286015182840152858301516060830152915163b858183f60e01b8152909186169063b858183f9061012f9084906004016109c4565b6020604051808303816000875af115801561014e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101729190610a2a565b505061026d565b6040805160e08101825284516001600160a01b03908116825284811660208084019182526127108486019081528684166060860190815291890151608086019081528987015160a08701908152600060c0880190815297516304e45aaf60e01b8152875187166004820152945186166024860152915162ffffff166044850152915184166064840152905160848301525160a48201529251811660c48401529091908616906304e45aaf9060e4016020604051808303816000875af1158015610246573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061026a9190610a2a565b50505b50505050565b608082015160408301516000918291829061028e9042610a59565b86608001516001600160601b03166102a69190610a72565b86516102b29190610a89565b93506102d6308760600151876001600160a01b03166105379092919063ffffffff16565b90508560400151426102e89190610a59565b6060870151610303906001600160a01b038816903090610537565b6001600160601b03166103169190610a72565b86602001516103259190610a89565b925092959194509250565b604080516001600160a01b0385811660248301528481166044830152606480830185905283518084039091018152608490920183526020820180516001600160e01b03166323b872dd60e01b17905291516000928392908816916103949190610a9c565b6000604051808303816000865af19150503d80600081146103d1576040519150601f19603f3d011682016040523d82523d6000602084013e6103d6565b606091505b50915091508180156104005750805115806104005750808060200190518101906104009190610ab8565b61026a5760405162461bcd60e51b815260206004820152600360248201526229aa2360e91b60448201526064015b60405180910390fd5b604080516001600160a01b038481166024830152604480830185905283518084039091018152606490920183526020820180516001600160e01b031663095ea7b360e01b17905291516000928392908716916104939190610a9c565b6000604051808303816000865af19150503d80600081146104d0576040519150601f19603f3d011682016040523d82523d6000602084013e6104d5565b606091505b50915091508180156104ff5750805115806104ff5750808060200190518101906104ff9190610ab8565b6105305760405162461bcd60e51b8152602060048201526002602482015261534160f01b604482015260640161042e565b5050505050565b600080610543856105cf565b604051631cd43d1160e31b81526001600160a01b03888116600483015287811660248301528681166044830152919350908316915063e6a1e88890606401608060405180830381865afa15801561059e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105c29190610ae1565b5090979650505050505050565b7f65599bf746e17a00ea62e3610586992d88101b78eec3cf380706621fb97ea837547fb969d79d88acd02d04ed7ee7d43b949e7daf093d363abcfbbc43dfdfd1ce969a546001600160a01b03811661071f576001600160a01b03821661069457826001600160a01b03166320bc44256040518163ffffffff1660e01b8152600401602060405180830381865afa15801561066d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106919190610b1f565b91505b604051635b69006f60e11b81527fa9214cc96615e0085d3bb077758db69497dc2dce3b2b1e97bc93c3d18d83efd360048201526001600160a01b0383169063b6d200de90602401602060405180830381865afa1580156106f8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061071c9190610b1f565b90505b6001600160a01b03821661073557610735610b3c565b6001600160a01b03811661074b5761074b610b3c565b915091565b6001600160a01b038116811461076557600080fd5b50565b634e487b7160e01b600052604160045260246000fd5b60405160a081016001600160401b03811182821017156107a0576107a0610768565b60405290565b604051601f8201601f191681016001600160401b03811182821017156107ce576107ce610768565b604052919050565b80356107e181610750565b919050565b600080600080608085870312156107fc57600080fd5b843561080781610750565b93506020858101356001600160401b038082111561082457600080fd5b9087019060a0828a03121561083857600080fd5b61084061077e565b823561084b81610750565b808252508383013584820152604083013560408201526060830135606082015260808301358281111561087d57600080fd5b80840193505089601f84011261089257600080fd5b8235828111156108a4576108a4610768565b6108b6601f8201601f191686016107a6565b92508083528a858286010111156108cc57600080fd5b808585018685013760009083019094019390935260808301525092506108f4604086016107d6565b9150610902606086016107d6565b905092959194509250565b80600b0b811461076557600080fd5b60008082840360c081121561093057600080fd5b60a081121561093e57600080fd5b5061094761077e565b833581526020840135602082015260408401356040820152606084013561096d81610750565b606082015260808401356109808161090d565b6080820152915060a083013561099581610750565b809150509250929050565b60005b838110156109bb5781810151838201526020016109a3565b50506000910152565b60208152600082516080602084015280518060a08501526109ec8160c08601602085016109a0565b60208501516001600160a01b0316604085810191909152850151606080860191909152909401516080840152505060c0601f909201601f1916010190565b600060208284031215610a3c57600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b81810381811115610a6c57610a6c610a43565b92915050565b8082028115828204841417610a6c57610a6c610a43565b80820180821115610a6c57610a6c610a43565b60008251610aae8184602087016109a0565b9190910192915050565b600060208284031215610aca57600080fd5b81518015158114610ada57600080fd5b9392505050565b60008060008060808587031215610af757600080fd5b845193506020850151610b098161090d565b6040860151606090960151949790965092505050565b600060208284031215610b3157600080fd5b8151610ada81610750565b634e487b7160e01b600052600160045260246000fdfea264697066735822122040f20e3f8d7e7114d62db380863d5f46e7cfdd7b624bdffc9517370abac1d02a64736f6c63430008130033";
+  "0x6116bd61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100615760003560e01c806321437a53146100665780634d167a901461009957806358c0dacb146100c6578063934e2cce146100e6578063b2f918a114610108575b600080fd5b81801561007257600080fd5b50610086610081366004610fa1565b610159565b6040519081526020015b60405180910390f35b8180156100a557600080fd5b506100b96100b4366004611056565b6102ed565b6040516100909190611149565b8180156100d257600080fd5b506100866100e1366004611163565b610409565b8180156100f257600080fd5b506101066101013660046111d7565b610418565b005b61011b610116366004611232565b610691565b604080519788526020880196909652948601939093526060850191909152600b90810b608085015290810b60a08401520b60c082015260e001610090565b600061016f8560000151843088602001516107d7565b61018285600001518787602001516108e6565b6080850151511561023157604080516080808201835287015181526001600160a01b0380851660208084019190915288015182840152878301516060830152915163b858183f60e01b8152909188169063b858183f906101e69084906004016112db565b6020604051808303816000875af1158015610205573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102299190611329565b9150506102e4565b6040805160e08101825286516001600160a01b039081168252868116602080840191825261271084860190815287841660608601908152918b0151608086019081528b87015160a08701908152600060c0880190815297516304e45aaf60e01b8152875187166004820152945186166024860152915162ffffff166044850152915184166064840152905160848301525160a48201529251811660c48401529091908816906304e45aaf9060e4016101e6565b95945050505050565b806001600160a01b038516156103fe5760006103136001600160a01b03891630896109e6565b90506000876001600160a01b0316876001600160a01b03161461035e575060016001600160a01b0388161561035e57600082600b0b131561035e5761035b8a84308b8d610a7e565b92505b6001600160a01b0387166103735750506103fe565b6000612710610386600389900b88611358565b6103909190611395565b61039a90846113d3565b9050811580156103ad5750600083600b0b135b156103de57600081600b0b136103d1576103ca8b85308b8e610a7e565b93506103fa565b6103ca8b858a8d85610aad565b600081600b0b13156103fa576103f78b858a8d85610ad2565b93505b5050505b979650505050505050565b60006102e48585858586610159565b60006001600160a01b0384161561049457836001600160a01b03166324a9d8536040518163ffffffff1660e01b8152600401602060405180830381865afa158015610467573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061048b9190611406565b63ffffffff1690505b60028601546104a39042611423565b60038701546104c29190600160a01b90046001600160601b0316611436565b8660000160008282546104d5919061144d565b909155505060038601546001600160a01b0316156105455760028601546104fc9042611423565b6003870154610519906001600160a01b03888116913091166109e6565b6001600160601b031661052c9190611436565b86600501600082825461053f919061144d565b90915550505b60048601546001600160a01b0316156105b05760028601546105679042611423565b6004870154610584906001600160a01b03888116913091166109e6565b6001600160601b03166105979190611436565b8660060160008282546105aa919061144d565b90915550505b81156106675761271063ffffffff84166105ca8383611423565b6105d49190611423565b6105de9084611436565b6105e89190611460565b8660000160008282546105fb919061144d565b90915550612710905061060e8284611436565b6106189190611460565b86600501600082825461062b919061144d565b90915550612710905061064463ffffffff851684611436565b61064e9190611460565b866006016000828254610661919061144d565b90915550505b8560050154866006015461067b919061144d565b6001870155505042600290940193909355505050565b6000806000806000806000886080015192508860400151426106b39190611423565b89608001516001600160601b03166106cb9190611436565b89516106d7919061144d565b96506106fb308a606001518a6001600160a01b03166109e69092919063ffffffff16565b915061071f308a60a001518a6001600160a01b03166109e69092919063ffffffff16565b90508860400151426107319190611423565b60608a015161074c906001600160a01b038b169030906109e6565b6001600160601b031661075f9190611436565b8960c0015161076e919061144d565b94508860400151426107809190611423565b60a08a015161079b906001600160a01b038b169030906109e6565b6001600160601b03166107ae9190611436565b8960e001516107bd919061144d565b93506107c9848661144d565b955092959891949750929550565b604080516001600160a01b0385811660248301528481166044830152606480830185905283518084039091018152608490920183526020820180516001600160e01b03166323b872dd60e01b179052915160009283929088169161083b9190611474565b6000604051808303816000865af19150503d8060008114610878576040519150601f19603f3d011682016040523d82523d6000602084013e61087d565b606091505b50915091508180156108a75750805115806108a75750808060200190518101906108a79190611490565b6108de5760405162461bcd60e51b815260206004820152600360248201526229aa2360e91b60448201526064015b60405180910390fd5b505050505050565b604080516001600160a01b038481166024830152604480830185905283518084039091018152606490920183526020820180516001600160e01b031663095ea7b360e01b17905291516000928392908716916109429190611474565b6000604051808303816000865af19150503d806000811461097f576040519150601f19603f3d011682016040523d82523d6000602084013e610984565b606091505b50915091508180156109ae5750805115806109ae5750808060200190518101906109ae9190611490565b6109df5760405162461bcd60e51b8152602060048201526002602482015261534160f01b60448201526064016108d5565b5050505050565b6000806109f285610af7565b604051631cd43d1160e31b81526001600160a01b03888116600483015287811660248301528681166044830152919350908316915063e6a1e88890606401608060405180830381865afa158015610a4d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a7191906114b2565b5090979650505050505050565b604080516000815260208101909152606090610aa39087908790879087908790610c78565b9695505050505050565b604080516000815260208101909152606090610aa39087908790879087908790610d61565b604080516000815260208101909152606090610aa39087908790879087908790610dc8565b7f65599bf746e17a00ea62e3610586992d88101b78eec3cf380706621fb97ea837547fb969d79d88acd02d04ed7ee7d43b949e7daf093d363abcfbbc43dfdfd1ce969a546001600160a01b038116610c47576001600160a01b038216610bbc57826001600160a01b03166320bc44256040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b95573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bb991906114f0565b91505b604051635b69006f60e11b81527fa9214cc96615e0085d3bb077758db69497dc2dce3b2b1e97bc93c3d18d83efd360048201526001600160a01b0383169063b6d200de90602401602060405180830381865afa158015610c20573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c4491906114f0565b90505b6001600160a01b038216610c5d57610c5d61150d565b6001600160a01b038116610c7357610c7361150d565b915091565b855460018701546040805160008152602081019091526060926001600160a01b0390811692634329d29392911690819063b4b333c690610cc19089908c908c9060448101611523565b60408051808303601f1901815291815260208201805160e094851b6001600160e01b03909116179052519185901b6001600160e01b0319168252610d0e9392509087908c90600401611557565b6000604051808303816000875af1158015610d2d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d5591908101906115ee565b50979650505050505050565b855460018701546060916001600160a01b0390811691634329d2939116806350209a62888a8960005b6040519080825280601f01601f191660200182016040528015610db4576020820181803683370190505b50604051602401610cc19493929190611651565b855460018701546060916001600160a01b0390811691634329d2939116806362fc305e888a896000610d8a565b6001600160a01b0381168114610e0a57600080fd5b50565b634e487b7160e01b600052604160045260246000fd5b60405161010081016001600160401b0381118282101715610e4657610e46610e0d565b60405290565b604051601f8201601f191681016001600160401b0381118282101715610e7457610e74610e0d565b604052919050565b8035610e8781610df5565b919050565b60006001600160401b03821115610ea557610ea5610e0d565b50601f01601f191660200190565b600082601f830112610ec457600080fd5b8135610ed7610ed282610e8c565b610e4c565b818152846020838601011115610eec57600080fd5b816020850160208301376000918101602001919091529392505050565b600060a08284031215610f1b57600080fd5b60405160a081016001600160401b038082118383101715610f3e57610f3e610e0d565b8160405282935084359150610f5282610df5565b8183526020850135602084015260408501356040840152606085013560608401526080850135915080821115610f8757600080fd5b50610f9485828601610eb3565b6080830152505092915050565b600080600080600060a08688031215610fb957600080fd5b8535610fc481610df5565b945060208601356001600160401b03811115610fdf57600080fd5b610feb88828901610f09565b9450506040860135610ffc81610df5565b9250606086013561100c81610df5565b9150608086013561101c81610df5565b809150509295509295909350565b63ffffffff81168114610e0a57600080fd5b80600b0b8114610e0a57600080fd5b8035610e878161103c565b600080600080600080600060e0888a03121561107157600080fd5b87359650602088013561108381610df5565b9550604088013561109381610df5565b945060608801356110a381610df5565b935060808801356110b38161102a565b925060a08801356110c38161103c565b915060c08801356001600160401b038111156110de57600080fd5b6110ea8a828b01610eb3565b91505092959891949750929550565b60005b838110156111145781810151838201526020016110fc565b50506000910152565b600081518084526111358160208601602086016110f9565b601f01601f19169290920160200192915050565b60208152600061115c602083018461111d565b9392505050565b6000806000806080858703121561117957600080fd5b843561118481610df5565b935060208501356001600160401b0381111561119f57600080fd5b6111ab87828801610f09565b93505060408501356111bc81610df5565b915060608501356111cc81610df5565b939692955090935050565b600080600080600060a086880312156111ef57600080fd5b85359450602086013561120181610df5565b9350604086013561121181610df5565b925060608601356112218161102a565b949793965091946080013592915050565b60008082840361012081121561124757600080fd5b6101008082121561125757600080fd5b61125f610e23565b9150843582526020850135602083015260408501356040830152606085013561128781610df5565b60608301526112986080860161104b565b60808301526112a960a08601610e7c565b60a083015260c085013560c083015260e085013560e08301528193506112d0818601610e7c565b925050509250929050565b6020815260008251608060208401526112f760a084018261111d565b905060018060a01b03602085015116604084015260408401516060840152606084015160808401528091505092915050565b60006020828403121561133b57600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b600082600b0b82600b0b0280600b0b915080821461137857611378611342565b5092915050565b634e487b7160e01b600052601260045260246000fd5b600081600b0b83600b0b806113ac576113ac61137f565b60016001605f1b03198214600019821416156113ca576113ca611342565b90059392505050565b600b81810b9083900b0160016001605f1b03811360016001605f1b03198212171561140057611400611342565b92915050565b60006020828403121561141857600080fd5b815161115c8161102a565b8181038181111561140057611400611342565b808202811582820484141761140057611400611342565b8082018082111561140057611400611342565b60008261146f5761146f61137f565b500490565b600082516114868184602087016110f9565b9190910192915050565b6000602082840312156114a257600080fd5b8151801515811461115c57600080fd5b600080600080608085870312156114c857600080fd5b8451935060208501516114da8161103c565b6040860151606090960151949790965092505050565b60006020828403121561150257600080fd5b815161115c81610df5565b634e487b7160e01b600052600160045260246000fd5b6001600160a01b038581168252848116602083015283166040820152608060608201819052600090610aa39083018461111d565b6001600160a01b038516815260806020820181905260009061157b9083018661111d565b828103604084015261158d818661111d565b905082810360608401526103fe818561111d565b600082601f8301126115b257600080fd5b81516115c0610ed282610e8c565b8181528460208386010111156115d557600080fd5b6115e68260208301602087016110f9565b949350505050565b6000806040838503121561160157600080fd5b82516001600160401b038082111561161857600080fd5b611624868387016115a1565b9350602085015191508082111561163a57600080fd5b50611647858286016115a1565b9150509250929050565b6001600160a01b03858116825284166020820152600b83900b6040820152608060608201819052600090610aa39083018461111d56fea26469706673582212206f86969876c39f24a01169b8913522e7f6e27e1313d7a3502880f4f3a1d94ce564736f6c63430008130033";
 
 type HelperLibraryConstructorParams =
   | [signer?: Signer]

package/typechain-types/hardhat.d.ts

@@ -312,10 +312,6 @@ declare module "hardhat/types/runtime" {
       name: "IUniswapV3SwapCallback",
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.IUniswapV3SwapCallback__factory>;
-    getContractFactory(
-      name: "ISwapRouter",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.ISwapRouter__factory>;
     getContractFactory(
       name: "DirectPaymentsFactory",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -340,6 +336,10 @@ declare module "hardhat/types/runtime" {
       name: "GoodCollectiveSuperApp",
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.GoodCollectiveSuperApp__factory>;
+    getContractFactory(
+      name: "IGoodCollectiveSuperApp",
+      signerOrOptions?: ethers.Signer | FactoryOptions
+    ): Promise<Contracts.IGoodCollectiveSuperApp__factory>;
     getContractFactory(
       name: "IRegistry",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -348,18 +348,6 @@ declare module "hardhat/types/runtime" {
       name: "SuperAppBaseFlow",
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.SuperAppBaseFlow__factory>;
-    getContractFactory(
-      name: "IClaimable",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.IClaimable__factory>;
-    getContractFactory(
-      name: "IModule",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.IModule__factory>;
-    getContractFactory(
-      name: "MultiClaimModule",
-      signerOrOptions?: ethers.Signer | FactoryOptions
-    ): Promise<Contracts.MultiClaimModule__factory>;
     getContractFactory(
       name: "IIdentityV2",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -368,6 +356,10 @@ declare module "hardhat/types/runtime" {
       name: "IMembersValidator",
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.IMembersValidator__factory>;
+    getContractFactory(
+      name: "HelperLibraryTest",
+      signerOrOptions?: ethers.Signer | FactoryOptions
+    ): Promise<Contracts.HelperLibraryTest__factory>;
     getContractFactory(
       name: "UBIPool",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -760,11 +752,6 @@ declare module "hardhat/types/runtime" {
       address: string,
       signer?: ethers.Signer
     ): Promise<Contracts.IUniswapV3SwapCallback>;
-    getContractAt(
-      name: "ISwapRouter",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.ISwapRouter>;
     getContractAt(
       name: "DirectPaymentsFactory",
       address: string,
@@ -795,6 +782,11 @@ declare module "hardhat/types/runtime" {
       address: string,
       signer?: ethers.Signer
     ): Promise<Contracts.GoodCollectiveSuperApp>;
+    getContractAt(
+      name: "IGoodCollectiveSuperApp",
+      address: string,
+      signer?: ethers.Signer
+    ): Promise<Contracts.IGoodCollectiveSuperApp>;
     getContractAt(
       name: "IRegistry",
       address: string,
@@ -805,21 +797,6 @@ declare module "hardhat/types/runtime" {
       address: string,
       signer?: ethers.Signer
     ): Promise<Contracts.SuperAppBaseFlow>;
-    getContractAt(
-      name: "IClaimable",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.IClaimable>;
-    getContractAt(
-      name: "IModule",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.IModule>;
-    getContractAt(
-      name: "MultiClaimModule",
-      address: string,
-      signer?: ethers.Signer
-    ): Promise<Contracts.MultiClaimModule>;
     getContractAt(
       name: "IIdentityV2",
       address: string,
@@ -830,6 +807,11 @@ declare module "hardhat/types/runtime" {
       address: string,
       signer?: ethers.Signer
     ): Promise<Contracts.IMembersValidator>;
+    getContractAt(
+      name: "HelperLibraryTest",
+      address: string,
+      signer?: ethers.Signer
+    ): Promise<Contracts.HelperLibraryTest>;
     getContractAt(
       name: "UBIPool",
       address: string,

package/typechain-types/index.ts

@@ -162,8 +162,6 @@ export type { IV3SwapRouter } from "./@uniswap/swap-router-contracts/contracts/i
 export { IV3SwapRouter__factory } from "./factories/@uniswap/swap-router-contracts/contracts/interfaces/IV3SwapRouter__factory";
 export type { IUniswapV3SwapCallback } from "./@uniswap/v3-core/contracts/interfaces/callback/IUniswapV3SwapCallback";
 export { IUniswapV3SwapCallback__factory } from "./factories/@uniswap/v3-core/contracts/interfaces/callback/IUniswapV3SwapCallback__factory";
-export type { ISwapRouter } from "./@uniswap/v3-periphery/contracts/interfaces/ISwapRouter";
-export { ISwapRouter__factory } from "./factories/@uniswap/v3-periphery/contracts/interfaces/ISwapRouter__factory";
 export type { DirectPaymentsFactory } from "./contracts/DirectPayments/DirectPaymentsFactory";
 export { DirectPaymentsFactory__factory } from "./factories/contracts/DirectPayments/DirectPaymentsFactory__factory";
 export type { DirectPaymentsPool } from "./contracts/DirectPayments/DirectPaymentsPool.sol/DirectPaymentsPool";
@@ -172,20 +170,18 @@ export type { IMembersValidator } from "./contracts/DirectPayments/DirectPayment
 export { IMembersValidator__factory } from "./factories/contracts/DirectPayments/DirectPaymentsPool.sol/IMembersValidator__factory";
 export type { ProvableNFT } from "./contracts/DirectPayments/ProvableNFT";
 export { ProvableNFT__factory } from "./factories/contracts/DirectPayments/ProvableNFT__factory";
-export type { GoodCollectiveSuperApp } from "./contracts/GoodCollective/GoodCollectiveSuperApp.sol/GoodCollectiveSuperApp";
-export { GoodCollectiveSuperApp__factory } from "./factories/contracts/GoodCollective/GoodCollectiveSuperApp.sol/GoodCollectiveSuperApp__factory";
-export type { IRegistry } from "./contracts/GoodCollective/GoodCollectiveSuperApp.sol/IRegistry";
-export { IRegistry__factory } from "./factories/contracts/GoodCollective/GoodCollectiveSuperApp.sol/IRegistry__factory";
+export type { GoodCollectiveSuperApp } from "./contracts/GoodCollective/GoodCollectiveSuperApp";
+export { GoodCollectiveSuperApp__factory } from "./factories/contracts/GoodCollective/GoodCollectiveSuperApp__factory";
+export type { IGoodCollectiveSuperApp } from "./contracts/GoodCollective/IGoodCollectiveSuperApp.sol/IGoodCollectiveSuperApp";
+export { IGoodCollectiveSuperApp__factory } from "./factories/contracts/GoodCollective/IGoodCollectiveSuperApp.sol/IGoodCollectiveSuperApp__factory";
+export type { IRegistry } from "./contracts/GoodCollective/IGoodCollectiveSuperApp.sol/IRegistry";
+export { IRegistry__factory } from "./factories/contracts/GoodCollective/IGoodCollectiveSuperApp.sol/IRegistry__factory";
 export type { SuperAppBaseFlow } from "./contracts/GoodCollective/SuperAppBaseFlow";
 export { SuperAppBaseFlow__factory } from "./factories/contracts/GoodCollective/SuperAppBaseFlow__factory";
-export type { IClaimable } from "./contracts/UBI/MultiClaimModule.sol/IClaimable";
-export { IClaimable__factory } from "./factories/contracts/UBI/MultiClaimModule.sol/IClaimable__factory";
-export type { IModule } from "./contracts/UBI/MultiClaimModule.sol/IModule";
-export { IModule__factory } from "./factories/contracts/UBI/MultiClaimModule.sol/IModule__factory";
-export type { MultiClaimModule } from "./contracts/UBI/MultiClaimModule.sol/MultiClaimModule";
-export { MultiClaimModule__factory } from "./factories/contracts/UBI/MultiClaimModule.sol/MultiClaimModule__factory";
-export type { UBIPool } from "./contracts/UBI/UBIPool.sol/UBIPool";
-export { UBIPool__factory } from "./factories/contracts/UBI/UBIPool.sol/UBIPool__factory";
+export type { HelperLibraryTest } from "./contracts/test/HelperLibraryTest";
+export { HelperLibraryTest__factory } from "./factories/contracts/test/HelperLibraryTest__factory";
+export type { UBIPool } from "./contracts/UBI/UBIPool";
+export { UBIPool__factory } from "./factories/contracts/UBI/UBIPool__factory";
 export type { UBIPoolFactory } from "./contracts/UBI/UBIPoolFactory";
 export { UBIPoolFactory__factory } from "./factories/contracts/UBI/UBIPoolFactory__factory";
 export type { HelperLibrary } from "./contracts/utils/HelperLibrary";

package/contracts/UBI/MultiClaimModule.sol

@@ -1,78 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-import { IERC20Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
-
-// Interface for ERC-7579 IModule (minimal implementation)
-interface IModule {
-    /**
-     * @dev This function is called by the smart account during installation of the module
-     * @param data arbitrary data that may be required on the module during `onInstall` initialization
-     *
-     * MUST revert on error (i.e. if module is already enabled)
-     */
-    function onInstall(bytes calldata data) external;
-
-    /**
-     * @dev This function is called by the smart account during uninstallation of the module
-     * @param data arbitrary data that may be required on the module during `onUninstall` de-initialization
-     *
-     * MUST revert on error
-     */
-    function onUninstall(bytes calldata data) external;
-
-    /**
-     * @dev Returns boolean value if module is a certain type
-     * @param typeID the module type ID according the ERC-7579 spec
-     *
-     * MUST return true if the module is of the given type and false otherwise
-     */
-    function isModuleType(uint256 typeID) external view returns (bool);
-
-    /**
-     * @dev Returns bit-encoded integer of the different typeIds of the module
-     *
-     * MUST return all the bit-encoded typeIds of the module
-     */
-    function getModuleTypes() external view returns (uint256);
-}
-
-interface IClaimable {
-    function claim() external;
-}
-
-contract MultiClaimModule is IModule {
-    // Function to claim tokens from multiple contracts
-    function multiClaim(
-        address[] calldata contracts,
-        IERC20Upgradeable token,
-        address recipient
-    ) external returns (bool[] memory success) {
-        // Loop through each contract address
-        uint256 tokenBalance = token.balanceOf(address(this));
-        success = new bool[](contracts.length);
-        for (uint i = 0; i < contracts.length; i++) {
-            try IClaimable(contracts[i]).claim() {
-                success[i] = true;
-            } catch {}
-        }
-
-        // Transfer any token balance after claims to recipient
-        uint256 tokenBalanceDiff = token.balanceOf(address(this)) - tokenBalance;
-        if (tokenBalanceDiff > 0) {
-            token.transfer(recipient, tokenBalanceDiff);
-        }
-    }
-
-    function onInstall(bytes calldata data) external override {}
-
-    function onUninstall(bytes calldata data) external override {}
-
-    function isModuleType(uint256 typeID) external view override returns (bool) {
-        return true;
-    }
-
-    function getModuleTypes() public view override returns (uint256) {
-        return 2;
-    }
-}

package/typechain-types/@gooddollar/goodprotocol/contracts/token/FeesFormula.sol/IFeesFormula.ts

@@ -1,115 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  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 interface IFeesFormulaInterface extends utils.Interface {
-  functions: {
-    "getTxFees(uint256,address,address)": FunctionFragment;
-  };
-
-  getFunction(nameOrSignatureOrTopic: "getTxFees"): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "getTxFees",
-    values: [
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<string>,
-      PromiseOrValue<string>
-    ]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "getTxFees", data: BytesLike): Result;
-
-  events: {};
-}
-
-export interface IFeesFormula extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: IFeesFormulaInterface;
-
-  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: {
-    getTxFees(
-      value: PromiseOrValue<BigNumberish>,
-      sender: PromiseOrValue<string>,
-      recipient: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber, boolean] & { fee: BigNumber; senderPays: boolean }>;
-  };
-
-  getTxFees(
-    value: PromiseOrValue<BigNumberish>,
-    sender: PromiseOrValue<string>,
-    recipient: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<[BigNumber, boolean] & { fee: BigNumber; senderPays: boolean }>;
-
-  callStatic: {
-    getTxFees(
-      value: PromiseOrValue<BigNumberish>,
-      sender: PromiseOrValue<string>,
-      recipient: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber, boolean] & { fee: BigNumber; senderPays: boolean }>;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    getTxFees(
-      value: PromiseOrValue<BigNumberish>,
-      sender: PromiseOrValue<string>,
-      recipient: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    getTxFees(
-      value: PromiseOrValue<BigNumberish>,
-      sender: PromiseOrValue<string>,
-      recipient: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}

package/typechain-types/@gooddollar/goodprotocol/contracts/token/FeesFormula.sol/index.ts

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

package/typechain-types/@uniswap/v3-periphery/contracts/index.ts

@@ -1,5 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type * as interfaces from "./interfaces";
-export type { interfaces };