Merge pull request paltalabs#82 from paltalabs/fix-dependencies-and-warning

Moving types definitions for removing circular dependencies

Author: esteblock

packages/contracts/src/useRegisteredContract.tsx

@@ -1,7 +1,9 @@
 import { useSorobanReact } from '@soroban-react/core'
-import {type ContractDeploymentInfo, type WrappedContract, type WrappedContractInvokeArgs} from '@soroban-react/types'
+import {type ContractDeploymentInfo} from '@soroban-react/types'
 import { contractInvoke,type InvokeArgs } from './contractInvoke'
+import {TxResponse} from '.'
 import { useCallback, useEffect, useState } from 'react';
+import * as StellarSdk from '@stellar/stellar-sdk'
 
 const getDeployment = (deployments: ContractDeploymentInfo[], contractId: string, networkPassphrase: string) => {
     let deployment = deployments.find((deployment) => {
@@ -18,6 +20,24 @@ const getDeployment = (deployments: ContractDeploymentInfo[], contractId: string
     }
 }
 
+export type WrappedContractInvokeArgs = {
+  // NO NEED contractAddress: string
+  method: string
+  args?: StellarSdk.xdr.ScVal[] | undefined
+  signAndSend?: boolean
+  fee?: number
+  skipAddingFootprint?: boolean
+  secretKey?: string
+  // NO NEED MAYBE sorobanContext: SorobanContextType
+  // If useSorobanReact called inside of wrapped function
+  reconnectAfterTx?: boolean
+}
+
+export type WrappedContract = {
+  deploymentInfo: ContractDeploymentInfo,
+  invoke: (args: WrappedContractInvokeArgs) => Promise<TxResponse | StellarSdk.xdr.ScVal>
+}
+
 export const useWrappedContract = (
     deploymentInfo: ContractDeploymentInfo
   ) => {

packages/core/package.json

@@ -42,7 +42,6 @@
     "@soroban-react/freighter": "^9.0.2",
     "@soroban-react/types": "^9.0.2",
     "@soroban-react/xbull": "^1.0.1",
-    "@soroban-react/contracts": "^9.0.2",
     "@stellar/stellar-sdk": "11.1.0"
   },
   "devDependencies": {

packages/types/package.json

@@ -15,8 +15,7 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@stellar/stellar-sdk": "11.1.0",
-    "@soroban-react/contracts": "^9.0.2"
+    "@stellar/stellar-sdk": "11.1.0"
   },
   "main": "dist/index.js",
   "exports": "./dist/index.js",

packages/types/src/index.tsx

@@ -62,26 +62,4 @@ export type ContractDeploymentInfo = {
   contractId: string,
   networkPassphrase: string,
   contractAddress: string
-}
-
-import * as StellarSdk from '@stellar/stellar-sdk'
-
-export type WrappedContractInvokeArgs = {
-  // NO NEED contractAddress: string
-  method: string
-  args?: StellarSdk.xdr.ScVal[] | undefined
-  signAndSend?: boolean
-  fee?: number
-  skipAddingFootprint?: boolean
-  secretKey?: string
-  // NO NEED MAYBE sorobanContext: SorobanContextType
-  // If useSorobanReact called inside of wrapped function
-  reconnectAfterTx?: boolean
-}
-
-import {TxResponse} from '@soroban-react/contracts'
-
-export type WrappedContract = {
-  deploymentInfo: ContractDeploymentInfo,
-  invoke: (args: WrappedContractInvokeArgs) => Promise<TxResponse | StellarSdk.xdr.ScVal>
 }