@shapeshiftoss/hdwallet-native 1.32.0 → 1.33.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.
package/dist/binance.d.ts CHANGED
@@ -24,7 +24,7 @@ export declare function MixinNativeBinanceWalletInfo<TBase extends core.Construc
24
24
  export declare function MixinNativeBinanceWallet<TBase extends core.Constructor<NativeHDWalletBase>>(Base: TBase): {
25
25
  new (...args: any[]): {
26
26
  readonly _supportsBinance: true;
27
- "__#6@#masterKey": Isolation.Core.BIP32.Node | undefined;
27
+ "__#8@#masterKey": Isolation.Core.BIP32.Node | undefined;
28
28
  binanceInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
29
29
  binanceWipe(): void;
30
30
  binanceBech32ify(address: ArrayLike<number>, prefix: string): string;
@@ -35,7 +35,7 @@ export declare function MixinNativeBinanceWallet<TBase extends core.Constructor<
35
35
  binanceSignTx(msg: core.BinanceSignTx & {
36
36
  testnet?: boolean;
37
37
  }): Promise<core.BinanceSignedTx | null>;
38
- readonly "__#15@#events": import("eventemitter2").EventEmitter2;
38
+ readonly "__#17@#events": import("eventemitter2").EventEmitter2;
39
39
  readonly events: import("eventemitter2").EventEmitter2;
40
40
  needsMnemonic<T>(hasMnemonic: boolean, callback: () => T): T | null;
41
41
  getVendor(): string;
package/dist/bitcoin.d.ts CHANGED
@@ -45,7 +45,7 @@ export declare function MixinNativeBTCWalletInfo<TBase extends core.Constructor<
45
45
  export declare function MixinNativeBTCWallet<TBase extends core.Constructor<NativeHDWalletBase>>(Base: TBase): {
46
46
  new (...args: any[]): {
47
47
  readonly _supportsBTC: true;
48
- "__#5@#masterKey": Isolation.Core.BIP32.Node | undefined;
48
+ "__#7@#masterKey": Isolation.Core.BIP32.Node | undefined;
49
49
  btcInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
50
50
  btcWipe(): void;
51
51
  createPayment(pubkey: Buffer, scriptType?: BTCScriptType | undefined, network?: bitcoin.networks.Network | undefined): bitcoin.Payment;
@@ -55,7 +55,7 @@ export declare function MixinNativeBTCWallet<TBase extends core.Constructor<Nati
55
55
  btcSignTx(msg: core.BTCSignTxNative): Promise<core.BTCSignedTx | null>;
56
56
  btcSignMessage(msg: core.BTCSignMessage): Promise<core.BTCSignedMessage>;
57
57
  btcVerifyMessage(msg: core.BTCVerifyMessage): Promise<boolean>;
58
- readonly "__#15@#events": import("eventemitter2").EventEmitter2;
58
+ readonly "__#17@#events": import("eventemitter2").EventEmitter2;
59
59
  readonly events: import("eventemitter2").EventEmitter2;
60
60
  needsMnemonic<T>(hasMnemonic: boolean, callback: () => T): T | null;
61
61
  getVendor(): string;
package/dist/cosmos.d.ts CHANGED
@@ -24,14 +24,14 @@ export declare function MixinNativeCosmosWalletInfo<TBase extends core.Construct
24
24
  export declare function MixinNativeCosmosWallet<TBase extends core.Constructor<NativeHDWalletBase>>(Base: TBase): {
25
25
  new (...args: any[]): {
26
26
  readonly _supportsCosmos: true;
27
- "__#7@#masterKey": Isolation.Core.BIP32.Node | undefined;
27
+ "__#9@#masterKey": Isolation.Core.BIP32.Node | undefined;
28
28
  cosmosInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
29
29
  cosmosWipe(): void;
30
30
  cosmosBech32ify(address: ArrayLike<number>, prefix: string): string;
31
31
  createCosmosAddress(publicKey: string): string;
32
32
  cosmosGetAddress(msg: core.CosmosGetAddress): Promise<string | null>;
33
33
  cosmosSignTx(msg: core.CosmosSignTx): Promise<core.CosmosSignedTx | null>;
34
- readonly "__#15@#events": import("eventemitter2").EventEmitter2;
34
+ readonly "__#17@#events": import("eventemitter2").EventEmitter2;
35
35
  readonly events: import("eventemitter2").EventEmitter2;
36
36
  needsMnemonic<T>(hasMnemonic: boolean, callback: () => T): T | null;
37
37
  getVendor(): string;
@@ -1,15 +1,15 @@
1
+ import * as core from "@shapeshiftoss/hdwallet-core";
1
2
  import * as ethers from "ethers";
2
- import { SecP256K1 } from "../core";
3
- export declare class SignerAdapter extends ethers.Signer {
4
- protected readonly _isolatedKey: SecP256K1.ECDSAKey;
3
+ import { Isolation } from "../..";
4
+ export declare class SignerAdapter {
5
+ protected readonly nodeAdapter: Isolation.Adapters.BIP32;
5
6
  readonly provider?: ethers.providers.Provider;
6
- protected constructor(isolatedKey: SecP256K1.ECDSAKey, provider?: ethers.providers.Provider);
7
- static create(isolatedKey: SecP256K1.ECDSAKey, provider?: ethers.providers.Provider): Promise<SignerAdapter>;
7
+ constructor(nodeAdapter: Isolation.Adapters.BIP32, provider?: ethers.providers.Provider);
8
8
  connect(_provider: ethers.providers.Provider): never;
9
- getAddress(): Promise<string>;
10
- signDigest(digest: ethers.BytesLike): Promise<ethers.Signature>;
11
- signTransaction(transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>): Promise<string>;
12
- signMessage(messageData: ethers.Bytes | string): Promise<string>;
9
+ getAddress(addressNList: core.BIP32Path): Promise<string>;
10
+ signDigest(digest: ethers.BytesLike, addressNList: core.BIP32Path): Promise<ethers.Signature>;
11
+ signTransaction(transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>, addressNList: core.BIP32Path): Promise<string>;
12
+ signMessage(messageData: ethers.Bytes | string, addressNList: core.BIP32Path): Promise<string>;
13
13
  }
14
14
  export default SignerAdapter;
15
15
  //# sourceMappingURL=ethereum.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ethereum.d.ts","sourceRoot":"","sources":["../../../../src/crypto/isolation/adapters/ethereum.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAQpC,qBAAa,aAAc,SAAQ,MAAM,CAAC,MAAM;IAC9C,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC,QAAQ,CAAC;IACpD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;IAE9C,SAAS,aAAa,WAAW,EAAE,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ;WAM9E,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC;IASlH,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,GAAG,KAAK;IAI9C,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAI7B,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;IAW/D,eAAe,CAAC,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAkB3G,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,KAAK,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAYvE;AAED,eAAe,aAAa,CAAC"}
1
+ {"version":3,"file":"ethereum.d.ts","sourceRoot":"","sources":["../../../../src/crypto/isolation/adapters/ethereum.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,8BAA8B,CAAC;AACrD,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AASlC,qBAAa,aAAa;IACxB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;IACzD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;gBAElC,WAAW,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ;IAUvF,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,GAAG,KAAK;IAI9C,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAKzD,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,YAAY,EAAE,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;IAY7F,eAAe,CACnB,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,EACzE,YAAY,EAAE,IAAI,CAAC,SAAS,GAC3B,OAAO,CAAC,MAAM,CAAC;IAmBZ,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,KAAK,GAAG,MAAM,EAAE,YAAY,EAAE,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAarG;AAED,eAAe,aAAa,CAAC"}
@@ -37,17 +37,11 @@ function ethSigFromRecoverableSig(x) {
37
37
  const recoveryParam = core_1.SecP256K1.RecoverableSignature.recoveryParam(x);
38
38
  return ethers.utils.splitSignature(core.compatibleBufferConcat([sig, Buffer.from([recoveryParam])]));
39
39
  }
40
- class SignerAdapter extends ethers.Signer {
41
- constructor(isolatedKey, provider) {
42
- super();
43
- this._isolatedKey = isolatedKey;
40
+ class SignerAdapter {
41
+ constructor(nodeAdapter, provider) {
42
+ this.nodeAdapter = nodeAdapter;
44
43
  this.provider = provider;
45
44
  }
46
- static create(isolatedKey, provider) {
47
- return __awaiter(this, void 0, void 0, function* () {
48
- return new SignerAdapter(isolatedKey, provider);
49
- });
50
- }
51
45
  // This throws (as allowed by ethers.Signer) to avoid having to return an object which is initialized asynchronously
52
46
  // from a synchronous function. Because all the (other) methods on SignerAdapter are async, one could construct a
53
47
  // wrapper that deferred its initialization and awaited it before calling through to a "real" method, but that's
@@ -56,35 +50,38 @@ class SignerAdapter extends ethers.Signer {
56
50
  connect(_provider) {
57
51
  throw new Error("changing providers on a SignerAdapter is unsupported");
58
52
  }
59
- getAddress() {
53
+ getAddress(addressNList) {
60
54
  return __awaiter(this, void 0, void 0, function* () {
61
- return ethers.utils.computeAddress(core_1.SecP256K1.UncompressedPoint.from(yield this._isolatedKey.getPublicKey()));
55
+ const nodeAdapter = yield this.nodeAdapter.derivePath(core.addressNListToBIP32(addressNList));
56
+ return ethers.utils.computeAddress(core_1.SecP256K1.UncompressedPoint.from(nodeAdapter.getPublicKey()));
62
57
  });
63
58
  }
64
- signDigest(digest) {
59
+ signDigest(digest, addressNList) {
65
60
  return __awaiter(this, void 0, void 0, function* () {
66
- const recoverableSig = yield core_1.SecP256K1.RecoverableSignature.signCanonically(this._isolatedKey, null, digest instanceof Uint8Array ? digest : ethers.utils.arrayify(digest));
61
+ const nodeAdapter = yield this.nodeAdapter.derivePath(core.addressNListToBIP32(addressNList));
62
+ const recoverableSig = yield core_1.SecP256K1.RecoverableSignature.signCanonically(nodeAdapter.node, null, digest instanceof Uint8Array ? digest : ethers.utils.arrayify(digest));
67
63
  const sig = core_1.SecP256K1.RecoverableSignature.sig(recoverableSig);
68
64
  const recoveryParam = core_1.SecP256K1.RecoverableSignature.recoveryParam(recoverableSig);
69
65
  return ethers.utils.splitSignature(core.compatibleBufferConcat([sig, Buffer.from([recoveryParam])]));
70
66
  });
71
67
  }
72
- signTransaction(transaction) {
68
+ signTransaction(transaction, addressNList) {
73
69
  return __awaiter(this, void 0, void 0, function* () {
74
70
  const tx = yield ethers.utils.resolveProperties(transaction);
75
71
  if (tx.from != null) {
76
- if (ethers.utils.getAddress(tx.from) !== (yield this.getAddress())) {
72
+ if (ethers.utils.getAddress(tx.from) !== (yield this.getAddress(addressNList))) {
77
73
  throw new Error("transaction from address mismatch");
78
74
  }
79
75
  delete tx.from;
80
76
  }
81
77
  const unsignedTx = Object.assign(Object.assign({}, tx), { nonce: tx.nonce !== undefined ? ethers.BigNumber.from(tx.nonce).toNumber() : undefined });
78
+ const nodeAdapter = yield this.nodeAdapter.derivePath(core.addressNListToBIP32(addressNList));
82
79
  const txBuf = ethers.utils.arrayify(ethers.utils.serializeTransaction(unsignedTx));
83
- const rawSig = yield core_1.SecP256K1.RecoverableSignature.signCanonically(this._isolatedKey, "keccak256", txBuf);
80
+ const rawSig = yield core_1.SecP256K1.RecoverableSignature.signCanonically(nodeAdapter.node, "keccak256", txBuf);
84
81
  return ethers.utils.serializeTransaction(unsignedTx, ethSigFromRecoverableSig(rawSig));
85
82
  });
86
83
  }
87
- signMessage(messageData) {
84
+ signMessage(messageData, addressNList) {
88
85
  return __awaiter(this, void 0, void 0, function* () {
89
86
  const messageDataBuf = typeof messageData === "string"
90
87
  ? Buffer.from(messageData.normalize("NFKD"), "utf8")
@@ -93,7 +90,8 @@ class SignerAdapter extends ethers.Signer {
93
90
  Buffer.from(`\x19Ethereum Signed Message:\n${messageDataBuf.length}`, "utf8"),
94
91
  messageDataBuf,
95
92
  ]);
96
- const rawSig = yield core_1.SecP256K1.RecoverableSignature.signCanonically(this._isolatedKey, "keccak256", messageBuf);
93
+ const nodeAdapter = yield this.nodeAdapter.derivePath(core.addressNListToBIP32(addressNList));
94
+ const rawSig = yield core_1.SecP256K1.RecoverableSignature.signCanonically(nodeAdapter.node, "keccak256", messageBuf);
97
95
  return ethers.utils.joinSignature(ethSigFromRecoverableSig(rawSig));
98
96
  });
99
97
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ethereum.js","sourceRoot":"","sources":["../../../../src/crypto/isolation/adapters/ethereum.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ethereum.js","sourceRoot":"","sources":["../../../../src/crypto/isolation/adapters/ethereum.ts"],"names":[],"mappings":"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"}
@@ -4,8 +4,8 @@ import { ByteArray, Uint32 } from "../../types";
4
4
  export * from "../../core/bip32";
5
5
  declare const Node_base: {
6
6
  new (...args: any[]): {
7
- readonly "__#1@#revokers": Set<() => void>;
8
- "__#1@#revoked": boolean;
7
+ readonly "__#3@#revokers": Set<() => void>;
8
+ "__#3@#revoked": boolean;
9
9
  readonly revoke: () => void;
10
10
  readonly addRevoker: (revoker: () => void) => void;
11
11
  };
@@ -33,8 +33,8 @@ export declare class Node extends Node_base implements BIP32.Node, SecP256K1.ECD
33
33
  }
34
34
  declare const Seed_base: {
35
35
  new (...args: any[]): {
36
- readonly "__#1@#revokers": Set<() => void>;
37
- "__#1@#revoked": boolean;
36
+ readonly "__#3@#revokers": Set<() => void>;
37
+ "__#3@#revoked": boolean;
38
38
  readonly revoke: () => void;
39
39
  readonly addRevoker: (revoker: () => void) => void;
40
40
  };
@@ -3,8 +3,8 @@ import * as BIP39 from "../../core/bip39";
3
3
  export * from "../../core/bip39";
4
4
  declare const Mnemonic_base: {
5
5
  new (...args: any[]): {
6
- readonly "__#1@#revokers": Set<() => void>;
7
- "__#1@#revoked": boolean;
6
+ readonly "__#3@#revokers": Set<() => void>;
7
+ "__#3@#revoked": boolean;
8
8
  readonly revoke: () => void;
9
9
  readonly addRevoker: (revoker: () => void) => void;
10
10
  };
@@ -6,8 +6,8 @@ export interface Revocable {
6
6
  }
7
7
  export declare const Revocable: <T extends core.Constructor<object>>(x: T) => {
8
8
  new (...args: any[]): {
9
- readonly "__#1@#revokers": Set<() => void>;
10
- "__#1@#revoked": boolean;
9
+ readonly "__#3@#revokers": Set<() => void>;
10
+ "__#3@#revoked": boolean;
11
11
  readonly revoke: () => void;
12
12
  readonly addRevoker: (revoker: () => void) => void;
13
13
  };
@@ -1,6 +1,6 @@
1
1
  import * as core from "@shapeshiftoss/hdwallet-core";
2
- import * as ethers from "ethers";
3
2
  import * as Isolation from "./crypto/isolation";
3
+ import SignerAdapter from "./crypto/isolation/adapters/ethereum";
4
4
  import { NativeHDWalletBase } from "./native";
5
5
  export declare function MixinNativeETHWalletInfo<TBase extends core.Constructor<core.HDWalletInfo>>(Base: TBase): {
6
6
  new (...args: any[]): {
@@ -26,14 +26,14 @@ export declare function MixinNativeETHWalletInfo<TBase extends core.Constructor<
26
26
  export declare function MixinNativeETHWallet<TBase extends core.Constructor<NativeHDWalletBase>>(Base: TBase): {
27
27
  new (...args: any[]): {
28
28
  readonly _supportsETH: true;
29
- "__#8@#ethSigner": ethers.Signer | undefined;
29
+ "__#10@#ethSigner": SignerAdapter | undefined;
30
30
  ethInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
31
31
  ethWipe(): void;
32
32
  ethGetAddress(msg: core.ETHGetAddress): Promise<string | null>;
33
33
  ethSignTx(msg: core.ETHSignTx): Promise<core.ETHSignedTx | null>;
34
34
  ethSignMessage(msg: core.ETHSignMessage): Promise<core.ETHSignedMessage | null>;
35
35
  ethVerifyMessage(msg: core.ETHVerifyMessage): Promise<boolean>;
36
- readonly "__#15@#events": import("eventemitter2").EventEmitter2;
36
+ readonly "__#17@#events": import("eventemitter2").EventEmitter2;
37
37
  readonly events: import("eventemitter2").EventEmitter2;
38
38
  needsMnemonic<T>(hasMnemonic: boolean, callback: () => T): T | null;
39
39
  getVendor(): string;
@@ -1 +1 @@
1
- {"version":3,"file":"ethereum.d.ts","sourceRoot":"","sources":["../src/ethereum.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,8BAA8B,CAAC;AACrD,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,OAAO,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE9C,wBAAgB,wBAAwB,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK;;;8BAKvE,QAAQ,OAAO,CAAC;qCAIT,QAAQ,OAAO,CAAC;uCAIpB,OAAO;8BAIV,QAAQ,OAAO,CAAC;gCAIpB,KAAK,iBAAiB,GAAG,MAAM,KAAK,cAAc,CAAC;gCAcnD,KAAK,cAAc,GAAG,KAAK,cAAc,GAAG,SAAS;;;;;;;;;;;;UAMhF;AAED,wBAAgB,oBAAoB,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,KAAK;;;2BAKpF,OAAO,MAAM,GAAG,SAAS;uCAEA,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,QAAQ,IAAI,CAAC;;2BAUrD,KAAK,aAAa,GAAG,QAAQ,MAAM,GAAG,IAAI,CAAC;uBAQ/C,KAAK,SAAS,GAAG,QAAQ,KAAK,WAAW,GAAG,IAAI,CAAC;4BAqC5C,KAAK,cAAc,GAAG,QAAQ,KAAK,gBAAgB,GAAG,IAAI,CAAC;8BAYzD,KAAK,gBAAgB,GAAG,QAAQ,OAAO,CAAC;;;;;;;;;;;;;;;UAMvE"}
1
+ {"version":3,"file":"ethereum.d.ts","sourceRoot":"","sources":["../src/ethereum.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,8BAA8B,CAAC;AAGrD,OAAO,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAChD,OAAO,aAAa,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAG9C,wBAAgB,wBAAwB,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK;;;8BAKvE,QAAQ,OAAO,CAAC;qCAIT,QAAQ,OAAO,CAAC;uCAIpB,OAAO;8BAIV,QAAQ,OAAO,CAAC;gCAIpB,KAAK,iBAAiB,GAAG,MAAM,KAAK,cAAc,CAAC;gCAcnD,KAAK,cAAc,GAAG,KAAK,cAAc,GAAG,SAAS;;;;;;;;;;;;UAMhF;AAED,wBAAgB,oBAAoB,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,KAAK;;;4BAKpF,aAAa,GAAG,SAAS;uCAEA,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,QAAQ,IAAI,CAAC;;2BAUrD,KAAK,aAAa,GAAG,QAAQ,MAAM,GAAG,IAAI,CAAC;uBAW/C,KAAK,SAAS,GAAG,QAAQ,KAAK,WAAW,GAAG,IAAI,CAAC;4BA2C5C,KAAK,cAAc,GAAG,QAAQ,KAAK,gBAAgB,GAAG,IAAI,CAAC;8BAYzD,KAAK,gBAAgB,GAAG,QAAQ,OAAO,CAAC;;;;;;;;;;;;;;;UAMvE"}
package/dist/ethereum.js CHANGED
@@ -45,8 +45,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
45
45
  exports.MixinNativeETHWallet = exports.MixinNativeETHWalletInfo = void 0;
46
46
  const core = __importStar(require("@shapeshiftoss/hdwallet-core"));
47
47
  const ethers = __importStar(require("ethers"));
48
- const lodash_1 = __importDefault(require("lodash"));
49
48
  const Isolation = __importStar(require("./crypto/isolation"));
49
+ const ethereum_1 = __importDefault(require("./crypto/isolation/adapters/ethereum"));
50
+ // import { addressNListToBIP32 } from "./utils";
50
51
  function MixinNativeETHWalletInfo(Base) {
51
52
  // eslint-disable-next-line @typescript-eslint/no-shadow
52
53
  return class MixinNativeETHWalletInfo extends Base {
@@ -105,9 +106,8 @@ function MixinNativeETHWallet(Base) {
105
106
  }
106
107
  ethInitializeWallet(masterKey) {
107
108
  return __awaiter(this, void 0, void 0, function* () {
108
- const rootNode = yield Isolation.Adapters.BIP32.create(masterKey);
109
- const isolatedSigner = yield rootNode.derivePath(ethers.utils.defaultPath);
110
- __classPrivateFieldSet(this, _MixinNativeETHWallet_ethSigner, yield Isolation.Adapters.Ethereum.create(isolatedSigner.node), "f");
109
+ const nodeAdapter = yield Isolation.Adapters.BIP32.create(masterKey);
110
+ __classPrivateFieldSet(this, _MixinNativeETHWallet_ethSigner, new ethereum_1.default(nodeAdapter), "f");
111
111
  });
112
112
  }
113
113
  ethWipe() {
@@ -115,11 +115,13 @@ function MixinNativeETHWallet(Base) {
115
115
  }
116
116
  ethGetAddress(msg) {
117
117
  return __awaiter(this, void 0, void 0, function* () {
118
- if (!lodash_1.default.isEqual(msg.addressNList, core.bip32ToAddressNList("m/44'/60'/0'/0/0"))) {
119
- throw new Error("path not supported");
118
+ if (msg.addressNList.length < 5) {
119
+ throw new Error(`path not supported length: ${msg.addressNList.length}`);
120
120
  }
121
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
122
- return this.needsMnemonic(!!__classPrivateFieldGet(this, _MixinNativeETHWallet_ethSigner, "f"), () => __classPrivateFieldGet(this, _MixinNativeETHWallet_ethSigner, "f").getAddress());
121
+ return this.needsMnemonic(!!__classPrivateFieldGet(this, _MixinNativeETHWallet_ethSigner, "f"), () => {
122
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
123
+ return __classPrivateFieldGet(this, _MixinNativeETHWallet_ethSigner, "f").getAddress(msg.addressNList);
124
+ });
123
125
  });
124
126
  }
125
127
  ethSignTx(msg) {
@@ -128,7 +130,7 @@ function MixinNativeETHWallet(Base) {
128
130
  const utx = {
129
131
  to: msg.to,
130
132
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
131
- from: yield __classPrivateFieldGet(this, _MixinNativeETHWallet_ethSigner, "f").getAddress(),
133
+ from: yield __classPrivateFieldGet(this, _MixinNativeETHWallet_ethSigner, "f").getAddress(msg.addressNList),
132
134
  nonce: msg.nonce,
133
135
  gasLimit: msg.gasLimit,
134
136
  data: msg.data,
@@ -137,9 +139,9 @@ function MixinNativeETHWallet(Base) {
137
139
  };
138
140
  const result = msg.maxFeePerGas
139
141
  ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
140
- yield __classPrivateFieldGet(this, _MixinNativeETHWallet_ethSigner, "f").signTransaction(Object.assign(Object.assign({}, utx), { maxFeePerGas: msg.maxFeePerGas, maxPriorityFeePerGas: msg.maxPriorityFeePerGas, type: core.ETHTransactionType.ETH_TX_TYPE_EIP_1559 }))
142
+ yield __classPrivateFieldGet(this, _MixinNativeETHWallet_ethSigner, "f").signTransaction(Object.assign(Object.assign({}, utx), { maxFeePerGas: msg.maxFeePerGas, maxPriorityFeePerGas: msg.maxPriorityFeePerGas, type: core.ETHTransactionType.ETH_TX_TYPE_EIP_1559 }), msg.addressNList)
141
143
  : // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
142
- yield __classPrivateFieldGet(this, _MixinNativeETHWallet_ethSigner, "f").signTransaction(Object.assign(Object.assign({}, utx), { gasPrice: msg.gasPrice, type: core.ETHTransactionType.ETH_TX_TYPE_LEGACY }));
144
+ yield __classPrivateFieldGet(this, _MixinNativeETHWallet_ethSigner, "f").signTransaction(Object.assign(Object.assign({}, utx), { gasPrice: msg.gasPrice, type: core.ETHTransactionType.ETH_TX_TYPE_LEGACY }), msg.addressNList);
143
145
  const decoded = ethers.utils.parseTransaction(result);
144
146
  return {
145
147
  v: core.mustBeDefined(decoded.v),
@@ -154,10 +156,10 @@ function MixinNativeETHWallet(Base) {
154
156
  return __awaiter(this, void 0, void 0, function* () {
155
157
  return this.needsMnemonic(!!__classPrivateFieldGet(this, _MixinNativeETHWallet_ethSigner, "f"), () => __awaiter(this, void 0, void 0, function* () {
156
158
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
157
- const result = yield __classPrivateFieldGet(this, _MixinNativeETHWallet_ethSigner, "f").signMessage(msg.message);
159
+ const result = yield __classPrivateFieldGet(this, _MixinNativeETHWallet_ethSigner, "f").signMessage(msg.message, msg.addressNList);
158
160
  return {
159
161
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
160
- address: yield __classPrivateFieldGet(this, _MixinNativeETHWallet_ethSigner, "f").getAddress(),
162
+ address: yield __classPrivateFieldGet(this, _MixinNativeETHWallet_ethSigner, "f").getAddress(msg.addressNList),
161
163
  signature: result,
162
164
  };
163
165
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"ethereum.js","sourceRoot":"","sources":["../src/ethereum.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ethereum.js","sourceRoot":"","sources":["../src/ethereum.ts"],"names":[],"mappings":"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"}
@@ -69,13 +69,8 @@ describe("NativeETHWallet", () => {
69
69
  it("should generate a correct ethereum address", () => __awaiter(void 0, void 0, void 0, function* () {
70
70
  expect(yield wallet.ethGetAddress({ addressNList: core.bip32ToAddressNList("m/44'/60'/0'/0/0") })).toBe("0x73d0385F4d8E00C5e6504C6030F47BF6212736A8");
71
71
  }));
72
- // Reflection. Surprise. Terror. For the future.
73
- // eslint-disable-next-line jest/no-disabled-tests
74
- it.skip("should generate another correct ethereum address", () => __awaiter(void 0, void 0, void 0, function* () {
75
- expect(yield wallet.ethGetAddress({ addressNList: core.bip32ToAddressNList("m/44'/60'/1337'/123/4") })).toBe("0x387F3031b30E2c8eB997E87a69FEA02756983b77");
76
- }));
77
- it("fails when generating another ethereum address", () => __awaiter(void 0, void 0, void 0, function* () {
78
- yield expect(wallet.ethGetAddress({ addressNList: core.bip32ToAddressNList("m/44'/60'/1337'/123/4") })).rejects.toThrowError("path not supported");
72
+ it("should generate another correct ethereum address at account 1", () => __awaiter(void 0, void 0, void 0, function* () {
73
+ expect(yield wallet.ethGetAddress({ addressNList: core.bip32ToAddressNList("m/44'/60'/1'/0/0") })).toBe("0xeDe5D356020A0aA3DC3fCAf0d899b5c63d7eA4aa");
79
74
  }));
80
75
  it("should sign a legacy transaction correctly", () => __awaiter(void 0, void 0, void 0, function* () {
81
76
  const sig = yield wallet.ethSignTx({
@@ -1 +1 @@
1
- {"version":3,"file":"ethereum.test.js","sourceRoot":"","sources":["../src/ethereum.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ethereum.test.js","sourceRoot":"","sources":["../src/ethereum.test.ts"],"names":[],"mappings":"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"}
package/dist/fio.d.ts CHANGED
@@ -26,7 +26,7 @@ export declare function MixinNativeFioWallet<TBase extends core.Constructor<Nati
26
26
  new (...args: any[]): {
27
27
  readonly _supportsFio: true;
28
28
  baseUrl: string;
29
- "__#9@#masterKey": Isolation.Core.BIP32.Node | undefined;
29
+ "__#11@#masterKey": Isolation.Core.BIP32.Node | undefined;
30
30
  fioInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
31
31
  fioWipe(): void;
32
32
  getFioSdk(addressNList: core.BIP32Path): Promise<fio.FIOSDK | null>;
@@ -34,7 +34,7 @@ export declare function MixinNativeFioWallet<TBase extends core.Constructor<Nati
34
34
  fioSignTx(msg: core.FioSignTx): Promise<core.FioSignedTx | null>;
35
35
  fioEncryptRequestContent<T extends core.Fio.ContentType>(msg: core.FioEncryptRequestContentMsg<T>): Promise<string | null>;
36
36
  fioDecryptRequestContent<T_1 extends core.Fio.ContentType>(msg: core.FioDecryptRequestContentMsg<T_1>): Promise<core.Fio.Content<T_1> | null>;
37
- readonly "__#15@#events": import("eventemitter2").EventEmitter2;
37
+ readonly "__#17@#events": import("eventemitter2").EventEmitter2;
38
38
  readonly events: import("eventemitter2").EventEmitter2;
39
39
  needsMnemonic<T_2>(hasMnemonic: boolean, callback: () => T_2): T_2 | null;
40
40
  getVendor(): string;
package/dist/fio.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fio.d.ts","sourceRoot":"","sources":["../src/fio.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,KAAK,IAAI,MAAM,8BAA8B,CAAC;AAGrD,OAAO,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAY9C,wBAAgB,wBAAwB,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK;;;8BAKvE,QAAQ,OAAO,CAAC;qCAIT,QAAQ,OAAO,CAAC;uCAIpB,OAAO;gCAId,KAAK,kBAAkB,GAAG,MAAM,KAAK,cAAc,CAAC;gCASpD,KAAK,cAAc,GAAG,KAAK,cAAc,GAAG,SAAS;;;;;;;;;;;;UAMhF;AAED,wBAAgB,oBAAoB,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,KAAK;;;;2BAKpF,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,SAAS;uCAEZ,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,QAAQ,IAAI,CAAC;mBAInE,IAAI;iDAIgC,QAAQ,IAAI,MAAM,GAAG,IAAI,CAAC;2BAUhD,KAAK,aAAa,GAAG,QAAQ,MAAM,GAAG,IAAI,CAAC;uBAK/C,KAAK,SAAS,GAAG,QAAQ,KAAK,WAAW,GAAG,IAAI,CAAC;4GA+JnE,QAAQ,MAAM,GAAG,IAAI,CAAC;;;;;;;;;;;;;;;;UA+B5B"}
1
+ {"version":3,"file":"fio.d.ts","sourceRoot":"","sources":["../src/fio.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAC7C,OAAO,KAAK,IAAI,MAAM,8BAA8B,CAAC;AAGrD,OAAO,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAY9C,wBAAgB,wBAAwB,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK;;;8BAKvE,QAAQ,OAAO,CAAC;qCAIT,QAAQ,OAAO,CAAC;uCAIpB,OAAO;gCAId,KAAK,kBAAkB,GAAG,MAAM,KAAK,cAAc,CAAC;gCASpD,KAAK,cAAc,GAAG,KAAK,cAAc,GAAG,SAAS;;;;;;;;;;;;UAMhF;AAED,wBAAgB,oBAAoB,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,KAAK;;;;4BAKpF,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,SAAS;uCAEZ,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,QAAQ,IAAI,CAAC;mBAInE,IAAI;iDAIgC,QAAQ,IAAI,MAAM,GAAG,IAAI,CAAC;2BAUhD,KAAK,aAAa,GAAG,QAAQ,MAAM,GAAG,IAAI,CAAC;uBAK/C,KAAK,SAAS,GAAG,QAAQ,KAAK,WAAW,GAAG,IAAI,CAAC;4GA+JnE,QAAQ,MAAM,GAAG,IAAI,CAAC;;;;;;;;;;;;;;;;UA+B5B"}
package/dist/kava.d.ts CHANGED
@@ -24,14 +24,14 @@ export declare function MixinNativeKavaWalletInfo<TBase extends core.Constructor
24
24
  export declare function MixinNativeKavaWallet<TBase extends core.Constructor<NativeHDWalletBase>>(Base: TBase): {
25
25
  new (...args: any[]): {
26
26
  readonly _supportsKava: true;
27
- "__#10@#masterKey": Isolation.Core.BIP32.Node | undefined;
27
+ "__#12@#masterKey": Isolation.Core.BIP32.Node | undefined;
28
28
  kavaInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
29
29
  kavaWipe(): void;
30
30
  kavaBech32ify(address: ArrayLike<number>, prefix: string): string;
31
31
  createKavaAddress(publicKey: string): string;
32
32
  kavaGetAddress(msg: core.KavaGetAddress): Promise<string | null>;
33
33
  kavaSignTx(msg: core.KavaSignTx): Promise<core.KavaSignedTx | null>;
34
- readonly "__#15@#events": import("eventemitter2").EventEmitter2;
34
+ readonly "__#17@#events": import("eventemitter2").EventEmitter2;
35
35
  readonly events: import("eventemitter2").EventEmitter2;
36
36
  needsMnemonic<T>(hasMnemonic: boolean, callback: () => T): T | null;
37
37
  getVendor(): string;
package/dist/native.d.ts CHANGED
@@ -240,7 +240,7 @@ declare class NativeHDWalletInfo extends NativeHDWalletInfo_base implements core
240
240
  declare const NativeHDWallet_base: {
241
241
  new (...args: any[]): {
242
242
  readonly _supportsBTC: true;
243
- "__#5@#masterKey": Isolation.Core.BIP32.Node | undefined;
243
+ "__#7@#masterKey": Isolation.Core.BIP32.Node | undefined;
244
244
  btcInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
245
245
  btcWipe(): void;
246
246
  createPayment(pubkey: Buffer, scriptType?: import("./bitcoin").BTCScriptType | undefined, network?: import("@shapeshiftoss/bitcoinjs-lib").Network | undefined): import("@shapeshiftoss/bitcoinjs-lib").Payment;
@@ -258,7 +258,7 @@ declare const NativeHDWallet_base: {
258
258
  btcSignTx(msg: core.BTCSignTxNative): Promise<core.BTCSignedTx | null>;
259
259
  btcSignMessage(msg: core.BTCSignMessage): Promise<core.BTCSignedMessage>;
260
260
  btcVerifyMessage(msg: core.BTCVerifyMessage): Promise<boolean>;
261
- readonly "__#15@#events": eventemitter2.EventEmitter2;
261
+ readonly "__#17@#events": eventemitter2.EventEmitter2;
262
262
  readonly events: eventemitter2.EventEmitter2;
263
263
  /**
264
264
  * Wrap a function call that needs a mnemonic seed
@@ -280,7 +280,7 @@ declare const NativeHDWallet_base: {
280
280
  new (...args: any[]): {
281
281
  readonly _supportsFio: true;
282
282
  baseUrl: string;
283
- "__#9@#masterKey": Isolation.Core.BIP32.Node | undefined;
283
+ "__#11@#masterKey": Isolation.Core.BIP32.Node | undefined;
284
284
  fioInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
285
285
  fioWipe(): void;
286
286
  getFioSdk(addressNList: core.BIP32Path): Promise<import("@shapeshiftoss/fiosdk").FIOSDK | null>;
@@ -288,7 +288,7 @@ declare const NativeHDWallet_base: {
288
288
  fioSignTx(msg: core.FioSignTx): Promise<core.FioSignedTx | null>;
289
289
  fioEncryptRequestContent<T_1 extends core.Fio.ContentType>(msg: core.FioEncryptRequestContentMsg<T_1>): Promise<string | null>;
290
290
  fioDecryptRequestContent<T_2 extends core.Fio.ContentType>(msg: core.FioDecryptRequestContentMsg<T_2>): Promise<core.Fio.Content<T_2> | null>;
291
- readonly "__#15@#events": eventemitter2.EventEmitter2;
291
+ readonly "__#17@#events": eventemitter2.EventEmitter2;
292
292
  readonly events: eventemitter2.EventEmitter2;
293
293
  /**
294
294
  * Wrap a function call that needs a mnemonic seed
@@ -309,14 +309,14 @@ declare const NativeHDWallet_base: {
309
309
  } & {
310
310
  new (...args: any[]): {
311
311
  readonly _supportsETH: true;
312
- "__#8@#ethSigner": import("ethers").Signer | undefined;
312
+ "__#10@#ethSigner": Isolation.Adapters.Ethereum | undefined;
313
313
  ethInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
314
314
  ethWipe(): void;
315
315
  ethGetAddress(msg: core.ETHGetAddress): Promise<string | null>;
316
316
  ethSignTx(msg: core.ETHSignTx): Promise<core.ETHSignedTx | null>;
317
317
  ethSignMessage(msg: core.ETHSignMessage): Promise<core.ETHSignedMessage | null>;
318
318
  ethVerifyMessage(msg: core.ETHVerifyMessage): Promise<boolean>;
319
- readonly "__#15@#events": eventemitter2.EventEmitter2;
319
+ readonly "__#17@#events": eventemitter2.EventEmitter2;
320
320
  readonly events: eventemitter2.EventEmitter2;
321
321
  /**
322
322
  * Wrap a function call that needs a mnemonic seed
@@ -337,14 +337,14 @@ declare const NativeHDWallet_base: {
337
337
  } & {
338
338
  new (...args: any[]): {
339
339
  readonly _supportsCosmos: true;
340
- "__#7@#masterKey": Isolation.Core.BIP32.Node | undefined;
340
+ "__#9@#masterKey": Isolation.Core.BIP32.Node | undefined;
341
341
  cosmosInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
342
342
  cosmosWipe(): void;
343
343
  cosmosBech32ify(address: ArrayLike<number>, prefix: string): string;
344
344
  createCosmosAddress(publicKey: string): string;
345
345
  cosmosGetAddress(msg: core.CosmosGetAddress): Promise<string | null>;
346
346
  cosmosSignTx(msg: core.CosmosSignTx): Promise<core.CosmosSignedTx | null>;
347
- readonly "__#15@#events": eventemitter2.EventEmitter2;
347
+ readonly "__#17@#events": eventemitter2.EventEmitter2;
348
348
  readonly events: eventemitter2.EventEmitter2;
349
349
  /**
350
350
  * Wrap a function call that needs a mnemonic seed
@@ -365,7 +365,7 @@ declare const NativeHDWallet_base: {
365
365
  } & {
366
366
  new (...args: any[]): {
367
367
  readonly _supportsBinance: true;
368
- "__#6@#masterKey": Isolation.Core.BIP32.Node | undefined;
368
+ "__#8@#masterKey": Isolation.Core.BIP32.Node | undefined;
369
369
  binanceInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
370
370
  binanceWipe(): void;
371
371
  binanceBech32ify(address: ArrayLike<number>, prefix: string): string;
@@ -376,7 +376,7 @@ declare const NativeHDWallet_base: {
376
376
  binanceSignTx(msg: core.BinanceSignTx & {
377
377
  testnet?: boolean | undefined;
378
378
  }): Promise<core.BinanceSignedTx | null>;
379
- readonly "__#15@#events": eventemitter2.EventEmitter2;
379
+ readonly "__#17@#events": eventemitter2.EventEmitter2;
380
380
  readonly events: eventemitter2.EventEmitter2;
381
381
  /**
382
382
  * Wrap a function call that needs a mnemonic seed
@@ -397,14 +397,14 @@ declare const NativeHDWallet_base: {
397
397
  } & {
398
398
  new (...args: any[]): {
399
399
  readonly _supportsThorchain: true;
400
- "__#14@#masterKey": Isolation.Core.BIP32.Node | undefined;
400
+ "__#16@#masterKey": Isolation.Core.BIP32.Node | undefined;
401
401
  thorchainInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
402
402
  thorchainWipe(): void;
403
403
  thorchainBech32ify(address: ArrayLike<number>, prefix: string): string;
404
404
  createThorchainAddress(publicKey: string): string;
405
405
  thorchainGetAddress(msg: core.ThorchainGetAddress): Promise<string | null>;
406
406
  thorchainSignTx(msg: core.ThorchainSignTx): Promise<core.ThorchainSignedTx | null>;
407
- readonly "__#15@#events": eventemitter2.EventEmitter2;
407
+ readonly "__#17@#events": eventemitter2.EventEmitter2;
408
408
  readonly events: eventemitter2.EventEmitter2;
409
409
  /**
410
410
  * Wrap a function call that needs a mnemonic seed
@@ -425,14 +425,14 @@ declare const NativeHDWallet_base: {
425
425
  } & {
426
426
  new (...args: any[]): {
427
427
  readonly _supportsSecret: true;
428
- "__#12@#masterKey": Isolation.Core.BIP32.Node | undefined;
428
+ "__#14@#masterKey": Isolation.Core.BIP32.Node | undefined;
429
429
  secretInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
430
430
  secretWipe(): void;
431
431
  secretBech32ify(address: ArrayLike<number>, prefix: string): string;
432
432
  createSecretAddress(publicKey: string): string;
433
433
  secretGetAddress(msg: core.SecretGetAddress): Promise<string | null>;
434
434
  secretSignTx(msg: core.SecretSignTx): Promise<any>;
435
- readonly "__#15@#events": eventemitter2.EventEmitter2;
435
+ readonly "__#17@#events": eventemitter2.EventEmitter2;
436
436
  readonly events: eventemitter2.EventEmitter2;
437
437
  /**
438
438
  * Wrap a function call that needs a mnemonic seed
@@ -453,14 +453,14 @@ declare const NativeHDWallet_base: {
453
453
  } & {
454
454
  new (...args: any[]): {
455
455
  readonly _supportsTerra: true;
456
- "__#13@#masterKey": Isolation.Core.BIP32.Node | undefined;
456
+ "__#15@#masterKey": Isolation.Core.BIP32.Node | undefined;
457
457
  terraInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
458
458
  terraWipe(): void;
459
459
  terraBech32ify(address: ArrayLike<number>, prefix: string): string;
460
460
  createTerraAddress(publicKey: string): string;
461
461
  terraGetAddress(msg: core.TerraGetAddress): Promise<string | null>;
462
462
  terraSignTx(msg: core.TerraSignTx): Promise<any>;
463
- readonly "__#15@#events": eventemitter2.EventEmitter2;
463
+ readonly "__#17@#events": eventemitter2.EventEmitter2;
464
464
  readonly events: eventemitter2.EventEmitter2;
465
465
  /**
466
466
  * Wrap a function call that needs a mnemonic seed
@@ -481,14 +481,14 @@ declare const NativeHDWallet_base: {
481
481
  } & {
482
482
  new (...args: any[]): {
483
483
  readonly _supportsKava: true;
484
- "__#10@#masterKey": Isolation.Core.BIP32.Node | undefined;
484
+ "__#12@#masterKey": Isolation.Core.BIP32.Node | undefined;
485
485
  kavaInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
486
486
  kavaWipe(): void;
487
487
  kavaBech32ify(address: ArrayLike<number>, prefix: string): string;
488
488
  createKavaAddress(publicKey: string): string;
489
489
  kavaGetAddress(msg: core.KavaGetAddress): Promise<string | null>;
490
490
  kavaSignTx(msg: core.KavaSignTx): Promise<core.KavaTx | null>;
491
- readonly "__#15@#events": eventemitter2.EventEmitter2;
491
+ readonly "__#17@#events": eventemitter2.EventEmitter2;
492
492
  readonly events: eventemitter2.EventEmitter2;
493
493
  /**
494
494
  * Wrap a function call that needs a mnemonic seed
@@ -509,14 +509,14 @@ declare const NativeHDWallet_base: {
509
509
  } & {
510
510
  new (...args: any[]): {
511
511
  readonly _supportsOsmosis: true;
512
- "__#11@#masterKey": Isolation.Core.BIP32.Node | undefined;
512
+ "__#13@#masterKey": Isolation.Core.BIP32.Node | undefined;
513
513
  osmosisInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
514
514
  osmosisWipe(): void;
515
515
  osmosisBech32ify(address: ArrayLike<number>, prefix: string): string;
516
516
  createOsmosisAddress(publicKey: string): string;
517
517
  osmosisGetAddress(msg: core.OsmosisGetAddress): Promise<string | null>;
518
518
  osmosisSignTx(msg: core.OsmosisSignTx): Promise<core.CosmosSignedTx | null>;
519
- readonly "__#15@#events": eventemitter2.EventEmitter2;
519
+ readonly "__#17@#events": eventemitter2.EventEmitter2;
520
520
  readonly events: eventemitter2.EventEmitter2;
521
521
  /**
522
522
  * Wrap a function call that needs a mnemonic seed
package/dist/osmosis.d.ts CHANGED
@@ -24,14 +24,14 @@ export declare function MixinNativeOsmosisWalletInfo<TBase extends core.Construc
24
24
  export declare function MixinNativeOsmosisWallet<TBase extends core.Constructor<NativeHDWalletBase>>(Base: TBase): {
25
25
  new (...args: any[]): {
26
26
  readonly _supportsOsmosis: true;
27
- "__#11@#masterKey": Isolation.Core.BIP32.Node | undefined;
27
+ "__#13@#masterKey": Isolation.Core.BIP32.Node | undefined;
28
28
  osmosisInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
29
29
  osmosisWipe(): void;
30
30
  osmosisBech32ify(address: ArrayLike<number>, prefix: string): string;
31
31
  createOsmosisAddress(publicKey: string): string;
32
32
  osmosisGetAddress(msg: core.OsmosisGetAddress): Promise<string | null>;
33
33
  osmosisSignTx(msg: core.OsmosisSignTx): Promise<core.CosmosSignedTx | null>;
34
- readonly "__#15@#events": import("eventemitter2").EventEmitter2;
34
+ readonly "__#17@#events": import("eventemitter2").EventEmitter2;
35
35
  readonly events: import("eventemitter2").EventEmitter2;
36
36
  needsMnemonic<T>(hasMnemonic: boolean, callback: () => T): T | null;
37
37
  getVendor(): string;
package/dist/secret.d.ts CHANGED
@@ -24,14 +24,14 @@ export declare function MixinNativeSecretWalletInfo<TBase extends core.Construct
24
24
  export declare function MixinNativeSecretWallet<TBase extends core.Constructor<NativeHDWalletBase>>(Base: TBase): {
25
25
  new (...args: any[]): {
26
26
  readonly _supportsSecret: true;
27
- "__#12@#masterKey": Isolation.Core.BIP32.Node | undefined;
27
+ "__#14@#masterKey": Isolation.Core.BIP32.Node | undefined;
28
28
  secretInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
29
29
  secretWipe(): void;
30
30
  secretBech32ify(address: ArrayLike<number>, prefix: string): string;
31
31
  createSecretAddress(publicKey: string): string;
32
32
  secretGetAddress(msg: core.SecretGetAddress): Promise<string | null>;
33
33
  secretSignTx(msg: core.SecretSignTx): Promise<any | null>;
34
- readonly "__#15@#events": import("eventemitter2").EventEmitter2;
34
+ readonly "__#17@#events": import("eventemitter2").EventEmitter2;
35
35
  readonly events: import("eventemitter2").EventEmitter2;
36
36
  needsMnemonic<T>(hasMnemonic: boolean, callback: () => T): T | null;
37
37
  getVendor(): string;
package/dist/terra.d.ts CHANGED
@@ -24,14 +24,14 @@ export declare function MixinNativeTerraWalletInfo<TBase extends core.Constructo
24
24
  export declare function MixinNativeTerraWallet<TBase extends core.Constructor<NativeHDWalletBase>>(Base: TBase): {
25
25
  new (...args: any[]): {
26
26
  readonly _supportsTerra: true;
27
- "__#13@#masterKey": Isolation.Core.BIP32.Node | undefined;
27
+ "__#15@#masterKey": Isolation.Core.BIP32.Node | undefined;
28
28
  terraInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
29
29
  terraWipe(): void;
30
30
  terraBech32ify(address: ArrayLike<number>, prefix: string): string;
31
31
  createTerraAddress(publicKey: string): string;
32
32
  terraGetAddress(msg: core.TerraGetAddress): Promise<string | null>;
33
33
  terraSignTx(msg: core.TerraSignTx): Promise<any | null>;
34
- readonly "__#15@#events": import("eventemitter2").EventEmitter2;
34
+ readonly "__#17@#events": import("eventemitter2").EventEmitter2;
35
35
  readonly events: import("eventemitter2").EventEmitter2;
36
36
  needsMnemonic<T>(hasMnemonic: boolean, callback: () => T): T | null;
37
37
  getVendor(): string;
@@ -24,14 +24,14 @@ export declare function MixinNativeThorchainWalletInfo<TBase extends core.Constr
24
24
  export declare function MixinNativeThorchainWallet<TBase extends core.Constructor<NativeHDWalletBase>>(Base: TBase): {
25
25
  new (...args: any[]): {
26
26
  readonly _supportsThorchain: true;
27
- "__#14@#masterKey": Isolation.Core.BIP32.Node | undefined;
27
+ "__#16@#masterKey": Isolation.Core.BIP32.Node | undefined;
28
28
  thorchainInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
29
29
  thorchainWipe(): void;
30
30
  thorchainBech32ify(address: ArrayLike<number>, prefix: string): string;
31
31
  createThorchainAddress(publicKey: string): string;
32
32
  thorchainGetAddress(msg: core.ThorchainGetAddress): Promise<string | null>;
33
33
  thorchainSignTx(msg: core.ThorchainSignTx): Promise<core.ThorchainSignedTx | null>;
34
- readonly "__#15@#events": import("eventemitter2").EventEmitter2;
34
+ readonly "__#17@#events": import("eventemitter2").EventEmitter2;
35
35
  readonly events: import("eventemitter2").EventEmitter2;
36
36
  needsMnemonic<T>(hasMnemonic: boolean, callback: () => T): T | null;
37
37
  getVendor(): string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shapeshiftoss/hdwallet-native",
3
- "version": "1.32.0",
3
+ "version": "1.33.0",
4
4
  "license": "MIT",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -16,7 +16,7 @@
16
16
  "dependencies": {
17
17
  "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2",
18
18
  "@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6",
19
- "@shapeshiftoss/hdwallet-core": "1.32.0",
19
+ "@shapeshiftoss/hdwallet-core": "1.33.0",
20
20
  "@shapeshiftoss/proto-tx-builder": "^0.3.0",
21
21
  "@zxing/text-encoding": "^0.9.0",
22
22
  "bchaddrjs": "^0.4.9",
@@ -59,5 +59,5 @@
59
59
  "ts-jest": "^26.5.5",
60
60
  "typescript": "^4.3.2"
61
61
  },
62
- "gitHead": "1ba4d8328f19ef424c6c5b731c11b52e0e7f7df0"
62
+ "gitHead": "8fb348f1c8faaa1f20b0cd521ab45437ddc7948b"
63
63
  }