@rango-dev/provider-unisat 0.18.1-next.4 → 0.18.1-next.6

package/dist/actions/utxo.d.ts

@@ -0,0 +1,7 @@
+import type { ProviderAPI, UtxoActions } from '@hub3js/bip122';
+import type { Context, FunctionWithContext } from '@hub3js/core';
+export declare function connect(instance: () => ProviderAPI): FunctionWithContext<UtxoActions['connect'], Context>;
+export declare const utxoActions: {
+    connect: typeof connect;
+};
+//# sourceMappingURL=utxo.d.ts.map

package/dist/actions/utxo.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utxo.d.ts","sourceRoot":"","sources":["../../src/actions/utxo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAIjE,wBAAgB,OAAO,CACrB,QAAQ,EAAE,MAAM,WAAW,GAC1B,mBAAmB,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,CAMtD;AAED,eAAO,MAAM,WAAW;;CAAc,CAAC"}

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAWrD,eAAO,MAAM,SAAS,WAAW,CAAC;AAElC,eAAO,MAAM,QAAQ,EAAE,gBA8BtB,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAUrD,eAAO,MAAM,SAAS,WAAW,CAAC;AAElC,eAAO,MAAM,QAAQ,EAAE,gBA4BtB,CAAC"}

package/dist/mod.d.ts

@@ -1,4 +1,4 @@
-declare const versions: () => readonly [readonly ["1.0.0", import("@hub3js/core").Provider<Record<"utxo", import("@rango-dev/wallets-core/namespaces/utxo").UtxoActions>>]];
+declare const versions: () => readonly [readonly ["1.0.0", import("@hub3js/core").Provider<Record<"utxo", import("@hub3js/bip122").UtxoActions>>]];
 export { versions };
 export { WALLET_ID } from './constants.js';
 //# sourceMappingURL=mod.d.ts.map

package/dist/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,QAAQ,qJAC8C,CAAC;AAE7D,OAAO,EAAE,QAAQ,EAAE,CAAC;AACpB,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,QAAQ,4HAC8C,CAAC;AAE7D,OAAO,EAAE,QAAQ,EAAE,CAAC;AACpB,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC"}

package/dist/mod.js

@@ -1,2 +1,2 @@
-var A=Object.defineProperty;var e=(t,r)=>A(t,"name",{value:r,configurable:!0});var M=(t,r)=>()=>(t&&(r=t(t=0)),r);var j=(t,r)=>{for(var o in r)A(t,o,{get:r[o],enumerable:!0})};var y={};j(y,{BTCSigner:()=>l});import{parseErrorAndThrowStandardizeError as L}from"@hub3js/std/utils";import{isBitcoinBlockchain as F}from"@rango-dev/internal-blockchains";import*as P from"bitcoinjs-lib";import{SignerError as D}from"rango-types";var H,l,x=M(()=>{"use strict";H="https://go.getblock.io/f37bad28a991436483c0a3679a3acbee",l=class{static{e(this,"BTCSigner")}provider;constructor(r){this.provider=r}async signMessage(){throw D.UnimplementedError("signMessage")}async signAndSendTx(r){let{asset:o,psbt:n}=r;if(!n)throw new Error("No PSBT found to sign. Ensure a valid PSBT is provided.");if(!F(o.blockchain))throw new Error(`Signing ${o.blockchain} transaction is not implemented by the signer.`);if((await this.provider.getChain())?.enum!=="BITCOIN_MAINNET")throw new Error("Switch your network to Bitcoin to proceed swap.");let u=Buffer.from(n.unsignedPsbtBase64,"base64").toString("hex"),c=n.inputsToSign.flatMap(({address:s,signingIndexes:O})=>O.map(k=>({index:k,address:s}))),d=await this.provider.signPsbt(u,{autoFinalized:!0,toSignInputs:c}).catch(s=>{L(s)}),N=P.Psbt.fromHex(d).extractTransaction().toHex(),f=await fetch(H,{method:"POST",body:JSON.stringify({method:"sendrawtransaction",params:[N]})});if(!f.ok){let s=await f.text();throw new Error(`Error broadcasting transaction: ${s}`)}let p=await f.json();if(!p.result)throw new Error(`Error broadcasting transaction. Error Code ${p.error.code}: ${p.error.message}`);return{hash:p.result}}}});import{defineVersions as et}from"@hub3js/core/utils";import{ProviderBuilder as rt}from"@hub3js/core";import{getChainIdFromCaip2ChainId as $}from"@hub3js/std/utils";import{CAIP_BITCOIN_CHAIN_ID as z,isUtxoNamespace as G}from"@rango-dev/wallets-core/namespaces/utxo";import{UTXO_NAMESPACE as R}from"@hub3js/namespaces";import{DefaultSignerFactory as X,TransactionType as W}from"rango-types";async function g(t){let r=t.get(R),{BTCSigner:o}=await Promise.resolve().then(()=>(x(),y)),n=new X;return r&&n.registerSigner(W.TRANSFER,new o(r)),n}e(g,"getSigners");import{UTXO_NAMESPACE as v}from"@hub3js/namespaces";function m(){let{unisat:t}=window;if(!t)return null;let r=new Map;return t&&r.set(v,t),r}e(m,"unisat");function I(){let t=m();if(!t)throw new Error("Unisat is not injected. Please check your wallet.");return t}e(I,"getInstanceOrThrow");function b(){let r=m()?.get(v);if(!r)throw new Error("UniSat not injected. Please check your wallet.");return r}e(b,"bitcoinUnisat");var a="unisat",T={name:"UniSat",icon:"https://raw.githubusercontent.com/rango-exchange/assets/main/wallets/unisat/icon.svg",extensions:{chrome:"https://chromewebstore.google.com/detail/unisat-wallet/ppbibelpcjmhbdihakflkdcoccbgbkpo",homepage:"https://unisat.io/"},properties:[{name:"namespaces",value:{selection:"single",data:[{label:"BTC",value:"UTXO",id:"BTC",isChainSupported:t=>G(t)&&$(t)===z}]}},{name:"signers",value:{getSigners:async()=>g(I())}}]};import{NamespaceBuilder as q}from"@hub3js/core";import*as S from"@hub3js/std/builders";import{standardizeAndThrowError as J}from"@hub3js/std/operators";import{builders as V,CAIP_BITCOIN_CHAIN_ID as h,CAIP_NAMESPACE as E}from"@rango-dev/wallets-core/namespaces/utxo";import{AccountId as C}from"caip";var K=e(async()=>({accounts:await b().requestAccounts(),chainId:h}),"getBitcoinAccounts");function Q(t){let r;return[(o,n)=>{let i=t();if(!i)throw new Error("Trying to subscribe to your Solana wallet, but seems its instance is not available.");let[,u]=o.state();if(r=e(c=>{if(!c.length){o.action("disconnect");return}let d=c.map(w=>C.format({address:w,chainId:{namespace:E,reference:h}}));u("accounts",d)},"eventCallback"),i.on("accountsChanged",r),n instanceof Error)throw n},(o,n)=>{let i=t();return r&&i&&i.removeListener("accountsChanged",r),n}]}e(Q,"getChangeAccountSubscriber");var[Y,U]=Q(b),Z=V.connect().action(async function(){let t=await K();if(Array.isArray(t))throw new Error("Expecting bitcoin response to be a single value, not an array.");return t.accounts.map(o=>C.format({address:o,chainId:{namespace:E,reference:h}}))}).before(Y).or(U).or(J).build(),tt=S.disconnect().after(U).build(),B=new q("UTXO",a).action(Z).action(tt).build();var _=e(()=>new rt(a).init(function(t){let[,r]=t.state();m()&&(r("installed",!0),console.debug("[unisat] instance detected.",t))}).config("metadata",T).add("utxo",B).build(),"buildProvider");var jt=e(()=>et().version("1.0.0",_()).build(),"versions");export{a as WALLET_ID,jt as versions};
+var f=Object.defineProperty;var o=(r,t)=>f(r,"name",{value:t,configurable:!0});var O=(r,t)=>()=>(r&&(t=r(r=0)),t);var N=(r,t)=>{for(var e in t)f(r,e,{get:t[e],enumerable:!0})};var b={};N(b,{BTCSigner:()=>m});import{parseErrorAndThrowStandardizeError as j}from"@hub3js/std/utils";import{isBitcoinBlockchain as k}from"@rango-dev/internal-blockchains";import*as l from"bitcoinjs-lib";import{SignerError as M}from"rango-types";var L,m,g=O(()=>{"use strict";L="https://go.getblock.io/f37bad28a991436483c0a3679a3acbee",m=class{static{o(this,"BTCSigner")}provider;constructor(t){this.provider=t}async signMessage(){throw M.UnimplementedError("signMessage")}async signAndSendTx(t){let{asset:e,psbt:n}=t;if(!n)throw new Error("No PSBT found to sign. Ensure a valid PSBT is provided.");if(!k(e.blockchain))throw new Error(`Signing ${e.blockchain} transaction is not implemented by the signer.`);if((await this.provider.getChain())?.enum!=="BITCOIN_MAINNET")throw new Error("Switch your network to Bitcoin to proceed swap.");let S=Buffer.from(n.unsignedPsbtBase64,"base64").toString("hex"),E=n.inputsToSign.flatMap(({address:i,signingIndexes:U})=>U.map(_=>({index:_,address:i}))),C=await this.provider.signPsbt(S,{autoFinalized:!0,toSignInputs:E}).catch(i=>{j(i)}),B=l.Psbt.fromHex(C).extractTransaction().toHex(),p=await fetch(L,{method:"POST",body:JSON.stringify({method:"sendrawtransaction",params:[B]})});if(!p.ok){let i=await p.text();throw new Error(`Error broadcasting transaction: ${i}`)}let a=await p.json();if(!a.result)throw new Error(`Error broadcasting transaction. Error Code ${a.error.code}: ${a.error.message}`);return{hash:a.result}}}});import{defineVersions as Z}from"@hub3js/core/utils";import{ProviderBuilder as Y}from"@hub3js/core";import{CAIP_BITCOIN_CHAIN_ID as W,isChainSupported as R}from"@hub3js/bip122";import{UTXO_NAMESPACE as D}from"@hub3js/namespaces";import{DefaultSignerFactory as H,TransactionType as F}from"rango-types";async function d(r){let t=r.get(D),{BTCSigner:e}=await Promise.resolve().then(()=>(g(),b)),n=new H;return t&&n.registerSigner(F.TRANSFER,new e(t)),n}o(d,"getSigners");import{UTXO_NAMESPACE as h}from"@hub3js/namespaces";function c(){let{unisat:r}=window;if(!r)return null;let t=new Map;return r&&t.set(h,r),t}o(c,"unisat");function P(){let r=c();if(!r)throw new Error("Unisat is not injected. Please check your wallet.");return r}o(P,"getInstanceOrThrow");function u(){let t=c()?.get(h);if(!t)throw new Error("UniSat not injected. Please check your wallet.");return t}o(u,"bitcoinUnisat");var s="unisat",x={name:"UniSat",icon:"https://raw.githubusercontent.com/rango-exchange/assets/main/wallets/unisat/icon.svg",extensions:{chrome:"https://chromewebstore.google.com/detail/unisat-wallet/ppbibelpcjmhbdihakflkdcoccbgbkpo",homepage:"https://unisat.io/"},properties:[{name:"namespaces",value:{selection:"single",data:[{label:"BTC",value:"UTXO",id:"BTC",isChainSupported:R([W])}]}},{name:"signers",value:{getSigners:async()=>d(P())}}]};import{builders as A,CAIP_BITCOIN_CHAIN_ID as G}from"@hub3js/bip122";import{NamespaceBuilder as q}from"@hub3js/core";import*as T from"@hub3js/std/builders";import{standardizeAndThrowError as J}from"@hub3js/std/operators";import{CAIP_BITCOIN_CHAIN_ID as X,utils as $}from"@hub3js/bip122";function z(r){return async()=>{let t=await r().requestAccounts();return $.formatAccountsToCAIP(t,X)}}o(z,"connect");var w={connect:z};var[V,v]=A.changeAccountSubscriber(u,{network:G}).build(),K=A.connect().action(w.connect(u)).before(V).or(v).or(J).build(),Q=T.disconnect().after(v).build(),I=new q("UTXO",s).action(K).action(Q).build();var y=o(()=>new Y(s).init(function(r){let[,t]=r.state();c()&&(t("installed",!0),console.debug("[unisat] instance detected.",r))}).config("metadata",x).add("utxo",I).build(),"buildProvider");var Mt=o(()=>Z().version("1.0.0",y()).build(),"versions");export{s as WALLET_ID,Mt as versions};
 //# sourceMappingURL=mod.js.map

package/dist/mod.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../src/signers/utxoSigner.ts", "../src/mod.ts", "../src/provider.ts", "../src/constants.ts", "../src/signer.ts", "../src/utils.ts", "../src/namespaces/utxo.ts"],
-  "sourcesContent": ["import type { GenericSigner, Transfer } from 'rango-types';\n\nimport { parseErrorAndThrowStandardizeError } from '@hub3js/std/utils';\nimport { isBitcoinBlockchain } from '@rango-dev/internal-blockchains';\nimport * as bitcoin from 'bitcoinjs-lib';\nimport { SignerError } from 'rango-types';\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype TransferExternalProvider = any;\n\nconst BTC_RPC_URL = 'https://go.getblock.io/f37bad28a991436483c0a3679a3acbee';\n\nexport class BTCSigner implements GenericSigner<Transfer> {\n  private provider: TransferExternalProvider;\n  constructor(provider: TransferExternalProvider) {\n    this.provider = provider;\n  }\n\n  async signMessage(): Promise<string> {\n    throw SignerError.UnimplementedError('signMessage');\n  }\n\n  async signAndSendTx(tx: Transfer): Promise<{ hash: string }> {\n    const { asset, psbt } = tx;\n    if (!psbt) {\n      throw new Error(\n        'No PSBT found to sign. Ensure a valid PSBT is provided.'\n      );\n    }\n\n    if (!isBitcoinBlockchain(asset.blockchain)) {\n      throw new Error(\n        `Signing ${asset.blockchain} transaction is not implemented by the signer.`\n      );\n    }\n\n    /*\n     * TODO this logic should be added to queue manager rango preset, for safety we are rejecting signing process to avoid asset loss.\n     * https://docs.unisat.io/dev/open-api-documentation/unisat-wallet/supported-chains\n     */\n    const currentChain = await this.provider.getChain();\n    if (currentChain?.enum !== 'BITCOIN_MAINNET') {\n      throw new Error(`Switch your network to Bitcoin to proceed swap.`);\n    }\n\n    // 1. Decode Base64 to hex\n    const psbtHex = Buffer.from(psbt.unsignedPsbtBase64, 'base64').toString(\n      'hex'\n    );\n\n    // 2. Build UniSat inputs\n    const toSignInputs = psbt.inputsToSign.flatMap(\n      ({ address, signingIndexes }) =>\n        signingIndexes.map((index) => ({ index, address }))\n    );\n\n    // 3. Sign (& auto-finalize)\n    const signedPsbtHex = await this.provider\n      .signPsbt(psbtHex, {\n        autoFinalized: true,\n        toSignInputs,\n      })\n      .catch((e: unknown) => {\n        parseErrorAndThrowStandardizeError(e);\n      });\n\n    // 4. Parse the PSBT hex and extract the raw transaction\n    const psbtObject = bitcoin.Psbt.fromHex(signedPsbtHex);\n    const finalPsbtBaseHex = psbtObject.extractTransaction().toHex();\n\n    // 5. Broadcast PSBT to rpc node\n    const response = await fetch(BTC_RPC_URL, {\n      method: 'POST',\n      body: JSON.stringify({\n        method: 'sendrawtransaction',\n        params: [finalPsbtBaseHex],\n      }),\n    });\n\n    if (!response.ok) {\n      // Handle network and fetch errors\n      const errorText = await response.text();\n      throw new Error(`Error broadcasting transaction: ${errorText}`);\n    }\n\n    const data = await response.json();\n\n    if (!data.result) {\n      // Handle Bitcoin specific errors\n      throw new Error(\n        `Error broadcasting transaction. Error Code ${data.error.code}: ${data.error.message}`\n      );\n    }\n\n    return { hash: data.result };\n  }\n}\n", "import { defineVersions } from '@hub3js/core/utils';\n\nimport { buildProvider } from './provider.js';\n\nconst versions = () =>\n  defineVersions().version('1.0.0', buildProvider()).build();\n\nexport { versions };\nexport { WALLET_ID } from './constants.js';\n", "import { ProviderBuilder } from '@hub3js/core';\n\nimport { metadata, WALLET_ID } from './constants.js';\nimport { utxo } from './namespaces/utxo.js';\nimport { unisat as unisatInstance } from './utils.js';\n\nconst buildProvider = () =>\n  new ProviderBuilder(WALLET_ID)\n    .init(function (context) {\n      const [, setState] = context.state();\n\n      if (unisatInstance()) {\n        setState('installed', true);\n        console.debug('[unisat] instance detected.', context);\n      }\n    })\n    .config('metadata', metadata)\n    .add('utxo', utxo)\n    .build();\n\nexport { buildProvider };\n", "import type { ProviderMetadata } from '@hub3js/core';\n\nimport { getChainIdFromCaip2ChainId } from '@hub3js/std/utils';\nimport {\n  CAIP_BITCOIN_CHAIN_ID,\n  isUtxoNamespace,\n} from '@rango-dev/wallets-core/namespaces/utxo';\n\nimport getSigners from './signer.js';\nimport { getInstanceOrThrow } from './utils.js';\n\nexport const WALLET_ID = 'unisat';\n\nexport const metadata: ProviderMetadata = {\n  name: 'UniSat',\n  icon: 'https://raw.githubusercontent.com/rango-exchange/assets/main/wallets/unisat/icon.svg',\n  extensions: {\n    chrome:\n      'https://chromewebstore.google.com/detail/unisat-wallet/ppbibelpcjmhbdihakflkdcoccbgbkpo',\n    homepage: 'https://unisat.io/',\n  },\n  properties: [\n    {\n      name: 'namespaces',\n      value: {\n        selection: 'single',\n        data: [\n          {\n            label: 'BTC',\n            value: 'UTXO',\n            id: 'BTC',\n            isChainSupported: (chainId: string) =>\n              isUtxoNamespace(chainId) &&\n              getChainIdFromCaip2ChainId(chainId) === CAIP_BITCOIN_CHAIN_ID,\n          },\n        ],\n      },\n    },\n    {\n      name: 'signers',\n      value: { getSigners: async () => getSigners(getInstanceOrThrow()) },\n    },\n  ],\n};\n", "import type { Provider } from './utils.js';\nimport type { SignerFactory } from 'rango-types';\n\nimport { UTXO_NAMESPACE } from '@hub3js/namespaces';\nimport { DefaultSignerFactory, TransactionType as TxType } from 'rango-types';\n\nexport default async function getSigners(\n  provider: Provider\n): Promise<SignerFactory> {\n  const bitcoinInstance = provider.get(UTXO_NAMESPACE);\n  const { BTCSigner } = await import('./signers/utxoSigner.js');\n  const signers = new DefaultSignerFactory();\n  if (!!bitcoinInstance) {\n    signers.registerSigner(TxType.TRANSFER, new BTCSigner(bitcoinInstance));\n  }\n  return signers;\n}\n", "import type { InstanceMap } from '@hub3js/std/types';\nimport type { ProviderAPI as UtxoProviderApi } from '@rango-dev/wallets-core/namespaces/utxo';\n\nimport { UTXO_NAMESPACE } from '@hub3js/namespaces';\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type ProviderAPI = Record<string, any>;\nexport type ProviderObject = {\n  [UTXO_NAMESPACE]: UtxoProviderApi;\n};\nexport type Provider = InstanceMap<ProviderObject>;\n\nexport function unisat(): Provider | null {\n  const { unisat } = window;\n\n  if (!unisat) {\n    return null;\n  }\n\n  const instances: Provider = new Map();\n\n  if (unisat) {\n    instances.set(UTXO_NAMESPACE, unisat);\n  }\n\n  return instances;\n}\n\nexport function getInstanceOrThrow(): Provider {\n  const instances = unisat();\n\n  if (!instances) {\n    throw new Error('Unisat is not injected. Please check your wallet.');\n  }\n\n  return instances;\n}\n\nexport function bitcoinUnisat(): ProviderAPI {\n  const instances = unisat();\n  const bitcoinInstance = instances?.get(UTXO_NAMESPACE);\n\n  if (!bitcoinInstance) {\n    throw new Error('UniSat not injected. Please check your wallet.');\n  }\n\n  return bitcoinInstance;\n}\n", "import type { CaipAccount } from '@hub3js/std/types';\nimport type {\n  ProviderAPI,\n  UtxoActions,\n} from '@rango-dev/wallets-core/namespaces/utxo';\n\nimport {\n  NamespaceBuilder,\n  type Subscriber,\n  type SubscriberCleanUp,\n} from '@hub3js/core';\nimport * as commonBuilders from '@hub3js/std/builders';\nimport { standardizeAndThrowError } from '@hub3js/std/operators';\nimport {\n  builders,\n  CAIP_BITCOIN_CHAIN_ID,\n  CAIP_NAMESPACE,\n} from '@rango-dev/wallets-core/namespaces/utxo';\nimport { AccountId } from 'caip';\n\nimport { WALLET_ID } from '../constants.js';\nimport { bitcoinUnisat } from '../utils.js';\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype AnyFunction = (...args: any[]) => any;\n\nconst getBitcoinAccounts: () => Promise<{\n  accounts: string[];\n  chainId: string;\n}> = async () => {\n  const instance = bitcoinUnisat();\n  const accounts = await instance.requestAccounts();\n\n  return {\n    accounts: accounts,\n    chainId: CAIP_BITCOIN_CHAIN_ID,\n  };\n};\n\nfunction getChangeAccountSubscriber(\n  instance: () => ProviderAPI | undefined\n): [Subscriber<UtxoActions>, SubscriberCleanUp<UtxoActions>] {\n  let eventCallback: AnyFunction;\n\n  // subscriber can be passed to `or`, it will get the error and should rethrow error to pass the error to next `or` or throw error.\n  return [\n    (context, err) => {\n      const bitcoinInstance = instance();\n\n      if (!bitcoinInstance) {\n        throw new Error(\n          'Trying to subscribe to your Solana wallet, but seems its instance is not available.'\n        );\n      }\n\n      const [, setState] = context.state();\n\n      eventCallback = (accounts: string[]) => {\n        if (!accounts.length) {\n          context.action('disconnect');\n          return;\n        }\n\n        const formatAccounts = accounts.map(\n          (account) =>\n            AccountId.format({\n              address: account,\n              chainId: {\n                namespace: CAIP_NAMESPACE,\n                reference: CAIP_BITCOIN_CHAIN_ID,\n              },\n            }) as CaipAccount\n        );\n\n        setState('accounts', formatAccounts);\n      };\n      bitcoinInstance.on('accountsChanged', eventCallback);\n\n      if (err instanceof Error) {\n        throw err;\n      }\n    },\n    (_context, err) => {\n      const bitcoinInstance = instance();\n\n      if (eventCallback && bitcoinInstance) {\n        bitcoinInstance.removeListener('accountsChanged', eventCallback);\n      }\n\n      return err;\n    },\n  ];\n}\n\nconst [changeAccountSubscriber, changeAccountCleanup] =\n  getChangeAccountSubscriber(bitcoinUnisat);\n\nconst connect = builders\n  .connect()\n  .action(async function () {\n    const result = await getBitcoinAccounts();\n    if (Array.isArray(result)) {\n      throw new Error(\n        'Expecting bitcoin response to be a single value, not an array.'\n      );\n    }\n\n    const formatAccounts = result.accounts.map(\n      (account) =>\n        AccountId.format({\n          address: account,\n          chainId: {\n            namespace: CAIP_NAMESPACE,\n            reference: CAIP_BITCOIN_CHAIN_ID,\n          },\n        }) as CaipAccount\n    );\n\n    return formatAccounts;\n  })\n  .before(changeAccountSubscriber)\n  .or(changeAccountCleanup)\n  .or(standardizeAndThrowError)\n  .build();\n\nconst disconnect = commonBuilders\n  .disconnect<UtxoActions>()\n  .after(changeAccountCleanup)\n  .build();\n\nconst utxo = new NamespaceBuilder<UtxoActions>('UTXO', WALLET_ID)\n  .action(connect)\n  .action(disconnect)\n  .build();\n\nexport { utxo };\n"],
-  "mappings": "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",
-  "names": ["utxoSigner_exports", "__export", "BTCSigner", "parseErrorAndThrowStandardizeError", "isBitcoinBlockchain", "bitcoin", "SignerError", "BTC_RPC_URL", "init_utxoSigner", "__esmMin", "__name", "provider", "tx", "asset", "psbt", "psbtHex", "toSignInputs", "address", "signingIndexes", "index", "signedPsbtHex", "e", "finalPsbtBaseHex", "response", "errorText", "data", "defineVersions", "ProviderBuilder", "getChainIdFromCaip2ChainId", "CAIP_BITCOIN_CHAIN_ID", "isUtxoNamespace", "UTXO_NAMESPACE", "DefaultSignerFactory", "TxType", "getSigners", "provider", "bitcoinInstance", "UTXO_NAMESPACE", "BTCSigner", "signers", "DefaultSignerFactory", "TxType", "__name", "UTXO_NAMESPACE", "unisat", "instances", "UTXO_NAMESPACE", "__name", "getInstanceOrThrow", "bitcoinUnisat", "bitcoinInstance", "WALLET_ID", "metadata", "chainId", "isUtxoNamespace", "getChainIdFromCaip2ChainId", "CAIP_BITCOIN_CHAIN_ID", "getSigners", "getInstanceOrThrow", "NamespaceBuilder", "commonBuilders", "standardizeAndThrowError", "builders", "CAIP_BITCOIN_CHAIN_ID", "CAIP_NAMESPACE", "AccountId", "getBitcoinAccounts", "__name", "bitcoinUnisat", "CAIP_BITCOIN_CHAIN_ID", "getChangeAccountSubscriber", "instance", "eventCallback", "context", "err", "bitcoinInstance", "setState", "accounts", "formatAccounts", "account", "AccountId", "CAIP_NAMESPACE", "_context", "changeAccountSubscriber", "changeAccountCleanup", "connect", "builders", "result", "standardizeAndThrowError", "disconnect", "utxo", "NamespaceBuilder", "WALLET_ID", "buildProvider", "__name", "ProviderBuilder", "WALLET_ID", "context", "setState", "unisat", "metadata", "utxo", "versions", "__name", "defineVersions", "buildProvider"]
+  "sources": ["../src/signers/utxoSigner.ts", "../src/mod.ts", "../src/provider.ts", "../src/constants.ts", "../src/signer.ts", "../src/utils.ts", "../src/namespaces/utxo.ts", "../src/actions/utxo.ts"],
+  "sourcesContent": ["import type { GenericSigner, Transfer } from 'rango-types';\n\nimport { parseErrorAndThrowStandardizeError } from '@hub3js/std/utils';\nimport { isBitcoinBlockchain } from '@rango-dev/internal-blockchains';\nimport * as bitcoin from 'bitcoinjs-lib';\nimport { SignerError } from 'rango-types';\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype TransferExternalProvider = any;\n\nconst BTC_RPC_URL = 'https://go.getblock.io/f37bad28a991436483c0a3679a3acbee';\n\nexport class BTCSigner implements GenericSigner<Transfer> {\n  private provider: TransferExternalProvider;\n  constructor(provider: TransferExternalProvider) {\n    this.provider = provider;\n  }\n\n  async signMessage(): Promise<string> {\n    throw SignerError.UnimplementedError('signMessage');\n  }\n\n  async signAndSendTx(tx: Transfer): Promise<{ hash: string }> {\n    const { asset, psbt } = tx;\n    if (!psbt) {\n      throw new Error(\n        'No PSBT found to sign. Ensure a valid PSBT is provided.'\n      );\n    }\n\n    if (!isBitcoinBlockchain(asset.blockchain)) {\n      throw new Error(\n        `Signing ${asset.blockchain} transaction is not implemented by the signer.`\n      );\n    }\n\n    /*\n     * TODO this logic should be added to queue manager rango preset, for safety we are rejecting signing process to avoid asset loss.\n     * https://docs.unisat.io/dev/open-api-documentation/unisat-wallet/supported-chains\n     */\n    const currentChain = await this.provider.getChain();\n    if (currentChain?.enum !== 'BITCOIN_MAINNET') {\n      throw new Error(`Switch your network to Bitcoin to proceed swap.`);\n    }\n\n    // 1. Decode Base64 to hex\n    const psbtHex = Buffer.from(psbt.unsignedPsbtBase64, 'base64').toString(\n      'hex'\n    );\n\n    // 2. Build UniSat inputs\n    const toSignInputs = psbt.inputsToSign.flatMap(\n      ({ address, signingIndexes }) =>\n        signingIndexes.map((index) => ({ index, address }))\n    );\n\n    // 3. Sign (& auto-finalize)\n    const signedPsbtHex = await this.provider\n      .signPsbt(psbtHex, {\n        autoFinalized: true,\n        toSignInputs,\n      })\n      .catch((e: unknown) => {\n        parseErrorAndThrowStandardizeError(e);\n      });\n\n    // 4. Parse the PSBT hex and extract the raw transaction\n    const psbtObject = bitcoin.Psbt.fromHex(signedPsbtHex);\n    const finalPsbtBaseHex = psbtObject.extractTransaction().toHex();\n\n    // 5. Broadcast PSBT to rpc node\n    const response = await fetch(BTC_RPC_URL, {\n      method: 'POST',\n      body: JSON.stringify({\n        method: 'sendrawtransaction',\n        params: [finalPsbtBaseHex],\n      }),\n    });\n\n    if (!response.ok) {\n      // Handle network and fetch errors\n      const errorText = await response.text();\n      throw new Error(`Error broadcasting transaction: ${errorText}`);\n    }\n\n    const data = await response.json();\n\n    if (!data.result) {\n      // Handle Bitcoin specific errors\n      throw new Error(\n        `Error broadcasting transaction. Error Code ${data.error.code}: ${data.error.message}`\n      );\n    }\n\n    return { hash: data.result };\n  }\n}\n", "import { defineVersions } from '@hub3js/core/utils';\n\nimport { buildProvider } from './provider.js';\n\nconst versions = () =>\n  defineVersions().version('1.0.0', buildProvider()).build();\n\nexport { versions };\nexport { WALLET_ID } from './constants.js';\n", "import { ProviderBuilder } from '@hub3js/core';\n\nimport { metadata, WALLET_ID } from './constants.js';\nimport { utxo } from './namespaces/utxo.js';\nimport { unisat as unisatInstance } from './utils.js';\n\nconst buildProvider = () =>\n  new ProviderBuilder(WALLET_ID)\n    .init(function (context) {\n      const [, setState] = context.state();\n\n      if (unisatInstance()) {\n        setState('installed', true);\n        console.debug('[unisat] instance detected.', context);\n      }\n    })\n    .config('metadata', metadata)\n    .add('utxo', utxo)\n    .build();\n\nexport { buildProvider };\n", "import type { ProviderMetadata } from '@hub3js/core';\n\nimport {\n  CAIP_BITCOIN_CHAIN_ID,\n  isChainSupported as isBip122ChainSupported,\n} from '@hub3js/bip122';\n\nimport getSigners from './signer.js';\nimport { getInstanceOrThrow } from './utils.js';\n\nexport const WALLET_ID = 'unisat';\n\nexport const metadata: ProviderMetadata = {\n  name: 'UniSat',\n  icon: 'https://raw.githubusercontent.com/rango-exchange/assets/main/wallets/unisat/icon.svg',\n  extensions: {\n    chrome:\n      'https://chromewebstore.google.com/detail/unisat-wallet/ppbibelpcjmhbdihakflkdcoccbgbkpo',\n    homepage: 'https://unisat.io/',\n  },\n  properties: [\n    {\n      name: 'namespaces',\n      value: {\n        selection: 'single',\n        data: [\n          {\n            label: 'BTC',\n            value: 'UTXO',\n            id: 'BTC',\n            isChainSupported: isBip122ChainSupported([CAIP_BITCOIN_CHAIN_ID]),\n          },\n        ],\n      },\n    },\n    {\n      name: 'signers',\n      value: { getSigners: async () => getSigners(getInstanceOrThrow()) },\n    },\n  ],\n};\n", "import type { Provider } from './utils.js';\nimport type { SignerFactory } from 'rango-types';\n\nimport { UTXO_NAMESPACE } from '@hub3js/namespaces';\nimport { DefaultSignerFactory, TransactionType as TxType } from 'rango-types';\n\nexport default async function getSigners(\n  provider: Provider\n): Promise<SignerFactory> {\n  const bitcoinInstance = provider.get(UTXO_NAMESPACE);\n  const { BTCSigner } = await import('./signers/utxoSigner.js');\n  const signers = new DefaultSignerFactory();\n  if (!!bitcoinInstance) {\n    signers.registerSigner(TxType.TRANSFER, new BTCSigner(bitcoinInstance));\n  }\n  return signers;\n}\n", "import type { ProviderAPI as UtxoProviderApi } from '@hub3js/bip122';\nimport type { InstanceMap } from '@hub3js/std/types';\n\nimport { UTXO_NAMESPACE } from '@hub3js/namespaces';\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type ProviderAPI = Record<string, any>;\nexport type ProviderObject = {\n  [UTXO_NAMESPACE]: UtxoProviderApi;\n};\nexport type Provider = InstanceMap<ProviderObject>;\n\nexport function unisat(): Provider | null {\n  const { unisat } = window;\n\n  if (!unisat) {\n    return null;\n  }\n\n  const instances: Provider = new Map();\n\n  if (unisat) {\n    instances.set(UTXO_NAMESPACE, unisat);\n  }\n\n  return instances;\n}\n\nexport function getInstanceOrThrow(): Provider {\n  const instances = unisat();\n\n  if (!instances) {\n    throw new Error('Unisat is not injected. Please check your wallet.');\n  }\n\n  return instances;\n}\n\nexport function bitcoinUnisat(): ProviderAPI {\n  const instances = unisat();\n  const bitcoinInstance = instances?.get(UTXO_NAMESPACE);\n\n  if (!bitcoinInstance) {\n    throw new Error('UniSat not injected. Please check your wallet.');\n  }\n\n  return bitcoinInstance;\n}\n", "import type { UtxoActions } from '@hub3js/bip122';\n\nimport { builders, CAIP_BITCOIN_CHAIN_ID } from '@hub3js/bip122';\nimport { NamespaceBuilder } from '@hub3js/core';\nimport * as commonBuilders from '@hub3js/std/builders';\nimport { standardizeAndThrowError } from '@hub3js/std/operators';\n\nimport { utxoActions } from '../actions/utxo.js';\nimport { WALLET_ID } from '../constants.js';\nimport { bitcoinUnisat } from '../utils.js';\n\nconst [changeAccountSubscriber, changeAccountCleanup] = builders\n  .changeAccountSubscriber(bitcoinUnisat, { network: CAIP_BITCOIN_CHAIN_ID })\n  .build();\n\nconst connect = builders\n  .connect()\n  .action(utxoActions.connect(bitcoinUnisat))\n  .before(changeAccountSubscriber)\n  .or(changeAccountCleanup)\n  .or(standardizeAndThrowError)\n  .build();\n\nconst disconnect = commonBuilders\n  .disconnect<UtxoActions>()\n  .after(changeAccountCleanup)\n  .build();\n\nconst utxo = new NamespaceBuilder<UtxoActions>('UTXO', WALLET_ID)\n  .action(connect)\n  .action(disconnect)\n  .build();\n\nexport { utxo };\n", "import type { ProviderAPI, UtxoActions } from '@hub3js/bip122';\nimport type { Context, FunctionWithContext } from '@hub3js/core';\n\nimport { CAIP_BITCOIN_CHAIN_ID, utils } from '@hub3js/bip122';\n\nexport function connect(\n  instance: () => ProviderAPI\n): FunctionWithContext<UtxoActions['connect'], Context> {\n  return async () => {\n    const accounts = await instance().requestAccounts();\n\n    return utils.formatAccountsToCAIP(accounts, CAIP_BITCOIN_CHAIN_ID);\n  };\n}\n\nexport const utxoActions = { connect };\n"],
+  "mappings": "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",
+  "names": ["utxoSigner_exports", "__export", "BTCSigner", "parseErrorAndThrowStandardizeError", "isBitcoinBlockchain", "bitcoin", "SignerError", "BTC_RPC_URL", "init_utxoSigner", "__esmMin", "__name", "provider", "tx", "asset", "psbt", "psbtHex", "toSignInputs", "address", "signingIndexes", "index", "signedPsbtHex", "e", "finalPsbtBaseHex", "response", "errorText", "data", "defineVersions", "ProviderBuilder", "CAIP_BITCOIN_CHAIN_ID", "isBip122ChainSupported", "UTXO_NAMESPACE", "DefaultSignerFactory", "TxType", "getSigners", "provider", "bitcoinInstance", "UTXO_NAMESPACE", "BTCSigner", "signers", "DefaultSignerFactory", "TxType", "__name", "UTXO_NAMESPACE", "unisat", "instances", "UTXO_NAMESPACE", "__name", "getInstanceOrThrow", "bitcoinUnisat", "bitcoinInstance", "WALLET_ID", "metadata", "isBip122ChainSupported", "CAIP_BITCOIN_CHAIN_ID", "getSigners", "getInstanceOrThrow", "builders", "CAIP_BITCOIN_CHAIN_ID", "NamespaceBuilder", "commonBuilders", "standardizeAndThrowError", "CAIP_BITCOIN_CHAIN_ID", "utils", "connect", "instance", "accounts", "utils", "CAIP_BITCOIN_CHAIN_ID", "__name", "utxoActions", "changeAccountSubscriber", "changeAccountCleanup", "builders", "bitcoinUnisat", "CAIP_BITCOIN_CHAIN_ID", "connect", "utxoActions", "standardizeAndThrowError", "disconnect", "utxo", "NamespaceBuilder", "WALLET_ID", "buildProvider", "__name", "ProviderBuilder", "WALLET_ID", "context", "setState", "unisat", "metadata", "utxo", "versions", "__name", "defineVersions", "buildProvider"]
 }

package/dist/namespaces/utxo.d.ts

@@ -1,4 +1,4 @@
-import type { UtxoActions } from '@rango-dev/wallets-core/namespaces/utxo';
+import type { UtxoActions } from '@hub3js/bip122';
 declare const utxo: import("@hub3js/core").ProxiedNamespace<UtxoActions>;
 export { utxo };
 //# sourceMappingURL=utxo.d.ts.map

package/dist/namespaces/utxo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utxo.d.ts","sourceRoot":"","sources":["../../src/namespaces/utxo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,WAAW,EACZ,MAAM,yCAAyC,CAAC;AA8HjD,QAAA,MAAM,IAAI,sDAGA,CAAC;AAEX,OAAO,EAAE,IAAI,EAAE,CAAC"}
+{"version":3,"file":"utxo.d.ts","sourceRoot":"","sources":["../../src/namespaces/utxo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AA4BlD,QAAA,MAAM,IAAI,sDAGA,CAAC;AAEX,OAAO,EAAE,IAAI,EAAE,CAAC"}

package/dist/provider.d.ts

@@ -1,3 +1,3 @@
-declare const buildProvider: () => import("@hub3js/core").Provider<Record<"utxo", import("@rango-dev/wallets-core/namespaces/utxo").UtxoActions>>;
+declare const buildProvider: () => import("@hub3js/core").Provider<Record<"utxo", import("@hub3js/bip122").UtxoActions>>;
 export { buildProvider };
 //# sourceMappingURL=provider.d.ts.map

package/dist/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAMA,QAAA,MAAM,aAAa,sHAYP,CAAC;AAEb,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAMA,QAAA,MAAM,aAAa,6FAYP,CAAC;AAEb,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
+import type { ProviderAPI as UtxoProviderApi } from '@hub3js/bip122';
 import type { InstanceMap } from '@hub3js/std/types';
-import type { ProviderAPI as UtxoProviderApi } from '@rango-dev/wallets-core/namespaces/utxo';
 import { UTXO_NAMESPACE } from '@hub3js/namespaces';
 export type ProviderAPI = Record<string, any>;
 export type ProviderObject = {

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE9F,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC9C,MAAM,MAAM,cAAc,GAAG;IAC3B,CAAC,cAAc,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AACF,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC;AAEnD,wBAAgB,MAAM,IAAI,QAAQ,GAAG,IAAI,CAcxC;AAED,wBAAgB,kBAAkB,IAAI,QAAQ,CAQ7C;AAED,wBAAgB,aAAa,IAAI,WAAW,CAS3C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC9C,MAAM,MAAM,cAAc,GAAG;IAC3B,CAAC,cAAc,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AACF,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC;AAEnD,wBAAgB,MAAM,IAAI,QAAQ,GAAG,IAAI,CAcxC;AAED,wBAAgB,kBAAkB,IAAI,QAAQ,CAQ7C;AAED,wBAAgB,aAAa,IAAI,WAAW,CAS3C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/provider-unisat",
-  "version": "0.18.1-next.4",
+  "version": "0.18.1-next.6",
   "license": "MIT",
   "type": "module",
   "source": "./src/mod.ts",
@@ -21,11 +21,12 @@
     "lint": "eslint \"**/*.{ts,tsx}\""
   },
   "dependencies": {
+    "@hub3js/bip122": "^0.2.1",
     "@hub3js/core": "^0.62.0",
-    "@hub3js/namespaces": "^0.4.0",
+    "@hub3js/namespaces": "^0.5.1",
     "@hub3js/std": "^0.4.0",
-    "@rango-dev/internal-blockchains": "^0.1.1-next.1",
-    "@rango-dev/wallets-core": "^0.61.1-next.1",
+    "@rango-dev/internal-blockchains": "^0.1.1-next.3",
+    "@rango-dev/wallets-core": "^0.61.1-next.3",
     "bitcoinjs-lib": "^6.1.7",
     "caip": "^1.1.1",
     "rango-types": "^0.5.0"

package/src/actions/utxo.ts

@@ -0,0 +1,16 @@
+import type { ProviderAPI, UtxoActions } from '@hub3js/bip122';
+import type { Context, FunctionWithContext } from '@hub3js/core';
+
+import { CAIP_BITCOIN_CHAIN_ID, utils } from '@hub3js/bip122';
+
+export function connect(
+  instance: () => ProviderAPI
+): FunctionWithContext<UtxoActions['connect'], Context> {
+  return async () => {
+    const accounts = await instance().requestAccounts();
+
+    return utils.formatAccountsToCAIP(accounts, CAIP_BITCOIN_CHAIN_ID);
+  };
+}
+
+export const utxoActions = { connect };

package/src/constants.ts

@@ -1,10 +1,9 @@
 import type { ProviderMetadata } from '@hub3js/core';
 
-import { getChainIdFromCaip2ChainId } from '@hub3js/std/utils';
 import {
   CAIP_BITCOIN_CHAIN_ID,
-  isUtxoNamespace,
-} from '@rango-dev/wallets-core/namespaces/utxo';
+  isChainSupported as isBip122ChainSupported,
+} from '@hub3js/bip122';
 
 import getSigners from './signer.js';
 import { getInstanceOrThrow } from './utils.js';
@@ -29,9 +28,7 @@ export const metadata: ProviderMetadata = {
             label: 'BTC',
             value: 'UTXO',
             id: 'BTC',
-            isChainSupported: (chainId: string) =>
-              isUtxoNamespace(chainId) &&
-              getChainIdFromCaip2ChainId(chainId) === CAIP_BITCOIN_CHAIN_ID,
+            isChainSupported: isBip122ChainSupported([CAIP_BITCOIN_CHAIN_ID]),
           },
         ],
       },

package/src/namespaces/utxo.ts

@@ -1,123 +1,21 @@
-import type { CaipAccount } from '@hub3js/std/types';
-import type {
-  ProviderAPI,
-  UtxoActions,
-} from '@rango-dev/wallets-core/namespaces/utxo';
+import type { UtxoActions } from '@hub3js/bip122';
 
-import {
-  NamespaceBuilder,
-  type Subscriber,
-  type SubscriberCleanUp,
-} from '@hub3js/core';
+import { builders, CAIP_BITCOIN_CHAIN_ID } from '@hub3js/bip122';
+import { NamespaceBuilder } from '@hub3js/core';
 import * as commonBuilders from '@hub3js/std/builders';
 import { standardizeAndThrowError } from '@hub3js/std/operators';
-import {
-  builders,
-  CAIP_BITCOIN_CHAIN_ID,
-  CAIP_NAMESPACE,
-} from '@rango-dev/wallets-core/namespaces/utxo';
-import { AccountId } from 'caip';
 
+import { utxoActions } from '../actions/utxo.js';
 import { WALLET_ID } from '../constants.js';
 import { bitcoinUnisat } from '../utils.js';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type AnyFunction = (...args: any[]) => any;
-
-const getBitcoinAccounts: () => Promise<{
-  accounts: string[];
-  chainId: string;
-}> = async () => {
-  const instance = bitcoinUnisat();
-  const accounts = await instance.requestAccounts();
-
-  return {
-    accounts: accounts,
-    chainId: CAIP_BITCOIN_CHAIN_ID,
-  };
-};
-
-function getChangeAccountSubscriber(
-  instance: () => ProviderAPI | undefined
-): [Subscriber<UtxoActions>, SubscriberCleanUp<UtxoActions>] {
-  let eventCallback: AnyFunction;
-
-  // subscriber can be passed to `or`, it will get the error and should rethrow error to pass the error to next `or` or throw error.
-  return [
-    (context, err) => {
-      const bitcoinInstance = instance();
-
-      if (!bitcoinInstance) {
-        throw new Error(
-          'Trying to subscribe to your Solana wallet, but seems its instance is not available.'
-        );
-      }
-
-      const [, setState] = context.state();
-
-      eventCallback = (accounts: string[]) => {
-        if (!accounts.length) {
-          context.action('disconnect');
-          return;
-        }
-
-        const formatAccounts = accounts.map(
-          (account) =>
-            AccountId.format({
-              address: account,
-              chainId: {
-                namespace: CAIP_NAMESPACE,
-                reference: CAIP_BITCOIN_CHAIN_ID,
-              },
-            }) as CaipAccount
-        );
-
-        setState('accounts', formatAccounts);
-      };
-      bitcoinInstance.on('accountsChanged', eventCallback);
-
-      if (err instanceof Error) {
-        throw err;
-      }
-    },
-    (_context, err) => {
-      const bitcoinInstance = instance();
-
-      if (eventCallback && bitcoinInstance) {
-        bitcoinInstance.removeListener('accountsChanged', eventCallback);
-      }
-
-      return err;
-    },
-  ];
-}
-
-const [changeAccountSubscriber, changeAccountCleanup] =
-  getChangeAccountSubscriber(bitcoinUnisat);
+const [changeAccountSubscriber, changeAccountCleanup] = builders
+  .changeAccountSubscriber(bitcoinUnisat, { network: CAIP_BITCOIN_CHAIN_ID })
+  .build();
 
 const connect = builders
   .connect()
-  .action(async function () {
-    const result = await getBitcoinAccounts();
-    if (Array.isArray(result)) {
-      throw new Error(
-        'Expecting bitcoin response to be a single value, not an array.'
-      );
-    }
-
-    const formatAccounts = result.accounts.map(
-      (account) =>
-        AccountId.format({
-          address: account,
-          chainId: {
-            namespace: CAIP_NAMESPACE,
-            reference: CAIP_BITCOIN_CHAIN_ID,
-          },
-        }) as CaipAccount
-    );
-
-    return formatAccounts;
-  })
+  .action(utxoActions.connect(bitcoinUnisat))
   .before(changeAccountSubscriber)
   .or(changeAccountCleanup)
   .or(standardizeAndThrowError)

package/src/utils.ts

@@ -1,5 +1,5 @@
+import type { ProviderAPI as UtxoProviderApi } from '@hub3js/bip122';
 import type { InstanceMap } from '@hub3js/std/types';
-import type { ProviderAPI as UtxoProviderApi } from '@rango-dev/wallets-core/namespaces/utxo';
 
 import { UTXO_NAMESPACE } from '@hub3js/namespaces';