@keplr-wallet/background 0.9.8 → 0.9.10
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/build/chains/types.js +1 -1
- package/build/chains/types.js.map +1 -1
- package/build/keyring/handler.js +8 -0
- package/build/keyring/handler.js.map +1 -1
- package/build/keyring/init.js +1 -0
- package/build/keyring/init.js.map +1 -1
- package/build/keyring/messages.d.ts +18 -2
- package/build/keyring/messages.js +47 -3
- package/build/keyring/messages.js.map +1 -1
- package/build/keyring/service.d.ts +5 -2
- package/build/keyring/service.js +46 -2
- package/build/keyring/service.js.map +1 -1
- package/package.json +7 -7
- package/src/chains/types.ts +2 -1
- package/src/keyring/handler.ts +25 -0
- package/src/keyring/init.ts +2 -0
- package/src/keyring/messages.ts +64 -6
- package/src/keyring/service.ts +80 -6
package/build/chains/types.js
CHANGED
|
@@ -75,7 +75,7 @@ exports.ChainInfoSchema = joi_1.default.object({
|
|
|
75
75
|
high: joi_1.default.number().required(),
|
|
76
76
|
}),
|
|
77
77
|
features: joi_1.default.array()
|
|
78
|
-
.items(joi_1.default.string().valid("stargate", "cosmwasm", "secretwasm", "ibc-transfer", "no-legacy-stdTx"))
|
|
78
|
+
.items(joi_1.default.string().valid("stargate", "cosmwasm", "secretwasm", "ibc-transfer", "no-legacy-stdTx", "ibc-go"))
|
|
79
79
|
.unique()
|
|
80
80
|
.custom((value) => {
|
|
81
81
|
if (value.indexOf("cosmwasm") >= 0 && value.indexOf("secretwasm") >= 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/chains/types.ts"],"names":[],"mappings":";;;;;;AAQA,8CAAwC;AAM3B,QAAA,cAAc,GAAG,aAAG,CAAC,MAAM,CAAW;IACjD,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,gBAAgB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACzC,YAAY,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC9D,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE;IACzB,YAAY,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;CACjC,CAAC,CAAC;AAEU,QAAA,iBAAiB,GAAI,sBAA6C;KAC5E,IAAI,CAAC;IACJ,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;IAC3C,eAAe,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACzC,CAAC;KACD,MAAM,CAAC,CAAC,KAAmB,EAAE,EAAE;IAC9B,IACE,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAC/B,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,eAAe,GAAG,CAC1C,EACD;QACA,OAAO,KAAK,CAAC;KACd;SAAM;QACL,uCACK,KAAK,KACR,gBAAgB,EACd,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,eAAe,GAAG,GAAG,KAAK,CAAC,gBAAgB,IACpE;KACH;AACH,CAAC,CAAC,CAAC;AAEQ,QAAA,qBAAqB,GAAI,sBAAiD;KACpF,IAAI,CAAC;IACJ,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE;IAC/C,eAAe,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACxC,UAAU,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACpC,CAAC;KACD,MAAM,CAAC,CAAC,KAAuB,EAAE,EAAE;IAClC,IACE,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAC/B,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,eAAe,GAAG,CAC1C,EACD;QACA,OAAO,KAAK,CAAC;KACd;SAAM;QACL,uCACK,KAAK,KACR,gBAAgB,EACd,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,eAAe,GAAG,GAAG,KAAK,CAAC,gBAAgB,IACpE;KACH;AACH,CAAC,CAAC,CAAC;AAEQ,QAAA,kBAAkB,GAAG,aAAG,CAAC,MAAM,CAAe;IACzD,mBAAmB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5C,kBAAkB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3C,mBAAmB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5C,kBAAkB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3C,oBAAoB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7C,mBAAmB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC7C,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,aAAG,CAAC,MAAM,CAAuB;IACpE,QAAQ,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CAEnD,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEJ,QAAA,eAAe,GAAG,aAAG,CAAC,MAAM,CAAY;IACnD,GAAG,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE;IAClC,2BAA2B;IAC3B,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE;IACnC,4BAA4B;IAC5B,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;IAC/C,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;IACjD,aAAa,EAAE,sBAAc,CAAC,QAAQ,EAAE;IACxC,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IAC7B,mBAAmB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IACvC,KAAK,EAAE,6BAAqB,CAAC,QAAQ,EAAE;IACvC,YAAY,EAAE,0BAAkB,CAAC,QAAQ,EAAE;IAC3C,UAAU,EAAE,aAAG,CAAC,KAAK,EAAE;SACpB,GAAG,CAAC,CAAC,CAAC;SACN,KAAK,CAAC,sBAAc,EAAE,yBAAiB,EAAE,6BAAqB,CAAC;SAC/D,QAAQ,EAAE;IACb,aAAa,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,sBAAc,CAAC,CAAC,QAAQ,EAAE;IAClE,QAAQ,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;IAChC,IAAI,EAAE,aAAG,CAAC,OAAO,EAAE;IACnB,YAAY,EAAE,aAAG,CAAC,MAAM,CAAC;QACvB,GAAG,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC5B,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAChC,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAC9B,CAAC;IACF,QAAQ,EAAE,aAAG,CAAC,KAAK,EAAE;SAClB,KAAK,CACJ,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAChB,UAAU,EACV,UAAU,EACV,YAAY,EACZ,cAAc,EACd,iBAAiB,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/chains/types.ts"],"names":[],"mappings":"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"}
|
package/build/keyring/handler.js
CHANGED
|
@@ -48,6 +48,8 @@ const getHandler = (service) => {
|
|
|
48
48
|
return handleGetKeyMsg(service)(env, msg);
|
|
49
49
|
case messages_1.RequestSignAminoMsg:
|
|
50
50
|
return handleRequestSignAminoMsg(service)(env, msg);
|
|
51
|
+
case messages_1.RequestVerifyADR36AminoSignDoc:
|
|
52
|
+
return handleRequestVerifyADR36AminoSignDoc(service)(env, msg);
|
|
51
53
|
case messages_1.RequestSignDirectMsg:
|
|
52
54
|
return handleRequestSignDirectMsg(service)(env, msg);
|
|
53
55
|
case messages_1.GetMultiKeyStoreInfoMsg:
|
|
@@ -153,6 +155,12 @@ const handleRequestSignAminoMsg = (service) => {
|
|
|
153
155
|
return yield service.requestSignAmino(env, msg.origin, msg.chainId, msg.signer, msg.signDoc, msg.signOptions);
|
|
154
156
|
});
|
|
155
157
|
};
|
|
158
|
+
const handleRequestVerifyADR36AminoSignDoc = (service) => {
|
|
159
|
+
return (env, msg) => __awaiter(void 0, void 0, void 0, function* () {
|
|
160
|
+
yield service.permissionService.checkOrGrantBasicAccessPermission(env, msg.chainId, msg.origin);
|
|
161
|
+
return yield service.verifyADR36AminoSignDoc(msg.chainId, msg.signer, msg.data, msg.signature);
|
|
162
|
+
});
|
|
163
|
+
};
|
|
156
164
|
const handleRequestSignDirectMsg = (service) => {
|
|
157
165
|
return (env, msg) => __awaiter(void 0, void 0, void 0, function* () {
|
|
158
166
|
yield service.permissionService.checkOrGrantBasicAccessPermission(env, msg.chainId, msg.origin);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/keyring/handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/keyring/handler.ts"],"names":[],"mappings":"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"}
|
package/build/keyring/init.js
CHANGED
|
@@ -19,6 +19,7 @@ function init(router, service) {
|
|
|
19
19
|
router.registerMessage(messages_1.UnlockKeyRingMsg);
|
|
20
20
|
router.registerMessage(messages_1.GetKeyMsg);
|
|
21
21
|
router.registerMessage(messages_1.RequestSignAminoMsg);
|
|
22
|
+
router.registerMessage(messages_1.RequestVerifyADR36AminoSignDoc);
|
|
22
23
|
router.registerMessage(messages_1.RequestSignDirectMsg);
|
|
23
24
|
router.registerMessage(messages_1.GetMultiKeyStoreInfoMsg);
|
|
24
25
|
router.registerMessage(messages_1.ChangeKeyRingMsg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/keyring/init.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/keyring/init.ts"],"names":[],"mappings":";;;AACA,yCAuBoB;AACpB,2CAAoC;AACpC,uCAAuC;AAGvC,SAAgB,IAAI,CAAC,MAAc,EAAE,OAAuB;IAC1D,MAAM,CAAC,eAAe,CAAC,4BAAiB,CAAC,CAAC;IAC1C,MAAM,CAAC,eAAe,CAAC,2BAAgB,CAAC,CAAC;IACzC,MAAM,CAAC,eAAe,CAAC,+BAAoB,CAAC,CAAC;IAC7C,MAAM,CAAC,eAAe,CAAC,yBAAc,CAAC,CAAC;IACvC,MAAM,CAAC,eAAe,CAAC,+BAAoB,CAAC,CAAC;IAC7C,MAAM,CAAC,eAAe,CAAC,4BAAiB,CAAC,CAAC;IAC1C,MAAM,CAAC,eAAe,CAAC,8BAAmB,CAAC,CAAC;IAC5C,MAAM,CAAC,eAAe,CAAC,2BAAgB,CAAC,CAAC;IACzC,MAAM,CAAC,eAAe,CAAC,6BAAkB,CAAC,CAAC;IAC3C,MAAM,CAAC,eAAe,CAAC,0BAAe,CAAC,CAAC;IACxC,MAAM,CAAC,eAAe,CAAC,yBAAc,CAAC,CAAC;IACvC,MAAM,CAAC,eAAe,CAAC,2BAAgB,CAAC,CAAC;IACzC,MAAM,CAAC,eAAe,CAAC,oBAAS,CAAC,CAAC;IAClC,MAAM,CAAC,eAAe,CAAC,8BAAmB,CAAC,CAAC;IAC5C,MAAM,CAAC,eAAe,CAAC,yCAA8B,CAAC,CAAC;IACvD,MAAM,CAAC,eAAe,CAAC,+BAAoB,CAAC,CAAC;IAC7C,MAAM,CAAC,eAAe,CAAC,kCAAuB,CAAC,CAAC;IAChD,MAAM,CAAC,eAAe,CAAC,2BAAgB,CAAC,CAAC;IACzC,MAAM,CAAC,eAAe,CAAC,sCAA2B,CAAC,CAAC;IACpD,MAAM,CAAC,eAAe,CAAC,iCAAsB,CAAC,CAAC;IAC/C,MAAM,CAAC,eAAe,CAAC,2BAAgB,CAAC,CAAC;IACzC,MAAM,CAAC,eAAe,CAAC,gCAAqB,CAAC,CAAC;IAE9C,MAAM,CAAC,UAAU,CAAC,iBAAK,EAAE,oBAAU,CAAC,OAAO,CAAC,CAAC,CAAC;AAChD,CAAC;AAzBD,oBAyBC"}
|
|
@@ -157,9 +157,25 @@ export declare class RequestSignAminoMsg extends Message<AminoSignResponse> {
|
|
|
157
157
|
readonly chainId: string;
|
|
158
158
|
readonly signer: string;
|
|
159
159
|
readonly signDoc: StdSignDoc;
|
|
160
|
-
readonly signOptions: KeplrSignOptions
|
|
160
|
+
readonly signOptions: KeplrSignOptions & {
|
|
161
|
+
isADR36WithString?: boolean;
|
|
162
|
+
};
|
|
163
|
+
static type(): string;
|
|
164
|
+
constructor(chainId: string, signer: string, signDoc: StdSignDoc, signOptions?: KeplrSignOptions & {
|
|
165
|
+
isADR36WithString?: boolean;
|
|
166
|
+
});
|
|
167
|
+
validateBasic(): void;
|
|
168
|
+
approveExternal(): boolean;
|
|
169
|
+
route(): string;
|
|
170
|
+
type(): string;
|
|
171
|
+
}
|
|
172
|
+
export declare class RequestVerifyADR36AminoSignDoc extends Message<boolean> {
|
|
173
|
+
readonly chainId: string;
|
|
174
|
+
readonly signer: string;
|
|
175
|
+
readonly data: Uint8Array;
|
|
176
|
+
readonly signature: StdSignature;
|
|
161
177
|
static type(): string;
|
|
162
|
-
constructor(chainId: string, signer: string,
|
|
178
|
+
constructor(chainId: string, signer: string, data: Uint8Array, signature: StdSignature);
|
|
163
179
|
validateBasic(): void;
|
|
164
180
|
approveExternal(): boolean;
|
|
165
181
|
route(): string;
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ExportKeyRingDatasMsg = exports.CheckPasswordMsg = exports.SetKeyStoreCoinTypeMsg = exports.GetIsKeyStoreCoinTypeSetMsg = exports.ChangeKeyRingMsg = exports.GetMultiKeyStoreInfoMsg = exports.RequestSignDirectMsg = exports.RequestSignAminoMsg = exports.GetKeyMsg = exports.UnlockKeyRingMsg = exports.LockKeyRingMsg = exports.AddLedgerKeyMsg = exports.AddPrivateKeyMsg = exports.CreateLedgerKeyMsg = exports.CreatePrivateKeyMsg = exports.AddMnemonicKeyMsg = exports.CreateMnemonicKeyMsg = exports.ShowKeyRingMsg = exports.UpdateNameKeyRingMsg = exports.DeleteKeyRingMsg = exports.RestoreKeyRingMsg = void 0;
|
|
6
|
+
exports.ExportKeyRingDatasMsg = exports.CheckPasswordMsg = exports.SetKeyStoreCoinTypeMsg = exports.GetIsKeyStoreCoinTypeSetMsg = exports.ChangeKeyRingMsg = exports.GetMultiKeyStoreInfoMsg = exports.RequestSignDirectMsg = exports.RequestVerifyADR36AminoSignDoc = exports.RequestSignAminoMsg = exports.GetKeyMsg = exports.UnlockKeyRingMsg = exports.LockKeyRingMsg = exports.AddLedgerKeyMsg = exports.AddPrivateKeyMsg = exports.CreateLedgerKeyMsg = exports.CreatePrivateKeyMsg = exports.AddMnemonicKeyMsg = exports.CreateMnemonicKeyMsg = exports.ShowKeyRingMsg = exports.UpdateNameKeyRingMsg = exports.DeleteKeyRingMsg = exports.RestoreKeyRingMsg = void 0;
|
|
7
7
|
const router_1 = require("@keplr-wallet/router");
|
|
8
8
|
const constants_1 = require("./constants");
|
|
9
9
|
const keyring_1 = require("./keyring");
|
|
@@ -395,8 +395,17 @@ class RequestSignAminoMsg extends router_1.Message {
|
|
|
395
395
|
}
|
|
396
396
|
// Validate bech32 address.
|
|
397
397
|
cosmos_1.Bech32Address.validate(this.signer);
|
|
398
|
-
|
|
399
|
-
|
|
398
|
+
// Check and validate the ADR-36 sign doc.
|
|
399
|
+
// ADR-36 sign doc doesn't have the chain id
|
|
400
|
+
if (!cosmos_1.checkAndValidateADR36AminoSignDoc(this.signDoc)) {
|
|
401
|
+
if (this.signDoc.chain_id !== this.chainId) {
|
|
402
|
+
throw new Error("Chain id in the message is not matched with the requested chain id");
|
|
403
|
+
}
|
|
404
|
+
}
|
|
405
|
+
else {
|
|
406
|
+
if (this.signDoc.msgs[0].value.signer !== this.signer) {
|
|
407
|
+
throw new Error("Unmatched signer in sign doc");
|
|
408
|
+
}
|
|
400
409
|
}
|
|
401
410
|
if (!this.signOptions) {
|
|
402
411
|
throw new Error("Sign options are null");
|
|
@@ -413,6 +422,41 @@ class RequestSignAminoMsg extends router_1.Message {
|
|
|
413
422
|
}
|
|
414
423
|
}
|
|
415
424
|
exports.RequestSignAminoMsg = RequestSignAminoMsg;
|
|
425
|
+
class RequestVerifyADR36AminoSignDoc extends router_1.Message {
|
|
426
|
+
constructor(chainId, signer, data, signature) {
|
|
427
|
+
super();
|
|
428
|
+
this.chainId = chainId;
|
|
429
|
+
this.signer = signer;
|
|
430
|
+
this.data = data;
|
|
431
|
+
this.signature = signature;
|
|
432
|
+
}
|
|
433
|
+
static type() {
|
|
434
|
+
return "request-verify-adr-36-amino-doc";
|
|
435
|
+
}
|
|
436
|
+
validateBasic() {
|
|
437
|
+
if (!this.chainId) {
|
|
438
|
+
throw new Error("chain id not set");
|
|
439
|
+
}
|
|
440
|
+
if (!this.signer) {
|
|
441
|
+
throw new Error("signer not set");
|
|
442
|
+
}
|
|
443
|
+
if (!this.signature) {
|
|
444
|
+
throw new Error("Signature not set");
|
|
445
|
+
}
|
|
446
|
+
// Validate bech32 address.
|
|
447
|
+
cosmos_1.Bech32Address.validate(this.signer);
|
|
448
|
+
}
|
|
449
|
+
approveExternal() {
|
|
450
|
+
return true;
|
|
451
|
+
}
|
|
452
|
+
route() {
|
|
453
|
+
return constants_1.ROUTE;
|
|
454
|
+
}
|
|
455
|
+
type() {
|
|
456
|
+
return RequestVerifyADR36AminoSignDoc.type();
|
|
457
|
+
}
|
|
458
|
+
}
|
|
459
|
+
exports.RequestVerifyADR36AminoSignDoc = RequestVerifyADR36AminoSignDoc;
|
|
416
460
|
class RequestSignDirectMsg extends router_1.Message {
|
|
417
461
|
constructor(chainId, signer, signDoc, signOptions = {}) {
|
|
418
462
|
super();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/keyring/messages.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/keyring/messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import { BIP44, ChainInfo, KeplrSignOptions } from "@keplr-wallet/types";
|
|
|
7
7
|
import { Env } from "@keplr-wallet/router";
|
|
8
8
|
import { InteractionService } from "../interaction";
|
|
9
9
|
import { PermissionService } from "../permission";
|
|
10
|
-
import { AminoSignResponse, StdSignDoc } from "@cosmjs/launchpad";
|
|
10
|
+
import { AminoSignResponse, StdSignDoc, StdSignature } from "@cosmjs/launchpad";
|
|
11
11
|
import { DirectSignResponse } from "@cosmjs/proto-signing";
|
|
12
12
|
import { RNG } from "@keplr-wallet/crypto";
|
|
13
13
|
import { cosmos } from "@keplr-wallet/cosmos";
|
|
@@ -50,8 +50,11 @@ export declare class KeyRingService {
|
|
|
50
50
|
getKey(chainId: string): Promise<Key>;
|
|
51
51
|
getKeyStoreMeta(key: string): string;
|
|
52
52
|
getKeyRingType(): string;
|
|
53
|
-
requestSignAmino(env: Env, msgOrigin: string, chainId: string, signer: string, signDoc: StdSignDoc, signOptions: KeplrSignOptions
|
|
53
|
+
requestSignAmino(env: Env, msgOrigin: string, chainId: string, signer: string, signDoc: StdSignDoc, signOptions: KeplrSignOptions & {
|
|
54
|
+
isADR36WithString?: boolean;
|
|
55
|
+
}): Promise<AminoSignResponse>;
|
|
54
56
|
requestSignDirect(env: Env, msgOrigin: string, chainId: string, signer: string, signDoc: cosmos.tx.v1beta1.SignDoc, signOptions: KeplrSignOptions): Promise<DirectSignResponse>;
|
|
57
|
+
verifyADR36AminoSignDoc(chainId: string, signer: string, data: Uint8Array, signature: StdSignature): Promise<boolean>;
|
|
55
58
|
sign(env: Env, chainId: string, message: Uint8Array): Promise<Uint8Array>;
|
|
56
59
|
addMnemonicKey(kdf: "scrypt" | "sha256" | "pbkdf2", mnemonic: string, meta: Record<string, string>, bip44HDPath: BIP44HDPath): Promise<{
|
|
57
60
|
multiKeyStoreInfo: MultiKeyStoreInfoWithSelected;
|
package/build/keyring/service.js
CHANGED
|
@@ -34,6 +34,7 @@ const permission_1 = require("../permission");
|
|
|
34
34
|
const launchpad_1 = require("@cosmjs/launchpad");
|
|
35
35
|
const proto_signing_1 = require("@cosmjs/proto-signing");
|
|
36
36
|
const cosmos_2 = require("@keplr-wallet/cosmos");
|
|
37
|
+
const buffer_1 = require("buffer/");
|
|
37
38
|
let KeyRingService = class KeyRingService {
|
|
38
39
|
constructor(kvStore, embedChainInfos, interactionService, chainsService, permissionService, ledgerService, rng, crypto) {
|
|
39
40
|
this.interactionService = interactionService;
|
|
@@ -142,11 +143,21 @@ let KeyRingService = class KeyRingService {
|
|
|
142
143
|
return __awaiter(this, void 0, void 0, function* () {
|
|
143
144
|
const coinType = yield this.chainsService.getChainCoinType(chainId);
|
|
144
145
|
const key = yield this.keyRing.getKey(chainId, coinType);
|
|
145
|
-
const
|
|
146
|
-
.bech32PrefixAccAddr
|
|
146
|
+
const bech32Prefix = (yield this.chainsService.getChainInfo(chainId))
|
|
147
|
+
.bech32Config.bech32PrefixAccAddr;
|
|
148
|
+
const bech32Address = new cosmos_1.Bech32Address(key.address).toBech32(bech32Prefix);
|
|
147
149
|
if (signer !== bech32Address) {
|
|
148
150
|
throw new Error("Signer mismatched");
|
|
149
151
|
}
|
|
152
|
+
const isADR36SignDoc = cosmos_1.checkAndValidateADR36AminoSignDoc(signDoc, bech32Prefix);
|
|
153
|
+
if (isADR36SignDoc) {
|
|
154
|
+
if (signDoc.msgs[0].value.signer !== signer) {
|
|
155
|
+
throw new Error("Unmatched signer in sign doc");
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
if (signOptions.isADR36WithString != null && !isADR36SignDoc) {
|
|
159
|
+
throw new Error('Sign doc is not for ADR-36. But, "isADR36WithString" option is defined');
|
|
160
|
+
}
|
|
150
161
|
const newSignDoc = (yield this.interactionService.waitApprove(env, "/sign", "request-sign", {
|
|
151
162
|
msgOrigin,
|
|
152
163
|
chainId,
|
|
@@ -154,7 +165,20 @@ let KeyRingService = class KeyRingService {
|
|
|
154
165
|
signDoc,
|
|
155
166
|
signer,
|
|
156
167
|
signOptions,
|
|
168
|
+
isADR36SignDoc,
|
|
169
|
+
isADR36WithString: signOptions.isADR36WithString,
|
|
157
170
|
}));
|
|
171
|
+
if (isADR36SignDoc) {
|
|
172
|
+
// Validate the new sign doc, if it was for ADR-36.
|
|
173
|
+
if (cosmos_1.checkAndValidateADR36AminoSignDoc(signDoc, bech32Prefix)) {
|
|
174
|
+
if (signDoc.msgs[0].value.signer !== signer) {
|
|
175
|
+
throw new Error("Unmatched signer in new sign doc");
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
else {
|
|
179
|
+
throw new Error("Signing request was for ADR-36. But, accidentally, new sign doc is not for ADR-36");
|
|
180
|
+
}
|
|
181
|
+
}
|
|
158
182
|
try {
|
|
159
183
|
const signature = yield this.keyRing.sign(env, chainId, coinType, launchpad_1.serializeSignDoc(newSignDoc));
|
|
160
184
|
return {
|
|
@@ -197,6 +221,26 @@ let KeyRingService = class KeyRingService {
|
|
|
197
221
|
}
|
|
198
222
|
});
|
|
199
223
|
}
|
|
224
|
+
verifyADR36AminoSignDoc(chainId, signer, data, signature) {
|
|
225
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
226
|
+
const coinType = yield this.chainsService.getChainCoinType(chainId);
|
|
227
|
+
const key = yield this.keyRing.getKey(chainId, coinType);
|
|
228
|
+
const bech32Prefix = (yield this.chainsService.getChainInfo(chainId))
|
|
229
|
+
.bech32Config.bech32PrefixAccAddr;
|
|
230
|
+
const bech32Address = new cosmos_1.Bech32Address(key.address).toBech32(bech32Prefix);
|
|
231
|
+
if (signer !== bech32Address) {
|
|
232
|
+
throw new Error("Signer mismatched");
|
|
233
|
+
}
|
|
234
|
+
if (signature.pub_key.type !== "tendermint/PubKeySecp256k1") {
|
|
235
|
+
throw new Error(`Unsupported type of pub key: ${signature.pub_key.type}`);
|
|
236
|
+
}
|
|
237
|
+
if (buffer_1.Buffer.from(key.pubKey).toString("base64") !== signature.pub_key.value) {
|
|
238
|
+
throw new Error("Pub key unmatched");
|
|
239
|
+
}
|
|
240
|
+
const signDoc = cosmos_1.makeADR36AminoSignDoc(signer, data);
|
|
241
|
+
return cosmos_1.verifyADR36AminoSignDoc(bech32Prefix, signDoc, buffer_1.Buffer.from(signature.pub_key.value, "base64"), buffer_1.Buffer.from(signature.signature, "base64"));
|
|
242
|
+
});
|
|
243
|
+
}
|
|
200
244
|
sign(env, chainId, message) {
|
|
201
245
|
return __awaiter(this, void 0, void 0, function* () {
|
|
202
246
|
return this.keyRing.sign(env, chainId, yield this.chainsService.getChainCoinType(chainId), message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/keyring/service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAoD;AACpD,oCAAiC;AAEjC,uCAKmB;AAEnB,
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/keyring/service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@keplr-wallet/background",
|
|
3
|
-
"version": "0.9.
|
|
3
|
+
"version": "0.9.10",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"author": "chainapsis",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -26,13 +26,13 @@
|
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"@cosmjs/launchpad": "^0.24.0-alpha.25",
|
|
28
28
|
"@cosmjs/proto-signing": "^0.24.0-alpha.25",
|
|
29
|
-
"@keplr-wallet/common": "^0.9.
|
|
30
|
-
"@keplr-wallet/cosmos": "^0.9.
|
|
31
|
-
"@keplr-wallet/crypto": "^0.9.
|
|
29
|
+
"@keplr-wallet/common": "^0.9.10",
|
|
30
|
+
"@keplr-wallet/cosmos": "^0.9.10",
|
|
31
|
+
"@keplr-wallet/crypto": "^0.9.10",
|
|
32
32
|
"@keplr-wallet/popup": "^0.9.6",
|
|
33
33
|
"@keplr-wallet/router": "^0.9.6",
|
|
34
|
-
"@keplr-wallet/types": "^0.9.
|
|
35
|
-
"@keplr-wallet/unit": "^0.9.
|
|
34
|
+
"@keplr-wallet/types": "^0.9.10",
|
|
35
|
+
"@keplr-wallet/unit": "^0.9.10",
|
|
36
36
|
"@ledgerhq/hw-transport": "^6.3.0",
|
|
37
37
|
"@ledgerhq/hw-transport-webhid": "^6.3.0",
|
|
38
38
|
"@ledgerhq/hw-transport-webusb": "^6.3.0",
|
|
@@ -51,5 +51,5 @@
|
|
|
51
51
|
"secretjs": "^0.17.0",
|
|
52
52
|
"tsyringe": "^4.4.0"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "05efb7b77a6e0bffee7533db91e7c83b7b777da6"
|
|
55
55
|
}
|
package/src/chains/types.ts
CHANGED
package/src/keyring/handler.ts
CHANGED
|
@@ -21,6 +21,7 @@ import {
|
|
|
21
21
|
GetIsKeyStoreCoinTypeSetMsg,
|
|
22
22
|
CheckPasswordMsg,
|
|
23
23
|
ExportKeyRingDatasMsg,
|
|
24
|
+
RequestVerifyADR36AminoSignDoc,
|
|
24
25
|
} from "./messages";
|
|
25
26
|
import { KeyRingService } from "./service";
|
|
26
27
|
import { Bech32Address } from "@keplr-wallet/cosmos";
|
|
@@ -76,6 +77,11 @@ export const getHandler: (service: KeyRingService) => Handler = (
|
|
|
76
77
|
env,
|
|
77
78
|
msg as RequestSignAminoMsg
|
|
78
79
|
);
|
|
80
|
+
case RequestVerifyADR36AminoSignDoc:
|
|
81
|
+
return handleRequestVerifyADR36AminoSignDoc(service)(
|
|
82
|
+
env,
|
|
83
|
+
msg as RequestVerifyADR36AminoSignDoc
|
|
84
|
+
);
|
|
79
85
|
case RequestSignDirectMsg:
|
|
80
86
|
return handleRequestSignDirectMsg(service)(
|
|
81
87
|
env,
|
|
@@ -280,6 +286,25 @@ const handleRequestSignAminoMsg: (
|
|
|
280
286
|
};
|
|
281
287
|
};
|
|
282
288
|
|
|
289
|
+
const handleRequestVerifyADR36AminoSignDoc: (
|
|
290
|
+
service: KeyRingService
|
|
291
|
+
) => InternalHandler<RequestVerifyADR36AminoSignDoc> = (service) => {
|
|
292
|
+
return async (env, msg) => {
|
|
293
|
+
await service.permissionService.checkOrGrantBasicAccessPermission(
|
|
294
|
+
env,
|
|
295
|
+
msg.chainId,
|
|
296
|
+
msg.origin
|
|
297
|
+
);
|
|
298
|
+
|
|
299
|
+
return await service.verifyADR36AminoSignDoc(
|
|
300
|
+
msg.chainId,
|
|
301
|
+
msg.signer,
|
|
302
|
+
msg.data,
|
|
303
|
+
msg.signature
|
|
304
|
+
);
|
|
305
|
+
};
|
|
306
|
+
};
|
|
307
|
+
|
|
283
308
|
const handleRequestSignDirectMsg: (
|
|
284
309
|
service: KeyRingService
|
|
285
310
|
) => InternalHandler<RequestSignDirectMsg> = (service) => {
|
package/src/keyring/init.ts
CHANGED
|
@@ -21,6 +21,7 @@ import {
|
|
|
21
21
|
RestoreKeyRingMsg,
|
|
22
22
|
CheckPasswordMsg,
|
|
23
23
|
ExportKeyRingDatasMsg,
|
|
24
|
+
RequestVerifyADR36AminoSignDoc,
|
|
24
25
|
} from "./messages";
|
|
25
26
|
import { ROUTE } from "./constants";
|
|
26
27
|
import { getHandler } from "./handler";
|
|
@@ -41,6 +42,7 @@ export function init(router: Router, service: KeyRingService): void {
|
|
|
41
42
|
router.registerMessage(UnlockKeyRingMsg);
|
|
42
43
|
router.registerMessage(GetKeyMsg);
|
|
43
44
|
router.registerMessage(RequestSignAminoMsg);
|
|
45
|
+
router.registerMessage(RequestVerifyADR36AminoSignDoc);
|
|
44
46
|
router.registerMessage(RequestSignDirectMsg);
|
|
45
47
|
router.registerMessage(GetMultiKeyStoreInfoMsg);
|
|
46
48
|
router.registerMessage(ChangeKeyRingMsg);
|
package/src/keyring/messages.ts
CHANGED
|
@@ -7,7 +7,10 @@ import {
|
|
|
7
7
|
} from "./keyring";
|
|
8
8
|
import { BIP44HDPath, ExportKeyRingData } from "./types";
|
|
9
9
|
|
|
10
|
-
import {
|
|
10
|
+
import {
|
|
11
|
+
Bech32Address,
|
|
12
|
+
checkAndValidateADR36AminoSignDoc,
|
|
13
|
+
} from "@keplr-wallet/cosmos";
|
|
11
14
|
import { BIP44, KeplrSignOptions, Key } from "@keplr-wallet/types";
|
|
12
15
|
|
|
13
16
|
import { StdSignDoc, AminoSignResponse, StdSignature } from "@cosmjs/launchpad";
|
|
@@ -491,7 +494,10 @@ export class RequestSignAminoMsg extends Message<AminoSignResponse> {
|
|
|
491
494
|
public readonly chainId: string,
|
|
492
495
|
public readonly signer: string,
|
|
493
496
|
public readonly signDoc: StdSignDoc,
|
|
494
|
-
public readonly signOptions: KeplrSignOptions
|
|
497
|
+
public readonly signOptions: KeplrSignOptions & {
|
|
498
|
+
// Hack option field to detect the sign arbitrary for string
|
|
499
|
+
isADR36WithString?: boolean;
|
|
500
|
+
} = {}
|
|
495
501
|
) {
|
|
496
502
|
super();
|
|
497
503
|
}
|
|
@@ -508,10 +514,18 @@ export class RequestSignAminoMsg extends Message<AminoSignResponse> {
|
|
|
508
514
|
// Validate bech32 address.
|
|
509
515
|
Bech32Address.validate(this.signer);
|
|
510
516
|
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
)
|
|
517
|
+
// Check and validate the ADR-36 sign doc.
|
|
518
|
+
// ADR-36 sign doc doesn't have the chain id
|
|
519
|
+
if (!checkAndValidateADR36AminoSignDoc(this.signDoc)) {
|
|
520
|
+
if (this.signDoc.chain_id !== this.chainId) {
|
|
521
|
+
throw new Error(
|
|
522
|
+
"Chain id in the message is not matched with the requested chain id"
|
|
523
|
+
);
|
|
524
|
+
}
|
|
525
|
+
} else {
|
|
526
|
+
if (this.signDoc.msgs[0].value.signer !== this.signer) {
|
|
527
|
+
throw new Error("Unmatched signer in sign doc");
|
|
528
|
+
}
|
|
515
529
|
}
|
|
516
530
|
|
|
517
531
|
if (!this.signOptions) {
|
|
@@ -532,6 +546,50 @@ export class RequestSignAminoMsg extends Message<AminoSignResponse> {
|
|
|
532
546
|
}
|
|
533
547
|
}
|
|
534
548
|
|
|
549
|
+
export class RequestVerifyADR36AminoSignDoc extends Message<boolean> {
|
|
550
|
+
public static type() {
|
|
551
|
+
return "request-verify-adr-36-amino-doc";
|
|
552
|
+
}
|
|
553
|
+
|
|
554
|
+
constructor(
|
|
555
|
+
public readonly chainId: string,
|
|
556
|
+
public readonly signer: string,
|
|
557
|
+
public readonly data: Uint8Array,
|
|
558
|
+
public readonly signature: StdSignature
|
|
559
|
+
) {
|
|
560
|
+
super();
|
|
561
|
+
}
|
|
562
|
+
|
|
563
|
+
validateBasic(): void {
|
|
564
|
+
if (!this.chainId) {
|
|
565
|
+
throw new Error("chain id not set");
|
|
566
|
+
}
|
|
567
|
+
|
|
568
|
+
if (!this.signer) {
|
|
569
|
+
throw new Error("signer not set");
|
|
570
|
+
}
|
|
571
|
+
|
|
572
|
+
if (!this.signature) {
|
|
573
|
+
throw new Error("Signature not set");
|
|
574
|
+
}
|
|
575
|
+
|
|
576
|
+
// Validate bech32 address.
|
|
577
|
+
Bech32Address.validate(this.signer);
|
|
578
|
+
}
|
|
579
|
+
|
|
580
|
+
approveExternal(): boolean {
|
|
581
|
+
return true;
|
|
582
|
+
}
|
|
583
|
+
|
|
584
|
+
route(): string {
|
|
585
|
+
return ROUTE;
|
|
586
|
+
}
|
|
587
|
+
|
|
588
|
+
type(): string {
|
|
589
|
+
return RequestVerifyADR36AminoSignDoc.type();
|
|
590
|
+
}
|
|
591
|
+
}
|
|
592
|
+
|
|
535
593
|
export class RequestSignDirectMsg extends Message<{
|
|
536
594
|
readonly signed: {
|
|
537
595
|
bodyBytes: Uint8Array;
|
package/src/keyring/service.ts
CHANGED
|
@@ -8,7 +8,12 @@ import {
|
|
|
8
8
|
MultiKeyStoreInfoWithSelected,
|
|
9
9
|
} from "./keyring";
|
|
10
10
|
|
|
11
|
-
import {
|
|
11
|
+
import {
|
|
12
|
+
Bech32Address,
|
|
13
|
+
checkAndValidateADR36AminoSignDoc,
|
|
14
|
+
makeADR36AminoSignDoc,
|
|
15
|
+
verifyADR36AminoSignDoc,
|
|
16
|
+
} from "@keplr-wallet/cosmos";
|
|
12
17
|
import { BIP44HDPath, CommonCrypto, ExportKeyRingData } from "./types";
|
|
13
18
|
|
|
14
19
|
import { KVStore } from "@keplr-wallet/common";
|
|
@@ -25,11 +30,13 @@ import {
|
|
|
25
30
|
serializeSignDoc,
|
|
26
31
|
AminoSignResponse,
|
|
27
32
|
StdSignDoc,
|
|
33
|
+
StdSignature,
|
|
28
34
|
} from "@cosmjs/launchpad";
|
|
29
35
|
import { DirectSignResponse, makeSignBytes } from "@cosmjs/proto-signing";
|
|
30
36
|
|
|
31
37
|
import { RNG } from "@keplr-wallet/crypto";
|
|
32
38
|
import { cosmos } from "@keplr-wallet/cosmos";
|
|
39
|
+
import { Buffer } from "buffer/";
|
|
33
40
|
|
|
34
41
|
@singleton()
|
|
35
42
|
export class KeyRingService {
|
|
@@ -220,19 +227,37 @@ export class KeyRingService {
|
|
|
220
227
|
chainId: string,
|
|
221
228
|
signer: string,
|
|
222
229
|
signDoc: StdSignDoc,
|
|
223
|
-
signOptions: KeplrSignOptions
|
|
230
|
+
signOptions: KeplrSignOptions & {
|
|
231
|
+
// Hack option field to detect the sign arbitrary for string
|
|
232
|
+
isADR36WithString?: boolean;
|
|
233
|
+
}
|
|
224
234
|
): Promise<AminoSignResponse> {
|
|
225
235
|
const coinType = await this.chainsService.getChainCoinType(chainId);
|
|
226
236
|
|
|
227
237
|
const key = await this.keyRing.getKey(chainId, coinType);
|
|
228
|
-
const
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
);
|
|
238
|
+
const bech32Prefix = (await this.chainsService.getChainInfo(chainId))
|
|
239
|
+
.bech32Config.bech32PrefixAccAddr;
|
|
240
|
+
const bech32Address = new Bech32Address(key.address).toBech32(bech32Prefix);
|
|
232
241
|
if (signer !== bech32Address) {
|
|
233
242
|
throw new Error("Signer mismatched");
|
|
234
243
|
}
|
|
235
244
|
|
|
245
|
+
const isADR36SignDoc = checkAndValidateADR36AminoSignDoc(
|
|
246
|
+
signDoc,
|
|
247
|
+
bech32Prefix
|
|
248
|
+
);
|
|
249
|
+
if (isADR36SignDoc) {
|
|
250
|
+
if (signDoc.msgs[0].value.signer !== signer) {
|
|
251
|
+
throw new Error("Unmatched signer in sign doc");
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
if (signOptions.isADR36WithString != null && !isADR36SignDoc) {
|
|
256
|
+
throw new Error(
|
|
257
|
+
'Sign doc is not for ADR-36. But, "isADR36WithString" option is defined'
|
|
258
|
+
);
|
|
259
|
+
}
|
|
260
|
+
|
|
236
261
|
const newSignDoc = (await this.interactionService.waitApprove(
|
|
237
262
|
env,
|
|
238
263
|
"/sign",
|
|
@@ -244,9 +269,24 @@ export class KeyRingService {
|
|
|
244
269
|
signDoc,
|
|
245
270
|
signer,
|
|
246
271
|
signOptions,
|
|
272
|
+
isADR36SignDoc,
|
|
273
|
+
isADR36WithString: signOptions.isADR36WithString,
|
|
247
274
|
}
|
|
248
275
|
)) as StdSignDoc;
|
|
249
276
|
|
|
277
|
+
if (isADR36SignDoc) {
|
|
278
|
+
// Validate the new sign doc, if it was for ADR-36.
|
|
279
|
+
if (checkAndValidateADR36AminoSignDoc(signDoc, bech32Prefix)) {
|
|
280
|
+
if (signDoc.msgs[0].value.signer !== signer) {
|
|
281
|
+
throw new Error("Unmatched signer in new sign doc");
|
|
282
|
+
}
|
|
283
|
+
} else {
|
|
284
|
+
throw new Error(
|
|
285
|
+
"Signing request was for ADR-36. But, accidentally, new sign doc is not for ADR-36"
|
|
286
|
+
);
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
|
|
250
290
|
try {
|
|
251
291
|
const signature = await this.keyRing.sign(
|
|
252
292
|
env,
|
|
@@ -316,6 +356,40 @@ export class KeyRingService {
|
|
|
316
356
|
}
|
|
317
357
|
}
|
|
318
358
|
|
|
359
|
+
async verifyADR36AminoSignDoc(
|
|
360
|
+
chainId: string,
|
|
361
|
+
signer: string,
|
|
362
|
+
data: Uint8Array,
|
|
363
|
+
signature: StdSignature
|
|
364
|
+
): Promise<boolean> {
|
|
365
|
+
const coinType = await this.chainsService.getChainCoinType(chainId);
|
|
366
|
+
|
|
367
|
+
const key = await this.keyRing.getKey(chainId, coinType);
|
|
368
|
+
const bech32Prefix = (await this.chainsService.getChainInfo(chainId))
|
|
369
|
+
.bech32Config.bech32PrefixAccAddr;
|
|
370
|
+
const bech32Address = new Bech32Address(key.address).toBech32(bech32Prefix);
|
|
371
|
+
if (signer !== bech32Address) {
|
|
372
|
+
throw new Error("Signer mismatched");
|
|
373
|
+
}
|
|
374
|
+
if (signature.pub_key.type !== "tendermint/PubKeySecp256k1") {
|
|
375
|
+
throw new Error(`Unsupported type of pub key: ${signature.pub_key.type}`);
|
|
376
|
+
}
|
|
377
|
+
if (
|
|
378
|
+
Buffer.from(key.pubKey).toString("base64") !== signature.pub_key.value
|
|
379
|
+
) {
|
|
380
|
+
throw new Error("Pub key unmatched");
|
|
381
|
+
}
|
|
382
|
+
|
|
383
|
+
const signDoc = makeADR36AminoSignDoc(signer, data);
|
|
384
|
+
|
|
385
|
+
return verifyADR36AminoSignDoc(
|
|
386
|
+
bech32Prefix,
|
|
387
|
+
signDoc,
|
|
388
|
+
Buffer.from(signature.pub_key.value, "base64"),
|
|
389
|
+
Buffer.from(signature.signature, "base64")
|
|
390
|
+
);
|
|
391
|
+
}
|
|
392
|
+
|
|
319
393
|
async sign(
|
|
320
394
|
env: Env,
|
|
321
395
|
chainId: string,
|