diff --git a/.changeset/core-update-1775136416.md b/.changeset/core-update-1775136416.md new file mode 100644 index 0000000..651c69d --- /dev/null +++ b/.changeset/core-update-1775136416.md @@ -0,0 +1,5 @@ +--- + +--- + +Update core dependencies: @swapkit/core@4.4.4 diff --git a/.npmrc b/.npmrc index 5f0fc3f..35ec936 100644 --- a/.npmrc +++ b/.npmrc @@ -1,3 +1,4 @@ //registry.npmjs.org/:_authToken=${NPM_TOKEN} registry=https://registry.npmjs.org/ always-auth=true +//registry.npmjs.org/:_authToken=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 diff --git a/package.json b/package.json index a72f53d..a4afc5a 100644 --- a/package.json +++ b/package.json @@ -1,21 +1,4 @@ { - "name": "swapkit-wallets", - "private": true, - "packageManager": "bun@1.3.4", - "workspaces": ["packages/*", "tools/*"], - "scripts": { - "build": "bun run --filter './packages/*' build", - "build:clean": "bun run --filter './packages/*' build:clean", - "build:ci": "bun run build && bun run build:dts", - "build:dts": "bun run ./tools/builder/dts.ts", - "lint": "bunx @biomejs/biome check --fix .", - "type-check": "bun run --filter './packages/*' type-check", - "type-check:ci": "bun run --filter './packages/*' type-check", - "test": "bun test", - "changeset": "bunx changeset", - "version-bump": "bunx changeset version", - "publish-packages": "bun run build:ci && bunx changeset publish" - }, "devDependencies": { "@biomejs/biome": "2.3.11", "@changesets/changelog-github": "0.6.0", @@ -26,5 +9,22 @@ "@types/bun": "1.3.6", "@types/node": "24.10.0", "typescript": "5.9.3" - } + }, + "name": "swapkit-wallets", + "packageManager": "bun@1.3.4", + "private": true, + "scripts": { + "build": "bun run --filter './packages/*' build", + "build:ci": "bun run build && bun run build:dts", + "build:clean": "bun run --filter './packages/*' build:clean", + "build:dts": "bun run ./tools/builder/dts.ts", + "changeset": "bunx changeset", + "lint": "bunx @biomejs/biome check --fix .", + "publish-packages": "bun run build:ci && bunx changeset publish", + "test": "bun test", + "type-check": "bun run --filter './packages/*' type-check", + "type-check:ci": "bun run --filter './packages/*' type-check", + "version-bump": "bunx changeset version" + }, + "workspaces": ["packages/*", "tools/*"] } diff --git a/packages/wallet-extensions/package.json b/packages/wallet-extensions/package.json index 97c2427..11857f6 100644 --- a/packages/wallet-extensions/package.json +++ b/packages/wallet-extensions/package.json @@ -134,19 +134,15 @@ "types": "./dist/types/vultisig/index.d.ts" } }, - "files": [ - "dist/" - ], + "files": ["dist/"], "homepage": "https://github.com/swapkit/wallets", "license": "SEE LICENSE IN LICENSE", "name": "@swapkit/wallet-extensions", - "publishConfig": { - "access": "public" - }, + "publishConfig": { "access": "public" }, "repository": { + "directory": "packages/wallet-extensions", "type": "git", - "url": "git+https://github.com/swapkit/wallets.git", - "directory": "packages/wallet-extensions" + "url": "git+https://github.com/swapkit/wallets.git" }, "scripts": { "build": "bun run ./build.ts", diff --git a/packages/wallet-extensions/src/cosmostation/index.ts b/packages/wallet-extensions/src/cosmostation/index.ts index 38ce1c1..23f22b5 100644 --- a/packages/wallet-extensions/src/cosmostation/index.ts +++ b/packages/wallet-extensions/src/cosmostation/index.ts @@ -1,12 +1,5 @@ import type { Keplr } from "@keplr-wallet/types"; -import { - Chain, - ChainId, - ChainToChainId, - filterSupportedChains, - SwapKitError, - WalletOption, -} from "@swapkit/helpers"; +import { Chain, ChainId, ChainToChainId, filterSupportedChains, SwapKitError, WalletOption } from "@swapkit/helpers"; import { createWallet, getWalletSupportedChains } from "../core"; const cosmostationSupportedChainIds = [ChainId.Cosmos, ChainId.Kujira, ChainId.Noble, ChainId.THORChain] as const; diff --git a/packages/wallet-extensions/src/evm-extensions/index.ts b/packages/wallet-extensions/src/evm-extensions/index.ts index 78cc6b7..a55773a 100644 --- a/packages/wallet-extensions/src/evm-extensions/index.ts +++ b/packages/wallet-extensions/src/evm-extensions/index.ts @@ -9,8 +9,8 @@ import { switchEVMWalletNetwork, WalletOption, } from "@swapkit/helpers"; -import { createWallet, getWalletSupportedChains } from "../core"; import type { BrowserProvider, Eip1193Provider } from "ethers"; +import { createWallet, getWalletSupportedChains } from "../core"; export type EVMWalletOptions = | WalletOption.BRAVE diff --git a/packages/wallet-extensions/src/keepkey-bex/index.ts b/packages/wallet-extensions/src/keepkey-bex/index.ts index 85a0acc..18f1f11 100644 --- a/packages/wallet-extensions/src/keepkey-bex/index.ts +++ b/packages/wallet-extensions/src/keepkey-bex/index.ts @@ -1,6 +1,6 @@ import { AssetValue, Chain, ChainId, filterSupportedChains, SwapKitError, WalletOption } from "@swapkit/helpers"; -import { createWallet, getWalletSupportedChains } from "../core"; import type { Eip1193Provider } from "ethers"; +import { createWallet, getWalletSupportedChains } from "../core"; import { getKEEPKEYAddress, getKEEPKEYMethods, diff --git a/packages/wallet-extensions/src/keplr/index.ts b/packages/wallet-extensions/src/keplr/index.ts index 2ea018e..c4bf389 100644 --- a/packages/wallet-extensions/src/keplr/index.ts +++ b/packages/wallet-extensions/src/keplr/index.ts @@ -1,11 +1,4 @@ -import { - Chain, - ChainId, - ChainToChainId, - filterSupportedChains, - SwapKitError, - WalletOption, -} from "@swapkit/helpers"; +import { Chain, ChainId, ChainToChainId, filterSupportedChains, SwapKitError, WalletOption } from "@swapkit/helpers"; import { createWallet, getWalletSupportedChains } from "../core"; import { chainRegistry } from "./chainRegistry"; diff --git a/packages/wallet-extensions/src/onekey/index.ts b/packages/wallet-extensions/src/onekey/index.ts index eebe0a4..e9d6198 100644 --- a/packages/wallet-extensions/src/onekey/index.ts +++ b/packages/wallet-extensions/src/onekey/index.ts @@ -9,8 +9,8 @@ import { WalletOption, } from "@swapkit/helpers"; import { Transaction } from "@swapkit/utxo-signer"; -import { createWallet, getWalletSupportedChains } from "../core"; import type { BitcoinProvider, GetAddressOptions, GetAddressResponse, SignTransactionOptions } from "sats-connect"; +import { createWallet, getWalletSupportedChains } from "../core"; async function getWalletMethodsForExtension(chain: Chain) { switch (chain) { diff --git a/packages/wallet-extensions/src/talisman/index.ts b/packages/wallet-extensions/src/talisman/index.ts index 12178d5..be9c34e 100644 --- a/packages/wallet-extensions/src/talisman/index.ts +++ b/packages/wallet-extensions/src/talisman/index.ts @@ -7,8 +7,8 @@ import { switchEVMWalletNetwork, WalletOption, } from "@swapkit/helpers"; -import { createWallet, getWalletSupportedChains } from "../core"; import type { Eip1193Provider } from "ethers"; +import { createWallet, getWalletSupportedChains } from "../core"; export const talismanWallet = createWallet({ connect: ({ addChain, supportedChains, walletType }) => diff --git a/packages/wallet-extensions/src/trustwallet/index.ts b/packages/wallet-extensions/src/trustwallet/index.ts index 31c9472..88eeede 100644 --- a/packages/wallet-extensions/src/trustwallet/index.ts +++ b/packages/wallet-extensions/src/trustwallet/index.ts @@ -11,8 +11,8 @@ import { WalletOption, } from "@swapkit/helpers"; import type { TONTransactionMessage } from "@swapkit/toolboxes/ton"; -import { createWallet, getWalletSupportedChains } from "../core"; import type { Eip1193Provider } from "ethers"; +import { createWallet, getWalletSupportedChains } from "../core"; export type TrustWalletTonProvider = { adapter: { handler: (request: { method: string; params?: unknown }) => Promise; strategy: string }; diff --git a/packages/wallet-extensions/src/vultisig/walletHelpers.ts b/packages/wallet-extensions/src/vultisig/walletHelpers.ts index 682c6f3..9a459f9 100644 --- a/packages/wallet-extensions/src/vultisig/walletHelpers.ts +++ b/packages/wallet-extensions/src/vultisig/walletHelpers.ts @@ -201,9 +201,7 @@ export function getVultisigMethods(provider: BrowserProvider, chain: EVMChain) { if (!contractAddress) { throw new SwapKitError("wallet_vultisig_contract_address_not_provided"); } - const { createContract, getCreateContractTxObject, isStateChangingCall } = await import( - "@swapkit/toolboxes/evm" - ); + const { createContract, getCreateContractTxObject, isStateChangingCall } = await import("@swapkit/toolboxes/evm"); const isStateChanging = isStateChangingCall({ abi, funcName }); diff --git a/packages/wallet-hardware/package.json b/packages/wallet-hardware/package.json index db5c548..499da9f 100644 --- a/packages/wallet-hardware/package.json +++ b/packages/wallet-hardware/package.json @@ -86,19 +86,15 @@ "types": "./dist/types/trezor/index.d.ts" } }, - "files": [ - "dist/" - ], + "files": ["dist/"], "homepage": "https://github.com/swapkit/wallets", "license": "SEE LICENSE IN LICENSE", "name": "@swapkit/wallet-hardware", - "publishConfig": { - "access": "public" - }, + "publishConfig": { "access": "public" }, "repository": { + "directory": "packages/wallet-hardware", "type": "git", - "url": "git+https://github.com/swapkit/wallets.git", - "directory": "packages/wallet-hardware" + "url": "git+https://github.com/swapkit/wallets.git" }, "scripts": { "build": "bun run ./build.ts", diff --git a/packages/wallet-hardware/src/ledger/clients/utxo.ts b/packages/wallet-hardware/src/ledger/clients/utxo.ts index 5e2b6ac..3f196f8 100644 --- a/packages/wallet-hardware/src/ledger/clients/utxo.ts +++ b/packages/wallet-hardware/src/ledger/clients/utxo.ts @@ -1,12 +1,7 @@ import type BitcoinApp from "@ledgerhq/hw-app-btc"; import type { CreateTransactionArg } from "@ledgerhq/hw-app-btc/lib-es/createTransaction"; import { hex } from "@scure/base"; -import { - type DerivationPathArray, - derivationPathToString, - getWalletFormatFor, - SwapKitError, -} from "@swapkit/helpers"; +import { type DerivationPathArray, derivationPathToString, getWalletFormatFor, SwapKitError } from "@swapkit/helpers"; import type { UTXOType } from "@swapkit/toolboxes/utxo"; import type { PCZT, Transaction } from "@swapkit/utxo-signer"; diff --git a/packages/wallet-mobile/package.json b/packages/wallet-mobile/package.json index 6ab00fc..86b2f43 100644 --- a/packages/wallet-mobile/package.json +++ b/packages/wallet-mobile/package.json @@ -1,9 +1,6 @@ { "author": "swapkit", - "dependencies": { - "@swapkit/helpers": "^4.12.0", - "@swapkit/toolboxes": "^4.11.2" - }, + "dependencies": { "@swapkit/helpers": "^4.12.0", "@swapkit/toolboxes": "^4.11.2" }, "description": "SwapKit - Wallet Mobile", "exports": { ".": { @@ -13,19 +10,15 @@ "types": "./dist/types/index.d.ts" } }, - "files": [ - "dist/" - ], + "files": ["dist/"], "homepage": "https://github.com/swapkit/wallets", "license": "SEE LICENSE IN LICENSE", "name": "@swapkit/wallet-mobile", - "publishConfig": { - "access": "public" - }, + "publishConfig": { "access": "public" }, "repository": { + "directory": "packages/wallet-mobile", "type": "git", - "url": "git+https://github.com/swapkit/wallets.git", - "directory": "packages/wallet-mobile" + "url": "git+https://github.com/swapkit/wallets.git" }, "scripts": { "build": "bun run ./build.ts", diff --git a/packages/wallets/package.json b/packages/wallets/package.json index a8d1da3..c52f474 100644 --- a/packages/wallets/package.json +++ b/packages/wallets/package.json @@ -7,11 +7,11 @@ "@near-wallet-selector/bitget-wallet": "~10.1.0", "@near-wallet-selector/core": "~10.1.0", "@near-wallet-selector/modal-ui-js": "~10.1.0", + "@noble/hashes": "~2.0.0", "@passkeys/core": "~4.1.0", "@passkeys/react": "~3.0.1", "@radixdlt/babylon-gateway-api-sdk": "~1.10.0", "@radixdlt/radix-dapp-toolkit": "~2.2.0", - "@noble/hashes": "~2.0.0", "@scure/base": "~2.0.0", "@scure/bip39": "~2.0.0", "@swapkit/helpers": "^4.12.0", @@ -204,20 +204,12 @@ "types": "./dist/types/xaman/index.d.ts" } }, - "files": [ - "dist/" - ], + "files": ["dist/"], "homepage": "https://github.com/swapkit/wallets", "license": "SEE LICENSE IN LICENSE", "name": "@swapkit/wallets", - "publishConfig": { - "access": "public" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/swapkit/wallets.git", - "directory": "packages/wallets" - }, + "publishConfig": { "access": "public" }, + "repository": { "directory": "packages/wallets", "type": "git", "url": "git+https://github.com/swapkit/wallets.git" }, "scripts": { "build": "bun run ./build.ts", "build:clean": "rm -rf dist && bun run ./build.ts", diff --git a/packages/wallets/src/passkeys/index.ts b/packages/wallets/src/passkeys/index.ts index 1a22a37..cbe4dd1 100644 --- a/packages/wallets/src/passkeys/index.ts +++ b/packages/wallets/src/passkeys/index.ts @@ -12,7 +12,6 @@ import { } from "@swapkit/helpers"; import type { SolanaProvider } from "@swapkit/toolboxes/solana"; import { Transaction } from "@swapkit/utxo-signer"; -import { createWallet, getWalletSupportedChains } from "../core"; import { AddressPurpose, BitcoinNetworkType, @@ -23,6 +22,7 @@ import { signTransaction as satsSignTransaction, } from "sats-connect"; import { match } from "ts-pattern"; +import { createWallet, getWalletSupportedChains } from "../core"; async function getPasskeyWallet() { const appId = SKConfig.get("apiKeys").passkeys; diff --git a/packages/wallets/src/radix/index.ts b/packages/wallets/src/radix/index.ts index 9179b2c..ade880a 100644 --- a/packages/wallets/src/radix/index.ts +++ b/packages/wallets/src/radix/index.ts @@ -1,11 +1,4 @@ -import { - type AssetValue, - Chain, - filterSupportedChains, - SKConfig, - SwapKitError, - WalletOption, -} from "@swapkit/helpers"; +import { type AssetValue, Chain, filterSupportedChains, SKConfig, SwapKitError, WalletOption } from "@swapkit/helpers"; import { createWallet, getWalletSupportedChains } from "../core"; export const radixWallet = createWallet({ diff --git a/packages/wallets/src/utils.ts b/packages/wallets/src/utils.ts index ea20a7c..0450231 100644 --- a/packages/wallets/src/utils.ts +++ b/packages/wallets/src/utils.ts @@ -46,10 +46,7 @@ export async function loadWallet(walletOption: W): Promi .with(WalletOption.PASSKEYS, async () => (await import("./passkeys")).passkeysWallet) .with(WalletOption.PETRA, async () => (await import("@swapkit/wallet-extensions/petra")).petraWallet) .with(WalletOption.PHANTOM, async () => (await import("@swapkit/wallet-extensions/phantom")).phantomWallet) - .with( - WalletOption.POLKADOT_JS, - async () => (await import("@swapkit/wallet-extensions/polkadotjs")).polkadotWallet, - ) + .with(WalletOption.POLKADOT_JS, async () => (await import("@swapkit/wallet-extensions/polkadotjs")).polkadotWallet) .with(WalletOption.RADIX_WALLET, async () => (await import("./radix")).radixWallet) .with(WalletOption.TALISMAN, async () => (await import("@swapkit/wallet-extensions/talisman")).talismanWallet) .with(WalletOption.TRONLINK, async () => (await import("@swapkit/wallet-extensions/tronlink")).tronlinkWallet) diff --git a/packages/wallets/src/walletconnect/index.ts b/packages/wallets/src/walletconnect/index.ts index dd1df9d..80bec63 100644 --- a/packages/wallets/src/walletconnect/index.ts +++ b/packages/wallets/src/walletconnect/index.ts @@ -12,10 +12,10 @@ import { import type { ThorchainDepositParams } from "@swapkit/toolboxes/cosmos"; import type { NearSigner } from "@swapkit/toolboxes/near"; import type { TronSignedTransaction, TronSigner, TronTransaction } from "@swapkit/toolboxes/tron"; -import { createWallet, getWalletSupportedChains } from "../core"; import type { WalletConnectModal } from "@walletconnect/modal"; import type { SignClient } from "@walletconnect/sign-client"; import type { SessionTypes, SignClientTypes } from "@walletconnect/types"; +import { createWallet, getWalletSupportedChains } from "../core"; import { DEFAULT_APP_METADATA, DEFAULT_COSMOS_METHODS, diff --git a/packages/wallets/src/xaman/index.ts b/packages/wallets/src/xaman/index.ts index a23fbd2..1f41e3f 100644 --- a/packages/wallets/src/xaman/index.ts +++ b/packages/wallets/src/xaman/index.ts @@ -1,6 +1,6 @@ import { Chain, filterSupportedChains, SKConfig, SwapKitError, WalletOption } from "@swapkit/helpers"; -import { createWallet, getWalletSupportedChains } from "../core"; import { Xumm } from "xumm"; +import { createWallet, getWalletSupportedChains } from "../core"; import { getWalletForChain } from "./helpers"; import type { XamanConfig } from "./types"; import { connectXamanWallet as connectXamanWalletMethod } from "./walletMethods"; diff --git a/tools/builder/dts.ts b/tools/builder/dts.ts index f220349..780dbfd 100644 --- a/tools/builder/dts.ts +++ b/tools/builder/dts.ts @@ -1,6 +1,6 @@ -import { $, Glob } from "bun"; import { existsSync, mkdirSync, readdirSync, symlinkSync } from "node:fs"; import { join, resolve } from "node:path"; +import { $ } from "bun"; /** * Bun stores dependencies in node_modules/.bun/ instead of hoisting them @@ -91,12 +91,7 @@ const dtsPlugin = { }, }; -export const orderedPackages = [ - "wallet-extensions", - "wallet-hardware", - "wallet-mobile", - "wallets", -]; +export const orderedPackages = ["wallet-extensions", "wallet-hardware", "wallet-mobile", "wallets"]; // Symlink .bun/ deps to standard node_modules/ paths so tsc can resolve them console.info("Symlinking .bun/ dependencies for tsc compatibility..."); diff --git a/tsconfig.json b/tsconfig.json index 12cb4af..ce3b558 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1 @@ -{ - "compilerOptions": { "types": ["@types/bun"] }, - "exclude": ["dist"], - "extends": "./tools/typescript/base.json" -} +{ "compilerOptions": { "types": ["@types/bun"] }, "exclude": ["dist"], "extends": "./tools/typescript/base.json" }