@novasamatech/host-papp 0.6.1 → 0.6.3

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 } from './sso/sessionManager/scale/signingRequest.js';
+export type { SignPayloadRequest, SigningRawRequest } from './sso/sessionManager/scale/signingRequest.js';
 export type { SignPayloadResponse } 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

@@ -10,19 +10,7 @@ export declare const RemoteMessageCodec: import("scale-ts").Codec<{
         } | {
             tag: "SignRequest";
             value: {
-                tag: "raw";
-                value: {
-                    address: string;
-                    data: {
-                        tag: "Bytes";
-                        value: Uint8Array<ArrayBufferLike>;
-                    } | {
-                        tag: "Payload";
-                        value: string;
-                    };
-                };
-            } | {
-                tag: "payload";
+                tag: "Payload";
                 value: {
                     address: string;
                     blockHash: `0x${string}`;
@@ -41,6 +29,18 @@ export declare const RemoteMessageCodec: import("scale-ts").Codec<{
                     mode: number | undefined;
                     withSignedTransaction: boolean | undefined;
                 };
+            } | {
+                tag: "Raw";
+                value: {
+                    address: string;
+                    data: {
+                        tag: "Bytes";
+                        value: Uint8Array<ArrayBufferLike>;
+                    } | {
+                        tag: "Payload";
+                        value: string;
+                    };
+                };
             };
         } | {
             tag: "SignResponse";

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

@@ -30,19 +30,7 @@ export declare const SigningRawRequestCodec: import("scale-ts").Codec<{
     };
 }>;
 export declare const SigningRequestCodec: import("scale-ts").Codec<{
-    tag: "raw";
-    value: {
-        address: string;
-        data: {
-            tag: "Bytes";
-            value: Uint8Array<ArrayBufferLike>;
-        } | {
-            tag: "Payload";
-            value: string;
-        };
-    };
-} | {
-    tag: "payload";
+    tag: "Payload";
     value: {
         address: string;
         blockHash: `0x${string}`;
@@ -61,4 +49,16 @@ export declare const SigningRequestCodec: import("scale-ts").Codec<{
         mode: number | undefined;
         withSignedTransaction: boolean | undefined;
     };
+} | {
+    tag: "Raw";
+    value: {
+        address: string;
+        data: {
+            tag: "Bytes";
+            value: Uint8Array<ArrayBufferLike>;
+        } | {
+            tag: "Payload";
+            value: string;
+        };
+    };
 }>;

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

@@ -26,6 +26,6 @@ export const SigningRawRequestCodec = Struct({
     }),
 });
 export const SigningRequestCodec = Enum({
-    payload: SigningPayloadRequestCodec,
-    raw: SigningRawRequestCodec,
+    Payload: SigningPayloadRequestCodec,
+    Raw: SigningRawRequestCodec,
 });

package/dist/sso/sessionManager/userSession.js

@@ -1,12 +1,12 @@
-import { enumValue } from '@novasamatech/scale';
+import { enumValue, toHex } from '@novasamatech/scale';
 import { createSession } from '@novasamatech/statement-store';
 import { fieldListView } from '@novasamatech/storage-adapter';
 import { AccountId } from '@polkadot-api/substrate-bindings';
-import { toHex } from '@polkadot-api/utils';
 import { nanoid } from 'nanoid';
 import { ResultAsync, err, errAsync, ok, okAsync } from 'neverthrow';
 import { RemoteMessageCodec } from './scale/remoteMessage.js';
 export function createUserSession({ userSession, statementStore, encryption, storage, prover, }) {
+    const accountId = AccountId();
     const session = createSession({
         localAccount: userSession.localAccount,
         remoteAccount: userSession.remoteAccount,
@@ -20,19 +20,32 @@ export function createUserSession({ userSession, statementStore, encryption, sto
         from: JSON.parse,
         to: JSON.stringify,
     });
+    function toAccountId(address) {
+        // already account id
+        if (address.startsWith('0x') && address.length === 64 + 2) {
+            return address;
+        }
+        return toHex(accountId.enc(address));
+    }
+    function toAddress(account) {
+        return accountId.dec(account);
+    }
     return {
         id: userSession.id,
         localAccount: userSession.localAccount,
         remoteAccount: userSession.remoteAccount,
         signPayload(payload) {
-            const accountId = AccountId();
-            if (toHex(accountId.enc(payload.address)) !== toHex(userSession.remoteAccount.accountId)) {
+            const accountId = toAccountId(payload.address);
+            if (accountId !== toHex(userSession.remoteAccount.accountId)) {
                 return errAsync(new Error(`Invalid address, got ${payload.address}`));
             }
             const messageId = nanoid();
             const request = session.request(RemoteMessageCodec, {
                 messageId,
-                data: enumValue('v1', enumValue('SignRequest', enumValue('payload', payload))),
+                data: enumValue('v1', enumValue('SignRequest', enumValue('Payload', {
+                    ...payload,
+                    address: toAddress(accountId),
+                }))),
             });
             const responseFilter = (message) => {
                 if (message.data.tag === 'v1' &&
@@ -53,14 +66,17 @@ export function createUserSession({ userSession, statementStore, encryption, sto
             });
         },
         signRaw(payload) {
-            const accountId = AccountId();
-            if (toHex(accountId.enc(payload.address)) !== toHex(userSession.remoteAccount.accountId)) {
+            const accountId = toAccountId(payload.address);
+            if (accountId !== toHex(userSession.remoteAccount.accountId)) {
                 return errAsync(new Error(`Invalid address, got ${payload.address}`));
             }
             const messageId = nanoid();
             const request = session.request(RemoteMessageCodec, {
                 messageId,
-                data: enumValue('v1', enumValue('SignRequest', enumValue('raw', payload))),
+                data: enumValue('v1', enumValue('SignRequest', enumValue('Raw', {
+                    ...payload,
+                    address: toAddress(accountId),
+                }))),
             });
             const responseFilter = (message) => {
                 if (message.data.tag === 'v1' &&

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@novasamatech/host-papp",
   "type": "module",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "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.1",
-    "@novasamatech/scale": "0.6.1",
-    "@novasamatech/statement-store": "0.6.1",
-    "@novasamatech/storage-adapter": "0.6.1",
+    "@novasamatech/host-api": "0.6.3",
+    "@novasamatech/scale": "0.6.3",
+    "@novasamatech/statement-store": "0.6.3",
+    "@novasamatech/storage-adapter": "0.6.3",
     "@polkadot-api/utils": "0.2.0",
     "@polkadot-api/substrate-bindings": "^0.17.0",
     "@polkadot-labs/hdkd-helpers": "^0.0.27",