remove cyclic imports

src/contracts/modules/credit-score.ts → src/contracts/contract-modules/credit-score.ts

@@ -5,14 +5,14 @@ import type {
   TypedDataDomain,
 } from "ethers";
 
-import { MasaSBTModuleBase } from "../../base/masa-sbt-module-base";
 import { Messages } from "../../collections";
 import type { PaymentMethod, PriceInformation } from "../../interface";
 import {
   generateSignatureDomain,
   isNativeCurrency,
   signTypedData,
 } from "../../utils";
+import { MasaSBTModuleBase } from "./sbt/masa-sbt-module-base";
 
 export class CreditScore extends MasaSBTModuleBase {
   /**

src/contracts/modules/green.ts → src/contracts/contract-modules/green.ts

@@ -5,14 +5,14 @@ import type {
   TypedDataDomain,
 } from "ethers";
 
-import { MasaSBTModuleBase } from "../../base/masa-sbt-module-base";
 import { Messages } from "../../collections";
 import type { PaymentMethod, PriceInformation } from "../../interface";
 import {
   generateSignatureDomain,
   isNativeCurrency,
   signTypedData,
 } from "../../utils";
+import { MasaSBTModuleBase } from "./sbt/masa-sbt-module-base";
 
 export class Green extends MasaSBTModuleBase {
   /**

src/contracts/modules/identity.ts → src/contracts/contract-modules/identity.ts

@@ -5,10 +5,10 @@ import {
   TypedDataDomain,
 } from "ethers";
 
-import { MasaSBTModuleBase } from "../../base/masa-sbt-module-base";
 import { Messages } from "../../collections";
 import type { PaymentMethod } from "../../interface";
 import { generateSignatureDomain, isNativeCurrency } from "../../utils";
+import { MasaSBTModuleBase } from "./sbt/masa-sbt-module-base";
 
 export class Identity extends MasaSBTModuleBase {
   /**

src/contracts/modules/index.ts → src/contracts/contract-modules/index.ts

@@ -1,4 +1,3 @@
-export * from "./contract-factory";
 export * from "./credit-score";
 export * from "./green";
 export * from "./identity";

src/base/masa-module-base.ts → src/contracts/contract-modules/masa-module-base.ts

@@ -16,16 +16,16 @@ import type {
 import { constants, utils } from "ethers";
 import { verifyTypedData } from "ethers/lib/utils";
 
-import { Messages } from "../collections";
+import { Messages } from "../../collections";
 import type {
   IIdentityContracts,
   MasaInterface,
   PaymentMethod,
-} from "../interface";
-import type { ERC20 } from "../stubs";
-import { ERC20__factory } from "../stubs";
-import { isERC20Currency, isNativeCurrency } from "../utils";
-import { MasaBase } from "./masa-base";
+} from "../../interface";
+import { MasaBase } from "../../masa-base";
+import type { ERC20 } from "../../stubs";
+import { ERC20__factory } from "../../stubs";
+import { isERC20Currency, isNativeCurrency } from "../../utils";
 
 export abstract class MasaModuleBase extends MasaBase {
   constructor(masa: MasaInterface, protected instances: IIdentityContracts) {

src/contracts/modules/sbt/ASBT/asbt-contract.ts → src/contracts/contract-modules/sbt/ASBT/asbt-contract.ts

@@ -1,8 +1,8 @@
 import type { ReferenceSBTAuthority } from "@masa-finance/masa-contracts-identity";
 import { MasaSBTAuthority__factory } from "@masa-finance/masa-contracts-identity";
 
-import { MasaSBTModuleBase } from "../../../../base/masa-sbt-module-base";
-import { ContractFactory } from "../../contract-factory";
+import { ContractFactory } from "../../../../interface/contract-factory";
+import { MasaSBTModuleBase } from "../masa-sbt-module-base";
 import { ASBTContractWrapper } from "./asbt-contract-wrapper";
 
 export class ASBTContract extends MasaSBTModuleBase {

src/contracts/modules/sbt/SBT/sbt-contract-wrapper.ts → src/contracts/contract-modules/sbt/SBT/sbt-contract-wrapper.ts

@@ -1,12 +1,12 @@
 import { MasaSBT } from "@masa-finance/masa-contracts-identity";
 
-import { MasaSBTModuleBase } from "../../../../base/masa-sbt-module-base";
 import type {
   IIdentityContracts,
   MasaInterface,
   PaymentMethod,
   PriceInformation,
 } from "../../../../interface";
+import { MasaSBTModuleBase } from "../masa-sbt-module-base";
 
 export class SBTContractWrapper<
   Contract extends MasaSBT

src/contracts/modules/sbt/SBT/sbt-contract.ts → src/contracts/contract-modules/sbt/SBT/sbt-contract.ts

@@ -1,8 +1,8 @@
 import type { MasaSBT } from "@masa-finance/masa-contracts-identity";
 import { MasaSBT__factory } from "@masa-finance/masa-contracts-identity";
 
-import { MasaSBTModuleBase } from "../../../../base/masa-sbt-module-base";
-import type { ContractFactory } from "../../contract-factory";
+import type { ContractFactory } from "../../../../interface/contract-factory";
+import { MasaSBTModuleBase } from "../masa-sbt-module-base";
 import { SBTContractWrapper } from "./sbt-contract-wrapper";
 
 export class SBTContract extends MasaSBTModuleBase {

src/contracts/modules/sbt/SSSBT/sssbt-contract.ts → src/contracts/contract-modules/sbt/SSSBT/sssbt-contract.ts

@@ -1,8 +1,8 @@
 import type { ReferenceSBTSelfSovereign } from "@masa-finance/masa-contracts-identity";
 import { MasaSBTSelfSovereign__factory } from "@masa-finance/masa-contracts-identity";
 
-import { MasaSBTModuleBase } from "../../../../base/masa-sbt-module-base";
-import type { ContractFactory } from "../../contract-factory";
+import type { ContractFactory } from "../../../../interface/contract-factory";
+import { MasaSBTModuleBase } from "../masa-sbt-module-base";
 import { SSSBTContractWrapper } from "./sssbt-contract-wrapper";
 
 export class SSSBTContract extends MasaSBTModuleBase {

src/base/masa-sbt-module-base.ts → src/contracts/contract-modules/sbt/masa-sbt-module-base.ts

@@ -2,10 +2,10 @@ import { BigNumber } from "@ethersproject/bignumber";
 import type { MasaSBT } from "@masa-finance/masa-contracts-identity";
 import { utils } from "ethers";
 
-import { ContractFactory } from "../contracts/modules/contract-factory";
-import type { PaymentMethod, PriceInformation } from "../interface";
-import { isNativeCurrency } from "../utils";
-import { MasaModuleBase } from "./masa-module-base";
+import type { PaymentMethod, PriceInformation } from "../../../interface";
+import { ContractFactory } from "../../../interface/contract-factory";
+import { isNativeCurrency } from "../../../utils";
+import { MasaModuleBase } from "../masa-module-base";
 
 export abstract class MasaSBTModuleBase extends MasaModuleBase {
   /**

src/contracts/modules/soul-linker.ts → src/contracts/contract-modules/soul-linker.ts

@@ -1,7 +1,6 @@
 import { BigNumber } from "@ethersproject/bignumber";
 import type { Contract, PayableOverrides } from "ethers";
 
-import { MasaModuleBase } from "../../base/masa-module-base";
 import { Messages } from "../../collections";
 import type {
   BaseResult,
@@ -11,6 +10,7 @@ import type {
 import type { Link } from "../../modules";
 import { loadLinks } from "../../modules";
 import { isNativeCurrency, signTypedData } from "../../utils";
+import { MasaModuleBase } from "./masa-module-base";
 
 export type BreakLinkResult = BaseResult;
 

src/contracts/modules/soul-name.ts → src/contracts/contract-modules/soul-name.ts

@@ -5,14 +5,14 @@ import type {
   TypedDataDomain,
 } from "ethers";
 
-import { MasaModuleBase } from "../../base/masa-module-base";
 import { Messages } from "../../collections";
 import type { PaymentMethod, PriceInformation } from "../../interface";
 import {
   generateSignatureDomain,
   isNativeCurrency,
   signTypedData,
 } from "../../utils";
+import { MasaModuleBase } from "./masa-module-base";
 
 export class SoulName extends MasaModuleBase {
   /**

src/contracts/index.ts

@@ -1,3 +1,3 @@
+export * from "./contract-modules";
 export * from "./load-Identity-contracts";
 export * from "./masa-contracts";
-export * from "./modules";

src/contracts/masa-contracts.ts

@@ -2,17 +2,17 @@ import type { LogDescription } from "@ethersproject/abi";
 import type { Log } from "@ethersproject/abstract-provider";
 import type { BaseContract } from "ethers";
 
-import { MasaBase } from "../base/masa-base";
 import type { IIdentityContracts, MasaInterface } from "../interface";
+import { MasaBase } from "../masa-base";
+import { CreditScore } from "./contract-modules/credit-score";
+import { Green } from "./contract-modules/green";
+import { Identity } from "./contract-modules/identity";
+import { ASBTContract } from "./contract-modules/sbt/ASBT";
+import { SBTContract } from "./contract-modules/sbt/SBT/sbt-contract";
+import { SSSBTContract } from "./contract-modules/sbt/SSSBT/sssbt-contract";
+import { SoulLinker } from "./contract-modules/soul-linker";
+import { SoulName } from "./contract-modules/soul-name";
 import { loadIdentityContracts } from "./load-Identity-contracts";
-import { CreditScore } from "./modules/credit-score";
-import { Green } from "./modules/green";
-import { Identity } from "./modules/identity";
-import { ASBTContract } from "./modules/sbt/ASBT";
-import { SBTContract } from "./modules/sbt/SBT/sbt-contract";
-import { SSSBTContract } from "./modules/sbt/SSSBT/sssbt-contract";
-import { SoulLinker } from "./modules/soul-linker";
-import { SoulName } from "./modules/soul-name";
 
 export class MasaContracts extends MasaBase {
   /**

src/base/masa-base.ts → src/masa-base.ts

@@ -1,4 +1,4 @@
-import type { MasaInterface } from "../interface";
+import type { MasaInterface } from "./interface";
 
 export abstract class MasaBase {
   public constructor(protected readonly masa: MasaInterface) {}

src/modules/account/account.ts

@@ -1,4 +1,4 @@
-import { MasaBase } from "../../base/masa-base";
+import { MasaBase } from "../../masa-base";
 import { getBalances } from "./get-balances";
 
 export class MasaAccount extends MasaBase {

src/modules/credit-score/credit-score.ts

@@ -1,8 +1,8 @@
 import type { SoulboundCreditScore } from "@masa-finance/masa-contracts-identity";
 import type { BigNumber } from "ethers";
 
-import { MasaLinkable } from "../../base/masa-linkable";
 import type { MasaInterface, PaymentMethod } from "../../interface";
+import { MasaLinkable } from "../masa-linkable";
 import { createCreditScore } from "./create";
 import { listCreditScores } from "./list";
 import { loadCreditScores } from "./load";

src/modules/green/green.ts

@@ -1,8 +1,8 @@
 import type { SoulboundGreen } from "@masa-finance/masa-contracts-identity";
 import type { BigNumber } from "ethers";
 
-import { MasaLinkable } from "../../base/masa-linkable";
 import type { MasaInterface, PaymentMethod } from "../../interface";
+import { MasaLinkable } from "..//masa-linkable";
 import { createGreen, generateGreen, mintGreen, verifyGreen } from "./create";
 import { listGreens } from "./list";
 import { loadGreens } from "./load";

src/modules/identity/identity.ts

@@ -1,7 +1,7 @@
 import type { SoulboundIdentity } from "@masa-finance/masa-contracts-identity";
 
-import { MasaLinkable } from "../../base/masa-linkable";
 import type { MasaInterface, PaymentMethod } from "../../interface";
+import { MasaLinkable } from "..//masa-linkable";
 import { burnIdentity } from "./burn";
 import { createIdentity, createIdentityWithSoulName } from "./create";
 import { loadIdentityByAddress } from "./load";

src/base/masa-linkable.ts → src/modules/masa-linkable.ts

@@ -1,8 +1,8 @@
 import type { Contract } from "ethers";
 
 import type { MasaInterface } from "../interface";
+import { MasaBase } from "../masa-base";
 import { MasaSoulLinker } from "../modules/soul-linker/soul-linker";
-import { MasaBase } from "./masa-base";
 
 export abstract class MasaLinkable<
   LinkContract extends Contract

src/modules/sbt/ASBT/masa-asbt.ts

@@ -3,8 +3,8 @@ import {
   ReferenceSBTAuthority__factory,
 } from "@masa-finance/masa-contracts-identity";
 
-import { MasaBase } from "../../../base/masa-base";
-import { ContractFactory } from "../../../contracts/modules/contract-factory";
+import { ContractFactory } from "../../../interface/contract-factory";
+import { MasaBase } from "../../../masa-base";
 import { deployASBT } from "./deploy";
 import { MasaASBTWrapper } from "./masa-asbt-wrapper";
 

src/modules/sbt/SBT/masa-sbt-wrapper.ts

@@ -1,9 +1,9 @@
 import type { MasaSBT } from "@masa-finance/masa-contracts-identity";
 import type { BigNumber } from "ethers";
 
-import { MasaLinkable } from "../../../base/masa-linkable";
 import { Messages } from "../../../collections";
 import { isBigNumber, patchMetadataUrl } from "../../../utils";
+import { MasaLinkable } from "../../masa-linkable";
 
 export class MasaSBTWrapper<
   Contract extends MasaSBT

src/modules/sbt/SBT/masa-sbt.ts

@@ -3,8 +3,8 @@ import {
   MasaSBT__factory,
 } from "@masa-finance/masa-contracts-identity";
 
-import { MasaBase } from "../../../base/masa-base";
-import type { ContractFactory } from "../../../contracts/modules/contract-factory";
+import type { ContractFactory } from "../../../interface/contract-factory";
+import { MasaBase } from "../../../masa-base";
 import { MasaSBTWrapper } from "./masa-sbt-wrapper";
 
 export class MasaSBTBase extends MasaBase {

src/modules/sbt/SSSBT/masa-sssbt.ts

@@ -3,8 +3,8 @@ import {
   ReferenceSBTSelfSovereign__factory,
 } from "@masa-finance/masa-contracts-identity";
 
-import { MasaBase } from "../../../base/masa-base";
-import { ContractFactory } from "../../../contracts/modules/contract-factory";
+import { ContractFactory } from "../../../interface/contract-factory";
+import { MasaBase } from "../../../masa-base";
 import { deploySSSBT } from "./deploy";
 import { MasaSSSBTWrapper } from "./masa-sssbt-wrapper";
 

src/modules/session/session.ts

@@ -1,4 +1,4 @@
-import { MasaBase } from "../../base/masa-base";
+import { MasaBase } from "../../masa-base";
 import { checkLogin } from "./check-login";
 import { getSession } from "./get-session";
 import { login } from "./login";

src/modules/soul-linker/soul-linker.ts

@@ -1,7 +1,7 @@
 import type { BigNumber, Contract } from "ethers";
 
-import { MasaBase } from "../../base/masa-base";
 import type { MasaInterface, PaymentMethod } from "../../interface";
+import { MasaBase } from "../../masa-base";
 import { createLink } from "./create-link";
 import { establishLinkFromPassport } from "./establish-link";
 import { listLinks } from "./list-links";

src/modules/soul-name/soul-name.ts

@@ -1,7 +1,7 @@
 import type { BigNumber } from "@ethersproject/bignumber";
 
-import { MasaBase } from "../../base/masa-base";
 import type { PaymentMethod } from "../../interface";
+import { MasaBase } from "../../masa-base";
 import { burnSoulName } from "./burn";
 import { createSoulName } from "./create";
 import { getSoulNameMetadataPrefix } from "./helpers";

src/utils/clients/masa-client.ts

@@ -1,7 +1,6 @@
 import type { AxiosError, AxiosInstance, AxiosResponse } from "axios";
 import axios from "axios";
 
-import { MasaBase } from "../../base/masa-base";
 import type {
   ChallengeResult,
   ChallengeResultWithCookie,
@@ -20,6 +19,7 @@ import type {
   UpdateCreditScoreResult,
   VerifyGreenResult,
 } from "../../interface";
+import { MasaBase } from "../../masa-base";
 
 const headers = {
   "Content-Type": "application/json",