@airgap/bitcoin 0.13.8-beta.9 → 0.13.9-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -32096,16 +32096,6 @@ module.exports={
32096
32096
  "$ref": "#/definitions/UnsignedBitcoinSegwitTransaction",
32097
32097
  "$schema": "http://json-schema.org/draft-07/schema#",
32098
32098
  "definitions": {
32099
- "RawBitcoinSegwitTransaction": {
32100
- "additionalProperties": false,
32101
- "properties": {
32102
- "psbt": {
32103
- "type": "string"
32104
- }
32105
- },
32106
- "required": ["psbt"],
32107
- "type": "object"
32108
- },
32109
32099
  "UnsignedBitcoinSegwitTransaction": {
32110
32100
  "additionalProperties": false,
32111
32101
  "properties": {
@@ -32116,7 +32106,14 @@ module.exports={
32116
32106
  "type": "string"
32117
32107
  },
32118
32108
  "transaction": {
32119
- "$ref": "#/definitions/RawBitcoinSegwitTransaction"
32109
+ "additionalProperties": false,
32110
+ "properties": {
32111
+ "psbt": {
32112
+ "type": "string"
32113
+ }
32114
+ },
32115
+ "required": ["psbt"],
32116
+ "type": "object"
32120
32117
  }
32121
32118
  },
32122
32119
  "required": ["publicKey", "transaction"],
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@airgap/bitcoin",
3
- "version": "0.13.8-beta.9",
3
+ "version": "0.13.9-beta.0",
4
4
  "description": "The @airgap/bitcoin is a Bitcoin implementation of the ICoinProtocol interface from @airgap/coinlib-core.",
5
5
  "keywords": [
6
6
  "airgap",
@@ -34,9 +34,9 @@
34
34
  "bitcoinjs-lib": "5.2.0"
35
35
  },
36
36
  "peerDependencies": {
37
- "@airgap/coinlib-core": "^0.13.8-beta.6",
38
- "@airgap/module-kit": "^0.13.8-beta.6",
39
- "@airgap/serializer": "^0.13.8-beta.6"
37
+ "@airgap/coinlib-core": "^0.13.9-beta.0",
38
+ "@airgap/module-kit": "^0.13.9-beta.0",
39
+ "@airgap/serializer": "^0.13.9-beta.0"
40
40
  },
41
41
  "localDependencies": {
42
42
  "bitcoinjs-message": "2.1.1"
@@ -2,16 +2,6 @@
2
2
  "$ref": "#/definitions/UnsignedBitcoinSegwitTransaction",
3
3
  "$schema": "http://json-schema.org/draft-07/schema#",
4
4
  "definitions": {
5
- "RawBitcoinSegwitTransaction": {
6
- "additionalProperties": false,
7
- "properties": {
8
- "psbt": {
9
- "type": "string"
10
- }
11
- },
12
- "required": ["psbt"],
13
- "type": "object"
14
- },
15
5
  "UnsignedBitcoinSegwitTransaction": {
16
6
  "additionalProperties": false,
17
7
  "properties": {
@@ -22,7 +12,14 @@
22
12
  "type": "string"
23
13
  },
24
14
  "transaction": {
25
- "$ref": "#/definitions/RawBitcoinSegwitTransaction"
15
+ "additionalProperties": false,
16
+ "properties": {
17
+ "psbt": {
18
+ "type": "string"
19
+ }
20
+ },
21
+ "required": ["psbt"],
22
+ "type": "object"
26
23
  }
27
24
  },
28
25
  "required": ["publicKey", "transaction"],
package/v1/utils/key.js CHANGED
@@ -129,7 +129,8 @@ function convertEncodedExtendedPublicKey(extendedPublicKey, target) {
129
129
  if (prefix === undefined) {
130
130
  throw new errors_1.ConditionViolationError(coinlib_core_1.Domain.BITCOIN, 'Unsupported encoded extended public key.');
131
131
  }
132
- var prefixBytes = Buffer.from(prefix, 'hex').length;
132
+ var encoding = recognizeExtendedPublicKeyEncoding(prefix);
133
+ var prefixBytes = Buffer.from(encoding[prefix], 'hex').length;
133
134
  return bs58check.decode(extendedPublicKey).slice(prefixBytes).toString('hex');
134
135
  default:
135
136
  (0, coinlib_core_1.assertNever)(target);
@@ -1 +1 @@
1
- {"version":3,"file":"key.js","sourceRoot":"","sources":["../../../src/v1/utils/key.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAA0D;AAC1D,+FAAkF;AAClF,sDAAuF;AACvF,iDAS2B;AAQ3B,IAAM,aAAa,GAAqD;IACtE,IAAI,EAAE,UAAU;CACjB,CAAA;AAED,IAAM,qBAAqB,GAA4D;IACrF,IAAI,EAAE,UAAU;CACjB,CAAA;AAED,IAAM,oBAAoB,GAA2D;IACnF,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,UAAU;CACjB,CAAA;AAUD,IAAM,yBAAyB,GAA6B,CAAC,aAAa,EAAE,qBAAqB,EAAE,oBAAoB,CAAC,CAAA;AACxH,IAAM,0BAA0B,GAAa,yBAAyB,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,IAAI,IAAK,OAAA,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAA7B,CAA6B,EAAE,EAAc,CAAC,CAAA;AAE3I,SAAgB,gBAAgB,CAAC,SAAoB,EAAE,YAAiC;IACtF,IAAI,SAAS,CAAC,MAAM,KAAK,YAAY,EAAE;QACrC,OAAO,SAAS,CAAA;KACjB;IAED,QAAQ,SAAS,CAAC,MAAM,EAAE;QACxB,KAAK,SAAS;YACZ,MAAM,IAAI,yBAAgB,CAAC,qBAAM,CAAC,OAAO,EAAE,wCAAiC,SAAS,CAAC,MAAM,MAAG,CAAC,CAAA;QAClG,KAAK,KAAK;YACR,OAAO,IAAA,yBAAY,EAAC,mBAAmB,CAAC,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAA;QACzE;YACE,IAAA,0BAAW,EAAC,SAAS,CAAC,MAAM,CAAC,CAAA;YAC7B,MAAM,IAAI,yBAAgB,CAAC,qBAAM,CAAC,OAAO,EAAE,gCAAgC,CAAC,CAAA;KAC/E;AACH,CAAC;AAdD,4CAcC;AAED,SAAS,mBAAmB,CAAC,SAAiB,EAAE,YAAiC;IAC/E,IAAI,YAAY,KAAK,KAAK,EAAE;QAC1B,OAAO,SAAS,CAAA;KACjB;IAED,MAAM,IAAI,yBAAgB,CAAC,qBAAM,CAAC,OAAO,EAAE,wCAAiC,YAAY,MAAG,CAAC,CAAA;AAC9F,CAAC;AAED,SAAgB,wBAAwB,CACtC,iBAAoC,EACpC,YAAyC;IAEzC,IAAI,iBAAiB,CAAC,MAAM,KAAK,YAAY,EAAE;QAC7C,OAAO,iBAAiB,CAAA;KACzB;IAED,QAAQ,iBAAiB,CAAC,MAAM,EAAE;QAChC,KAAK,SAAS;YACZ,OAAO,IAAA,iCAAoB,EAAC,+BAA+B,CAAC,iBAAiB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAA;QACrG,KAAK,KAAK;YACR,MAAM,IAAI,yBAAgB,CAAC,qBAAM,CAAC,OAAO,EAAE,iDAA0C,iBAAiB,CAAC,MAAM,MAAG,CAAC,CAAA;QACnH;YACE,IAAA,0BAAW,EAAC,iBAAiB,CAAC,MAAM,CAAC,CAAA;YACrC,MAAM,IAAI,yBAAgB,CAAC,qBAAM,CAAC,OAAO,EAAE,yCAAyC,CAAC,CAAA;KACxF;AACH,CAAC;AAjBD,4DAiBC;AAED,SAAS,+BAA+B,CAAC,iBAAyB,EAAE,YAAyC;IAC3G,IAAI,YAAY,KAAK,SAAS,EAAE;QAC9B,OAAO,iBAAiB,CAAA;KACzB;IAED,MAAM,IAAI,yBAAgB,CAAC,qBAAM,CAAC,OAAO,EAAE,iDAA0C,YAAY,MAAG,CAAC,CAAA;AACvG,CAAC;AAED,SAAgB,gBAAgB,CAAC,SAAoB,EAAE,YAAiC;IACtF,IAAI,SAAS,CAAC,MAAM,KAAK,YAAY,EAAE;QACrC,OAAO,SAAS,CAAA;KACjB;IAED,QAAQ,SAAS,CAAC,MAAM,EAAE;QACxB,KAAK,SAAS;YACZ,MAAM,IAAI,yBAAgB,CAAC,qBAAM,CAAC,OAAO,EAAE,wCAAiC,SAAS,CAAC,MAAM,MAAG,CAAC,CAAA;QAClG,KAAK,KAAK;YACR,OAAO,IAAA,yBAAY,EAAC,mBAAmB,CAAC,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAA;QACzE;YACE,IAAA,0BAAW,EAAC,SAAS,CAAC,MAAM,CAAC,CAAA;YAC7B,MAAM,IAAI,yBAAgB,CAAC,qBAAM,CAAC,OAAO,EAAE,gCAAgC,CAAC,CAAA;KAC/E;AACH,CAAC;AAdD,4CAcC;AAED,SAAS,mBAAmB,CAAC,EAAU,EAAE,YAAiC;IACxE,IAAI,YAAY,KAAK,KAAK,EAAE;QAC1B,OAAO,EAAE,CAAA;KACV;IAED,MAAM,IAAI,yBAAgB,CAAC,qBAAM,CAAC,OAAO,EAAE,wCAAiC,YAAY,MAAG,CAAC,CAAA;AAC9F,CAAC;AAMD,SAAgB,wBAAwB,CACtC,iBAAoC,EACpC,MAAgD;IAEhD,QAAQ,iBAAiB,CAAC,MAAM,EAAE;QAChC,KAAK,SAAS;YACZ,OAAO,IAAA,iCAAoB,EAAC,+BAA+B,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAA;QAC/F,KAAK,KAAK;YACR,OAAO,IAAA,iCAAoB,EAAC,2BAA2B,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAA;QAC3F;YACE,IAAA,0BAAW,EAAC,iBAAiB,CAAC,MAAM,CAAC,CAAA;YACrC,MAAM,IAAI,yBAAgB,CAAC,qBAAM,CAAC,OAAO,EAAE,yCAAyC,CAAC,CAAA;KACxF;AACH,CAAC;AAbD,4DAaC;AAED,SAAS,+BAA+B,CACtC,iBAAyB,EACzB,MAAgD;IAEhD,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,iBAAiB,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC5E,OAAO,iBAAiB,CAAA;KACzB;IAED,QAAQ,MAAM,CAAC,MAAM,EAAE;QACrB,KAAK,SAAS;YACZ,IAAM,oBAAoB,GAAW,+BAA+B,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;YAE1G,OAAO,2BAA2B,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAA;QAClE,KAAK,KAAK;YACR,IAAM,MAAM,GAAuB,0BAA0B,CAAC,IAAI,CAAC,UAAC,MAAc,IAAK,OAAA,iBAAiB,CAAC,UAAU,CAAC,MAAM,CAAC,EAApC,CAAoC,CAAC,CAAA;YAC5H,IAAI,MAAM,KAAK,SAAS,EAAE;gBACxB,MAAM,IAAI,gCAAuB,CAAC,qBAAM,CAAC,OAAO,EAAE,0CAA0C,CAAC,CAAA;aAC9F;YACD,IAAM,WAAW,GAAW,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,MAAM,CAAA;YAE7D,OAAO,SAAS,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC/E;YACE,IAAA,0BAAW,EAAC,MAAM,CAAC,CAAA;YACnB,MAAM,IAAI,yBAAgB,CAAC,qBAAM,CAAC,OAAO,EAAE,yCAAyC,CAAC,CAAA;KACxF;AACH,CAAC;AAED,SAAS,2BAA2B,CAClC,iBAAyB,EACzB,MAAgD;IAEhD,IAAI,MAAM,CAAC,MAAM,KAAK,KAAK,EAAE;QAC3B,OAAO,iBAAiB,CAAA;KACzB;IAED,IAAM,QAAQ,GAAwC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrG,IAAM,MAAM,GAAW,QAAQ,CAAC,MAAM,CAAC,IAAW,CAAC,CAAA;IAEnD,OAAO,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AAC7G,CAAC;AAED,SAAS,kCAAkC,CAA0B,IAAc;IACjF,IAAM,UAAU,GAA6B,yBAAyB,CAAA;IACtE,IAAM,QAAQ,GAAuC,UAAU,CAAC,IAAI,CAAC,UAAC,SAAiC;QACrG,OAAA,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;IAArC,CAAqC,CACtC,CAAA;IACD,IAAI,QAAQ,KAAK,SAAS,EAAE;QAC1B,MAAM,IAAI,yBAAgB,CAAC,qBAAM,CAAC,OAAO,EAAE,2CAA2C,CAAC,CAAA;KACxF;IAED,OAAO,QAA+C,CAAA;AACxD,CAAC"}
1
+ {"version":3,"file":"key.js","sourceRoot":"","sources":["../../../src/v1/utils/key.ts"],"names":[],"mappings":"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"}