use IBTCProvider

babylonlabs-io · Dec 16, 2024 · 365b9b7 · 365b9b7
1 parent c9625b3
commit 365b9b7
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 139 deletions.
diff --git a/src/core/wallets/bbn/injectable/index.ts b/src/core/wallets/bbn/injectable/index.ts
@@ -10,7 +10,7 @@ const metadata: WalletMetadata<BBNProvider, BBNConfig> = {
   wallet: "bbnwallet",
   createProvider: (wallet) => wallet,
   networks: [Network.MAINNET, Network.SIGNET],
-  label: 'Injectable'
+  label: "Injectable",
 };
 
 export default metadata;
diff --git a/src/core/wallets/btc/BTCProvider.ts b/src/core/wallets/btc/BTCProvider.ts
diff --git a/src/core/wallets/btc/bitget/index.ts b/src/core/wallets/btc/bitget/index.ts
@@ -1,11 +1,9 @@
-import { Network, type BTCConfig, type WalletMetadata } from "@/core/types";
-
-import type { BTCProvider } from "../BTCProvider";
+import { IBTCProvider, Network, type BTCConfig, type WalletMetadata } from "@/core/types";
 
 import logo from "./logo.svg";
 import { BitgetProvider, WALLET_PROVIDER_NAME } from "./provider";
 
-const metadata: WalletMetadata<BTCProvider, BTCConfig> = {
+const metadata: WalletMetadata<IBTCProvider, BTCConfig> = {
   id: "bitget",
   name: WALLET_PROVIDER_NAME,
   icon: logo,

diff --git a/src/core/wallets/btc/bitget/provider.ts b/src/core/wallets/btc/bitget/provider.ts
@@ -1,9 +1,8 @@
 import { Psbt } from "bitcoinjs-lib";
 
-import type { BTCConfig, InscriptionIdentifier, WalletInfo } from "@/core/types";
+import type { BTCConfig, IBTCProvider, InscriptionIdentifier, WalletInfo } from "@/core/types";
 import { Network } from "@/core/types";
 import { validateAddress } from "@/core/utils/wallet";
-import { BTCProvider } from "@/core/wallets/btc/BTCProvider";
 
 import logo from "./logo.svg";
 
@@ -15,12 +14,13 @@ const INTERNAL_NETWORK_NAMES = {
 
 export const WALLET_PROVIDER_NAME = "Bitget";
 
-export class BitgetProvider extends BTCProvider {
+export class BitgetProvider implements IBTCProvider {
   private provider: any;
   private walletInfo: WalletInfo | undefined;
+  private config: BTCConfig;
 
   constructor(wallet: any, config: BTCConfig) {
-    super(config);
+    this.config = config;
 
     // check whether there is an Bitget Wallet extension
     if (!wallet?.unisat) {

diff --git a/src/core/wallets/btc/cactus/index.ts b/src/core/wallets/btc/cactus/index.ts
@@ -1,11 +1,9 @@
-import { Network, type BTCConfig, type WalletMetadata } from "@/core/types";
-
-import type { BTCProvider } from "../BTCProvider";
+import { IBTCProvider, Network, type BTCConfig, type WalletMetadata } from "@/core/types";
 
 import logo from "./logo.svg";
 import { CactusLinkProvider, WALLET_PROVIDER_NAME } from "./provider";
 
-const metadata: WalletMetadata<BTCProvider, BTCConfig> = {
+const metadata: WalletMetadata<IBTCProvider, BTCConfig> = {
   id: "cactus",
   name: WALLET_PROVIDER_NAME,
   icon: logo,

diff --git a/src/core/wallets/btc/cactus/provider.ts b/src/core/wallets/btc/cactus/provider.ts
@@ -1,7 +1,6 @@
-import type { BTCConfig, InscriptionIdentifier, WalletInfo } from "@/core/types";
+import type { BTCConfig, IBTCProvider, InscriptionIdentifier, WalletInfo } from "@/core/types";
 import { Network } from "@/core/types";
 import { validateAddress } from "@/core/utils/wallet";
-import { BTCProvider } from "@/core/wallets/btc/BTCProvider";
 
 import logo from "./logo.svg";
 
@@ -13,12 +12,13 @@ const INTERNAL_NETWORK_NAMES = {
 
 export const WALLET_PROVIDER_NAME = "Cactus Link";
 
-export class CactusLinkProvider extends BTCProvider {
+export class CactusLinkProvider implements IBTCProvider {
   private provider: any;
   private walletInfo: WalletInfo | undefined;
+  private config: BTCConfig;
 
   constructor(wallet: any, config: BTCConfig) {
-    super(config);
+    this.config = config;
 
     // check whether there is a Cactus Link Wallet extension
     if (!wallet) {

diff --git a/src/core/wallets/btc/index.ts b/src/core/wallets/btc/index.ts
@@ -1,6 +1,5 @@
-import type { BTCConfig, ChainMetadata } from "@/core/types";
+import type { BTCConfig, ChainMetadata, IBTCProvider } from "@/core/types";
 
-import { BTCProvider } from "./BTCProvider";
 import icon from "./bitcoin.png";
 import bitget from "./bitget";
 import cactus from "./cactus";
@@ -9,7 +8,7 @@ import keystone from "./keystone";
 import okx from "./okx";
 import onekey from "./onekey";
 
-const metadata: ChainMetadata<"BTC", BTCProvider, BTCConfig> = {
+const metadata: ChainMetadata<"BTC", IBTCProvider, BTCConfig> = {
   chain: "BTC",
   name: "Bitcoin",
   icon,

diff --git a/src/core/wallets/btc/injectable/index.ts b/src/core/wallets/btc/injectable/index.ts
@@ -1,8 +1,6 @@
-import { Network, type BTCConfig, type WalletMetadata } from "@/core/types";
+import { IBTCProvider, Network, type BTCConfig, type WalletMetadata } from "@/core/types";
 
-import { BTCProvider } from "../BTCProvider";
-
-const metadata: WalletMetadata<BTCProvider, BTCConfig> = {
+const metadata: WalletMetadata<IBTCProvider, BTCConfig> = {
   id: "injectable",
   name: (wallet) => wallet.getWalletProviderName?.(),
   icon: (wallet) => wallet.getWalletProviderIcon?.(),

diff --git a/src/core/wallets/btc/keystone/index.ts b/src/core/wallets/btc/keystone/index.ts
@@ -1,11 +1,9 @@
-import { Network, type BTCConfig, type WalletMetadata } from "@/core/types";
-
-import type { BTCProvider } from "../BTCProvider";
+import { IBTCProvider, Network, type BTCConfig, type WalletMetadata } from "@/core/types";
 
 import logo from "./logo.svg";
 import { KeystoneProvider, WALLET_PROVIDER_NAME } from "./provider";
 
-const metadata: WalletMetadata<BTCProvider, BTCConfig> = {
+const metadata: WalletMetadata<IBTCProvider, BTCConfig> = {
   id: "keystone",
   name: WALLET_PROVIDER_NAME,
   icon: logo,

diff --git a/src/core/wallets/btc/keystone/provider.ts b/src/core/wallets/btc/keystone/provider.ts
@@ -9,10 +9,9 @@ import { toXOnly } from "bitcoinjs-lib/src/psbt/bip371";
 import { pubkeyInScript } from "bitcoinjs-lib/src/psbt/psbtutils";
 
 import type { BTCConfig, InscriptionIdentifier } from "@/core/types";
-import { Network } from "@/core/types";
+import { IBTCProvider, Network } from "@/core/types";
 import BIP322 from "@/core/utils/bip322";
 import { toNetwork } from "@/core/utils/wallet";
-import { BTCProvider } from "@/core/wallets/btc/BTCProvider";
 
 import logo from "./logo.svg";
 
@@ -29,13 +28,15 @@ type KeystoneWalletInfo = {
 
 export const WALLET_PROVIDER_NAME = "Keystone";
 
-export class KeystoneProvider extends BTCProvider {
+export class KeystoneProvider implements IBTCProvider {
   private keystoneWaleltInfo: KeystoneWalletInfo | undefined;
   private viewSdk: typeof sdk;
   private dataSdk: KeystoneSDK;
+  private config: BTCConfig;
 
   constructor(_wallet: any, config: BTCConfig) {
-    super(config);
+    this.config = config;
+
     if (sdk?.bootstrap) {
       sdk.bootstrap();
       this.viewSdk = sdk;

diff --git a/src/core/wallets/btc/okx/index.ts b/src/core/wallets/btc/okx/index.ts
@@ -1,11 +1,9 @@
-import { Network, type BTCConfig, type WalletMetadata } from "@/core/types";
-
-import type { BTCProvider } from "../BTCProvider";
+import { IBTCProvider, Network, type BTCConfig, type WalletMetadata } from "@/core/types";
 
 import logo from "./logo.svg";
 import { OKXProvider, WALLET_PROVIDER_NAME } from "./provider";
 
-const metadata: WalletMetadata<BTCProvider, BTCConfig> = {
+const metadata: WalletMetadata<IBTCProvider, BTCConfig> = {
   id: "okx",
   name: WALLET_PROVIDER_NAME,
   icon: logo,

diff --git a/src/core/wallets/btc/okx/provider.ts b/src/core/wallets/btc/okx/provider.ts
@@ -1,7 +1,6 @@
 import type { BTCConfig, InscriptionIdentifier, WalletInfo } from "@/core/types";
-import { Network } from "@/core/types";
+import { IBTCProvider, Network } from "@/core/types";
 import { validateAddress } from "@/core/utils/wallet";
-import { BTCProvider } from "@/core/wallets/btc/BTCProvider";
 
 import logo from "./logo.svg";
 
@@ -13,15 +12,16 @@ const PROVIDER_NAMES = {
 
 export const WALLET_PROVIDER_NAME = "OKX";
 
-export class OKXProvider extends BTCProvider {
+export class OKXProvider implements IBTCProvider {
   private provider: any;
   private walletInfo: WalletInfo | undefined;
+  private config: BTCConfig;
 
   constructor(
     private wallet: any,
     config: BTCConfig,
   ) {
-    super(config);
+    this.config = config;
 
     // check whether there is an OKX Wallet extension
     if (!wallet) {

diff --git a/src/core/wallets/btc/onekey/index.ts b/src/core/wallets/btc/onekey/index.ts
@@ -1,11 +1,9 @@
-import { Network, type BTCConfig, type WalletMetadata } from "@/core/types";
-
-import type { BTCProvider } from "../BTCProvider";
+import { IBTCProvider, Network, type BTCConfig, type WalletMetadata } from "@/core/types";
 
 import logo from "./logo.svg";
 import { OneKeyProvider, WALLET_PROVIDER_NAME } from "./provider";
 
-const metadata: WalletMetadata<BTCProvider, BTCConfig> = {
+const metadata: WalletMetadata<IBTCProvider, BTCConfig> = {
   id: "onekey",
   name: WALLET_PROVIDER_NAME,
   icon: logo,

diff --git a/src/core/wallets/btc/onekey/provider.ts b/src/core/wallets/btc/onekey/provider.ts
@@ -1,7 +1,6 @@
-import type { BTCConfig, InscriptionIdentifier, WalletInfo } from "@/core/types";
+import type { BTCConfig, IBTCProvider, InscriptionIdentifier, WalletInfo } from "@/core/types";
 import { Network } from "@/core/types";
 import { validateAddress } from "@/core/utils/wallet";
-import { BTCProvider } from "@/core/wallets/btc/BTCProvider";
 
 import logo from "./logo.svg";
 
@@ -13,12 +12,13 @@ const INTERNAL_NETWORK_NAMES = {
 
 export const WALLET_PROVIDER_NAME = "OneKey";
 
-export class OneKeyProvider extends BTCProvider {
+export class OneKeyProvider implements IBTCProvider {
   private provider: any;
   private walletInfo: WalletInfo | undefined;
+  private config: BTCConfig;
 
   constructor(wallet: any, config: BTCConfig) {
-    super(config);
+    this.config = config;
 
     // check whether there is an OneKey extension
     if (!wallet?.btcwallet) {

diff --git a/src/index.tsx b/src/index.tsx
@@ -14,4 +14,3 @@ export * from "@/context/State.context";
 export { createExternalWallet } from "@/core";
 export * from "@/core/types";
 export * from "@/core/wallets/bbn/BBNProvider";
-export * from "@/core/wallets/btc/BTCProvider";