Support dApp Providers (Bitcoin Provider)

local-libs/keyring/cjs/pair/index.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createPair = createPair;
+var _bip322Js = require("bip322-js");
 var bitcoin = _interopRequireWildcard(require("bitcoinjs-lib"));
-var _bitcoinjsMessage = require("bitcoinjs-message");
 var _ecpair = require("ecpair");
 var _ethSimpleKeyring = _interopRequireDefault(require("eth-simple-keyring"));
 var ecc = _interopRequireWildcard(require("tiny-secp256k1"));
@@ -108,13 +108,13 @@ function createPair(_ref, _ref2) {
   const encodeAddress = () => {
     const raw = _utils.TYPE_ADDRESS[type](publicKey);
     const bitNetwork = ['bitcoin-44', 'bitcoin-84', 'bitcoin-86'].includes(type) ? bitcoin.networks.bitcoin : ['bittest-44', 'bittest-84', 'bittest-86'].includes(type) ? bitcoin.networks.testnet : bitcoin.networks.regtest;
+    let dataKey;
 
     /**
      *  With bitcoin accounts, some attached account have no public key (only address).
      *  In this case, public key is the hash of result after decoded address.
      *  Add `noPublicKey` in metadata for this case.
      */
-    let dataKey;
     if (meta.noPublicKey) {
       dataKey = 'hash';
     } else {
@@ -316,34 +316,37 @@ function createPair(_ref, _ref2) {
             type
           }, derived, meta, null);
         },
-        signMessage: (message, compressed, options) => {
+        signMessage: message => {
           if (isLocked(secretKey)) {
             throw new Error('Cannot encrypt with a locked key pair');
           }
-          const _message = typeof message === 'string' ? message : Buffer.from(message);
+          const _message = typeof message === 'string' ? message : (0, _util.u8aToString)(message);
+          const address = encodeAddress();
+          const _pair = ECPair.fromPrivateKey(Buffer.from(secretKey));
+          const wif = _pair.toWIF();
 
           // Sign the message
-          const signature = (0, _bitcoinjsMessage.sign)(_message, Buffer.from(secretKey), compressed, options);
-          return signature.toString('base64');
+          const signature = _bip322Js.Signer.sign(wif, address, _message);
+          return typeof signature === 'string' ? signature : signature.toString('base64');
         },
-        signTransaction: (transaction, indexes) => {
+        signTransaction: (psbt, indexes, sighashTypes, tapLeafHashToSign) => {
           if (isLocked(secretKey)) {
             throw new Error('Cannot encrypt with a locked key pair');
           }
-          if (!transaction) {
+          if (!psbt) {
             throw new Error('Not found sign method');
           }
           const pair = ECPair.fromPrivateKey(Buffer.from(secretKey));
           const isTaproot = ['bitcoin-86', 'bittest-86'].includes(type);
           for (const index of indexes) {
             if (isTaproot) {
               const tweakedSigner = pair.tweak(bitcoin.crypto.taggedHash('TapTweak', toXOnly(pair.publicKey)));
-              transaction.signTaprootInput(index, tweakedSigner);
+              psbt.signTaprootInput(index, tweakedSigner, tapLeafHashToSign, sighashTypes);
             } else {
-              transaction.signInput(index, pair);
+              psbt.signInput(index, pair, sighashTypes);
             }
           }
-          return transaction;
+          return psbt;
         },
         get output() {
           return output || Buffer.from([]);

local-libs/keyring/cjs/types.js

@@ -3,13 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.BitcoinAddressType = void 0;
+exports.SubstrateKeypairTypes = exports.EthereumKeypairTypes = exports.BitcoinKeypairTypes = exports.BitcoinAddressType = void 0;
 // Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 /**
  *
  *
  * */
+
+const SubstrateKeypairTypes = ['sr25519', 'ed25519', 'ecdsa'];
+exports.SubstrateKeypairTypes = SubstrateKeypairTypes;
+const EthereumKeypairTypes = ['ethereum'];
+exports.EthereumKeypairTypes = EthereumKeypairTypes;
+const BitcoinKeypairTypes = ['bitcoin-44', 'bitcoin-84', 'bitcoin-86', 'bittest-44', 'bittest-84', 'bittest-86'];
+exports.BitcoinKeypairTypes = BitcoinKeypairTypes;
 let BitcoinAddressType;
 exports.BitcoinAddressType = BitcoinAddressType;
 (function (BitcoinAddressType) {

local-libs/keyring/cjs/utils/derive-path.js

@@ -15,7 +15,7 @@ const getEvmDerivePath = index => {
   return emvPath.replace('{index}', index.toString());
 };
 exports.getEvmDerivePath = getEvmDerivePath;
-const getBitDerivePathFunction = (proposal, slip44) => {
+const getBitDerivePathFunction = (slip44, proposal) => {
   const path = bitPath.replace('{proposal}', proposal.toString()).replace('{slip44}', slip44.toString());
   return index => {
     return path.replace('{index}', index.toString());
@@ -27,17 +27,17 @@ const getDerivePath = type => {
     case 'ethereum':
       return getEvmDerivePath;
     case 'bitcoin-44':
-      return getBitDerivePathFunction(44, 0);
+      return getBitDerivePathFunction(0, 44);
     case 'bitcoin-84':
-      return getBitDerivePathFunction(84, 0);
+      return getBitDerivePathFunction(0, 84);
     case 'bitcoin-86':
-      return getBitDerivePathFunction(86, 0);
+      return getBitDerivePathFunction(0, 86);
     case 'bittest-44':
-      return getBitDerivePathFunction(44, 1);
+      return getBitDerivePathFunction(1, 44);
     case 'bittest-84':
-      return getBitDerivePathFunction(84, 1);
+      return getBitDerivePathFunction(1, 84);
     case 'bittest-86':
-      return getBitDerivePathFunction(86, 1);
+      return getBitDerivePathFunction(1, 86);
     default:
       return () => '';
   }

local-libs/keyring/package.json

@@ -205,6 +205,7 @@
     "@polkadot/util-crypto": "^12.2.1",
     "bcryptjs": "^2.4.3",
     "bignumber.js": "^9.1.2",
+    "bip322-js": "^2.0.0",
     "bitcoinjs-lib": "^6.1.5",
     "bitcoinjs-message": "^2.2.0",
     "ecpair": "^2.1.0",

local-libs/keyring/pair/index.js

@@ -1,12 +1,12 @@
 // Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { Signer } from 'bip322-js';
 import * as bitcoin from 'bitcoinjs-lib';
-import { sign as bitcoinSignMessage } from 'bitcoinjs-message';
 import { ECPairFactory } from 'ecpair';
 import SimpleKeyring from 'eth-simple-keyring';
 import * as ecc from 'tiny-secp256k1';
-import { hexAddPrefix, hexStripPrefix, objectSpread, u8aConcat, u8aEmpty, u8aEq, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { hexAddPrefix, hexStripPrefix, objectSpread, u8aConcat, u8aEmpty, u8aEq, u8aToHex, u8aToString, u8aToU8a } from '@polkadot/util';
 import { blake2AsU8a, ethereumEncode, hdEthereum, keyExtractPath, mnemonicToLegacySeed, secp256k1Compress, signatureVerify, sr25519VrfSign, sr25519VrfVerify } from '@polkadot/util-crypto';
 import { entropyToMnemonic } from '@polkadot/util-crypto/mnemonic/bip39';
 import { getDerivePath, keyFromPath, TYPE_ADDRESS, TYPE_FROM_SEED, TYPE_PREFIX, TYPE_SIGNATURE } from "../utils/index.js";
@@ -94,13 +94,13 @@ export function createPair({
   const encodeAddress = () => {
     const raw = TYPE_ADDRESS[type](publicKey);
     const bitNetwork = ['bitcoin-44', 'bitcoin-84', 'bitcoin-86'].includes(type) ? bitcoin.networks.bitcoin : ['bittest-44', 'bittest-84', 'bittest-86'].includes(type) ? bitcoin.networks.testnet : bitcoin.networks.regtest;
+    let dataKey;
 
     /**
      *  With bitcoin accounts, some attached account have no public key (only address).
      *  In this case, public key is the hash of result after decoded address.
      *  Add `noPublicKey` in metadata for this case.
      */
-    let dataKey;
     if (meta.noPublicKey) {
       dataKey = 'hash';
     } else {
@@ -301,34 +301,37 @@ export function createPair({
             type
           }, derived, meta, null);
         },
-        signMessage: (message, compressed, options) => {
+        signMessage: message => {
           if (isLocked(secretKey)) {
             throw new Error('Cannot encrypt with a locked key pair');
           }
-          const _message = typeof message === 'string' ? message : Buffer.from(message);
+          const _message = typeof message === 'string' ? message : u8aToString(message);
+          const address = encodeAddress();
+          const _pair = ECPair.fromPrivateKey(Buffer.from(secretKey));
+          const wif = _pair.toWIF();
 
           // Sign the message
-          const signature = bitcoinSignMessage(_message, Buffer.from(secretKey), compressed, options);
-          return signature.toString('base64');
+          const signature = Signer.sign(wif, address, _message);
+          return typeof signature === 'string' ? signature : signature.toString('base64');
         },
-        signTransaction: (transaction, indexes) => {
+        signTransaction: (psbt, indexes, sighashTypes, tapLeafHashToSign) => {
           if (isLocked(secretKey)) {
             throw new Error('Cannot encrypt with a locked key pair');
           }
-          if (!transaction) {
+          if (!psbt) {
             throw new Error('Not found sign method');
           }
           const pair = ECPair.fromPrivateKey(Buffer.from(secretKey));
           const isTaproot = ['bitcoin-86', 'bittest-86'].includes(type);
           for (const index of indexes) {
             if (isTaproot) {
               const tweakedSigner = pair.tweak(bitcoin.crypto.taggedHash('TapTweak', toXOnly(pair.publicKey)));
-              transaction.signTaprootInput(index, tweakedSigner);
+              psbt.signTaprootInput(index, tweakedSigner, tapLeafHashToSign, sighashTypes);
             } else {
-              transaction.signInput(index, pair);
+              psbt.signInput(index, pair, sighashTypes);
             }
           }
-          return transaction;
+          return psbt;
         },
         get output() {
           return output || Buffer.from([]);

local-libs/keyring/types.d.ts

@@ -4,7 +4,6 @@ import type { HexString } from '@polkadot/util/types';
 import type { EncryptedJson, Keypair, Prefix } from '@polkadot/util-crypto/types';
 import { TypedTransaction } from '@ethereumjs/tx';
 import { Psbt as BitcoinTransaction } from 'bitcoinjs-lib';
-import { SignatureOptions } from 'bitcoinjs-message';
 /**
  *
  *
@@ -58,8 +57,8 @@ export interface SubstrateSigner {
 }
 export interface BitcoinSigner {
     derive: (index: number, meta?: KeyringPair$Meta) => KeyringPair;
-    signMessage: (message: HexString | string | Uint8Array, compressed?: boolean, options?: SignatureOptions) => string;
-    signTransaction: (transaction: BitcoinTransaction, indexes: number[]) => BitcoinTransaction;
+    signMessage: (message: HexString | string | Uint8Array) => string;
+    signTransaction: (transaction: BitcoinTransaction, indexes: number[], sighashTypes?: number[], tapLeafHashToSign?: Buffer | undefined) => BitcoinTransaction;
     output: Buffer;
     internalPubkey: Buffer;
 }

local-libs/keyring/utils/derive-path.d.ts

@@ -2,5 +2,5 @@ import { KeypairType } from '../types';
 export declare const emvPath = "m/44'/60'/0'/0/{index}";
 export declare const bitPath = "m/{proposal}'/{slip44}'/{index}'/0/0";
 export declare const getEvmDerivePath: (index: number) => string;
-export declare const getBitDerivePathFunction: (proposal: number, slip44: number) => (index: number) => string;
+export declare const getBitDerivePathFunction: (slip44: number, proposal: number) => (index: number) => string;
 export declare const getDerivePath: (type: KeypairType) => (index: number) => string;

local-libs/keyring/utils/derive-path.js

@@ -6,7 +6,7 @@ export const bitPath = "m/{proposal}'/{slip44}'/{index}'/0/0";
 export const getEvmDerivePath = index => {
   return emvPath.replace('{index}', index.toString());
 };
-export const getBitDerivePathFunction = (proposal, slip44) => {
+export const getBitDerivePathFunction = (slip44, proposal) => {
   const path = bitPath.replace('{proposal}', proposal.toString()).replace('{slip44}', slip44.toString());
   return index => {
     return path.replace('{index}', index.toString());
@@ -17,17 +17,17 @@ export const getDerivePath = type => {
     case 'ethereum':
       return getEvmDerivePath;
     case 'bitcoin-44':
-      return getBitDerivePathFunction(44, 0);
+      return getBitDerivePathFunction(0, 44);
     case 'bitcoin-84':
-      return getBitDerivePathFunction(84, 0);
+      return getBitDerivePathFunction(0, 84);
     case 'bitcoin-86':
-      return getBitDerivePathFunction(86, 0);
+      return getBitDerivePathFunction(0, 86);
     case 'bittest-44':
-      return getBitDerivePathFunction(44, 1);
+      return getBitDerivePathFunction(1, 44);
     case 'bittest-84':
-      return getBitDerivePathFunction(84, 1);
+      return getBitDerivePathFunction(1, 84);
     case 'bittest-86':
-      return getBitDerivePathFunction(86, 1);
+      return getBitDerivePathFunction(1, 86);
     default:
       return () => '';
   }

packages/extension-base/package.json

@@ -89,9 +89,11 @@
     "web3-core-subscriptions": "1.10.0",
     "web3-eth": "1.10.0",
     "web3-eth-contract": "^1.10.0",
-    "web3-utils": "^1.10.0"
+    "web3-utils": "^1.10.0",
+    "yup": "^1.4.0"
   },
   "devDependencies": {
+    "@btckit/types": "^0.0.19",
     "@types/uuid": "^9.0.1"
   }
 }