@midnightntwrk/wallet-sdk-unshielded-wallet 4.0.0-beta.0 → 4.0.0-beta.1

package/dist/index.d.ts

@@ -1,3 +1,3 @@
 export * from './UnshieldedWallet.js';
-export { type UnshieldedTransactionHistoryEntry, UnshieldedSectionSchema } from './v1/TransactionHistory.js';
+export { type UnshieldedTransactionHistoryEntry, UnshieldedSectionSchema, mergeUnshieldedSections, } from './v1/TransactionHistory.js';
 export * from './KeyStore.js';

package/dist/index.js

@@ -11,5 +11,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 export * from './UnshieldedWallet.js';
-export { UnshieldedSectionSchema } from './v1/TransactionHistory.js';
+export { UnshieldedSectionSchema, mergeUnshieldedSections, } from './v1/TransactionHistory.js';
 export * from './KeyStore.js';

package/dist/v1/SyncSchema.d.ts

@@ -40,6 +40,8 @@ export declare const UnshieldedTransactionSchema: Schema.Data<Schema.Struct<{
     protocolVersion: typeof Schema.Number;
     identifiers: Schema.optional<Schema.Array$<typeof Schema.String>>;
     block: Schema.Struct<{
+        hash: typeof Schema.String;
+        height: typeof Schema.Number;
         timestamp: Schema.transform<typeof Schema.Number, typeof Schema.DateFromSelf>;
     }>;
     fees: Schema.optional<Schema.Struct<{
@@ -64,6 +66,8 @@ export declare const UnshieldedUpdateSchema: Schema.transform<Schema.Struct<{
         protocolVersion: typeof Schema.Number;
         identifiers: Schema.optional<Schema.Array$<typeof Schema.String>>;
         block: Schema.Struct<{
+            hash: typeof Schema.String;
+            height: typeof Schema.Number;
             timestamp: Schema.transform<typeof Schema.Number, typeof Schema.DateFromSelf>;
         }>;
         fees: Schema.optional<Schema.Struct<{
@@ -167,6 +171,8 @@ export declare const UnshieldedUpdateSchema: Schema.transform<Schema.Struct<{
         readonly hash: string;
         readonly identifiers?: readonly string[] | undefined;
         readonly block: {
+            readonly hash: string;
+            readonly height: number;
             readonly timestamp: Date;
         };
         readonly fees?: {
@@ -217,6 +223,8 @@ export declare const UnshieldedUpdateSchema: Schema.transform<Schema.Struct<{
         readonly hash: string;
         readonly identifiers?: readonly string[] | undefined;
         readonly block: {
+            readonly hash: string;
+            readonly height: number;
             readonly timestamp: Date;
         };
         readonly fees?: {
@@ -259,6 +267,8 @@ export declare const WalletSyncUpdateSchema: Schema.Union<[Schema.transform<Sche
         protocolVersion: typeof Schema.Number;
         identifiers: Schema.optional<Schema.Array$<typeof Schema.String>>;
         block: Schema.Struct<{
+            hash: typeof Schema.String;
+            height: typeof Schema.Number;
             timestamp: Schema.transform<typeof Schema.Number, typeof Schema.DateFromSelf>;
         }>;
         fees: Schema.optional<Schema.Struct<{
@@ -362,6 +372,8 @@ export declare const WalletSyncUpdateSchema: Schema.Union<[Schema.transform<Sche
         readonly hash: string;
         readonly identifiers?: readonly string[] | undefined;
         readonly block: {
+            readonly hash: string;
+            readonly height: number;
             readonly timestamp: Date;
         };
         readonly fees?: {
@@ -412,6 +424,8 @@ export declare const WalletSyncUpdateSchema: Schema.Union<[Schema.transform<Sche
         readonly hash: string;
         readonly identifiers?: readonly string[] | undefined;
         readonly block: {
+            readonly hash: string;
+            readonly height: number;
             readonly timestamp: Date;
         };
         readonly fees?: {

package/dist/v1/SyncSchema.js

@@ -70,6 +70,8 @@ export const UnshieldedTransactionSchema = Schema.Data(Schema.Struct({
     protocolVersion: Schema.Number,
     identifiers: Schema.optional(Schema.Array(Schema.String)),
     block: Schema.Struct({
+        hash: Schema.String,
+        height: Schema.Number,
         timestamp: DateFromMillis,
     }),
     fees: Schema.optional(Schema.Struct({

package/dist/v1/TransactionHistory.d.ts

@@ -19,8 +19,37 @@ export declare const UnshieldedSectionSchema: Schema.Struct<{
         outputIndex: typeof Schema.Number;
     }>>;
 }>;
-export declare const UnshieldedTransactionHistoryEntrySchema: Schema.Struct<{
-    unshielded: Schema.Struct<{
+type UnshieldedSection = Schema.Schema.Type<typeof UnshieldedSectionSchema>;
+export declare const mergeUnshieldedSections: (existing: UnshieldedSection, incoming: UnshieldedSection) => UnshieldedSection;
+/**
+ * Unshielded entry schema. Extends the common entry shape with an optional `unshielded` section. Tightening — required
+ * `unshielded` plus required `protocolVersion`/`status`/`timestamp` — happens at the writer-input type, not on the
+ * stored shape. Fees are not unshielded's concern (dust pays them); unshielded never writes `fees`.
+ */
+export declare const UnshieldedTransactionHistoryEntrySchema: Schema.Struct<Readonly<{
+    hash: typeof Schema.String;
+    identifiers: Schema.Array$<typeof Schema.String>;
+    protocolVersion: Schema.optional<typeof Schema.Number>;
+    status: Schema.optional<Schema.Literal<["SUCCESS", "FAILURE", "PARTIAL_SUCCESS"]>>;
+    timestamp: Schema.optional<typeof Schema.Date>;
+    fees: Schema.optional<Schema.NullOr<typeof Schema.BigInt>>;
+    lifecycle: Schema.Union<[Schema.Struct<{
+        status: Schema.Literal<["pending"]>;
+        submittedAt: typeof Schema.Date;
+    }>, Schema.Struct<{
+        status: Schema.Literal<["finalized"]>;
+        finalizedBlock: Schema.Struct<{
+            hash: typeof Schema.String;
+            height: typeof Schema.Number;
+            timestamp: typeof Schema.Date;
+        }>;
+    }>, Schema.Struct<{
+        status: Schema.Literal<["rejected"]>;
+        rejectedAt: typeof Schema.Date;
+        reason: Schema.optional<typeof Schema.String>;
+    }>]>;
+}> & {
+    unshielded: Schema.optional<Schema.Struct<{
         id: typeof Schema.Number;
         createdUtxos: Schema.Array$<Schema.Struct<{
             value: Schema.Schema<bigint, string, never>;
@@ -36,19 +65,15 @@ export declare const UnshieldedTransactionHistoryEntrySchema: Schema.Struct<{
             intentHash: typeof Schema.String;
             outputIndex: typeof Schema.Number;
         }>>;
-    }>;
-    hash: typeof Schema.String;
-    protocolVersion: typeof Schema.Number;
-    status: Schema.Literal<["SUCCESS", "FAILURE", "PARTIAL_SUCCESS"]>;
-    identifiers: Schema.optional<Schema.Array$<typeof Schema.String>>;
-    timestamp: Schema.optional<typeof Schema.Date>;
-    fees: Schema.optional<Schema.NullOr<typeof Schema.BigInt>>;
+    }>>;
 }>;
 export type UnshieldedTransactionHistoryEntry = Schema.Schema.Type<typeof UnshieldedTransactionHistoryEntrySchema>;
 export type TransactionHistoryService = {
     put(update: UnshieldedUpdate): Effect.Effect<void, TransactionHistoryError>;
 };
+export type UnshieldedHistoryStorage = TransactionHistoryStorage.TransactionHistoryReader<TransactionHistoryStorage.TransactionHistoryEntryWithHash> & TransactionHistoryStorage.TransactionHistoryWriter<UnshieldedTransactionHistoryEntry>;
 export type DefaultTransactionHistoryConfiguration = {
-    txHistoryStorage: TransactionHistoryStorage.TransactionHistoryStorage<TransactionHistoryStorage.TransactionHistoryEntryWithHash>;
+    txHistoryStorage: UnshieldedHistoryStorage;
 };
 export declare const makeDefaultTransactionHistoryService: (config: DefaultTransactionHistoryConfiguration, _getContext: () => unknown) => TransactionHistoryService;
+export {};

package/dist/v1/TransactionHistory.js

@@ -26,17 +26,29 @@ export const UnshieldedSectionSchema = Schema.Struct({
     createdUtxos: Schema.Array(UtxoSchema),
     spentUtxos: Schema.Array(UtxoSchema),
 });
-export const UnshieldedTransactionHistoryEntrySchema = Schema.Struct({
-    ...TransactionHistoryStorage.TransactionHistoryCommonSchema.fields,
-    unshielded: UnshieldedSectionSchema,
+export const mergeUnshieldedSections = (existing, incoming) => ({
+    ...existing,
+    ...incoming,
 });
-const convertUpdateToStorageEntry = ({ transaction, createdUtxos, spentUtxos, status, }) => ({
+/**
+ * Unshielded entry schema. Extends the common entry shape with an optional `unshielded` section. Tightening — required
+ * `unshielded` plus required `protocolVersion`/`status`/`timestamp` — happens at the writer-input type, not on the
+ * stored shape. Fees are not unshielded's concern (dust pays them); unshielded never writes `fees`.
+ */
+export const UnshieldedTransactionHistoryEntrySchema = TransactionHistoryStorage.extendEntrySchema({
+    unshielded: Schema.optional(UnshieldedSectionSchema),
+});
+const convertUpdateToFinalizedInput = ({ transaction, createdUtxos, spentUtxos, status, }) => ({
     hash: transaction.hash,
     protocolVersion: transaction.protocolVersion,
     status,
     identifiers: transaction.identifiers ?? [],
     timestamp: transaction.block.timestamp,
-    fees: transaction.fees?.paidFees ?? null,
+    finalizedBlock: {
+        hash: transaction.block.hash,
+        height: transaction.block.height,
+        timestamp: transaction.block.timestamp,
+    },
     unshielded: {
         id: transaction.id,
         createdUtxos: createdUtxos.map(({ utxo }) => ({
@@ -59,8 +71,8 @@ export const makeDefaultTransactionHistoryService = (config, _getContext) => {
     const txHistoryStorage = config.txHistoryStorage;
     return {
         put: (update) => Effect.tryPromise({
-            try: () => txHistoryStorage.upsert(convertUpdateToStorageEntry(update)),
-            catch: (e) => new TransactionHistoryError({ message: 'Failed to put transaction history entry', cause: e }),
+            try: () => txHistoryStorage.gotFinalized(convertUpdateToFinalizedInput(update)),
+            catch: (e) => new TransactionHistoryError({ message: 'Failed to record finalized history entry', cause: e }),
         }),
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midnightntwrk/wallet-sdk-unshielded-wallet",
-  "version": "4.0.0-beta.0",
+  "version": "4.0.0-beta.1",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -31,12 +31,12 @@
   },
   "dependencies": {
     "@midnightntwrk/ledger-v9": "1.0.0-rc.2",
-    "@midnightntwrk/wallet-sdk-abstractions": "^2.1.0",
-    "@midnightntwrk/wallet-sdk-address-format": "^4.0.0-beta.0",
-    "@midnightntwrk/wallet-sdk-capabilities": "^4.0.0-beta.0",
-    "@midnightntwrk/wallet-sdk-indexer-client": "^1.2.4-beta.0",
-    "@midnightntwrk/wallet-sdk-runtime": "^1.0.4",
-    "@midnightntwrk/wallet-sdk-utilities": "^1.2.0",
+    "@midnightntwrk/wallet-sdk-abstractions": "3.0.0-beta.0",
+    "@midnightntwrk/wallet-sdk-address-format": "4.0.0-beta.1",
+    "@midnightntwrk/wallet-sdk-capabilities": "4.0.0-beta.1",
+    "@midnightntwrk/wallet-sdk-indexer-client": "1.3.0-beta.1",
+    "@midnightntwrk/wallet-sdk-runtime": "1.0.6-beta.0",
+    "@midnightntwrk/wallet-sdk-utilities": "1.2.0",
     "effect": "^3.19.19",
     "rxjs": "^7.8.2"
   },
@@ -54,7 +54,7 @@
     "publint": "publint --strict"
   },
   "devDependencies": {
-    "@midnightntwrk/wallet-sdk-hd": "^3.1.0-beta.0",
+    "@midnightntwrk/wallet-sdk-hd": "^3.1.0-beta.1",
     "@noble/curves": "^1.9.7",
     "@noble/hashes": "^1.8.0"
   }