@virtonetwork/authenticators-substrate 1.0.0 → 1.1.1

package/dist/cjs/index.js

@@ -36,9 +36,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SubstrateKey = exports.KREIVO_AUTHORITY_ID = void 0;
+exports.SubstrateKey = exports.KREIVO_AUTHORITY_ID = exports.KeyRegistration = exports.KeySignature = exports.SignedMessage = void 0;
 var signer_1 = require("@virtonetwork/signer");
 var types_ts_1 = require("./types.js");
+Object.defineProperty(exports, "KeyRegistration", { enumerable: true, get: function () { return types_ts_1.KeyRegistration; } });
+Object.defineProperty(exports, "KeySignature", { enumerable: true, get: function () { return types_ts_1.KeySignature; } });
+Object.defineProperty(exports, "SignedMessage", { enumerable: true, get: function () { return types_ts_1.SignedMessage; } });
 var polkadot_api_1 = require("polkadot-api");
 exports.KREIVO_AUTHORITY_ID = polkadot_api_1.Binary.fromText("kreivo_p".padEnd(32, "\0"));
 var SubstrateKey = /** @class */ (function () {
@@ -91,12 +94,12 @@ var SubstrateKey = /** @class */ (function () {
     SubstrateKey.prototype.register = function (context) {
         return __awaiter(this, void 0, void 0, function () {
             var challenge, message, _a, _b;
-            var _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var _c, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0: return [4 /*yield*/, this.getChallenge(context, this.addressGenerator(this.hashedUserId))];
                     case 1:
-                        challenge = _d.sent();
+                        challenge = _e.sent();
                         message = types_ts_1.SignedMessage.enc({
                             context: context,
                             authority_id: exports.KREIVO_AUTHORITY_ID,
@@ -106,9 +109,13 @@ var SubstrateKey = /** @class */ (function () {
                             message: types_ts_1.SignedMessage.dec(message),
                             public: polkadot_api_1.Binary.fromBytes(this.signer.publicKey)
                         };
+                        _d = {
+                            type: this.signer.signingType
+                        };
                         _b = (_a = polkadot_api_1.Binary).fromBytes;
                         return [4 /*yield*/, this.signer.sign(message)];
-                    case 2: return [2 /*return*/, (_c.signature = _b.apply(_a, [_d.sent()]),
+                    case 2: return [2 /*return*/, (_c.signature = (_d.value = _b.apply(_a, [_e.sent()]),
+                            _d),
                             _c)];
                 }
             });
@@ -127,12 +134,12 @@ var SubstrateKey = /** @class */ (function () {
     SubstrateKey.prototype.authenticate = function (context, xtc) {
         return __awaiter(this, void 0, void 0, function () {
             var challenge, message, _a, _b, _c, _d;
-            var _e, _f, _g;
-            return __generator(this, function (_h) {
-                switch (_h.label) {
+            var _e, _f, _g, _h;
+            return __generator(this, function (_j) {
+                switch (_j.label) {
                     case 0: return [4 /*yield*/, this.getChallenge(context, xtc)];
                     case 1:
-                        challenge = _h.sent();
+                        challenge = _j.sent();
                         message = {
                             context: context,
                             authority_id: exports.KREIVO_AUTHORITY_ID,
@@ -148,9 +155,13 @@ var SubstrateKey = /** @class */ (function () {
                         _g = {
                             message: message
                         };
+                        _h = {
+                            type: this.signer.signingType
+                        };
                         _d = (_c = polkadot_api_1.Binary).fromBytes;
                         return [4 /*yield*/, this.signer.sign(types_ts_1.SignedMessage.enc(message))];
-                    case 2: return [2 /*return*/, (_e.credentials = (_f.value = _b.apply(_a, [(_g.signature = _d.apply(_c, [_h.sent()]),
+                    case 2: return [2 /*return*/, (_e.credentials = (_f.value = _b.apply(_a, [(_g.signature = (_h.value = _d.apply(_c, [_j.sent()]),
+                                _h),
                                 _g)]),
                             _f),
                             _e)];

package/dist/cjs/types.js

@@ -1,14 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeySignature = exports.SignedMessage = void 0;
+exports.KeySignature = exports.KeyRegistration = exports.SignedMessage = exports.MultiSignature = void 0;
 var substrate_bindings_1 = require("@polkadot-api/substrate-bindings");
 var scale_ts_1 = require("scale-ts");
+exports.MultiSignature = (0, substrate_bindings_1.Variant)({
+    Ed25519: (0, substrate_bindings_1.Bin)(64),
+    Sr25519: (0, substrate_bindings_1.Bin)(64),
+    Ecdsa: (0, substrate_bindings_1.Bin)(65),
+    Eth: (0, substrate_bindings_1.Bin)(65),
+});
 exports.SignedMessage = (0, scale_ts_1.Struct)({
     context: scale_ts_1.u32,
-    challenge: (0, substrate_bindings_1.Bin)(),
+    challenge: (0, substrate_bindings_1.Bin)(32),
     authority_id: (0, substrate_bindings_1.Bin)(32),
 });
+exports.KeyRegistration = (0, scale_ts_1.Struct)({
+    message: exports.SignedMessage,
+    public: (0, substrate_bindings_1.Bin)(32),
+    signature: exports.MultiSignature,
+});
 exports.KeySignature = (0, scale_ts_1.Struct)({
     message: exports.SignedMessage,
-    signature: (0, substrate_bindings_1.Bin)(),
+    signature: exports.MultiSignature,
 });

package/dist/esm/index.d.ts

@@ -1,6 +1,8 @@
 import { AddressGenerator, Authenticator, Challenger, TPassAuthenticate } from "@virtonetwork/signer";
-import { SubstrateSigner, TKeyRegistration } from "./types.ts";
+import { KeyRegistration, KeySignature, SignedMessage, SubstrateSigner, TKeyRegistration, TKeySignature, TSignedMessage } from "./types.ts";
 import { Binary } from "polkadot-api";
+export type { SubstrateSigner, TKeyRegistration, TKeySignature, TSignedMessage, };
+export { SignedMessage, KeySignature, KeyRegistration };
 export declare const KREIVO_AUTHORITY_ID: Binary;
 export declare class SubstrateKey implements Authenticator<number> {
     readonly userId: string;

package/dist/esm/index.js

@@ -1,6 +1,7 @@
 import { kreivoPassDefaultAddressGenerator, } from "@virtonetwork/signer";
-import { KeySignature, SignedMessage, } from "./types.js";
+import { KeyRegistration, KeySignature, SignedMessage, } from "./types.js";
 import { Binary } from "polkadot-api";
+export { SignedMessage, KeySignature, KeyRegistration };
 export const KREIVO_AUTHORITY_ID = Binary.fromText("kreivo_p".padEnd(32, "\0"));
 export class SubstrateKey {
     userId;
@@ -41,7 +42,10 @@ export class SubstrateKey {
         return {
             message: SignedMessage.dec(message),
             public: Binary.fromBytes(this.signer.publicKey),
-            signature: Binary.fromBytes(await this.signer.sign(message)),
+            signature: {
+                type: this.signer.signingType,
+                value: Binary.fromBytes(await this.signer.sign(message)),
+            },
         };
     }
     /**
@@ -67,7 +71,10 @@ export class SubstrateKey {
                 tag: "SubstrateKey",
                 value: KeySignature.enc({
                     message: message,
-                    signature: Binary.fromBytes(await this.signer.sign(SignedMessage.enc(message))),
+                    signature: {
+                        type: this.signer.signingType,
+                        value: Binary.fromBytes(await this.signer.sign(SignedMessage.enc(message))),
+                    },
                 }),
             },
         };

package/dist/esm/types.d.ts

@@ -1,23 +1,39 @@
-import { Binary, FixedSizeBinary } from "@polkadot-api/substrate-bindings";
+import { FixedSizeBinary } from "@polkadot-api/substrate-bindings";
 import { Codec } from "scale-ts";
 import { AuthorityId } from "@virtonetwork/signer";
 export type SubstrateSigner = {
     publicKey: Uint8Array;
+    signingType: "Ed25519" | "Sr25519" | "Ecdsa" | "Eth";
     sign: (bytes: Uint8Array) => Promise<Uint8Array> | Uint8Array;
 };
 export type TSignedMessage<Cx> = {
     context: Cx;
-    challenge: Binary;
+    challenge: FixedSizeBinary<32>;
     authority_id: AuthorityId;
 };
+export type TMutiSignature = {
+    type: "Ed25519";
+    value: FixedSizeBinary<64>;
+} | {
+    type: "Sr25519";
+    value: FixedSizeBinary<64>;
+} | {
+    type: "Ecdsa";
+    value: FixedSizeBinary<65>;
+} | {
+    type: "Eth";
+    value: FixedSizeBinary<65>;
+};
+export declare const MultiSignature: Codec<TMutiSignature>;
 export declare const SignedMessage: Codec<TSignedMessage<number>>;
 export type TKeyRegistration<Cx> = {
     message: TSignedMessage<Cx>;
     public: FixedSizeBinary<32>;
-    signature: AuthorityId;
+    signature: TMutiSignature;
 };
+export declare const KeyRegistration: Codec<TKeyRegistration<number>>;
 export type TKeySignature<Cx> = {
     message: TSignedMessage<Cx>;
-    signature: Binary;
+    signature: TMutiSignature;
 };
 export declare const KeySignature: Codec<TKeySignature<number>>;

package/dist/esm/types.js

@@ -1,11 +1,22 @@
-import { Bin } from "@polkadot-api/substrate-bindings";
+import { Bin, Variant, } from "@polkadot-api/substrate-bindings";
 import { Struct, u32 } from "scale-ts";
+export const MultiSignature = Variant({
+    Ed25519: Bin(64),
+    Sr25519: Bin(64),
+    Ecdsa: Bin(65),
+    Eth: Bin(65),
+});
 export const SignedMessage = Struct({
     context: u32,
-    challenge: Bin(),
+    challenge: Bin(32),
     authority_id: Bin(32),
 });
+export const KeyRegistration = Struct({
+    message: SignedMessage,
+    public: Bin(32),
+    signature: MultiSignature,
+});
 export const KeySignature = Struct({
     message: SignedMessage,
-    signature: Bin(),
+    signature: MultiSignature,
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@virtonetwork/authenticators-substrate",
   "description": "An Authenticator compatible with KreivoPassSigner that uses substrate-style signatures",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "type": "module",
   "files": [
     "dist"