@novasamatech/host-papp 0.6.2-0 → 0.6.4

package/dist/constants.js

@@ -1,6 +1,3 @@
 export const SS_UNSTABLE_STAGE_ENDPOINTS = ['wss://pop-testnet.parity-lab.parity.io:443/9910'];
-export const SS_STABLE_STAGE_ENDPOINTS = [
-    'wss://pop3-testnet.parity-lab.parity.io:443/7911',
-    'wss://pop3-testnet.parity-lab.parity.io:443/7912',
-];
+export const SS_STABLE_STAGE_ENDPOINTS = ['wss://pop3-testnet.parity-lab.parity.io/people'];
 export const SS_PREVIEW_STAGE_ENDPOINTS = ['wss://previewnet.substrate.dev/people'];

package/dist/index.d.ts

@@ -5,5 +5,5 @@ export type { AttestationStatus, PairingStatus } from './sso/auth/types.js';
 export type { UserSession } from './sso/sessionManager/userSession.js';
 export type { StoredUserSession } from './sso/userSessionRepository.js';
 export type { Identity } from './identity/types.js';
-export type { SignPayloadRequest, SigningRawRequest } from './sso/sessionManager/scale/signingRequest.js';
-export type { SignPayloadResponse } from './sso/sessionManager/scale/signingResponse.js';
+export type { SigningPayloadRequest, SigningRawRequest, SigningRequest, } from './sso/sessionManager/scale/signingRequest.js';
+export type { SigningPayloadResponse } from './sso/sessionManager/scale/signingResponse.js';

package/dist/sso/auth/impl.js

@@ -61,19 +61,18 @@ export function createAuth({ metadata, statementStore, ssoSessionRepository, use
                     }
                 }
             });
-            const secretesSaved = pappResponse.andThen(({ id }) => {
-                return userSecretRepository.write(id, {
+            const sessionWithSecretsPayload = pappResponse.map(session => ({
+                session,
+                secretsPayload: {
+                    id: session.id,
                     ssSecret: account.secret,
                     encrSecret: encrKeys.secret,
                     entropy: account.entropy,
-                });
-            });
-            // secrets and sso session should be chained, or it can produce an incorrect state
-            const userCreated = secretesSaved.andThen(() => pappResponse.andThen(ssoSessionRepository.add));
-            const sessionReceived = ResultAsync.combine([userCreated, secretesSaved]).map(([session]) => session);
-            return sessionReceived
-                .andTee(session => {
-                pairingStatus.write(session ? { step: 'finished', session } : { step: 'none' });
+                },
+            }));
+            return sessionWithSecretsPayload
+                .andTee(({ session }) => {
+                pairingStatus.write({ step: 'finished', session });
             })
                 .orTee(e => {
                 if (!(e instanceof AbortError)) {
@@ -92,7 +91,18 @@ export function createAuth({ metadata, statementStore, ssoSessionRepository, use
             abort = new AbortController();
             const account = deriveSr25519Account(generateMnemonic(), '//wallet//sso');
             authResult = ResultAsync.combine([handshake(account, abort.signal), attestAccount(account, abort.signal)])
-                .map(([session]) => session)
+                .andThen(([handshakeResult]) => {
+                // Save secrets and sso session only after attestation has finished
+                const { session, secretsPayload } = handshakeResult;
+                return userSecretRepository
+                    .write(secretsPayload.id, {
+                    ssSecret: secretsPayload.ssSecret,
+                    encrSecret: secretsPayload.encrSecret,
+                    entropy: secretsPayload.entropy,
+                })
+                    .andThen(() => ssoSessionRepository.add(session))
+                    .map(() => session);
+            })
                 .orElse(e => (e instanceof AbortError ? ok(null) : err(e)))
                 .andTee(() => {
                 abort = null;

package/dist/sso/sessionManager/scale/remoteMessage.d.ts

@@ -27,7 +27,7 @@ export declare const RemoteMessageCodec: import("scale-ts").Codec<{
                     assetId: `0x${string}` | undefined;
                     metadataHash: `0x${string}` | undefined;
                     mode: number | undefined;
-                    withSignedTransaction: boolean | undefined;
+                    withSignedTransaction: boolean | void;
                 };
             } | {
                 tag: "Raw";

package/dist/sso/sessionManager/scale/signingRequest.d.ts

@@ -1,5 +1,5 @@
 import type { CodecType } from 'scale-ts';
-export type SignPayloadRequest = CodecType<typeof SigningPayloadRequestCodec>;
+export type SigningPayloadRequest = CodecType<typeof SigningPayloadRequestCodec>;
 export declare const SigningPayloadRequestCodec: import("scale-ts").Codec<{
     address: string;
     blockHash: `0x${string}`;
@@ -16,7 +16,7 @@ export declare const SigningPayloadRequestCodec: import("scale-ts").Codec<{
     assetId: `0x${string}` | undefined;
     metadataHash: `0x${string}` | undefined;
     mode: number | undefined;
-    withSignedTransaction: boolean | undefined;
+    withSignedTransaction: boolean | void;
 }>;
 export type SigningRawRequest = CodecType<typeof SigningRawRequestCodec>;
 export declare const SigningRawRequestCodec: import("scale-ts").Codec<{
@@ -29,6 +29,7 @@ export declare const SigningRawRequestCodec: import("scale-ts").Codec<{
         value: string;
     };
 }>;
+export type SigningRequest = CodecType<typeof SigningRequestCodec>;
 export declare const SigningRequestCodec: import("scale-ts").Codec<{
     tag: "Payload";
     value: {
@@ -47,7 +48,7 @@ export declare const SigningRequestCodec: import("scale-ts").Codec<{
         assetId: `0x${string}` | undefined;
         metadataHash: `0x${string}` | undefined;
         mode: number | undefined;
-        withSignedTransaction: boolean | undefined;
+        withSignedTransaction: boolean | void;
     };
 } | {
     tag: "Raw";

package/dist/sso/sessionManager/scale/signingRequest.js

@@ -1,5 +1,5 @@
-import { Enum, Hex } from '@novasamatech/scale';
-import { Bytes, Option, Struct, Vector, bool, str, u32 } from 'scale-ts';
+import { Enum, Hex, OptionBool } from '@novasamatech/scale';
+import { Bytes, Option, Struct, Vector, str, u32 } from 'scale-ts';
 export const SigningPayloadRequestCodec = Struct({
     address: str,
     blockHash: Hex(),
@@ -16,7 +16,7 @@ export const SigningPayloadRequestCodec = Struct({
     assetId: Option(Hex()),
     metadataHash: Option(Hex()),
     mode: Option(u32),
-    withSignedTransaction: Option(bool),
+    withSignedTransaction: OptionBool,
 });
 export const SigningRawRequestCodec = Struct({
     address: str,

package/dist/sso/sessionManager/scale/signingResponse.d.ts

@@ -1,10 +1,10 @@
 import type { CodecType } from 'scale-ts';
-export type SignPayloadResponseData = CodecType<typeof SignPayloadResponseDataCodec>;
-export declare const SignPayloadResponseDataCodec: import("scale-ts").Codec<{
+export type SigningPayloadResponseData = CodecType<typeof SigningPayloadResponseDataCodec>;
+export declare const SigningPayloadResponseDataCodec: import("scale-ts").Codec<{
     signature: Uint8Array<ArrayBufferLike>;
     signedTransaction: Uint8Array<ArrayBufferLike> | undefined;
 }>;
-export type SignPayloadResponse = CodecType<typeof SigningResponseCodec>;
+export type SigningPayloadResponse = CodecType<typeof SigningResponseCodec>;
 export declare const SigningResponseCodec: import("scale-ts").Codec<{
     respondingTo: string;
     payload: import("scale-ts").ResultPayload<{

package/dist/sso/sessionManager/scale/signingResponse.js

@@ -1,10 +1,10 @@
 import { Bytes, Option, Result, Struct, str } from 'scale-ts';
-export const SignPayloadResponseDataCodec = Struct({
+export const SigningPayloadResponseDataCodec = Struct({
     signature: Bytes(),
     signedTransaction: Option(Bytes()),
 });
 export const SigningResponseCodec = Struct({
     // referencing to RemoteMessage.messageId
     respondingTo: str,
-    payload: Result(SignPayloadResponseDataCodec, str),
+    payload: Result(SigningPayloadResponseDataCodec, str),
 });

package/dist/sso/sessionManager/userSession.d.ts

@@ -5,12 +5,12 @@ import type { CodecType } from 'scale-ts';
 import type { Callback } from '../../types.js';
 import type { StoredUserSession } from '../userSessionRepository.js';
 import { RemoteMessageCodec } from './scale/remoteMessage.js';
-import type { SignPayloadRequest, SigningRawRequest } from './scale/signingRequest.js';
-import type { SignPayloadResponseData } from './scale/signingResponse.js';
+import type { SigningPayloadRequest, SigningRawRequest } from './scale/signingRequest.js';
+import type { SigningPayloadResponseData } from './scale/signingResponse.js';
 export type UserSession = StoredUserSession & {
     sendDisconnectMessage(): ResultAsync<void, Error>;
-    signPayload(payload: SignPayloadRequest): ResultAsync<SignPayloadResponseData, Error>;
-    signRaw(payload: SigningRawRequest): ResultAsync<SignPayloadResponseData, Error>;
+    signPayload(payload: SigningPayloadRequest): ResultAsync<SigningPayloadResponseData, Error>;
+    signRaw(payload: SigningRawRequest): ResultAsync<SigningPayloadResponseData, Error>;
     subscribe(callback: Callback<CodecType<typeof RemoteMessageCodec>, ResultAsync<boolean, Error>>): VoidFunction;
     dispose(): void;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@novasamatech/host-papp",
   "type": "module",
-  "version": "0.6.2-0",
+  "version": "0.6.4",
   "description": "Polkadot app integration",
   "license": "Apache-2.0",
   "repository": {
@@ -28,10 +28,10 @@
     "@noble/ciphers": "2.1.1",
     "@noble/curves": "2.0.1",
     "@noble/hashes": "2.0.1",
-    "@novasamatech/host-api": "0.6.2-0",
-    "@novasamatech/scale": "0.6.2-0",
-    "@novasamatech/statement-store": "0.6.2-0",
-    "@novasamatech/storage-adapter": "0.6.2-0",
+    "@novasamatech/host-api": "0.6.4",
+    "@novasamatech/scale": "0.6.4",
+    "@novasamatech/statement-store": "0.6.4",
+    "@novasamatech/storage-adapter": "0.6.4",
     "@polkadot-api/utils": "0.2.0",
     "@polkadot-api/substrate-bindings": "^0.17.0",
     "@polkadot-labs/hdkd-helpers": "^0.0.27",