@parity/product-sdk-host 0.14.1 → 0.15.1

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { JsonRpcProvider, PolkadotSigner } from 'polkadot-api';
 import { Topic, RemoteStatementStoreSubscribeItem, Statement, StatementProof, SignedStatement, HexString, scale, TrUApiClient, AllocatableResource, AllocationOutcome, VersionedHostGetUserIdError, HostRequestLoginResponse, VersionedHostRequestLoginError, ProductAccountId, ProductAccount as ProductAccount$1, VersionedHostAccountGetError, ProductProofContext, RingLocation, ContextualAlias as ContextualAlias$1, VersionedHostAccountGetAliasError, LegacyAccount, VersionedHostGetLegacyAccountsError, HostAccountCreateProofResponse, VersionedHostAccountCreateProofError, HostAccountConnectionStatusSubscribeItem, HostDevicePermissionRequest, RemotePermission, HostThemeSubscribeItem, ChatBotRegistrationStatus, HostChatCreateRoomRequest, ChatRoomRegistrationStatus, HostChatRegisterBotRequest, ChatMessageContent, ChatRoom, HostChatActionSubscribeItem, HostPaymentBalanceSubscribeItem, CoinPaymentPurseId, Balance, PaymentTopUpSource, HostPaymentStatusSubscribeItem, HostPushNotificationRequest, NotificationId } from '@parity/truapi';
-export { AllocatableResource, AllocationOutcome, ChatMessageContent, ChatRoom, HexString, HostPaymentBalanceSubscribeItem, HostPaymentStatusSubscribeItem, NotificationId, PaymentTopUpSource, ProductAccountId, ProductProofContext, HostPushNotificationError as PushNotificationError, RemotePermission, RingLocation, SignedStatement, Statement, StatementProof, ThemeName, ThemeVariant, Topic } from '@parity/truapi';
+export { AllocatableResource, AllocationOutcome, ChatMessageContent, ChatRoom, DerivationIndex, HexString, HostPaymentBalanceSubscribeItem, HostPaymentStatusSubscribeItem, NotificationId, PaymentTopUpSource, ProductAccountId, ProductProofContext, HostPushNotificationError as PushNotificationError, RemotePermission, RingLocation, SignedStatement, Statement, StatementProof, ThemeName, ThemeVariant, Topic } from '@parity/truapi';
 import { SdkError } from '@parity/product-sdk-errors';
 export { SdkError, isSdkError } from '@parity/product-sdk-errors';
 import { Result } from '@parity/result';
@@ -405,9 +405,13 @@ type HostAccount = Omit<LegacyAccount, "publicKey"> & {
  *
  * Combines `@parity/truapi`'s `ProductAccountId` (the `{ dotNsIdentifier,
  * derivationIndex }` lookup key) with the `ProductAccount` payload, with
- * `publicKey` decoded to bytes.
+ * `publicKey` decoded to bytes and `derivationIndex` kept as the plain
+ * numeric index (the adapter wraps it into the wire's tagged
+ * {@link DerivationIndex} selector).
  */
-type ProductAccount = ProductAccountId & Omit<ProductAccount$1, "publicKey"> & {
+type ProductAccount = Omit<ProductAccountId, "derivationIndex"> & Omit<ProductAccount$1, "publicKey"> & {
+    /** Plain account index within the product subtree. */
+    derivationIndex: number;
     /** Raw public key bytes. */
     publicKey: Uint8Array;
 };
@@ -721,7 +725,7 @@ interface PaymentManager {
  * const payments = await getPaymentManager();
  * if (payments) {
  *   const sub = payments.subscribeBalance((b) => { ... });
- *   await payments.topUp(1_000_000n, { tag: "ProductAccount", value: { derivationIndex: 0 } });
+ *   await payments.topUp(1_000_000n, { tag: "ProductAccount", value: { derivationIndex: { tag: "Left", value: 0 } } });
  *   const { id } = await payments.requestPayment(500n, "0x…");
  *   sub.unsubscribe();
  * }

package/dist/index.js

@@ -596,6 +596,9 @@ function toHostExtensions(signedExtensions) {
     additionalSigned: toHex(ext.additionalSigned)
   }));
 }
+function toWireProductAccountId(dotNsIdentifier, derivationIndex) {
+  return { dotNsIdentifier, derivationIndex: { tag: "Left", value: derivationIndex } };
+}
 function adaptAccountsProvider(client) {
   const account = client.account;
   const signing = client.signing;
@@ -609,7 +612,9 @@ function adaptAccountsProvider(client) {
       return account.requestLogin({ reason });
     },
     getProductAccount(dotNsIdentifier, derivationIndex = 0) {
-      return account.getAccount({ productAccountId: { dotNsIdentifier, derivationIndex } }).map((response) => ({
+      return account.getAccount({
+        productAccountId: toWireProductAccountId(dotNsIdentifier, derivationIndex)
+      }).map((response) => ({
         publicKey: fromHex(response.account.publicKey),
         dotNsIdentifier,
         derivationIndex
@@ -645,10 +650,10 @@ function adaptAccountsProvider(client) {
       }));
     },
     getProductAccountSigner(account_) {
-      const productAccountId = {
-        dotNsIdentifier: account_.dotNsIdentifier,
-        derivationIndex: account_.derivationIndex
-      };
+      const productAccountId = toWireProductAccountId(
+        account_.dotNsIdentifier,
+        account_.derivationIndex
+      );
       return {
         publicKey: account_.publicKey,
         async signTx(callData, signedExtensions, metadata) {