safe-global · yagopv · Sep 18, 2024 · Sep 16, 2024 · Sep 17, 2024 · Sep 17, 2024
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -21,7 +21,7 @@ Please describe concisely the bug you have found.
   - api-kit:
   - protocol-kit:
   - relay-kit:
-  - safe-core-sdk-types:
+  - types-kit:
   - sdk-starter-kit:
 - Safe contract version: 
 - Environment:

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ If you want to develop using Safe Smart Accounts in a Javascript/Typescript app,
 | [protocol-kit](https://github.com/safe-global/safe-core-sdk/tree/main/packages/protocol-kit)                 | [![npm Version](https://badge.fury.io/js/%40safe-global%2Fprotocol-kit.svg)](https://badge.fury.io/js/%40safe-global%2Fprotocol-kit)       | TypeScript library that facilitates the interaction with [Safe Smart Accounts](https://github.com/safe-global/safe-smart-account). Can be used to create new Safe accounts, update the configuration of existing Safes, create and execute transactions, among other features.                                              |
 | [api-kit](https://github.com/safe-global/safe-core-sdk/tree/main/packages/api-kit)                           | [![npm Version](https://badge.fury.io/js/%40safe-global%2Fapi-kit.svg)](https://badge.fury.io/js/%40safe-global%2Fapi-kit)                 | [Safe Transaction Service API](https://github.com/safe-global/safe-transaction-service) typescript library. Allows to propose and share transactions with the other signers of a Safe, sending the signatures to the service to collect them, and getting information about a Safe, among other features.                                                                       |
 | [relay-kit](https://github.com/safe-global/safe-core-sdk/tree/main/packages/relay-kit)                       | [![npm Version](https://badge.fury.io/js/%40safe-global%2Frelay-kit.svg)](https://badge.fury.io/js/%40safe-global%2Frelay-kit)             | Typescript library that enables ERC-4337 with Safe and allows users to pay for the transaction fees from their Safe account balance using the blockchain native token or ERC-20 tokens, or to get their transactions sponsored.                                                                            |
-| [safe-core-sdk-types](https://github.com/safe-global/safe-core-sdk/tree/main/packages/safe-core-sdk-types)   | [![npm Version](https://badge.fury.io/js/%40safe-global%2Fsafe-core-sdk-types.svg)](https://badge.fury.io/js/%40safe-global%2Fsafe-core-sdk-types)  | Common types used in the [Safe Core SDK](https://github.com/safe-global/safe-core-sdk/tree/main/packages) packages.                                                  |
+| [types-kit](https://github.com/safe-global/safe-core-sdk/tree/main/packages/types-kit)   | [![npm Version](https://badge.fury.io/js/%40safe-global%2Ftypes-kit.svg)](https://badge.fury.io/js/%40safe-global%2Ftypes-kit)  | Common types used in the [Safe Core SDK](https://github.com/safe-global/safe-core-sdk/tree/main/packages) packages.                                                  |
 
 ## Guides
 

diff --git a/guides/README.md b/guides/README.md
@@ -9,7 +9,7 @@ Read about the basics of Safe and [how it compares to other solutions](https://h
 The [Safe Core SDK](https://github.com/safe-global/safe-core-sdk) is a monorepo that contains software developer tools that allows interaction with [Safe Smart Accounts](https://github.com/safe-global/safe-smart-account) and the [Safe Transaction Service API](https://github.com/safe-global/safe-transaction-service).
 
 In this guide we will use the following packages to deploy new Safes, create transactions, collect off-chain signatures and execute transactions:
-* **safe-core-sdk-types**
+* **types-kit**
 
   Contains the types that are shared among the different packages inside the monorepo.
 

diff --git a/guides/integrating-the-safe-core-sdk.md b/guides/integrating-the-safe-core-sdk.md
@@ -17,7 +17,7 @@
 To integrate the [Safe Core SDK](https://github.com/safe-global/safe-core-sdk) into your Dapp or script you will need to install these dependencies:
 
 ```
-@safe-global/safe-core-sdk-types
+@safe-global/types-kit
 @safe-global/protocol-kit
 @safe-global/api-kit
 ```
@@ -143,7 +143,7 @@ When the array contains only one transaction, it is not wrapped in the MultiSend
 
 ```js
 import { SafeTransactionOptionalProps } from '@safe-global/protocol-kit'
-import { MetaTransactionData } from '@safe-global/safe-core-sdk-types'
+import { MetaTransactionData } from '@safe-global/types-kit'
 
 const transactions: MetaTransactionData[] = [
   {

diff --git a/packages/api-kit/package.json b/packages/api-kit/package.json
@@ -59,7 +59,7 @@
   },
   "dependencies": {
     "@safe-global/protocol-kit": "^4.1.0",
-    "@safe-global/safe-core-sdk-types": "^5.1.0",
+    "@safe-global/types-kit": "^1.0.0",
     "node-fetch": "^2.7.0",
     "viem": "^2.21.8"
   }

diff --git a/packages/api-kit/src/SafeApiKit.ts b/packages/api-kit/src/SafeApiKit.ts
@@ -41,7 +41,7 @@
   SafeOperation,
   SafeOperationConfirmationListResponse,
   SafeOperationResponse
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import { TRANSACTION_SERVICE_URLS } from './utils/config'
 import { isEmptyData } from './utils'
 import { getAddSafeOperationProps } from './utils/safeOperation'
@@ -120,7 +120,7 @@
   * @throws "Not Found"
   * @throws "Ensure this field has at least 1 hexadecimal chars (not counting 0x)."
   */
  async decodeData(data: string): Promise<any> {
    if (data === '') {
      throw new Error('Invalid data')
    }
@@ -330,7 +330,7 @@
    const { address: delegator } = this.#getEip3770Address(delegatorAddress)
    const signature = await signDelegate(signer, delegate, this.#chainId)

    const body: any = {
      safe: safeAddress ? this.#getEip3770Address(safeAddress).address : null,
      delegate,
      delegator,

diff --git a/packages/api-kit/src/types/safeTransactionServiceTypes.ts b/packages/api-kit/src/types/safeTransactionServiceTypes.ts
@@ -5,7 +5,7 @@ import {
   UserOperation,
   SafeOperationResponse,
   ListResponse
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 
 export type ListOptions = {
   /** Maximum number of results to return per page */

diff --git a/packages/api-kit/src/utils/safeOperation.ts b/packages/api-kit/src/utils/safeOperation.ts
@@ -1,4 +1,4 @@
-import { SafeOperation } from '@safe-global/safe-core-sdk-types'
+import { SafeOperation } from '@safe-global/types-kit'
 
 export const getAddSafeOperationProps = async (safeOperation: SafeOperation) => {
   const userOperation = safeOperation.toUserOperation()

diff --git a/packages/api-kit/tests/e2e/addMessageSignature.test.ts b/packages/api-kit/tests/e2e/addMessageSignature.test.ts
@@ -5,7 +5,7 @@ import Safe, {
   SigningMethod,
   buildContractSignature
 } from '@safe-global/protocol-kit'
-import { SafeMessage } from '@safe-global/safe-core-sdk-types'
+import { SafeMessage } from '@safe-global/types-kit'
 import SafeApiKit from '@safe-global/api-kit/index'
 import chai from 'chai'
 import chaiAsPromised from 'chai-as-promised'

diff --git a/packages/api-kit/tests/e2e/confirmSafeOperation.test.ts b/packages/api-kit/tests/e2e/confirmSafeOperation.test.ts
@@ -6,7 +6,7 @@ import { BundlerClient, Safe4337InitOptions, Safe4337Pack } from '@safe-global/r
 import { generateTransferCallData } from '@safe-global/relay-kit/packs/safe-4337/testing-utils/helpers'
 import SafeApiKit from '@safe-global/api-kit/index'
 import { getAddSafeOperationProps } from '@safe-global/api-kit/utils/safeOperation'
-import { SafeOperation } from '@safe-global/safe-core-sdk-types'
+import { SafeOperation } from '@safe-global/types-kit'
 // Needs to be imported from dist folder in order to mock the getEip4337BundlerProvider function
 import * as safe4337Utils from '@safe-global/relay-kit/dist/src/packs/safe-4337/utils'
 import { getApiKit, getEip1193Provider } from '../utils/setupKits'

diff --git a/packages/api-kit/tests/e2e/confirmTransaction.test.ts b/packages/api-kit/tests/e2e/confirmTransaction.test.ts
@@ -7,7 +7,7 @@ import Safe, {
 import {
   SafeMultisigConfirmationResponse,
   SafeTransactionDataPartial
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import SafeApiKit from '@safe-global/api-kit/index'
 import chai from 'chai'
 import chaiAsPromised from 'chai-as-promised'

diff --git a/packages/api-kit/tests/e2e/getSafeOperationsByAddress.test.ts b/packages/api-kit/tests/e2e/getSafeOperationsByAddress.test.ts
@@ -1,5 +1,5 @@
 import SafeApiKit from '@safe-global/api-kit/index'
-import { SafeOperationResponse } from '@safe-global/safe-core-sdk-types'
+import { SafeOperationResponse } from '@safe-global/types-kit'
 import chai from 'chai'
 import chaiAsPromised from 'chai-as-promised'
 import { getApiKit } from '../utils/setupKits'

diff --git a/packages/api-kit/tests/endpoint/index.test.ts b/packages/api-kit/tests/endpoint/index.test.ts
@@ -13,7 +13,7 @@ import SafeApiKit, {
 } from '@safe-global/api-kit/index'
 import * as httpRequests from '@safe-global/api-kit/utils/httpRequests'
 import Safe from '@safe-global/protocol-kit'
-import { UserOperation } from '@safe-global/safe-core-sdk-types'
+import { UserOperation } from '@safe-global/types-kit'
 import { signDelegate } from '@safe-global/api-kit/utils/signDelegate'
 import config from '../utils/config'
 import { getApiKit, getKits } from '../utils/setupKits'

diff --git a/packages/protocol-kit/package.json b/packages/protocol-kit/package.json
@@ -68,7 +68,7 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.3.3",
-    "@safe-global/safe-core-sdk-types": "^5.1.0",
+    "@safe-global/types-kit": "^1.0.0",
     "@safe-global/safe-deployments": "^1.37.5",
     "@safe-global/safe-modules-deployments": "^2.2.1",
     "abitype": "^1.0.2",

diff --git a/packages/protocol-kit/scripts/safe-deployments/utils.ts b/packages/protocol-kit/scripts/safe-deployments/utils.ts
@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { SafeVersion } from '@safe-global/safe-core-sdk-types'
+import { SafeVersion } from '@safe-global/types-kit'
 import { DeploymentFilter, getSafeSingletonDeployment } from '@safe-global/safe-deployments'
 import { networks } from '../../src/utils/eip-3770/config'
 

diff --git a/packages/protocol-kit/src/Safe.ts b/packages/protocol-kit/src/Safe.ts
@@ -14,7 +14,7 @@ import {
   EIP712TypedData,
   SafeTransactionData,
   CompatibilityFallbackHandlerContractType
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import {
   encodeSetupCallData,
   getChainSpecificDefaultSaltNonce,

diff --git a/packages/protocol-kit/src/SafeFactory.ts b/packages/protocol-kit/src/SafeFactory.ts
@@ -22,7 +22,7 @@ import {
   SafeFactoryInitConfig,
   DeploySafeProps
 } from '@safe-global/protocol-kit/types'
-import { SafeVersion } from '@safe-global/safe-core-sdk-types'
+import { SafeVersion } from '@safe-global/types-kit'
 import SafeProvider from '@safe-global/protocol-kit/SafeProvider'
 
 class SafeFactory {

diff --git a/packages/protocol-kit/src/SafeProvider.ts b/packages/protocol-kit/src/SafeProvider.ts
@@ -15,7 +15,7 @@
   Eip3770Address,
   SafeEIP712Args,
   SafeVersion
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import {
   getCompatibilityFallbackHandlerContractInstance,
   getCreateCallContractInstance,
@@ -509,11 +509,11 @@
  }

  // TODO: fix anys
  encodeParameters(types: string, values: any[]): string {
    return encodeAbiParameters(parseAbiParameters(types), values)
  }

  decodeParameters(types: string, values: string): { [key: string]: any } {
    return decodeAbiParameters(parseAbiParameters(types), asHex(values))
  }


diff --git a/packages/protocol-kit/src/contracts/BaseContract.ts b/packages/protocol-kit/src/contracts/BaseContract.ts
@@ -9,7 +9,7 @@
   GetAddressFunction,
   SafeVersion,
   TransactionOptions
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import { getChainById } from '../utils/types'
 import {
   WalletTransactionOptions,
@@ -171,7 +171,7 @@
      functionName
    >
  >(functionName: functionName, args: functionArgs, options?: TransactionOptions) {
    const converted = (await this.convertOptions(options)) as any

    return await this.getWallet().writeContract({
      address: this.contractAddress,

diff --git a/...it/src/contracts/CompatibilityFallbackHandler/CompatibilityFallbackHandlerBaseContract.ts b/...it/src/contracts/CompatibilityFallbackHandler/CompatibilityFallbackHandlerBaseContract.ts
@@ -2,7 +2,7 @@ import { Abi } from 'abitype'
 
 import SafeProvider from '@safe-global/protocol-kit/SafeProvider'
 import BaseContract from '@safe-global/protocol-kit/contracts/BaseContract'
-import { SafeVersion } from '@safe-global/safe-core-sdk-types'
+import { SafeVersion } from '@safe-global/types-kit'
 import { contractName } from '@safe-global/protocol-kit/contracts/config'
 import { ExternalClient } from '@safe-global/protocol-kit/types'
 

diff --git a/...tracts/CompatibilityFallbackHandler/v1.3.0/CompatibilityFallbackHandlerContract_v1_3_0.ts b/...tracts/CompatibilityFallbackHandler/v1.3.0/CompatibilityFallbackHandlerContract_v1_3_0.ts
@@ -5,7 +5,7 @@ import {
   CompatibilityFallbackHandlerContract_v1_3_0_Abi,
   CompatibilityFallbackHandlerContract_v1_3_0_Contract,
   compatibilityFallbackHandler_1_3_0_ContractArtifacts
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 
 /**
  * CompatibilityFallbackHandlerContract_v1_3_0  is the implementation specific to the CompatibilityFallbackHandler contract version 1.3.0.

diff --git a/...tracts/CompatibilityFallbackHandler/v1.4.1/CompatibilityFallbackHandlerContract_v1_4_1.ts b/...tracts/CompatibilityFallbackHandler/v1.4.1/CompatibilityFallbackHandlerContract_v1_4_1.ts
@@ -5,7 +5,7 @@ import {
   CompatibilityFallbackHandlerContract_v1_4_1_Abi,
   CompatibilityFallbackHandlerContract_v1_4_1_Contract,
   SafeVersion
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 
 /**
  * CompatibilityFallbackHandlerContract_v1_4_1  is the implementation specific to the CompatibilityFallbackHandler contract version 1.4.1.

diff --git a/packages/protocol-kit/src/contracts/CreateCall/CreateCallBaseContract.ts b/packages/protocol-kit/src/contracts/CreateCall/CreateCallBaseContract.ts
@@ -2,7 +2,7 @@ import { Abi } from 'abitype'
 
 import SafeProvider from '@safe-global/protocol-kit/SafeProvider'
 import BaseContract from '@safe-global/protocol-kit/contracts/BaseContract'
-import { SafeVersion } from '@safe-global/safe-core-sdk-types'
+import { SafeVersion } from '@safe-global/types-kit'
 import { contractName } from '@safe-global/protocol-kit/contracts/config'
 import { ExternalClient } from '@safe-global/protocol-kit/types'
 

diff --git a/packages/protocol-kit/src/contracts/CreateCall/v1.3.0/CreateCallContract_v1_3_0.ts b/packages/protocol-kit/src/contracts/CreateCall/v1.3.0/CreateCallContract_v1_3_0.ts
@@ -5,7 +5,7 @@ import {
   CreateCallContract_v1_3_0_Contract,
   createCall_1_3_0_ContractArtifacts,
   SafeContractFunction
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import { toTxResult } from '@safe-global/protocol-kit/contracts/utils'
 import SafeProvider from '@safe-global/protocol-kit/SafeProvider'
 

diff --git a/packages/protocol-kit/src/contracts/CreateCall/v1.4.1/CreateCallContract_v1_4_1.ts b/packages/protocol-kit/src/contracts/CreateCall/v1.4.1/CreateCallContract_v1_4_1.ts
@@ -6,7 +6,7 @@ import {
   CreateCallContract_v1_4_1_Contract,
   createCall_1_4_1_ContractArtifacts,
   SafeContractFunction
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import { toTxResult } from '@safe-global/protocol-kit/contracts/utils'
 
 /**

diff --git a/packages/protocol-kit/src/contracts/MultiSend/MultiSendBaseContract.ts b/packages/protocol-kit/src/contracts/MultiSend/MultiSendBaseContract.ts
@@ -1,7 +1,7 @@
 import { Abi } from 'abitype'
 
 import SafeProvider from '@safe-global/protocol-kit/SafeProvider'
-import { SafeVersion } from '@safe-global/safe-core-sdk-types'
+import { SafeVersion } from '@safe-global/types-kit'
 import BaseContract from '@safe-global/protocol-kit/contracts/BaseContract'
 import { contractName } from '@safe-global/protocol-kit/contracts/config'
 

diff --git a/packages/protocol-kit/src/contracts/MultiSend/MultiSendCallOnlyBaseContract.ts b/packages/protocol-kit/src/contracts/MultiSend/MultiSendCallOnlyBaseContract.ts
@@ -1,7 +1,7 @@
 import { Abi } from 'abitype'
 
 import SafeProvider from '@safe-global/protocol-kit/SafeProvider'
-import { SafeVersion } from '@safe-global/safe-core-sdk-types'
+import { SafeVersion } from '@safe-global/types-kit'
 import BaseContract from '@safe-global/protocol-kit/contracts/BaseContract'
 import { contractName } from '@safe-global/protocol-kit/contracts/config'
 

diff --git a/packages/protocol-kit/src/contracts/MultiSend/v1.1.1/MultiSendContract_v1_1_1.ts b/packages/protocol-kit/src/contracts/MultiSend/v1.1.1/MultiSendContract_v1_1_1.ts
@@ -5,7 +5,7 @@ import {
   multisend_1_1_1_ContractArtifacts,
   MultiSendContract_v1_1_1_Abi,
   MultiSendContract_v1_1_1_Contract
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 
 /**
  * MultiSendContract_v1_1_1  is the implementation specific to the MultiSend contract version 1.1.1.

diff --git a/packages/protocol-kit/src/contracts/MultiSend/v1.3.0/MultiSendCallOnlyContract_v1_3_0.ts b/packages/protocol-kit/src/contracts/MultiSend/v1.3.0/MultiSendCallOnlyContract_v1_3_0.ts
@@ -5,7 +5,7 @@ import {
   MultiSendCallOnlyContract_v1_3_0_Abi,
   MultiSendCallOnlyContract_v1_3_0_Contract,
   multiSendCallOnly_1_3_0_ContractArtifacts
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 
 /**
  * MultiSendCallOnlyContract_v1_3_0  is the implementation specific to the MultiSendCallOnly contract version 1.3.0.

diff --git a/packages/protocol-kit/src/contracts/MultiSend/v1.3.0/MultiSendContract_v1_3_0.ts b/packages/protocol-kit/src/contracts/MultiSend/v1.3.0/MultiSendContract_v1_3_0.ts
@@ -5,7 +5,7 @@ import {
   multisend_1_3_0_ContractArtifacts,
   MultiSendContract_v1_3_0_Abi,
   MultiSendContract_v1_3_0_Contract
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 
 /**
  * MultiSendContract_v1_3_0  is the implementation specific to the MultiSend contract version 1.3.0.

diff --git a/packages/protocol-kit/src/contracts/MultiSend/v1.4.1/MultiSendCallOnlyContract_v1_4_1.ts b/packages/protocol-kit/src/contracts/MultiSend/v1.4.1/MultiSendCallOnlyContract_v1_4_1.ts
@@ -5,7 +5,7 @@ import {
   multiSendCallOnly_1_4_1_ContractArtifacts,
   MultiSendCallOnlyContract_v1_4_1_Abi,
   MultiSendCallOnlyContract_v1_4_1_Contract
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 
 /**
  * MultiSendCallOnlyContract_v1_4_1  is the implementation specific to the MultiSend contract version 1.4.1.

diff --git a/packages/protocol-kit/src/contracts/MultiSend/v1.4.1/MultiSendContract_v1_4_1.ts b/packages/protocol-kit/src/contracts/MultiSend/v1.4.1/MultiSendContract_v1_4_1.ts
@@ -5,7 +5,7 @@ import {
   MultiSendContract_v1_4_1_Abi,
   MultiSendContract_v1_4_1_Contract,
   multisend_1_4_1_ContractArtifacts
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 
 /**
  * MultiSendContract_v1_4_1  is the implementation specific to the MultiSend contract version 1.4.1.

diff --git a/packages/protocol-kit/src/contracts/Safe/SafeBaseContract.ts b/packages/protocol-kit/src/contracts/Safe/SafeBaseContract.ts
@@ -1,7 +1,7 @@
 import { Abi } from 'abitype'
 
 import SafeProvider from '@safe-global/protocol-kit/SafeProvider'
-import { SafeVersion } from '@safe-global/safe-core-sdk-types'
+import { SafeVersion } from '@safe-global/types-kit'
 import BaseContract from '@safe-global/protocol-kit/contracts/BaseContract'
 import { contractName, safeDeploymentsL1ChainIds } from '@safe-global/protocol-kit/contracts/config'
 import { SAFE_FEATURES, hasSafeFeature } from '@safe-global/protocol-kit/utils'

diff --git a/packages/protocol-kit/src/contracts/Safe/v1.0.0/SafeContract_v1_0_0.ts b/packages/protocol-kit/src/contracts/Safe/v1.0.0/SafeContract_v1_0_0.ts
@@ -13,7 +13,7 @@ import {
   safe_1_0_0_ContractArtifacts,
   TransactionOptions,
   TransactionResult
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import { SENTINEL_ADDRESS } from '@safe-global/protocol-kit/utils/constants'
 import { asHash, asHex } from '@safe-global/protocol-kit/utils/types'
 

diff --git a/packages/protocol-kit/src/contracts/Safe/v1.1.1/SafeContract_v1_1_1.ts b/packages/protocol-kit/src/contracts/Safe/v1.1.1/SafeContract_v1_1_1.ts
@@ -12,7 +12,7 @@ import {
   safe_1_1_1_ContractArtifacts,
   TransactionOptions,
   TransactionResult
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import { asHash, asHex } from '@safe-global/protocol-kit/utils/types'
 import { ContractFunctionArgs } from 'viem'
 

diff --git a/packages/protocol-kit/src/contracts/Safe/v1.2.0/SafeContract_v1_2_0.ts b/packages/protocol-kit/src/contracts/Safe/v1.2.0/SafeContract_v1_2_0.ts
@@ -11,7 +11,7 @@ import {
   safe_1_2_0_ContractArtifacts,
   TransactionOptions,
   TransactionResult
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import { asHash, asHex } from '@safe-global/protocol-kit/utils/types'
 import { ContractFunctionArgs } from 'viem'
 

diff --git a/packages/protocol-kit/src/contracts/Safe/v1.3.0/SafeContract_v1_3_0.ts b/packages/protocol-kit/src/contracts/Safe/v1.3.0/SafeContract_v1_3_0.ts
@@ -12,7 +12,7 @@ import {
   safe_1_3_0_ContractArtifacts,
   TransactionOptions,
   TransactionResult
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import { asHash, asHex } from '@safe-global/protocol-kit/utils/types'
 import { ContractFunctionArgs } from 'viem'
 

diff --git a/packages/protocol-kit/src/contracts/Safe/v1.4.1/SafeContract_v1_4_1.ts b/packages/protocol-kit/src/contracts/Safe/v1.4.1/SafeContract_v1_4_1.ts
@@ -12,7 +12,7 @@ import {
   safe_1_4_1_ContractArtifacts,
   TransactionOptions,
   TransactionResult
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import { asHash, asHex } from '@safe-global/protocol-kit/utils/types'
 import { ContractFunctionArgs } from 'viem'
 

diff --git a/packages/protocol-kit/src/contracts/SafeProxyFactory/SafeProxyFactoryBaseContract.ts b/packages/protocol-kit/src/contracts/SafeProxyFactory/SafeProxyFactoryBaseContract.ts
@@ -5,7 +5,7 @@ import {
   SafeVersion,
   TransactionOptions,
   CreateProxyProps as CreateProxyPropsGeneral
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import { contractName } from '@safe-global/protocol-kit/contracts/config'
 import { ExternalClient } from '@safe-global/protocol-kit/types'
 

diff --git a/...ges/protocol-kit/src/contracts/SafeProxyFactory/v1.0.0/SafeProxyFactoryContract_v1_0_0.ts b/...ges/protocol-kit/src/contracts/SafeProxyFactory/v1.0.0/SafeProxyFactoryContract_v1_0_0.ts
@@ -9,7 +9,7 @@ import {
   SafeProxyFactoryContract_v1_0_0_Contract,
   SafeProxyFactoryContract_v1_0_0_Function,
   safeProxyFactory_1_0_0_ContractArtifacts
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import { waitForTransactionReceipt } from '@safe-global/protocol-kit/utils'
 import { asHex } from '@safe-global/protocol-kit/utils/types'
 import { ExternalClient } from '@safe-global/protocol-kit/types'

diff --git a/...ges/protocol-kit/src/contracts/SafeProxyFactory/v1.1.1/SafeProxyFactoryContract_v1_1_1.ts b/...ges/protocol-kit/src/contracts/SafeProxyFactory/v1.1.1/SafeProxyFactoryContract_v1_1_1.ts
@@ -9,7 +9,7 @@ import {
   SafeProxyFactoryContract_v1_1_1_Contract,
   SafeProxyFactoryContract_v1_1_1_Function,
   safeProxyFactory_1_1_1_ContractArtifacts
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import { waitForTransactionReceipt } from '@safe-global/protocol-kit/utils'
 import { asHex } from '@safe-global/protocol-kit/utils/types'
 import { ExternalClient } from '@safe-global/protocol-kit/types'

diff --git a/...ges/protocol-kit/src/contracts/SafeProxyFactory/v1.3.0/SafeProxyFactoryContract_v1_3_0.ts b/...ges/protocol-kit/src/contracts/SafeProxyFactory/v1.3.0/SafeProxyFactoryContract_v1_3_0.ts
@@ -9,7 +9,7 @@ import {
   SafeProxyFactoryContract_v1_3_0_Contract,
   SafeProxyFactoryContract_v1_3_0_Function,
   safeProxyFactory_1_3_0_ContractArtifacts
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import { waitForTransactionReceipt } from '@safe-global/protocol-kit/utils'
 import { asHex } from '@safe-global/protocol-kit/utils/types'
 import { ExternalClient } from '@safe-global/protocol-kit/types'

diff --git a/...ges/protocol-kit/src/contracts/SafeProxyFactory/v1.4.1/SafeProxyFactoryContract_v1_4_1.ts b/...ges/protocol-kit/src/contracts/SafeProxyFactory/v1.4.1/SafeProxyFactoryContract_v1_4_1.ts
@@ -8,7 +8,7 @@ import {
   SafeProxyFactoryContract_v1_4_1_Contract,
   SafeProxyFactoryContract_v1_4_1_Function,
   safeProxyFactory_1_4_1_ContractArtifacts
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import SafeProvider from '@safe-global/protocol-kit/SafeProvider'
 import { waitForTransactionReceipt } from '@safe-global/protocol-kit/utils'
 import { asHex } from '@safe-global/protocol-kit/utils/types'

diff --git a/...otocol-kit/src/contracts/SafeWebAuthnSharedSigner/SafeWebAuthnSharedSignerBaseContract.ts b/...otocol-kit/src/contracts/SafeWebAuthnSharedSigner/SafeWebAuthnSharedSignerBaseContract.ts
@@ -5,7 +5,7 @@ import {
   SafeVersion,
   TransactionOptions,
   CreateProxyProps as CreateProxyPropsGeneral
-} from '@safe-global/safe-core-sdk-types'
+} from '@safe-global/types-kit'
 import { contractName } from '@safe-global/protocol-kit/contracts/config'
 import { ExternalClient } from '@safe-global/protocol-kit/types'