@shapeshiftoss/hdwallet-native 1.30.0 → 1.31.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.
@@ -1 +1 @@
1
- {"version":3,"file":"cosmos.d.ts","sourceRoot":"","sources":["../src/cosmos.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,8BAA8B,CAAC;AAKrD,OAAO,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,wBAAgB,2BAA2B,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK;;;iCAIvE,QAAQ,OAAO,CAAC;wCAIT,QAAQ,OAAO,CAAC;0CAIpB,OAAO;mCAId,KAAK,qBAAqB,GAAG,MAAM,KAAK,iBAAiB,CAAC;mCAU1D,KAAK,iBAAiB,GAAG,KAAK,iBAAiB,GAAG,SAAS;;;;;;;;;;;UAKzF;AAED,wBAAgB,uBAAuB,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,KAAK;;;2BAKvF,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,SAAS;0CAET,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,QAAQ,IAAI,CAAC;sBAInE,IAAI;iCAIO,UAAU,MAAM,CAAC,UAAU,MAAM,GAAG,MAAM;uCAKpC,MAAM;8BAOT,KAAK,gBAAgB,GAAG,QAAQ,MAAM,GAAG,IAAI,CAAC;0BAQlD,KAAK,YAAY,GAAG,QAAQ,KAAK,cAAc,GAAG,IAAI,CAAC;;;;;;;;;;;;;;UAUlF"}
1
+ {"version":3,"file":"cosmos.d.ts","sourceRoot":"","sources":["../src/cosmos.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,IAAI,MAAM,8BAA8B,CAAC;AAKrD,OAAO,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAO9C,wBAAgB,2BAA2B,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK;;;iCAIvE,QAAQ,OAAO,CAAC;wCAIT,QAAQ,OAAO,CAAC;0CAIpB,OAAO;mCAId,KAAK,qBAAqB,GAAG,MAAM,KAAK,iBAAiB,CAAC;mCAU1D,KAAK,iBAAiB,GAAG,KAAK,iBAAiB,GAAG,SAAS;;;;;;;;;;;UAKzF;AAED,wBAAgB,uBAAuB,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,KAAK;;;2BAKvF,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,SAAS;0CAET,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,QAAQ,IAAI,CAAC;sBAInE,IAAI;iCAIO,UAAU,MAAM,CAAC,UAAU,MAAM,GAAG,MAAM;uCAKpC,MAAM;8BAOT,KAAK,gBAAgB,GAAG,QAAQ,MAAM,GAAG,IAAI,CAAC;0BAQlD,KAAK,YAAY,GAAG,QAAQ,KAAK,cAAc,GAAG,IAAI,CAAC;;;;;;;;;;;;;;UAgBlF"}
package/dist/cosmos.js CHANGED
@@ -44,12 +44,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
44
44
  Object.defineProperty(exports, "__esModule", { value: true });
45
45
  exports.MixinNativeCosmosWallet = exports.MixinNativeCosmosWalletInfo = void 0;
46
46
  const core = __importStar(require("@shapeshiftoss/hdwallet-core"));
47
- const protoTxBuilder = __importStar(require("@shapeshiftoss/proto-tx-builder"));
48
47
  const bech32 = __importStar(require("bech32"));
49
48
  const crypto_js_1 = __importDefault(require("crypto-js"));
49
+ const p_lazy_1 = __importDefault(require("p-lazy"));
50
50
  const Isolation = __importStar(require("./crypto/isolation"));
51
51
  const util = __importStar(require("./util"));
52
52
  const ATOM_CHAIN = "cosmoshub-4";
53
+ const protoTxBuilder = p_lazy_1.default.from(() => Promise.resolve().then(() => __importStar(require("@shapeshiftoss/proto-tx-builder"))));
53
54
  function MixinNativeCosmosWalletInfo(Base) {
54
55
  // eslint-disable-next-line @typescript-eslint/no-shadow
55
56
  return class MixinNativeCosmosWalletInfo extends Base {
@@ -128,8 +129,12 @@ function MixinNativeCosmosWallet(Base) {
128
129
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
129
130
  const keyPair = yield util.getKeyPair(__classPrivateFieldGet(this, _MixinNativeCosmosWallet_masterKey, "f"), msg.addressNList, "cosmos");
130
131
  const adapter = yield Isolation.Adapters.CosmosDirect.create(keyPair.node, "cosmos");
131
- const result = yield protoTxBuilder.sign(msg.tx, adapter, msg.sequence, msg.account_number, ATOM_CHAIN);
132
- return result;
132
+ const signerData = {
133
+ sequence: Number(msg.sequence),
134
+ accountNumber: Number(msg.account_number),
135
+ chainId: ATOM_CHAIN,
136
+ };
137
+ return (yield protoTxBuilder).sign(adapter.address, msg.tx, adapter, signerData);
133
138
  }));
134
139
  });
135
140
  }
@@ -1 +1 @@
1
- {"version":3,"file":"cosmos.js","sourceRoot":"","sources":["../src/cosmos.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cosmos.js","sourceRoot":"","sources":["../src/cosmos.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,mEAAqD;AACrD,+CAAiC;AACjC,0DAAiC;AACjC,oDAA2B;AAE3B,8DAAgD;AAEhD,6CAA+B;AAE/B,MAAM,UAAU,GAAG,aAAa,CAAC;AAEjC,MAAM,cAAc,GAAG,gBAAK,CAAC,IAAI,CAAC,GAAG,EAAE,mDAAQ,iCAAiC,GAAC,CAAC,CAAC;AAEnF,SAAgB,2BAA2B,CAAoD,IAAW;IACxG,wDAAwD;IACxD,OAAO,MAAM,2BAA4B,SAAQ,IAAI;QAA9C;;YACI,wBAAmB,GAAG,IAAI,CAAC;QA2BtC,CAAC;QA1BO,qBAAqB;;gBACzB,OAAO,IAAI,CAAC;YACd,CAAC;SAAA;QAEK,4BAA4B;;gBAChC,OAAO,KAAK,CAAC;YACf,CAAC;SAAA;QAED,8BAA8B;YAC5B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,qBAAqB,CAAC,GAA+B;YACnD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACzC,OAAO;gBACL;oBACE,YAAY,EAAE,CAAC,UAAU,GAAG,EAAE,EAAE,UAAU,GAAG,MAAM,EAAE,UAAU,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;iBACxF;aACF,CAAC;QACJ,CAAC;QAED,6DAA6D;QAC7D,qBAAqB,CAAC,GAA2B;YAC/C,kDAAkD;YAClD,OAAO,SAAS,CAAC;QACnB,CAAC;KACF,CAAC;AACJ,CAAC;AA/BD,kEA+BC;AAED,SAAgB,uBAAuB,CAAqD,IAAW;;IACrG,wDAAwD;IACxD,YAAO,MAAM,uBAAwB,SAAQ,IAAI;YAA1C;;gBACI,oBAAe,GAAG,IAAI,CAAC;gBAEhC,qDAAkD;YA6CpD,CAAC;YA3CO,sBAAsB,CAAC,SAAoC;;oBAC/D,uBAAA,IAAI,sCAAc,SAAS,MAAA,CAAC;gBAC9B,CAAC;aAAA;YAED,UAAU;gBACR,uBAAA,IAAI,sCAAc,SAAS,MAAA,CAAC;YAC9B,CAAC;YAED,eAAe,CAAC,OAA0B,EAAE,MAAc;gBACxD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACtC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACtC,CAAC;YAED,mBAAmB,CAAC,SAAiB;gBACnC,MAAM,OAAO,GAAG,mBAAQ,CAAC,MAAM,CAAC,mBAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;gBACnE,MAAM,IAAI,GAAG,mBAAQ,CAAC,SAAS,CAAC,OAAc,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACzC,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACjD,CAAC;YAEK,gBAAgB,CAAC,GAA0B;;oBAC/C,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,uBAAA,IAAI,0CAAW,EAAE,GAAS,EAAE;wBACtD,oEAAoE;wBACpE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,uBAAA,IAAI,0CAAY,EAAE,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;wBACpF,OAAO,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;oBACrE,CAAC,CAAA,CAAC,CAAC;gBACL,CAAC;aAAA;YAEK,YAAY,CAAC,GAAsB;;oBACvC,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,uBAAA,IAAI,0CAAW,EAAE,GAAS,EAAE;wBACtD,oEAAoE;wBACpE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,uBAAA,IAAI,0CAAY,EAAE,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;wBACpF,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;wBAErF,MAAM,UAAU,GAAe;4BAC7B,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;4BAC9B,aAAa,EAAE,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC;4BACzC,OAAO,EAAE,UAAU;yBACpB,CAAC;wBAEF,OAAO,CAAC,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,EAAW,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;oBAC5F,CAAC,CAAA,CAAC,CAAC;gBACL,CAAC;aAAA;SACF;;WAAC;AACJ,CAAC;AAnDD,0DAmDC"}
@@ -91,7 +91,7 @@ describe("NativeCosmosWallet", () => {
91
91
  ],
92
92
  gas: "100000",
93
93
  },
94
- signatures: null,
94
+ signatures: [],
95
95
  memo: "foobar",
96
96
  },
97
97
  chain_id: "cosmoshub-4",
@@ -1 +1 @@
1
- {"version":3,"file":"cosmos.test.js","sourceRoot":"","sources":["../src/cosmos.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cosmos.test.js","sourceRoot":"","sources":["../src/cosmos.test.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@ import { SecP256K1 } from "../core";
4
4
  export declare class OfflineDirectSignerAdapter implements OfflineDirectSigner {
5
5
  protected readonly _isolatedKey: SecP256K1.ECDSAKey;
6
6
  protected readonly _pubkey: Uint8Array;
7
- protected readonly _address: string;
7
+ readonly address: string;
8
8
  protected constructor(isolatedKey: SecP256K1.ECDSAKey, pubkey: Uint8Array, address: string);
9
9
  static create(isolatedKey: SecP256K1.ECDSAKey, prefix: string): Promise<OfflineDirectSignerAdapter>;
10
10
  getAccounts(): Promise<readonly AccountData[]>;
@@ -1 +1 @@
1
- {"version":3,"file":"cosmosDirect.d.ts","sourceRoot":"","sources":["../../../../src/crypto/isolation/adapters/cosmosDirect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAElG,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAGjE,OAAO,EAAU,SAAS,EAAE,MAAM,SAAS,CAAC;AAI5C,qBAAa,0BAA2B,YAAW,mBAAmB;IACpE,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC,QAAQ,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IACvC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAEpC,SAAS,aAAa,WAAW,EAAE,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM;WAM7E,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC;IASnG,WAAW,IAAI,OAAO,CAAC,SAAS,WAAW,EAAE,CAAC;IAU9C,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAgBvF;AAED,eAAe,0BAA0B,CAAC"}
1
+ {"version":3,"file":"cosmosDirect.d.ts","sourceRoot":"","sources":["../../../../src/crypto/isolation/adapters/cosmosDirect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAElG,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAGjE,OAAO,EAAU,SAAS,EAAE,MAAM,SAAS,CAAC;AAI5C,qBAAa,0BAA2B,YAAW,mBAAmB;IACpE,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC,QAAQ,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,SAAS,aAAa,WAAW,EAAE,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM;WAM7E,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC;IASnG,WAAW,IAAI,OAAO,CAAC,SAAS,WAAW,EAAE,CAAC;IAU9C,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAgBvF;AAED,eAAe,0BAA0B,CAAC"}
@@ -40,7 +40,7 @@ class OfflineDirectSignerAdapter {
40
40
  constructor(isolatedKey, pubkey, address) {
41
41
  this._isolatedKey = isolatedKey;
42
42
  this._pubkey = pubkey;
43
- this._address = address;
43
+ this.address = address;
44
44
  }
45
45
  static create(isolatedKey, prefix) {
46
46
  return __awaiter(this, void 0, void 0, function* () {
@@ -53,7 +53,7 @@ class OfflineDirectSignerAdapter {
53
53
  return __awaiter(this, void 0, void 0, function* () {
54
54
  return [
55
55
  {
56
- address: this._address,
56
+ address: this.address,
57
57
  algo: "secp256k1",
58
58
  pubkey: this._pubkey,
59
59
  },
@@ -62,7 +62,7 @@ class OfflineDirectSignerAdapter {
62
62
  }
63
63
  signDirect(signerAddress, signDoc) {
64
64
  return __awaiter(this, void 0, void 0, function* () {
65
- if (signerAddress !== this._address)
65
+ if (signerAddress !== this.address)
66
66
  throw new Error("signerAddress mismatch");
67
67
  const signBytes = (yield cosmJsProtoSigning).makeSignBytes(signDoc);
68
68
  const signatureBytes = yield this._isolatedKey.ecdsaSign("sha256", signBytes);
@@ -1 +1 @@
1
- {"version":3,"file":"cosmosDirect.js","sourceRoot":"","sources":["../../../../src/crypto/isolation/adapters/cosmosDirect.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAAiC;AAEjC,oDAA2B;AAE3B,kCAA4C;AAE5C,MAAM,kBAAkB,GAAG,gBAAK,CAAC,IAAI,CAAC,GAAG,EAAE,mDAAQ,uBAAuB,GAAC,CAAC,CAAC;AAE7E,MAAa,0BAA0B;IAKrC,YAAsB,WAA+B,EAAE,MAAkB,EAAE,OAAe;QACxF,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,MAAM,CAAO,MAAM,CAAC,WAA+B,EAAE,MAAc;;YACjE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,YAAY,EAAE,CAAC;YAChD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAC3B,MAAM,EACN,MAAM,CAAC,OAAO,CAAC,aAAM,CAAC,UAAU,CAAC,SAAS,CAAC,aAAM,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,WAAW,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CACxG,CAAC;YACF,OAAO,IAAI,0BAA0B,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACtE,CAAC;KAAA;IAEK,WAAW;;YACf,OAAO;gBACL;oBACE,OAAO,EAAE,IAAI,CAAC,QAAQ;oBACtB,IAAI,EAAE,WAAW;oBACjB,MAAM,EAAE,IAAI,CAAC,OAAO;iBACrB;aACF,CAAC;QACJ,CAAC;KAAA;IAEK,UAAU,CAAC,aAAqB,EAAE,OAAgB;;YACtD,IAAI,aAAa,KAAK,IAAI,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAE/E,MAAM,SAAS,GAAG,CAAC,MAAM,kBAAkB,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YACpE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAC9E,OAAO;gBACL,MAAM,EAAE,OAAO;gBACf,SAAS,EAAE;oBACT,OAAO,EAAE;wBACP,IAAI,EAAE,4BAA4B;wBAClC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;qBACpD;oBACD,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;iBAC1D;aACF,CAAC;QACJ,CAAC;KAAA;CACF;AA9CD,gEA8CC;AAED,kBAAe,0BAA0B,CAAC"}
1
+ {"version":3,"file":"cosmosDirect.js","sourceRoot":"","sources":["../../../../src/crypto/isolation/adapters/cosmosDirect.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAAiC;AAEjC,oDAA2B;AAE3B,kCAA4C;AAE5C,MAAM,kBAAkB,GAAG,gBAAK,CAAC,IAAI,CAAC,GAAG,EAAE,mDAAQ,uBAAuB,GAAC,CAAC,CAAC;AAE7E,MAAa,0BAA0B;IAKrC,YAAsB,WAA+B,EAAE,MAAkB,EAAE,OAAe;QACxF,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,MAAM,CAAO,MAAM,CAAC,WAA+B,EAAE,MAAc;;YACjE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,YAAY,EAAE,CAAC;YAChD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAC3B,MAAM,EACN,MAAM,CAAC,OAAO,CAAC,aAAM,CAAC,UAAU,CAAC,SAAS,CAAC,aAAM,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,WAAW,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CACxG,CAAC;YACF,OAAO,IAAI,0BAA0B,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACtE,CAAC;KAAA;IAEK,WAAW;;YACf,OAAO;gBACL;oBACE,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,IAAI,EAAE,WAAW;oBACjB,MAAM,EAAE,IAAI,CAAC,OAAO;iBACrB;aACF,CAAC;QACJ,CAAC;KAAA;IAEK,UAAU,CAAC,aAAqB,EAAE,OAAgB;;YACtD,IAAI,aAAa,KAAK,IAAI,CAAC,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAE9E,MAAM,SAAS,GAAG,CAAC,MAAM,kBAAkB,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YACpE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAC9E,OAAO;gBACL,MAAM,EAAE,OAAO;gBACf,SAAS,EAAE;oBACT,OAAO,EAAE;wBACP,IAAI,EAAE,4BAA4B;wBAClC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;qBACpD;oBACD,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;iBAC1D;aACF,CAAC;QACJ,CAAC;KAAA;CACF;AA9CD,gEA8CC;AAED,kBAAe,0BAA0B,CAAC"}
package/dist/native.d.ts CHANGED
@@ -134,7 +134,7 @@ declare const NativeHDWalletInfo_base: {
134
134
  };
135
135
  } & {
136
136
  new (...args: any[]): {
137
- _supportsThorchainInfo: boolean;
137
+ readonly _supportsThorchainInfo: true;
138
138
  thorchainSupportsNetwork(): Promise<boolean>;
139
139
  thorchainSupportsSecureTransfer(): Promise<boolean>;
140
140
  thorchainSupportsNativeShapeShift(): boolean;
@@ -380,14 +380,14 @@ declare const NativeHDWallet_base: {
380
380
  };
381
381
  } & {
382
382
  new (...args: any[]): {
383
- _supportsThorchain: boolean;
383
+ readonly _supportsThorchain: true;
384
384
  "__#14@#masterKey": Isolation.Core.BIP32.Node | undefined;
385
385
  thorchainInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
386
386
  thorchainWipe(): void;
387
387
  thorchainBech32ify(address: ArrayLike<number>, prefix: string): string;
388
388
  createThorchainAddress(publicKey: string): string;
389
389
  thorchainGetAddress(msg: core.ThorchainGetAddress): Promise<string | null>;
390
- thorchainSignTx(msg: core.ThorchainSignTx): Promise<core.ThorchainTx | null>;
390
+ thorchainSignTx(msg: core.ThorchainSignTx): Promise<core.ThorchainSignedTx | null>;
391
391
  readonly "__#15@#events": eventemitter2.EventEmitter2;
392
392
  readonly events: eventemitter2.EventEmitter2;
393
393
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"osmosis.d.ts","sourceRoot":"","sources":["../src/osmosis.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,8BAA8B,CAAC;AAKrD,OAAO,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,wBAAgB,4BAA4B,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK;;;kCAIvE,QAAQ,OAAO,CAAC;yCAIT,QAAQ,OAAO,CAAC;2CAIpB,OAAO;oCAId,KAAK,sBAAsB,GAAG,MAAM,KAAK,kBAAkB,CAAC;oCAU5D,KAAK,kBAAkB,GAAG,KAAK,kBAAkB,GAAG,SAAS;;;;;;;;;;;UAK5F;AAED,wBAAgB,wBAAwB,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,KAAK;;;4BAKxF,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,SAAS;2CAER,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,QAAQ,IAAI,CAAC;uBAInE,IAAI;kCAIO,UAAU,MAAM,CAAC,UAAU,MAAM,GAAG,MAAM;wCAKpC,MAAM;+BAOT,KAAK,iBAAiB,GAAG,QAAQ,MAAM,GAAG,IAAI,CAAC;2BAQnD,KAAK,aAAa,GAAG,QAAQ,KAAK,cAAc,GAAG,IAAI,CAAC;;;;;;;;;;;;;;UASpF"}
1
+ {"version":3,"file":"osmosis.d.ts","sourceRoot":"","sources":["../src/osmosis.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,IAAI,MAAM,8BAA8B,CAAC;AAKrD,OAAO,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAO9C,wBAAgB,4BAA4B,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK;;;kCAIvE,QAAQ,OAAO,CAAC;yCAIT,QAAQ,OAAO,CAAC;2CAIpB,OAAO;oCAId,KAAK,sBAAsB,GAAG,MAAM,KAAK,kBAAkB,CAAC;oCAU5D,KAAK,kBAAkB,GAAG,KAAK,kBAAkB,GAAG,SAAS;;;;;;;;;;;UAK5F;AAED,wBAAgB,wBAAwB,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,KAAK;;;4BAKxF,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,SAAS;2CAER,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,QAAQ,IAAI,CAAC;uBAInE,IAAI;kCAIO,UAAU,MAAM,CAAC,UAAU,MAAM,GAAG,MAAM;wCAKpC,MAAM;+BAOT,KAAK,iBAAiB,GAAG,QAAQ,MAAM,GAAG,IAAI,CAAC;2BAQnD,KAAK,aAAa,GAAG,QAAQ,KAAK,cAAc,GAAG,IAAI,CAAC;;;;;;;;;;;;;;UAgBpF"}
package/dist/osmosis.js CHANGED
@@ -44,12 +44,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
44
44
  Object.defineProperty(exports, "__esModule", { value: true });
45
45
  exports.MixinNativeOsmosisWallet = exports.MixinNativeOsmosisWalletInfo = void 0;
46
46
  const core = __importStar(require("@shapeshiftoss/hdwallet-core"));
47
- const protoTxBuilder = __importStar(require("@shapeshiftoss/proto-tx-builder"));
48
47
  const bech32 = __importStar(require("bech32"));
49
48
  const crypto_js_1 = __importDefault(require("crypto-js"));
49
+ const p_lazy_1 = __importDefault(require("p-lazy"));
50
50
  const Isolation = __importStar(require("./crypto/isolation"));
51
51
  const util = __importStar(require("./util"));
52
52
  const OSMOSIS_CHAIN = "osmosis-1";
53
+ const protoTxBuilder = p_lazy_1.default.from(() => Promise.resolve().then(() => __importStar(require("@shapeshiftoss/proto-tx-builder"))));
53
54
  function MixinNativeOsmosisWalletInfo(Base) {
54
55
  // eslint-disable-next-line @typescript-eslint/no-shadow
55
56
  return class MixinNativeOsmosisWalletInfo extends Base {
@@ -128,7 +129,12 @@ function MixinNativeOsmosisWallet(Base) {
128
129
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
129
130
  const keyPair = yield util.getKeyPair(__classPrivateFieldGet(this, _MixinNativeOsmosisWallet_masterKey, "f"), msg.addressNList, "osmosis");
130
131
  const adapter = yield Isolation.Adapters.CosmosDirect.create(keyPair.node, "osmo");
131
- return yield protoTxBuilder.sign(msg.tx, adapter, msg.sequence, msg.account_number, OSMOSIS_CHAIN);
132
+ const signerData = {
133
+ sequence: Number(msg.sequence),
134
+ accountNumber: Number(msg.account_number),
135
+ chainId: OSMOSIS_CHAIN,
136
+ };
137
+ return (yield protoTxBuilder).sign(adapter.address, msg.tx, adapter, signerData, "osmos");
132
138
  }));
133
139
  });
134
140
  }
@@ -1 +1 @@
1
- {"version":3,"file":"osmosis.js","sourceRoot":"","sources":["../src/osmosis.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAqD;AACrD,gFAAkE;AAClE,+CAAiC;AACjC,0DAAiC;AAEjC,8DAAgD;AAEhD,6CAA+B;AAE/B,MAAM,aAAa,GAAG,WAAW,CAAC;AAElC,SAAgB,4BAA4B,CAAoD,IAAW;IACzG,wDAAwD;IACxD,OAAO,MAAM,4BAA6B,SAAQ,IAAI;QAA/C;;YACI,yBAAoB,GAAG,IAAI,CAAC;QA2BvC,CAAC;QA1BO,sBAAsB;;gBAC1B,OAAO,IAAI,CAAC;YACd,CAAC;SAAA;QAEK,6BAA6B;;gBACjC,OAAO,KAAK,CAAC;YACf,CAAC;SAAA;QAED,+BAA+B;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,sBAAsB,CAAC,GAAgC;YACrD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACzC,OAAO;gBACL;oBACE,YAAY,EAAE,CAAC,UAAU,GAAG,EAAE,EAAE,UAAU,GAAG,MAAM,EAAE,UAAU,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;iBACxF;aACF,CAAC;QACJ,CAAC;QAED,6DAA6D;QAC7D,sBAAsB,CAAC,GAA4B;YACjD,kDAAkD;YAClD,OAAO,SAAS,CAAC;QACnB,CAAC;KACF,CAAC;AACJ,CAAC;AA/BD,oEA+BC;AAED,SAAgB,wBAAwB,CAAqD,IAAW;;IACtG,wDAAwD;IACxD,YAAO,MAAM,wBAAyB,SAAQ,IAAI;YAA3C;;gBACI,qBAAgB,GAAG,IAAI,CAAC;gBAEjC,sDAAkD;YAsCpD,CAAC;YApCO,uBAAuB,CAAC,SAAoC;;oBAChE,uBAAA,IAAI,uCAAc,SAAS,MAAA,CAAC;gBAC9B,CAAC;aAAA;YAED,WAAW;gBACT,uBAAA,IAAI,uCAAc,SAAS,MAAA,CAAC;YAC9B,CAAC;YAED,gBAAgB,CAAC,OAA0B,EAAE,MAAc;gBACzD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACtC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACtC,CAAC;YAED,oBAAoB,CAAC,SAAiB;gBACpC,MAAM,OAAO,GAAG,mBAAQ,CAAC,MAAM,CAAC,mBAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;gBACnE,MAAM,IAAI,GAAG,mBAAQ,CAAC,SAAS,CAAC,OAAc,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACzC,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAChD,CAAC;YAEK,iBAAiB,CAAC,GAA2B;;oBACjD,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,uBAAA,IAAI,2CAAW,EAAE,GAAS,EAAE;wBACtD,oEAAoE;wBACpE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,uBAAA,IAAI,2CAAY,EAAE,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;wBACrF,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;oBACtE,CAAC,CAAA,CAAC,CAAC;gBACL,CAAC;aAAA;YAEK,aAAa,CAAC,GAAuB;;oBACzC,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,uBAAA,IAAI,2CAAW,EAAE,GAAS,EAAE;wBACtD,oEAAoE;wBACpE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,uBAAA,IAAI,2CAAY,EAAE,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;wBACrF,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;wBACnF,OAAO,MAAM,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;oBACrG,CAAC,CAAA,CAAC,CAAC;gBACL,CAAC;aAAA;SACF;;WAAC;AACJ,CAAC;AA5CD,4DA4CC"}
1
+ {"version":3,"file":"osmosis.js","sourceRoot":"","sources":["../src/osmosis.ts"],"names":[],"mappings":"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"}
@@ -91,7 +91,7 @@ describe("NativeOsmosisWallet", () => {
91
91
  ],
92
92
  gas: "100000",
93
93
  },
94
- signatures: null,
94
+ signatures: [],
95
95
  memo: "foobar",
96
96
  },
97
97
  chain_id: "osmosishub-4",
@@ -1 +1 @@
1
- {"version":3,"file":"osmosis.test.js","sourceRoot":"","sources":["../src/osmosis.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"osmosis.test.js","sourceRoot":"","sources":["../src/osmosis.test.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,7 @@ import * as Isolation from "./crypto/isolation";
3
3
  import { NativeHDWalletBase } from "./native";
4
4
  export declare function MixinNativeThorchainWalletInfo<TBase extends core.Constructor<core.HDWalletInfo>>(Base: TBase): {
5
5
  new (...args: any[]): {
6
- _supportsThorchainInfo: boolean;
6
+ readonly _supportsThorchainInfo: true;
7
7
  thorchainSupportsNetwork(): Promise<boolean>;
8
8
  thorchainSupportsSecureTransfer(): Promise<boolean>;
9
9
  thorchainSupportsNativeShapeShift(): boolean;
@@ -22,7 +22,7 @@ export declare function MixinNativeThorchainWalletInfo<TBase extends core.Constr
22
22
  } & TBase;
23
23
  export declare function MixinNativeThorchainWallet<TBase extends core.Constructor<NativeHDWalletBase>>(Base: TBase): {
24
24
  new (...args: any[]): {
25
- _supportsThorchain: boolean;
25
+ readonly _supportsThorchain: true;
26
26
  "__#14@#masterKey": Isolation.Core.BIP32.Node | undefined;
27
27
  thorchainInitializeWallet(masterKey: Isolation.Core.BIP32.Node): Promise<void>;
28
28
  thorchainWipe(): void;
@@ -1 +1 @@
1
- {"version":3,"file":"thorchain.d.ts","sourceRoot":"","sources":["../src/thorchain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,8BAA8B,CAAC;AAKrD,OAAO,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,wBAAgB,8BAA8B,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK;;;oCAIvE,QAAQ,OAAO,CAAC;2CAIT,QAAQ,OAAO,CAAC;6CAIpB,OAAO;sCAId,KAAK,wBAAwB,GAAG,MAAM,KAAK,oBAAoB,CAAC;sCAUhE,KAAK,oBAAoB,GAAG,KAAK,oBAAoB,GAAG,SAAS;;;;;;;;;;;UAKlG;AAED,wBAAgB,0BAA0B,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,KAAK;;;4BAK1F,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,SAAS;6CAEN,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,QAAQ,IAAI,CAAC;yBAInE,IAAI;oCAIO,UAAU,MAAM,CAAC,UAAU,MAAM,GAAG,MAAM;0CAKpC,MAAM;iCAOT,KAAK,mBAAmB,GAAG,QAAQ,MAAM,GAAG,IAAI,CAAC;6BAQrD,KAAK,eAAe,GAAG,QAAQ,KAAK,iBAAiB,GAAG,IAAI,CAAC;;;;;;;;;;;;;;UAU3F"}
1
+ {"version":3,"file":"thorchain.d.ts","sourceRoot":"","sources":["../src/thorchain.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,IAAI,MAAM,8BAA8B,CAAC;AAKrD,OAAO,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAO9C,wBAAgB,8BAA8B,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK;;;oCAIvE,QAAQ,OAAO,CAAC;2CAIT,QAAQ,OAAO,CAAC;6CAIpB,OAAO;sCAId,KAAK,wBAAwB,GAAG,MAAM,KAAK,oBAAoB,CAAC;sCAUhE,KAAK,oBAAoB,GAAG,KAAK,oBAAoB,GAAG,SAAS;;;;;;;;;;;UAKlG;AAED,wBAAgB,0BAA0B,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,KAAK;;;4BAK1F,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,SAAS;6CAEN,UAAU,IAAI,CAAC,KAAK,KAAK,GAAG,QAAQ,IAAI,CAAC;yBAInE,IAAI;oCAIO,UAAU,MAAM,CAAC,UAAU,MAAM,GAAG,MAAM;0CAKpC,MAAM;iCAOT,KAAK,mBAAmB,GAAG,QAAQ,MAAM,GAAG,IAAI,CAAC;6BAQrD,KAAK,eAAe,GAAG,QAAQ,KAAK,iBAAiB,GAAG,IAAI,CAAC;;;;;;;;;;;;;;UAgB3F"}
package/dist/thorchain.js CHANGED
@@ -46,10 +46,11 @@ exports.MixinNativeThorchainWallet = exports.MixinNativeThorchainWalletInfo = vo
46
46
  const core = __importStar(require("@shapeshiftoss/hdwallet-core"));
47
47
  const bech32 = __importStar(require("bech32"));
48
48
  const crypto_js_1 = __importDefault(require("crypto-js"));
49
- const txBuilder = __importStar(require("tendermint-tx-builder"));
49
+ const p_lazy_1 = __importDefault(require("p-lazy"));
50
50
  const Isolation = __importStar(require("./crypto/isolation"));
51
51
  const util = __importStar(require("./util"));
52
- const THOR_CHAIN = "thorchain";
52
+ const THOR_CHAIN = "thorchain-mainnet-v1";
53
+ const protoTxBuilder = p_lazy_1.default.from(() => Promise.resolve().then(() => __importStar(require("@shapeshiftoss/proto-tx-builder"))));
53
54
  function MixinNativeThorchainWalletInfo(Base) {
54
55
  // eslint-disable-next-line @typescript-eslint/no-shadow
55
56
  return class MixinNativeThorchainWalletInfo extends Base {
@@ -127,9 +128,13 @@ function MixinNativeThorchainWallet(Base) {
127
128
  return this.needsMnemonic(!!__classPrivateFieldGet(this, _MixinNativeThorchainWallet_masterKey, "f"), () => __awaiter(this, void 0, void 0, function* () {
128
129
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
129
130
  const keyPair = yield util.getKeyPair(__classPrivateFieldGet(this, _MixinNativeThorchainWallet_masterKey, "f"), msg.addressNList, "thorchain");
130
- const adapter = yield Isolation.Adapters.Cosmos.create(keyPair.node);
131
- const result = yield txBuilder.sign(msg.tx, adapter, msg.sequence, msg.account_number, THOR_CHAIN);
132
- return txBuilder.createSignedTx(msg.tx, result);
131
+ const adapter = yield Isolation.Adapters.CosmosDirect.create(keyPair.node, "thor");
132
+ const signerData = {
133
+ sequence: Number(msg.sequence),
134
+ accountNumber: Number(msg.account_number),
135
+ chainId: THOR_CHAIN,
136
+ };
137
+ return (yield protoTxBuilder).sign(adapter.address, msg.tx, adapter, signerData, "thor");
133
138
  }));
134
139
  });
135
140
  }
@@ -1 +1 @@
1
- {"version":3,"file":"thorchain.js","sourceRoot":"","sources":["../src/thorchain.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAqD;AACrD,+CAAiC;AACjC,0DAAiC;AACjC,iEAAmD;AAEnD,8DAAgD;AAEhD,6CAA+B;AAE/B,MAAM,UAAU,GAAG,WAAW,CAAC;AAE/B,SAAgB,8BAA8B,CAAoD,IAAW;IAC3G,wDAAwD;IACxD,OAAO,MAAM,8BAA+B,SAAQ,IAAI;QAAjD;;YACL,2BAAsB,GAAG,IAAI,CAAC;QA2BhC,CAAC;QA1BO,wBAAwB;;gBAC5B,OAAO,IAAI,CAAC;YACd,CAAC;SAAA;QAEK,+BAA+B;;gBACnC,OAAO,KAAK,CAAC;YACf,CAAC;SAAA;QAED,iCAAiC;YAC/B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,wBAAwB,CAAC,GAAkC;YACzD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YAC9C,OAAO;gBACL;oBACE,YAAY,EAAE,CAAC,UAAU,GAAG,EAAE,EAAE,UAAU,GAAG,MAAM,EAAE,UAAU,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;iBACxF;aACF,CAAC;QACJ,CAAC;QAED,6DAA6D;QAC7D,wBAAwB,CAAC,GAA8B;YACrD,kDAAkD;YAClD,OAAO,SAAS,CAAC;QACnB,CAAC;KACF,CAAC;AACJ,CAAC;AA/BD,wEA+BC;AAED,SAAgB,0BAA0B,CAAqD,IAAW;;IACxG,wDAAwD;IACxD,YAAO,MAAM,0BAA2B,SAAQ,IAAI;YAA7C;;gBACL,uBAAkB,GAAG,IAAI,CAAC;gBAE1B,wDAAkD;YAuCpD,CAAC;YArCO,yBAAyB,CAAC,SAAoC;;oBAClE,uBAAA,IAAI,yCAAc,SAAS,MAAA,CAAC;gBAC9B,CAAC;aAAA;YAED,aAAa;gBACX,uBAAA,IAAI,yCAAc,SAAS,MAAA,CAAC;YAC9B,CAAC;YAED,kBAAkB,CAAC,OAA0B,EAAE,MAAc;gBAC3D,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACtC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACtC,CAAC;YAED,sBAAsB,CAAC,SAAiB;gBACtC,MAAM,OAAO,GAAG,mBAAQ,CAAC,MAAM,CAAC,mBAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;gBACnE,MAAM,IAAI,GAAG,mBAAQ,CAAC,SAAS,CAAC,OAAc,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACzC,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAClD,CAAC;YAEK,mBAAmB,CAAC,GAA6B;;oBACrD,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,uBAAA,IAAI,6CAAW,EAAE,GAAS,EAAE;wBACtD,oEAAoE;wBACpE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,uBAAA,IAAI,6CAAY,EAAE,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;wBACvF,OAAO,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;oBACxE,CAAC,CAAA,CAAC,CAAC;gBACL,CAAC;aAAA;YAEK,eAAe,CAAC,GAAyB;;oBAC7C,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,uBAAA,IAAI,6CAAW,EAAE,GAAS,EAAE;wBACtD,oEAAoE;wBACpE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,uBAAA,IAAI,6CAAY,EAAE,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;wBACvF,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;wBACrE,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;wBACnG,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;oBAClD,CAAC,CAAA,CAAC,CAAC;gBACL,CAAC;aAAA;SACF;;WAAC;AACJ,CAAC;AA7CD,gEA6CC"}
1
+ {"version":3,"file":"thorchain.js","sourceRoot":"","sources":["../src/thorchain.ts"],"names":[],"mappings":"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"}
@@ -63,25 +63,38 @@ describe("NativeThorchainWallet", () => {
63
63
  yield expect(wallet.thorchainGetAddress({ addressNList: core.bip32ToAddressNList("m/44'/931'/1337'/123/4") })).resolves.toBe("thor14hqwsy4qpwzsdk2l3h3q82eghg4ctaa38rx63g");
64
64
  }));
65
65
  it("should sign a transaction correctly", () => __awaiter(void 0, void 0, void 0, function* () {
66
- var _a, _b, _c, _d;
66
+ var _a, _b;
67
67
  const signed = yield wallet.thorchainSignTx({
68
68
  addressNList: core.bip32ToAddressNList("m/44'/931'/0'/0/0"),
69
69
  tx: {
70
- msg: [{ type: "foo", value: "bar" }],
70
+ msg: [
71
+ {
72
+ type: "thorchain/MsgSend",
73
+ value: {
74
+ from_address: "thor1ujumx36gj3jv33gcw49dfafdddza3kdcd38paq",
75
+ to_address: "thor14hqwsy4qpwzsdk2l3h3q82eghg4ctaa38rx63g",
76
+ amount: [
77
+ {
78
+ denom: "rune",
79
+ amount: "123456",
80
+ },
81
+ ],
82
+ },
83
+ },
84
+ ],
71
85
  fee: {
72
- amount: [{ denom: "foo", amount: "bar" }],
73
- gas: "baz",
86
+ amount: [],
87
+ gas: "1000000",
74
88
  },
75
- signatures: null,
76
- memo: "foobar",
89
+ memo: "hdwallet thorchain test",
90
+ signatures: [],
77
91
  },
78
- chain_id: "foobar",
79
- account_number: "foo",
80
- sequence: "bar",
92
+ chain_id: "thorchain-mainnet-v1",
93
+ account_number: "2722",
94
+ sequence: "11",
81
95
  });
82
96
  expect((_a = signed === null || signed === void 0 ? void 0 : signed.signatures) === null || _a === void 0 ? void 0 : _a.length).toBe(1);
83
- expect((_c = (_b = signed === null || signed === void 0 ? void 0 : signed.signatures) === null || _b === void 0 ? void 0 : _b[0].pub_key) === null || _c === void 0 ? void 0 : _c.value).toMatchInlineSnapshot(`"A1DSQ2pqr8D5di36Uj6M/sbvkSi7nMf/07yMwcBXyJHL"`);
84
- expect((_d = signed === null || signed === void 0 ? void 0 : signed.signatures) === null || _d === void 0 ? void 0 : _d[0].signature).toMatchInlineSnapshot(`"3fYykzgna7MWg9VLhsYwHMEF55ZHQEmefq5KOH0jRtNDOYc2K0J9ss3sts54i5I52sg5dA4aGC/yJuSDGUlUJQ=="`);
97
+ expect((_b = signed === null || signed === void 0 ? void 0 : signed.signatures) === null || _b === void 0 ? void 0 : _b[0]).toBe("hKgBg+lB6poFDTMIKPA/hBMkgrKb0BJ5aP1vy5KMze8/joV30TPZrayrLBK42/MDSCmVauNJbfwvRhrCQwRCmg==");
85
98
  }));
86
99
  });
87
100
  //# sourceMappingURL=thorchain.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"thorchain.test.js","sourceRoot":"","sources":["../src/thorchain.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"thorchain.test.js","sourceRoot":"","sources":["../src/thorchain.test.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shapeshiftoss/hdwallet-native",
3
- "version": "1.30.0",
3
+ "version": "1.31.0",
4
4
  "license": "MIT",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -16,8 +16,8 @@
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.30.0",
20
- "@shapeshiftoss/proto-tx-builder": "^0.2.1",
19
+ "@shapeshiftoss/hdwallet-core": "1.31.0",
20
+ "@shapeshiftoss/proto-tx-builder": "^0.3.0",
21
21
  "@zxing/text-encoding": "^0.9.0",
22
22
  "bchaddrjs": "^0.4.9",
23
23
  "bignumber.js": "^9.0.1",
@@ -37,7 +37,9 @@
37
37
  "web-encoding": "^1.1.0"
38
38
  },
39
39
  "devDependencies": {
40
- "@cosmjs/proto-signing": "^0.27.1",
40
+ "@cosmjs/amino": "^0.28.13",
41
+ "@cosmjs/proto-signing": "^0.28.13",
42
+ "@cosmjs/stargate": "^0.28.13",
41
43
  "@peculiar/webcrypto": "^1.1.3",
42
44
  "@types/bchaddrjs": "^0.4.0",
43
45
  "@types/big.js": "^6.0.2",
@@ -57,5 +59,5 @@
57
59
  "ts-jest": "^26.5.5",
58
60
  "typescript": "^4.3.2"
59
61
  },
60
- "gitHead": "bfec9b6286cb3f5b2d0f81505c8f7414c48ed29a"
62
+ "gitHead": "725e2fb767651667fac47999f9af34f290585cc4"
61
63
  }