@metamask/keyring-api 17.5.0 → 17.6.0

package/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [17.6.0]
+
+### Added
+
+- Add support for Bitcoin account type: p2pkh, p2sh, p2tr ([#284](https://github.com/MetaMask/accounts/pull/284))
+
 ## [17.5.0]
 
 ### Added
@@ -569,7 +575,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - SnapController keyring client. It is intended to be used by MetaMask to talk to the snap.
 - Helper functions to create keyring handler in the snap.
 
-[Unreleased]: https://github.com/MetaMask/accounts/compare/@metamask/keyring-api@17.5.0...HEAD
+[Unreleased]: https://github.com/MetaMask/accounts/compare/@metamask/keyring-api@17.6.0...HEAD
+[17.6.0]: https://github.com/MetaMask/accounts/compare/@metamask/keyring-api@17.5.0...@metamask/keyring-api@17.6.0
 [17.5.0]: https://github.com/MetaMask/accounts/compare/@metamask/keyring-api@17.4.0...@metamask/keyring-api@17.5.0
 [17.4.0]: https://github.com/MetaMask/accounts/compare/@metamask/keyring-api@17.3.0...@metamask/keyring-api@17.4.0
 [17.3.0]: https://github.com/MetaMask/accounts/compare/@metamask/keyring-api@17.2.1...@metamask/keyring-api@17.3.0

package/dist/api/account.cjs

@@ -18,7 +18,10 @@ var EthAccountType;
  */
 var BtcAccountType;
 (function (BtcAccountType) {
+    BtcAccountType["P2pkh"] = "bip122:p2pkh";
+    BtcAccountType["P2sh"] = "bip122:p2sh";
     BtcAccountType["P2wpkh"] = "bip122:p2wpkh";
+    BtcAccountType["P2tr"] = "bip122:p2tr";
 })(BtcAccountType || (exports.BtcAccountType = BtcAccountType = {}));
 /**
  * Supported Solana account types.
@@ -45,7 +48,10 @@ exports.KeyringAccountStruct = (0, keyring_utils_1.object)({
     type: (0, superstruct_1.enums)([
         `${EthAccountType.Eoa}`,
         `${EthAccountType.Erc4337}`,
+        `${BtcAccountType.P2pkh}`,
+        `${BtcAccountType.P2sh}`,
         `${BtcAccountType.P2wpkh}`,
+        `${BtcAccountType.P2tr}`,
         `${SolAccountType.DataAccount}`,
     ]),
     /**

package/dist/api/account.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"account.cjs","sourceRoot":"","sources":["../../src/api/account.ts"],"names":[],"mappings":";;;AAAA,2DAAkE;AAElE,uDAA+E;AAC/E,2CAA6C;AAE7C,qCAA2C;AAE3C;;GAEG;AACH,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,oCAAkB,CAAA;IAClB,4CAA0B,CAAA;AAC5B,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB;AAED;;GAEG;AACH,IAAY,cAEX;AAFD,WAAY,cAAc;IACxB,0CAAwB,CAAA;AAC1B,CAAC,EAFW,cAAc,8BAAd,cAAc,QAEzB;AAED;;GAEG;AACH,IAAY,cAEX;AAFD,WAAY,cAAc;IACxB,qDAAmC,CAAA;AACrC,CAAC,EAFW,cAAc,8BAAd,cAAc,QAEzB;AAWD;;;;;;GAMG;AACU,QAAA,oBAAoB,GAAG,IAAA,sBAAM,EAAC;IACzC;;OAEG;IACH,EAAE,EAAE,+BAAe;IAEnB;;OAEG;IACH,IAAI,EAAE,IAAA,mBAAK,EAAC;QACV,GAAG,cAAc,CAAC,GAAG,EAAE;QACvB,GAAG,cAAc,CAAC,OAAO,EAAE;QAC3B,GAAG,cAAc,CAAC,MAAM,EAAE;QAC1B,GAAG,cAAc,CAAC,WAAW,EAAE;KAChC,CAAC;IAEF;;OAEG;IACH,OAAO,EAAE,IAAA,oBAAM,GAAE;IAEjB;;OAEG;IACH,MAAM,EAAE,IAAA,sBAAQ,EAAC,IAAA,mBAAK,EAAC,wBAAiB,CAAC,CAAC;IAE1C;;OAEG;IACH,OAAO,EAAE,IAAA,oBAAM,EAAC,IAAA,oBAAM,GAAE,EAAE,kBAAU,CAAC;IAErC;;OAEG;IACH,OAAO,EAAE,IAAA,mBAAK,EAAC,IAAA,oBAAM,GAAE,CAAC;CACzB,CAAC,CAAC","sourcesContent":["import { AccountIdStruct, object } from '@metamask/keyring-utils';\nimport type { Infer } from '@metamask/superstruct';\nimport { nonempty, array, enums, record, string } from '@metamask/superstruct';\nimport { JsonStruct } from '@metamask/utils';\n\nimport { CaipChainIdStruct } from './caip';\n\n/**\n * Supported Ethereum account types.\n */\nexport enum EthAccountType {\n  Eoa = 'eip155:eoa',\n  Erc4337 = 'eip155:erc4337',\n}\n\n/**\n * Supported Bitcoin account types.\n */\nexport enum BtcAccountType {\n  P2wpkh = 'bip122:p2wpkh',\n}\n\n/**\n * Supported Solana account types.\n */\nexport enum SolAccountType {\n  DataAccount = 'solana:data-account',\n}\n\n/**\n * Supported account types.\n */\nexport type KeyringAccountType =\n  | `${EthAccountType.Eoa}`\n  | `${EthAccountType.Erc4337}`\n  | `${BtcAccountType.P2wpkh}`\n  | `${SolAccountType.DataAccount}`;\n\n/**\n * A struct which represents a Keyring account object. It is abstract enough to\n * be used with any blockchain. Specific blockchain account types should extend\n * this struct.\n *\n * See {@link KeyringAccount}.\n */\nexport const KeyringAccountStruct = object({\n  /**\n   * Account ID (UUIDv4).\n   */\n  id: AccountIdStruct,\n\n  /**\n   * Account type.\n   */\n  type: enums([\n    `${EthAccountType.Eoa}`,\n    `${EthAccountType.Erc4337}`,\n    `${BtcAccountType.P2wpkh}`,\n    `${SolAccountType.DataAccount}`,\n  ]),\n\n  /**\n   * Account main address.\n   */\n  address: string(),\n\n  /**\n   * Account supported scopes (CAIP-2 chain IDs).\n   */\n  scopes: nonempty(array(CaipChainIdStruct)),\n\n  /**\n   * Account options.\n   */\n  options: record(string(), JsonStruct),\n\n  /**\n   * Account supported methods.\n   */\n  methods: array(string()),\n});\n\n/**\n * Keyring Account type represents an account and its properties from the\n * point of view of the keyring.\n */\nexport type KeyringAccount = Infer<typeof KeyringAccountStruct>;\n"]}
+{"version":3,"file":"account.cjs","sourceRoot":"","sources":["../../src/api/account.ts"],"names":[],"mappings":";;;AAAA,2DAAkE;AAElE,uDAA+E;AAC/E,2CAA6C;AAE7C,qCAA2C;AAE3C;;GAEG;AACH,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,oCAAkB,CAAA;IAClB,4CAA0B,CAAA;AAC5B,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB;AAED;;GAEG;AACH,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,wCAAsB,CAAA;IACtB,sCAAoB,CAAA;IACpB,0CAAwB,CAAA;IACxB,sCAAoB,CAAA;AACtB,CAAC,EALW,cAAc,8BAAd,cAAc,QAKzB;AAED;;GAEG;AACH,IAAY,cAEX;AAFD,WAAY,cAAc;IACxB,qDAAmC,CAAA;AACrC,CAAC,EAFW,cAAc,8BAAd,cAAc,QAEzB;AAcD;;;;;;GAMG;AACU,QAAA,oBAAoB,GAAG,IAAA,sBAAM,EAAC;IACzC;;OAEG;IACH,EAAE,EAAE,+BAAe;IAEnB;;OAEG;IACH,IAAI,EAAE,IAAA,mBAAK,EAAC;QACV,GAAG,cAAc,CAAC,GAAG,EAAE;QACvB,GAAG,cAAc,CAAC,OAAO,EAAE;QAC3B,GAAG,cAAc,CAAC,KAAK,EAAE;QACzB,GAAG,cAAc,CAAC,IAAI,EAAE;QACxB,GAAG,cAAc,CAAC,MAAM,EAAE;QAC1B,GAAG,cAAc,CAAC,IAAI,EAAE;QACxB,GAAG,cAAc,CAAC,WAAW,EAAE;KAChC,CAAC;IAEF;;OAEG;IACH,OAAO,EAAE,IAAA,oBAAM,GAAE;IAEjB;;OAEG;IACH,MAAM,EAAE,IAAA,sBAAQ,EAAC,IAAA,mBAAK,EAAC,wBAAiB,CAAC,CAAC;IAE1C;;OAEG;IACH,OAAO,EAAE,IAAA,oBAAM,EAAC,IAAA,oBAAM,GAAE,EAAE,kBAAU,CAAC;IAErC;;OAEG;IACH,OAAO,EAAE,IAAA,mBAAK,EAAC,IAAA,oBAAM,GAAE,CAAC;CACzB,CAAC,CAAC","sourcesContent":["import { AccountIdStruct, object } from '@metamask/keyring-utils';\nimport type { Infer } from '@metamask/superstruct';\nimport { nonempty, array, enums, record, string } from '@metamask/superstruct';\nimport { JsonStruct } from '@metamask/utils';\n\nimport { CaipChainIdStruct } from './caip';\n\n/**\n * Supported Ethereum account types.\n */\nexport enum EthAccountType {\n  Eoa = 'eip155:eoa',\n  Erc4337 = 'eip155:erc4337',\n}\n\n/**\n * Supported Bitcoin account types.\n */\nexport enum BtcAccountType {\n  P2pkh = 'bip122:p2pkh',\n  P2sh = 'bip122:p2sh',\n  P2wpkh = 'bip122:p2wpkh',\n  P2tr = 'bip122:p2tr',\n}\n\n/**\n * Supported Solana account types.\n */\nexport enum SolAccountType {\n  DataAccount = 'solana:data-account',\n}\n\n/**\n * Supported account types.\n */\nexport type KeyringAccountType =\n  | `${EthAccountType.Eoa}`\n  | `${EthAccountType.Erc4337}`\n  | `${BtcAccountType.P2pkh}`\n  | `${BtcAccountType.P2sh}`\n  | `${BtcAccountType.P2wpkh}`\n  | `${BtcAccountType.P2tr}`\n  | `${SolAccountType.DataAccount}`;\n\n/**\n * A struct which represents a Keyring account object. It is abstract enough to\n * be used with any blockchain. Specific blockchain account types should extend\n * this struct.\n *\n * See {@link KeyringAccount}.\n */\nexport const KeyringAccountStruct = object({\n  /**\n   * Account ID (UUIDv4).\n   */\n  id: AccountIdStruct,\n\n  /**\n   * Account type.\n   */\n  type: enums([\n    `${EthAccountType.Eoa}`,\n    `${EthAccountType.Erc4337}`,\n    `${BtcAccountType.P2pkh}`,\n    `${BtcAccountType.P2sh}`,\n    `${BtcAccountType.P2wpkh}`,\n    `${BtcAccountType.P2tr}`,\n    `${SolAccountType.DataAccount}`,\n  ]),\n\n  /**\n   * Account main address.\n   */\n  address: string(),\n\n  /**\n   * Account supported scopes (CAIP-2 chain IDs).\n   */\n  scopes: nonempty(array(CaipChainIdStruct)),\n\n  /**\n   * Account options.\n   */\n  options: record(string(), JsonStruct),\n\n  /**\n   * Account supported methods.\n   */\n  methods: array(string()),\n});\n\n/**\n * Keyring Account type represents an account and its properties from the\n * point of view of the keyring.\n */\nexport type KeyringAccount = Infer<typeof KeyringAccountStruct>;\n"]}

package/dist/api/account.d.cts

@@ -10,7 +10,10 @@ export declare enum EthAccountType {
  * Supported Bitcoin account types.
  */
 export declare enum BtcAccountType {
-    P2wpkh = "bip122:p2wpkh"
+    P2pkh = "bip122:p2pkh",
+    P2sh = "bip122:p2sh",
+    P2wpkh = "bip122:p2wpkh",
+    P2tr = "bip122:p2tr"
 }
 /**
  * Supported Solana account types.
@@ -21,7 +24,7 @@ export declare enum SolAccountType {
 /**
  * Supported account types.
  */
-export type KeyringAccountType = `${EthAccountType.Eoa}` | `${EthAccountType.Erc4337}` | `${BtcAccountType.P2wpkh}` | `${SolAccountType.DataAccount}`;
+export type KeyringAccountType = `${EthAccountType.Eoa}` | `${EthAccountType.Erc4337}` | `${BtcAccountType.P2pkh}` | `${BtcAccountType.P2sh}` | `${BtcAccountType.P2wpkh}` | `${BtcAccountType.P2tr}` | `${SolAccountType.DataAccount}`;
 /**
  * A struct which represents a Keyring account object. It is abstract enough to
  * be used with any blockchain. Specific blockchain account types should extend
@@ -30,7 +33,7 @@ export type KeyringAccountType = `${EthAccountType.Eoa}` | `${EthAccountType.Erc
  * See {@link KeyringAccount}.
  */
 export declare const KeyringAccountStruct: import("@metamask/superstruct").Struct<{
-    type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh" | "solana:data-account";
+    type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2pkh" | "bip122:p2sh" | "bip122:p2wpkh" | "bip122:p2tr" | "solana:data-account";
     id: string;
     options: Record<string, import("@metamask/utils").Json>;
     address: string;
@@ -44,10 +47,13 @@ export declare const KeyringAccountStruct: import("@metamask/superstruct").Struc
     /**
      * Account type.
      */
-    type: import("@metamask/superstruct").Struct<"eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh" | "solana:data-account", {
+    type: import("@metamask/superstruct").Struct<"eip155:eoa" | "eip155:erc4337" | "bip122:p2pkh" | "bip122:p2sh" | "bip122:p2wpkh" | "bip122:p2tr" | "solana:data-account", {
         "eip155:eoa": "eip155:eoa";
         "eip155:erc4337": "eip155:erc4337";
+        "bip122:p2pkh": "bip122:p2pkh";
+        "bip122:p2sh": "bip122:p2sh";
         "bip122:p2wpkh": "bip122:p2wpkh";
+        "bip122:p2tr": "bip122:p2tr";
         "solana:data-account": "solana:data-account";
     }>;
     /**

package/dist/api/account.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.cts","sourceRoot":"","sources":["../../src/api/account.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,8BAA8B;AAMnD;;GAEG;AACH,oBAAY,cAAc;IACxB,GAAG,eAAe;IAClB,OAAO,mBAAmB;CAC3B;AAED;;GAEG;AACH,oBAAY,cAAc;IACxB,MAAM,kBAAkB;CACzB;AAED;;GAEG;AACH,oBAAY,cAAc;IACxB,WAAW,wBAAwB;CACpC;AAED;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAC1B,GAAG,cAAc,CAAC,GAAG,EAAE,GACvB,GAAG,cAAc,CAAC,OAAO,EAAE,GAC3B,GAAG,cAAc,CAAC,MAAM,EAAE,GAC1B,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;AAEpC;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;IAC/B;;OAEG;;IAGH;;OAEG;;;;;;;IAQH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;EAEH,CAAC;AAEH;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
+{"version":3,"file":"account.d.cts","sourceRoot":"","sources":["../../src/api/account.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,8BAA8B;AAMnD;;GAEG;AACH,oBAAY,cAAc;IACxB,GAAG,eAAe;IAClB,OAAO,mBAAmB;CAC3B;AAED;;GAEG;AACH,oBAAY,cAAc;IACxB,KAAK,iBAAiB;IACtB,IAAI,gBAAgB;IACpB,MAAM,kBAAkB;IACxB,IAAI,gBAAgB;CACrB;AAED;;GAEG;AACH,oBAAY,cAAc;IACxB,WAAW,wBAAwB;CACpC;AAED;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAC1B,GAAG,cAAc,CAAC,GAAG,EAAE,GACvB,GAAG,cAAc,CAAC,OAAO,EAAE,GAC3B,GAAG,cAAc,CAAC,KAAK,EAAE,GACzB,GAAG,cAAc,CAAC,IAAI,EAAE,GACxB,GAAG,cAAc,CAAC,MAAM,EAAE,GAC1B,GAAG,cAAc,CAAC,IAAI,EAAE,GACxB,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;AAEpC;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;IAC/B;;OAEG;;IAGH;;OAEG;;;;;;;;;;IAWH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;EAEH,CAAC;AAEH;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}

package/dist/api/account.d.mts

@@ -10,7 +10,10 @@ export declare enum EthAccountType {
  * Supported Bitcoin account types.
  */
 export declare enum BtcAccountType {
-    P2wpkh = "bip122:p2wpkh"
+    P2pkh = "bip122:p2pkh",
+    P2sh = "bip122:p2sh",
+    P2wpkh = "bip122:p2wpkh",
+    P2tr = "bip122:p2tr"
 }
 /**
  * Supported Solana account types.
@@ -21,7 +24,7 @@ export declare enum SolAccountType {
 /**
  * Supported account types.
  */
-export type KeyringAccountType = `${EthAccountType.Eoa}` | `${EthAccountType.Erc4337}` | `${BtcAccountType.P2wpkh}` | `${SolAccountType.DataAccount}`;
+export type KeyringAccountType = `${EthAccountType.Eoa}` | `${EthAccountType.Erc4337}` | `${BtcAccountType.P2pkh}` | `${BtcAccountType.P2sh}` | `${BtcAccountType.P2wpkh}` | `${BtcAccountType.P2tr}` | `${SolAccountType.DataAccount}`;
 /**
  * A struct which represents a Keyring account object. It is abstract enough to
  * be used with any blockchain. Specific blockchain account types should extend
@@ -30,7 +33,7 @@ export type KeyringAccountType = `${EthAccountType.Eoa}` | `${EthAccountType.Erc
  * See {@link KeyringAccount}.
  */
 export declare const KeyringAccountStruct: import("@metamask/superstruct").Struct<{
-    type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh" | "solana:data-account";
+    type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2pkh" | "bip122:p2sh" | "bip122:p2wpkh" | "bip122:p2tr" | "solana:data-account";
     id: string;
     options: Record<string, import("@metamask/utils").Json>;
     address: string;
@@ -44,10 +47,13 @@ export declare const KeyringAccountStruct: import("@metamask/superstruct").Struc
     /**
      * Account type.
      */
-    type: import("@metamask/superstruct").Struct<"eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh" | "solana:data-account", {
+    type: import("@metamask/superstruct").Struct<"eip155:eoa" | "eip155:erc4337" | "bip122:p2pkh" | "bip122:p2sh" | "bip122:p2wpkh" | "bip122:p2tr" | "solana:data-account", {
         "eip155:eoa": "eip155:eoa";
         "eip155:erc4337": "eip155:erc4337";
+        "bip122:p2pkh": "bip122:p2pkh";
+        "bip122:p2sh": "bip122:p2sh";
         "bip122:p2wpkh": "bip122:p2wpkh";
+        "bip122:p2tr": "bip122:p2tr";
         "solana:data-account": "solana:data-account";
     }>;
     /**

package/dist/api/account.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.mts","sourceRoot":"","sources":["../../src/api/account.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,8BAA8B;AAMnD;;GAEG;AACH,oBAAY,cAAc;IACxB,GAAG,eAAe;IAClB,OAAO,mBAAmB;CAC3B;AAED;;GAEG;AACH,oBAAY,cAAc;IACxB,MAAM,kBAAkB;CACzB;AAED;;GAEG;AACH,oBAAY,cAAc;IACxB,WAAW,wBAAwB;CACpC;AAED;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAC1B,GAAG,cAAc,CAAC,GAAG,EAAE,GACvB,GAAG,cAAc,CAAC,OAAO,EAAE,GAC3B,GAAG,cAAc,CAAC,MAAM,EAAE,GAC1B,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;AAEpC;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;IAC/B;;OAEG;;IAGH;;OAEG;;;;;;;IAQH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;EAEH,CAAC;AAEH;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
+{"version":3,"file":"account.d.mts","sourceRoot":"","sources":["../../src/api/account.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,8BAA8B;AAMnD;;GAEG;AACH,oBAAY,cAAc;IACxB,GAAG,eAAe;IAClB,OAAO,mBAAmB;CAC3B;AAED;;GAEG;AACH,oBAAY,cAAc;IACxB,KAAK,iBAAiB;IACtB,IAAI,gBAAgB;IACpB,MAAM,kBAAkB;IACxB,IAAI,gBAAgB;CACrB;AAED;;GAEG;AACH,oBAAY,cAAc;IACxB,WAAW,wBAAwB;CACpC;AAED;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAC1B,GAAG,cAAc,CAAC,GAAG,EAAE,GACvB,GAAG,cAAc,CAAC,OAAO,EAAE,GAC3B,GAAG,cAAc,CAAC,KAAK,EAAE,GACzB,GAAG,cAAc,CAAC,IAAI,EAAE,GACxB,GAAG,cAAc,CAAC,MAAM,EAAE,GAC1B,GAAG,cAAc,CAAC,IAAI,EAAE,GACxB,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;AAEpC;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;IAC/B;;OAEG;;IAGH;;OAEG;;;;;;;;;;IAWH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;EAEH,CAAC;AAEH;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}

package/dist/api/account.mjs

@@ -15,7 +15,10 @@ export var EthAccountType;
  */
 export var BtcAccountType;
 (function (BtcAccountType) {
+    BtcAccountType["P2pkh"] = "bip122:p2pkh";
+    BtcAccountType["P2sh"] = "bip122:p2sh";
     BtcAccountType["P2wpkh"] = "bip122:p2wpkh";
+    BtcAccountType["P2tr"] = "bip122:p2tr";
 })(BtcAccountType || (BtcAccountType = {}));
 /**
  * Supported Solana account types.
@@ -42,7 +45,10 @@ export const KeyringAccountStruct = object({
     type: enums([
         `${EthAccountType.Eoa}`,
         `${EthAccountType.Erc4337}`,
+        `${BtcAccountType.P2pkh}`,
+        `${BtcAccountType.P2sh}`,
         `${BtcAccountType.P2wpkh}`,
+        `${BtcAccountType.P2tr}`,
         `${SolAccountType.DataAccount}`,
     ]),
     /**

package/dist/api/account.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"account.mjs","sourceRoot":"","sources":["../../src/api/account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,gCAAgC;AAElE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,8BAA8B;AAC/E,OAAO,EAAE,UAAU,EAAE,wBAAwB;AAE7C,OAAO,EAAE,iBAAiB,EAAE,mBAAe;AAE3C;;GAEG;AACH,MAAM,CAAN,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,oCAAkB,CAAA;IAClB,4CAA0B,CAAA;AAC5B,CAAC,EAHW,cAAc,KAAd,cAAc,QAGzB;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,cAEX;AAFD,WAAY,cAAc;IACxB,0CAAwB,CAAA;AAC1B,CAAC,EAFW,cAAc,KAAd,cAAc,QAEzB;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,cAEX;AAFD,WAAY,cAAc;IACxB,qDAAmC,CAAA;AACrC,CAAC,EAFW,cAAc,KAAd,cAAc,QAEzB;AAWD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC;IACzC;;OAEG;IACH,EAAE,EAAE,eAAe;IAEnB;;OAEG;IACH,IAAI,EAAE,KAAK,CAAC;QACV,GAAG,cAAc,CAAC,GAAG,EAAE;QACvB,GAAG,cAAc,CAAC,OAAO,EAAE;QAC3B,GAAG,cAAc,CAAC,MAAM,EAAE;QAC1B,GAAG,cAAc,CAAC,WAAW,EAAE;KAChC,CAAC;IAEF;;OAEG;IACH,OAAO,EAAE,MAAM,EAAE;IAEjB;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAE1C;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,UAAU,CAAC;IAErC;;OAEG;IACH,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;CACzB,CAAC,CAAC","sourcesContent":["import { AccountIdStruct, object } from '@metamask/keyring-utils';\nimport type { Infer } from '@metamask/superstruct';\nimport { nonempty, array, enums, record, string } from '@metamask/superstruct';\nimport { JsonStruct } from '@metamask/utils';\n\nimport { CaipChainIdStruct } from './caip';\n\n/**\n * Supported Ethereum account types.\n */\nexport enum EthAccountType {\n  Eoa = 'eip155:eoa',\n  Erc4337 = 'eip155:erc4337',\n}\n\n/**\n * Supported Bitcoin account types.\n */\nexport enum BtcAccountType {\n  P2wpkh = 'bip122:p2wpkh',\n}\n\n/**\n * Supported Solana account types.\n */\nexport enum SolAccountType {\n  DataAccount = 'solana:data-account',\n}\n\n/**\n * Supported account types.\n */\nexport type KeyringAccountType =\n  | `${EthAccountType.Eoa}`\n  | `${EthAccountType.Erc4337}`\n  | `${BtcAccountType.P2wpkh}`\n  | `${SolAccountType.DataAccount}`;\n\n/**\n * A struct which represents a Keyring account object. It is abstract enough to\n * be used with any blockchain. Specific blockchain account types should extend\n * this struct.\n *\n * See {@link KeyringAccount}.\n */\nexport const KeyringAccountStruct = object({\n  /**\n   * Account ID (UUIDv4).\n   */\n  id: AccountIdStruct,\n\n  /**\n   * Account type.\n   */\n  type: enums([\n    `${EthAccountType.Eoa}`,\n    `${EthAccountType.Erc4337}`,\n    `${BtcAccountType.P2wpkh}`,\n    `${SolAccountType.DataAccount}`,\n  ]),\n\n  /**\n   * Account main address.\n   */\n  address: string(),\n\n  /**\n   * Account supported scopes (CAIP-2 chain IDs).\n   */\n  scopes: nonempty(array(CaipChainIdStruct)),\n\n  /**\n   * Account options.\n   */\n  options: record(string(), JsonStruct),\n\n  /**\n   * Account supported methods.\n   */\n  methods: array(string()),\n});\n\n/**\n * Keyring Account type represents an account and its properties from the\n * point of view of the keyring.\n */\nexport type KeyringAccount = Infer<typeof KeyringAccountStruct>;\n"]}
+{"version":3,"file":"account.mjs","sourceRoot":"","sources":["../../src/api/account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,gCAAgC;AAElE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,8BAA8B;AAC/E,OAAO,EAAE,UAAU,EAAE,wBAAwB;AAE7C,OAAO,EAAE,iBAAiB,EAAE,mBAAe;AAE3C;;GAEG;AACH,MAAM,CAAN,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,oCAAkB,CAAA;IAClB,4CAA0B,CAAA;AAC5B,CAAC,EAHW,cAAc,KAAd,cAAc,QAGzB;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,wCAAsB,CAAA;IACtB,sCAAoB,CAAA;IACpB,0CAAwB,CAAA;IACxB,sCAAoB,CAAA;AACtB,CAAC,EALW,cAAc,KAAd,cAAc,QAKzB;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,cAEX;AAFD,WAAY,cAAc;IACxB,qDAAmC,CAAA;AACrC,CAAC,EAFW,cAAc,KAAd,cAAc,QAEzB;AAcD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC;IACzC;;OAEG;IACH,EAAE,EAAE,eAAe;IAEnB;;OAEG;IACH,IAAI,EAAE,KAAK,CAAC;QACV,GAAG,cAAc,CAAC,GAAG,EAAE;QACvB,GAAG,cAAc,CAAC,OAAO,EAAE;QAC3B,GAAG,cAAc,CAAC,KAAK,EAAE;QACzB,GAAG,cAAc,CAAC,IAAI,EAAE;QACxB,GAAG,cAAc,CAAC,MAAM,EAAE;QAC1B,GAAG,cAAc,CAAC,IAAI,EAAE;QACxB,GAAG,cAAc,CAAC,WAAW,EAAE;KAChC,CAAC;IAEF;;OAEG;IACH,OAAO,EAAE,MAAM,EAAE;IAEjB;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAE1C;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,UAAU,CAAC;IAErC;;OAEG;IACH,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;CACzB,CAAC,CAAC","sourcesContent":["import { AccountIdStruct, object } from '@metamask/keyring-utils';\nimport type { Infer } from '@metamask/superstruct';\nimport { nonempty, array, enums, record, string } from '@metamask/superstruct';\nimport { JsonStruct } from '@metamask/utils';\n\nimport { CaipChainIdStruct } from './caip';\n\n/**\n * Supported Ethereum account types.\n */\nexport enum EthAccountType {\n  Eoa = 'eip155:eoa',\n  Erc4337 = 'eip155:erc4337',\n}\n\n/**\n * Supported Bitcoin account types.\n */\nexport enum BtcAccountType {\n  P2pkh = 'bip122:p2pkh',\n  P2sh = 'bip122:p2sh',\n  P2wpkh = 'bip122:p2wpkh',\n  P2tr = 'bip122:p2tr',\n}\n\n/**\n * Supported Solana account types.\n */\nexport enum SolAccountType {\n  DataAccount = 'solana:data-account',\n}\n\n/**\n * Supported account types.\n */\nexport type KeyringAccountType =\n  | `${EthAccountType.Eoa}`\n  | `${EthAccountType.Erc4337}`\n  | `${BtcAccountType.P2pkh}`\n  | `${BtcAccountType.P2sh}`\n  | `${BtcAccountType.P2wpkh}`\n  | `${BtcAccountType.P2tr}`\n  | `${SolAccountType.DataAccount}`;\n\n/**\n * A struct which represents a Keyring account object. It is abstract enough to\n * be used with any blockchain. Specific blockchain account types should extend\n * this struct.\n *\n * See {@link KeyringAccount}.\n */\nexport const KeyringAccountStruct = object({\n  /**\n   * Account ID (UUIDv4).\n   */\n  id: AccountIdStruct,\n\n  /**\n   * Account type.\n   */\n  type: enums([\n    `${EthAccountType.Eoa}`,\n    `${EthAccountType.Erc4337}`,\n    `${BtcAccountType.P2pkh}`,\n    `${BtcAccountType.P2sh}`,\n    `${BtcAccountType.P2wpkh}`,\n    `${BtcAccountType.P2tr}`,\n    `${SolAccountType.DataAccount}`,\n  ]),\n\n  /**\n   * Account main address.\n   */\n  address: string(),\n\n  /**\n   * Account supported scopes (CAIP-2 chain IDs).\n   */\n  scopes: nonempty(array(CaipChainIdStruct)),\n\n  /**\n   * Account options.\n   */\n  options: record(string(), JsonStruct),\n\n  /**\n   * Account supported methods.\n   */\n  methods: array(string()),\n});\n\n/**\n * Keyring Account type represents an account and its properties from the\n * point of view of the keyring.\n */\nexport type KeyringAccount = Infer<typeof KeyringAccountStruct>;\n"]}

package/dist/btc/types.cjs

@@ -1,18 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BtcP2wpkhAccountStruct = exports.BtcMethod = exports.BtcP2wpkhAddressStruct = void 0;
+exports.BtcP2trAccountStruct = exports.BtcP2wpkhAccountStruct = exports.BtcP2shAccountStruct = exports.BtcP2pkhAccountStruct = exports.BtcMethod = exports.BtcP2trAddressStruct = exports.BtcP2wpkhAddressStruct = exports.BtcP2shAddressStruct = exports.BtcP2pkhAddressStruct = void 0;
 const keyring_utils_1 = require("@metamask/keyring-utils");
 const superstruct_1 = require("@metamask/superstruct");
-const bech32_1 = require("bech32");
+const bitcoin_address_validation_1 = require("bitcoin-address-validation");
 const api_1 = require("../api/index.cjs");
-exports.BtcP2wpkhAddressStruct = (0, superstruct_1.refine)((0, superstruct_1.string)(), 'BtcP2wpkhAddressStruct', (address) => {
+const validateAddress = (address, type) => {
     try {
-        bech32_1.bech32.decode(address);
+        const addressInfo = (0, bitcoin_address_validation_1.getAddressInfo)(address);
+        if (addressInfo.type === type) {
+            return true;
+        }
+        return new Error(`Invalid ${type} address`);
     }
     catch (error) {
-        return new Error(`Could not decode P2WPKH address: ${error.message}`);
+        return new Error(`Failed to decode ${type} address: ${error.message}`);
     }
-    return true;
+};
+exports.BtcP2pkhAddressStruct = (0, superstruct_1.refine)((0, superstruct_1.string)(), 'BtcP2pkhAddressStruct', (address) => {
+    return validateAddress(address, bitcoin_address_validation_1.AddressType.p2pkh);
+});
+exports.BtcP2shAddressStruct = (0, superstruct_1.refine)((0, superstruct_1.string)(), 'BtcP2shAddressStruct', (address) => {
+    return validateAddress(address, bitcoin_address_validation_1.AddressType.p2sh);
+});
+exports.BtcP2wpkhAddressStruct = (0, superstruct_1.refine)((0, superstruct_1.string)(), 'BtcP2wpkhAddressStruct', (address) => {
+    return validateAddress(address, bitcoin_address_validation_1.AddressType.p2wpkh);
+});
+exports.BtcP2trAddressStruct = (0, superstruct_1.refine)((0, superstruct_1.string)(), 'BtcP2trAddressStruct', (address) => {
+    return validateAddress(address, bitcoin_address_validation_1.AddressType.p2tr);
 });
 /**
  * Supported Bitcoin methods.
@@ -22,25 +37,59 @@ var BtcMethod;
     // General transaction methods
     BtcMethod["SendBitcoin"] = "sendBitcoin";
 })(BtcMethod || (exports.BtcMethod = BtcMethod = {}));
-exports.BtcP2wpkhAccountStruct = (0, keyring_utils_1.object)({
+const BtcAccountStruct = (0, keyring_utils_1.object)({
     ...api_1.KeyringAccountStruct.schema,
     /**
-     * Account address.
+     * Account supported scopes (CAIP-2 chain ID).
+     */
+    scopes: (0, superstruct_1.nonempty)((0, superstruct_1.array)(api_1.CaipChainIdStruct)),
+    /**
+     * Account supported methods.
+     */
+    methods: (0, superstruct_1.array)((0, superstruct_1.enums)([`${BtcMethod.SendBitcoin}`])),
+});
+exports.BtcP2pkhAccountStruct = (0, keyring_utils_1.object)({
+    ...BtcAccountStruct.schema,
+    /**
+     * Account P2PKH address.
+     */
+    address: exports.BtcP2pkhAddressStruct,
+    /**
+     * Account type.
+     */
+    type: (0, superstruct_1.literal)(`${api_1.BtcAccountType.P2pkh}`),
+});
+exports.BtcP2shAccountStruct = (0, keyring_utils_1.object)({
+    ...BtcAccountStruct.schema,
+    /**
+     * Account P2SH address.
+     */
+    address: exports.BtcP2shAddressStruct,
+    /**
+     * Account type.
+     */
+    type: (0, superstruct_1.literal)(`${api_1.BtcAccountType.P2sh}`),
+});
+exports.BtcP2wpkhAccountStruct = (0, keyring_utils_1.object)({
+    ...BtcAccountStruct.schema,
+    /**
+     * Account P2WPKH address.
      */
     address: exports.BtcP2wpkhAddressStruct,
     /**
      * Account type.
      */
     type: (0, superstruct_1.literal)(`${api_1.BtcAccountType.P2wpkh}`),
+});
+exports.BtcP2trAccountStruct = (0, keyring_utils_1.object)({
+    ...BtcAccountStruct.schema,
     /**
-     * Account supported scope (CAIP-2 chain ID).
-     *
-     * NOTE: We consider a Bitcoin address to be valid on only 1 network at time.
+     * Account P2TR address.
      */
-    scopes: (0, superstruct_1.size)((0, superstruct_1.array)(api_1.CaipChainIdStruct), 1),
+    address: exports.BtcP2trAddressStruct,
     /**
-     * Account supported methods.
+     * Account type.
      */
-    methods: (0, superstruct_1.array)((0, superstruct_1.enums)([`${BtcMethod.SendBitcoin}`])),
+    type: (0, superstruct_1.literal)(`${api_1.BtcAccountType.P2tr}`),
 });
 //# sourceMappingURL=types.cjs.map

package/dist/btc/types.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"types.cjs","sourceRoot":"","sources":["../../src/btc/types.ts"],"names":[],"mappings":";;;AAAA,2DAAiD;AAEjD,uDAO+B;AAC/B,mCAAgC;AAEhC,0CAIgB;AAEH,QAAA,sBAAsB,GAAG,IAAA,oBAAM,EAC1C,IAAA,oBAAM,GAAE,EACR,wBAAwB,EACxB,CAAC,OAAe,EAAE,EAAE;IAClB,IAAI,CAAC;QACH,eAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,IAAI,KAAK,CACd,oCAAqC,KAAe,CAAC,OAAO,EAAE,CAC/D,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CACF,CAAC;AAEF;;GAEG;AACH,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,8BAA8B;IAC9B,wCAA2B,CAAA;AAC7B,CAAC,EAHW,SAAS,yBAAT,SAAS,QAGpB;AAEY,QAAA,sBAAsB,GAAG,IAAA,sBAAM,EAAC;IAC3C,GAAG,0BAAoB,CAAC,MAAM;IAE9B;;OAEG;IACH,OAAO,EAAE,8BAAsB;IAE/B;;OAEG;IACH,IAAI,EAAE,IAAA,qBAAO,EAAC,GAAG,oBAAc,CAAC,MAAM,EAAE,CAAC;IAEzC;;;;OAIG;IACH,MAAM,EAAE,IAAA,kBAAI,EAAC,IAAA,mBAAK,EAAC,uBAAiB,CAAC,EAAE,CAAC,CAAC;IAEzC;;OAEG;IACH,OAAO,EAAE,IAAA,mBAAK,EAAC,IAAA,mBAAK,EAAC,CAAC,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;CACpD,CAAC,CAAC","sourcesContent":["import { object } from '@metamask/keyring-utils';\nimport type { Infer } from '@metamask/superstruct';\nimport {\n  string,\n  array,\n  enums,\n  refine,\n  literal,\n  size,\n} from '@metamask/superstruct';\nimport { bech32 } from 'bech32';\n\nimport {\n  BtcAccountType,\n  KeyringAccountStruct,\n  CaipChainIdStruct,\n} from '../api';\n\nexport const BtcP2wpkhAddressStruct = refine(\n  string(),\n  'BtcP2wpkhAddressStruct',\n  (address: string) => {\n    try {\n      bech32.decode(address);\n    } catch (error) {\n      return new Error(\n        `Could not decode P2WPKH address: ${(error as Error).message}`,\n      );\n    }\n    return true;\n  },\n);\n\n/**\n * Supported Bitcoin methods.\n */\nexport enum BtcMethod {\n  // General transaction methods\n  SendBitcoin = 'sendBitcoin',\n}\n\nexport const BtcP2wpkhAccountStruct = object({\n  ...KeyringAccountStruct.schema,\n\n  /**\n   * Account address.\n   */\n  address: BtcP2wpkhAddressStruct,\n\n  /**\n   * Account type.\n   */\n  type: literal(`${BtcAccountType.P2wpkh}`),\n\n  /**\n   * Account supported scope (CAIP-2 chain ID).\n   *\n   * NOTE: We consider a Bitcoin address to be valid on only 1 network at time.\n   */\n  scopes: size(array(CaipChainIdStruct), 1),\n\n  /**\n   * Account supported methods.\n   */\n  methods: array(enums([`${BtcMethod.SendBitcoin}`])),\n});\n\nexport type BtcP2wpkhAccount = Infer<typeof BtcP2wpkhAccountStruct>;\n"]}
+{"version":3,"file":"types.cjs","sourceRoot":"","sources":["../../src/btc/types.ts"],"names":[],"mappings":"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","sourcesContent":["import { object } from '@metamask/keyring-utils';\nimport type { Infer } from '@metamask/superstruct';\nimport {\n  string,\n  array,\n  enums,\n  refine,\n  literal,\n  nonempty,\n} from '@metamask/superstruct';\nimport { AddressType, getAddressInfo } from 'bitcoin-address-validation';\n\nimport {\n  BtcAccountType,\n  CaipChainIdStruct,\n  KeyringAccountStruct,\n} from '../api';\n\nconst validateAddress = (\n  address: string,\n  type: AddressType,\n): boolean | Error => {\n  try {\n    const addressInfo = getAddressInfo(address);\n    if (addressInfo.type === type) {\n      return true;\n    }\n    return new Error(`Invalid ${type} address`);\n  } catch (error) {\n    return new Error(\n      `Failed to decode ${type} address: ${(error as Error).message}`,\n    );\n  }\n};\n\nexport const BtcP2pkhAddressStruct = refine(\n  string(),\n  'BtcP2pkhAddressStruct',\n  (address: string) => {\n    return validateAddress(address, AddressType.p2pkh);\n  },\n);\n\nexport const BtcP2shAddressStruct = refine(\n  string(),\n  'BtcP2shAddressStruct',\n  (address: string) => {\n    return validateAddress(address, AddressType.p2sh);\n  },\n);\n\nexport const BtcP2wpkhAddressStruct = refine(\n  string(),\n  'BtcP2wpkhAddressStruct',\n  (address: string) => {\n    return validateAddress(address, AddressType.p2wpkh);\n  },\n);\n\nexport const BtcP2trAddressStruct = refine(\n  string(),\n  'BtcP2trAddressStruct',\n  (address: string) => {\n    return validateAddress(address, AddressType.p2tr);\n  },\n);\n\n/**\n * Supported Bitcoin methods.\n */\nexport enum BtcMethod {\n  // General transaction methods\n  SendBitcoin = 'sendBitcoin',\n}\n\nconst BtcAccountStruct = object({\n  ...KeyringAccountStruct.schema,\n\n  /**\n   * Account supported scopes (CAIP-2 chain ID).\n   */\n  scopes: nonempty(array(CaipChainIdStruct)),\n\n  /**\n   * Account supported methods.\n   */\n  methods: array(enums([`${BtcMethod.SendBitcoin}`])),\n});\n\nexport const BtcP2pkhAccountStruct = object({\n  ...BtcAccountStruct.schema,\n\n  /**\n   * Account P2PKH address.\n   */\n  address: BtcP2pkhAddressStruct,\n\n  /**\n   * Account type.\n   */\n  type: literal(`${BtcAccountType.P2pkh}`),\n});\n\nexport const BtcP2shAccountStruct = object({\n  ...BtcAccountStruct.schema,\n\n  /**\n   * Account P2SH address.\n   */\n  address: BtcP2shAddressStruct,\n\n  /**\n   * Account type.\n   */\n  type: literal(`${BtcAccountType.P2sh}`),\n});\n\nexport const BtcP2wpkhAccountStruct = object({\n  ...BtcAccountStruct.schema,\n\n  /**\n   * Account P2WPKH address.\n   */\n  address: BtcP2wpkhAddressStruct,\n\n  /**\n   * Account type.\n   */\n  type: literal(`${BtcAccountType.P2wpkh}`),\n});\n\nexport const BtcP2trAccountStruct = object({\n  ...BtcAccountStruct.schema,\n\n  /**\n   * Account P2TR address.\n   */\n  address: BtcP2trAddressStruct,\n\n  /**\n   * Account type.\n   */\n  type: literal(`${BtcAccountType.P2tr}`),\n});\n\nexport type BtcP2pkhAccount = Infer<typeof BtcP2pkhAccountStruct>;\nexport type BtcP2shAccount = Infer<typeof BtcP2shAccountStruct>;\nexport type BtcP2wpkhAccount = Infer<typeof BtcP2wpkhAccountStruct>;\nexport type BtcP2trAccount = Infer<typeof BtcP2trAccountStruct>;\n"]}

package/dist/btc/types.d.cts

@@ -1,11 +1,72 @@
 import type { Infer } from "@metamask/superstruct";
+export declare const BtcP2pkhAddressStruct: import("@metamask/superstruct").Struct<string, null>;
+export declare const BtcP2shAddressStruct: import("@metamask/superstruct").Struct<string, null>;
 export declare const BtcP2wpkhAddressStruct: import("@metamask/superstruct").Struct<string, null>;
+export declare const BtcP2trAddressStruct: import("@metamask/superstruct").Struct<string, null>;
 /**
  * Supported Bitcoin methods.
  */
 export declare enum BtcMethod {
     SendBitcoin = "sendBitcoin"
 }
+export declare const BtcP2pkhAccountStruct: import("@metamask/superstruct").Struct<{
+    type: "bip122:p2pkh";
+    id: string;
+    options: Record<string, import("@metamask/utils").Json>;
+    address: string;
+    scopes: `${string}:${string}`[];
+    methods: "sendBitcoin"[];
+}, {
+    /**
+     * Account P2PKH address.
+     */
+    address: import("@metamask/superstruct").Struct<string, null>;
+    /**
+     * Account type.
+     */
+    type: import("@metamask/superstruct").Struct<"bip122:p2pkh", "bip122:p2pkh">;
+    /**
+     * Account supported scopes (CAIP-2 chain ID).
+     */
+    scopes: import("@metamask/superstruct").Struct<`${string}:${string}`[], import("@metamask/superstruct").Struct<`${string}:${string}`, null>>;
+    /**
+     * Account supported methods.
+     */
+    methods: import("@metamask/superstruct").Struct<"sendBitcoin"[], import("@metamask/superstruct").Struct<"sendBitcoin", {
+        sendBitcoin: "sendBitcoin";
+    }>>;
+    id: import("@metamask/superstruct").Struct<string, null>;
+    options: import("@metamask/superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
+}>;
+export declare const BtcP2shAccountStruct: import("@metamask/superstruct").Struct<{
+    type: "bip122:p2sh";
+    id: string;
+    options: Record<string, import("@metamask/utils").Json>;
+    address: string;
+    scopes: `${string}:${string}`[];
+    methods: "sendBitcoin"[];
+}, {
+    /**
+     * Account P2SH address.
+     */
+    address: import("@metamask/superstruct").Struct<string, null>;
+    /**
+     * Account type.
+     */
+    type: import("@metamask/superstruct").Struct<"bip122:p2sh", "bip122:p2sh">;
+    /**
+     * Account supported scopes (CAIP-2 chain ID).
+     */
+    scopes: import("@metamask/superstruct").Struct<`${string}:${string}`[], import("@metamask/superstruct").Struct<`${string}:${string}`, null>>;
+    /**
+     * Account supported methods.
+     */
+    methods: import("@metamask/superstruct").Struct<"sendBitcoin"[], import("@metamask/superstruct").Struct<"sendBitcoin", {
+        sendBitcoin: "sendBitcoin";
+    }>>;
+    id: import("@metamask/superstruct").Struct<string, null>;
+    options: import("@metamask/superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
+}>;
 export declare const BtcP2wpkhAccountStruct: import("@metamask/superstruct").Struct<{
     type: "bip122:p2wpkh";
     id: string;
@@ -15,7 +76,7 @@ export declare const BtcP2wpkhAccountStruct: import("@metamask/superstruct").Str
     methods: "sendBitcoin"[];
 }, {
     /**
-     * Account address.
+     * Account P2WPKH address.
      */
     address: import("@metamask/superstruct").Struct<string, null>;
     /**
@@ -23,9 +84,36 @@ export declare const BtcP2wpkhAccountStruct: import("@metamask/superstruct").Str
      */
     type: import("@metamask/superstruct").Struct<"bip122:p2wpkh", "bip122:p2wpkh">;
     /**
-     * Account supported scope (CAIP-2 chain ID).
-     *
-     * NOTE: We consider a Bitcoin address to be valid on only 1 network at time.
+     * Account supported scopes (CAIP-2 chain ID).
+     */
+    scopes: import("@metamask/superstruct").Struct<`${string}:${string}`[], import("@metamask/superstruct").Struct<`${string}:${string}`, null>>;
+    /**
+     * Account supported methods.
+     */
+    methods: import("@metamask/superstruct").Struct<"sendBitcoin"[], import("@metamask/superstruct").Struct<"sendBitcoin", {
+        sendBitcoin: "sendBitcoin";
+    }>>;
+    id: import("@metamask/superstruct").Struct<string, null>;
+    options: import("@metamask/superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
+}>;
+export declare const BtcP2trAccountStruct: import("@metamask/superstruct").Struct<{
+    type: "bip122:p2tr";
+    id: string;
+    options: Record<string, import("@metamask/utils").Json>;
+    address: string;
+    scopes: `${string}:${string}`[];
+    methods: "sendBitcoin"[];
+}, {
+    /**
+     * Account P2TR address.
+     */
+    address: import("@metamask/superstruct").Struct<string, null>;
+    /**
+     * Account type.
+     */
+    type: import("@metamask/superstruct").Struct<"bip122:p2tr", "bip122:p2tr">;
+    /**
+     * Account supported scopes (CAIP-2 chain ID).
      */
     scopes: import("@metamask/superstruct").Struct<`${string}:${string}`[], import("@metamask/superstruct").Struct<`${string}:${string}`, null>>;
     /**
@@ -37,5 +125,8 @@ export declare const BtcP2wpkhAccountStruct: import("@metamask/superstruct").Str
     id: import("@metamask/superstruct").Struct<string, null>;
     options: import("@metamask/superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
 }>;
+export type BtcP2pkhAccount = Infer<typeof BtcP2pkhAccountStruct>;
+export type BtcP2shAccount = Infer<typeof BtcP2shAccountStruct>;
 export type BtcP2wpkhAccount = Infer<typeof BtcP2wpkhAccountStruct>;
+export type BtcP2trAccount = Infer<typeof BtcP2trAccountStruct>;
 //# sourceMappingURL=types.d.cts.map

package/dist/btc/types.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../../src/btc/types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,8BAA8B;AAiBnD,eAAO,MAAM,sBAAsB,sDAalC,CAAC;AAEF;;GAEG;AACH,oBAAY,SAAS;IAEnB,WAAW,gBAAgB;CAC5B;AAED,eAAO,MAAM,sBAAsB;;;;;;;;IAGjC;;OAEG;;IAGH;;OAEG;;IAGH;;;;OAIG;;IAGH;;OAEG;;;;;;EAEH,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC"}
+{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../../src/btc/types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,8BAA8B;AAkCnD,eAAO,MAAM,qBAAqB,sDAMjC,CAAC;AAEF,eAAO,MAAM,oBAAoB,sDAMhC,CAAC;AAEF,eAAO,MAAM,sBAAsB,sDAMlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,sDAMhC,CAAC;AAEF;;GAEG;AACH,oBAAY,SAAS;IAEnB,WAAW,gBAAgB;CAC5B;AAgBD,eAAO,MAAM,qBAAqB;;;;;;;;IAGhC;;OAEG;;IAGH;;OAEG;;IArBH;;OAEG;;IAGH;;OAEG;;;;;;EAgBH,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;IAG/B;;OAEG;;IAGH;;OAEG;;IAnCH;;OAEG;;IAGH;;OAEG;;;;;;EA8BH,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;;;;IAGjC;;OAEG;;IAGH;;OAEG;;IAjDH;;OAEG;;IAGH;;OAEG;;;;;;EA4CH,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;IAG/B;;OAEG;;IAGH;;OAEG;;IA/DH;;OAEG;;IAGH;;OAEG;;;;;;EA0DH,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAClE,MAAM,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAChE,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AACpE,MAAM,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}

package/dist/btc/types.d.mts

@@ -1,11 +1,72 @@
 import type { Infer } from "@metamask/superstruct";
+export declare const BtcP2pkhAddressStruct: import("@metamask/superstruct").Struct<string, null>;
+export declare const BtcP2shAddressStruct: import("@metamask/superstruct").Struct<string, null>;
 export declare const BtcP2wpkhAddressStruct: import("@metamask/superstruct").Struct<string, null>;
+export declare const BtcP2trAddressStruct: import("@metamask/superstruct").Struct<string, null>;
 /**
  * Supported Bitcoin methods.
  */
 export declare enum BtcMethod {
     SendBitcoin = "sendBitcoin"
 }
+export declare const BtcP2pkhAccountStruct: import("@metamask/superstruct").Struct<{
+    type: "bip122:p2pkh";
+    id: string;
+    options: Record<string, import("@metamask/utils").Json>;
+    address: string;
+    scopes: `${string}:${string}`[];
+    methods: "sendBitcoin"[];
+}, {
+    /**
+     * Account P2PKH address.
+     */
+    address: import("@metamask/superstruct").Struct<string, null>;
+    /**
+     * Account type.
+     */
+    type: import("@metamask/superstruct").Struct<"bip122:p2pkh", "bip122:p2pkh">;
+    /**
+     * Account supported scopes (CAIP-2 chain ID).
+     */
+    scopes: import("@metamask/superstruct").Struct<`${string}:${string}`[], import("@metamask/superstruct").Struct<`${string}:${string}`, null>>;
+    /**
+     * Account supported methods.
+     */
+    methods: import("@metamask/superstruct").Struct<"sendBitcoin"[], import("@metamask/superstruct").Struct<"sendBitcoin", {
+        sendBitcoin: "sendBitcoin";
+    }>>;
+    id: import("@metamask/superstruct").Struct<string, null>;
+    options: import("@metamask/superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
+}>;
+export declare const BtcP2shAccountStruct: import("@metamask/superstruct").Struct<{
+    type: "bip122:p2sh";
+    id: string;
+    options: Record<string, import("@metamask/utils").Json>;
+    address: string;
+    scopes: `${string}:${string}`[];
+    methods: "sendBitcoin"[];
+}, {
+    /**
+     * Account P2SH address.
+     */
+    address: import("@metamask/superstruct").Struct<string, null>;
+    /**
+     * Account type.
+     */
+    type: import("@metamask/superstruct").Struct<"bip122:p2sh", "bip122:p2sh">;
+    /**
+     * Account supported scopes (CAIP-2 chain ID).
+     */
+    scopes: import("@metamask/superstruct").Struct<`${string}:${string}`[], import("@metamask/superstruct").Struct<`${string}:${string}`, null>>;
+    /**
+     * Account supported methods.
+     */
+    methods: import("@metamask/superstruct").Struct<"sendBitcoin"[], import("@metamask/superstruct").Struct<"sendBitcoin", {
+        sendBitcoin: "sendBitcoin";
+    }>>;
+    id: import("@metamask/superstruct").Struct<string, null>;
+    options: import("@metamask/superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
+}>;
 export declare const BtcP2wpkhAccountStruct: import("@metamask/superstruct").Struct<{
     type: "bip122:p2wpkh";
     id: string;
@@ -15,7 +76,7 @@ export declare const BtcP2wpkhAccountStruct: import("@metamask/superstruct").Str
     methods: "sendBitcoin"[];
 }, {
     /**
-     * Account address.
+     * Account P2WPKH address.
      */
     address: import("@metamask/superstruct").Struct<string, null>;
     /**
@@ -23,9 +84,36 @@ export declare const BtcP2wpkhAccountStruct: import("@metamask/superstruct").Str
      */
     type: import("@metamask/superstruct").Struct<"bip122:p2wpkh", "bip122:p2wpkh">;
     /**
-     * Account supported scope (CAIP-2 chain ID).
-     *
-     * NOTE: We consider a Bitcoin address to be valid on only 1 network at time.
+     * Account supported scopes (CAIP-2 chain ID).
+     */
+    scopes: import("@metamask/superstruct").Struct<`${string}:${string}`[], import("@metamask/superstruct").Struct<`${string}:${string}`, null>>;
+    /**
+     * Account supported methods.
+     */
+    methods: import("@metamask/superstruct").Struct<"sendBitcoin"[], import("@metamask/superstruct").Struct<"sendBitcoin", {
+        sendBitcoin: "sendBitcoin";
+    }>>;
+    id: import("@metamask/superstruct").Struct<string, null>;
+    options: import("@metamask/superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
+}>;
+export declare const BtcP2trAccountStruct: import("@metamask/superstruct").Struct<{
+    type: "bip122:p2tr";
+    id: string;
+    options: Record<string, import("@metamask/utils").Json>;
+    address: string;
+    scopes: `${string}:${string}`[];
+    methods: "sendBitcoin"[];
+}, {
+    /**
+     * Account P2TR address.
+     */
+    address: import("@metamask/superstruct").Struct<string, null>;
+    /**
+     * Account type.
+     */
+    type: import("@metamask/superstruct").Struct<"bip122:p2tr", "bip122:p2tr">;
+    /**
+     * Account supported scopes (CAIP-2 chain ID).
      */
     scopes: import("@metamask/superstruct").Struct<`${string}:${string}`[], import("@metamask/superstruct").Struct<`${string}:${string}`, null>>;
     /**
@@ -37,5 +125,8 @@ export declare const BtcP2wpkhAccountStruct: import("@metamask/superstruct").Str
     id: import("@metamask/superstruct").Struct<string, null>;
     options: import("@metamask/superstruct").Struct<Record<string, import("@metamask/utils").Json>, null>;
 }>;
+export type BtcP2pkhAccount = Infer<typeof BtcP2pkhAccountStruct>;
+export type BtcP2shAccount = Infer<typeof BtcP2shAccountStruct>;
 export type BtcP2wpkhAccount = Infer<typeof BtcP2wpkhAccountStruct>;
+export type BtcP2trAccount = Infer<typeof BtcP2trAccountStruct>;
 //# sourceMappingURL=types.d.mts.map

package/dist/btc/types.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../../src/btc/types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,8BAA8B;AAiBnD,eAAO,MAAM,sBAAsB,sDAalC,CAAC;AAEF;;GAEG;AACH,oBAAY,SAAS;IAEnB,WAAW,gBAAgB;CAC5B;AAED,eAAO,MAAM,sBAAsB;;;;;;;;IAGjC;;OAEG;;IAGH;;OAEG;;IAGH;;;;OAIG;;IAGH;;OAEG;;;;;;EAEH,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC"}
+{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../../src/btc/types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,8BAA8B;AAkCnD,eAAO,MAAM,qBAAqB,sDAMjC,CAAC;AAEF,eAAO,MAAM,oBAAoB,sDAMhC,CAAC;AAEF,eAAO,MAAM,sBAAsB,sDAMlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,sDAMhC,CAAC;AAEF;;GAEG;AACH,oBAAY,SAAS;IAEnB,WAAW,gBAAgB;CAC5B;AAgBD,eAAO,MAAM,qBAAqB;;;;;;;;IAGhC;;OAEG;;IAGH;;OAEG;;IArBH;;OAEG;;IAGH;;OAEG;;;;;;EAgBH,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;IAG/B;;OAEG;;IAGH;;OAEG;;IAnCH;;OAEG;;IAGH;;OAEG;;;;;;EA8BH,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;;;;IAGjC;;OAEG;;IAGH;;OAEG;;IAjDH;;OAEG;;IAGH;;OAEG;;;;;;EA4CH,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;IAG/B;;OAEG;;IAGH;;OAEG;;IA/DH;;OAEG;;IAGH;;OAEG;;;;;;EA0DH,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAClE,MAAM,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAChE,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AACpE,MAAM,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}