@bsv/wallet-toolbox 2.4.3 → 2.4.20

package/out/src/Wallet.js

@@ -18,6 +18,7 @@ const WERR_errors_1 = require("./sdk/WERR_errors");
 const WalletError_1 = require("./sdk/WalletError");
 const utilityHelpers_noBuffer_1 = require("./utility/utilityHelpers.noBuffer");
 const resultBeef_1 = require("./signer/methods/resultBeef");
+const ActionBatchWorkspace_1 = require("./signer/actionBatch/ActionBatchWorkspace");
 /**
  * Build a {@link DiscoverCertificatesResult} from contact records so {@link Wallet.discoverByIdentityKey}
  * and {@link Wallet.discoverByAttributes} can short-circuit on a local contacts hit. The synthetic
@@ -25,7 +26,7 @@ const resultBeef_1 = require("./signer/methods/resultBeef");
  * style filtering treats contacts as authoritative.
  */
 function synthesizeContactResult(contacts) {
-    const certificates = contacts.map((c) => ({
+    const certificates = contacts.map(c => ({
         type: c.type ?? 'contact',
         subject: c.identityKey,
         serialNumber: '',
@@ -49,7 +50,7 @@ function synthesizeContactResult(contacts) {
     };
 }
 function isWalletSigner(args) {
-    return args['isWalletSigner'];
+    return 'isWalletSigner' in args && args.isWalletSigner;
 }
 class Wallet {
     chain;
@@ -92,6 +93,9 @@ class Wallet {
     privilegedKeyManager;
     makeLogger;
     pendingSignActions;
+    actionBatch;
+    scriptVerifier;
+    telemetry;
     /**
      * For repeatability testing, set to an array of random numbers from [0..1).
      */
@@ -111,12 +115,14 @@ class Wallet {
         if (args.storage._authId.identityKey != args.keyDeriver.identityKey) {
             throw new WERR_errors_1.WERR_INVALID_PARAMETER('storage', `authenticated as the same identityKey (${args.storage._authId.identityKey}) as the keyDeriver (${args.keyDeriver.identityKey}).`);
         }
+        this.telemetry = new sdk_1.Telemetry(args.telemetry);
         this.settingsManager = args.settingsManager || new WalletSettingsManager_1.WalletSettingsManager(this);
         this.chain = args.chain;
         this.lookupResolver =
             args.lookupResolver ||
                 new sdk_1.LookupResolver({
-                    networkPreset: (0, utilityHelpers_1.toLookupNetworkPreset)(this.chain)
+                    networkPreset: (0, utilityHelpers_1.toLookupNetworkPreset)(this.chain),
+                    telemetry: args.telemetry
                 });
         this.keyDeriver = args.keyDeriver;
         this.storage = args.storage;
@@ -128,6 +134,8 @@ class Wallet {
         this.contactSource = args.contactSource;
         this.identityKey = this.keyDeriver.identityKey;
         this.pendingSignActions = {};
+        this.actionBatch = new ActionBatchWorkspace_1.ActionBatchController(this, args.actionBatchMode ?? 'auto');
+        this.scriptVerifier = args.scriptVerifier;
         this.userParty = `user ${this.getClientChangeKeyPair().publicKey}`;
         this.beef = new sdk_1.BeefParty([this.userParty]);
         this.trustSelf = 'known';
@@ -136,6 +144,7 @@ class Wallet {
         }
     }
     async destroy() {
+        await this.actionBatch.abort();
         await this.storage.destroy();
         if (this.privilegedKeyManager != null)
             this.privilegedKeyManager.destroyKey();
@@ -150,7 +159,7 @@ class Wallet {
     async getIdentityKey() {
         return (await this.getPublicKey({ identityKey: true })).publicKey;
     }
-    async getPublicKey(args, originator) {
+    async getPublicKey(args, _originator) {
         if (args.privileged) {
             if (this.privilegedKeyManager == null) {
                 throw new Error('Privileged operations require the Wallet to be configured with a privileged key manager.');
@@ -159,7 +168,7 @@ class Wallet {
         }
         return await this.proto.getPublicKey(args);
     }
-    async revealCounterpartyKeyLinkage(args, originator) {
+    async revealCounterpartyKeyLinkage(args, _originator) {
         if (args.privileged) {
             if (this.privilegedKeyManager == null) {
                 throw new Error('Privileged operations require the Wallet to be configured with a privileged key manager.');
@@ -168,7 +177,7 @@ class Wallet {
         }
         return await this.proto.revealCounterpartyKeyLinkage(args);
     }
-    async revealSpecificKeyLinkage(args, originator) {
+    async revealSpecificKeyLinkage(args, _originator) {
         if (args.privileged) {
             if (this.privilegedKeyManager == null) {
                 throw new Error('Privileged operations require the Wallet to be configured with a privileged key manager.');
@@ -177,7 +186,7 @@ class Wallet {
         }
         return await this.proto.revealSpecificKeyLinkage(args);
     }
-    async encrypt(args, originator) {
+    async encrypt(args, _originator) {
         if (args.privileged) {
             if (this.privilegedKeyManager == null) {
                 throw new Error('Privileged operations require the Wallet to be configured with a privileged key manager.');
@@ -186,7 +195,7 @@ class Wallet {
         }
         return await this.proto.encrypt(args);
     }
-    async decrypt(args, originator) {
+    async decrypt(args, _originator) {
         if (args.privileged) {
             if (this.privilegedKeyManager == null) {
                 throw new Error('Privileged operations require the Wallet to be configured with a privileged key manager.');
@@ -195,7 +204,7 @@ class Wallet {
         }
         return await this.proto.decrypt(args);
     }
-    async createHmac(args, originator) {
+    async createHmac(args, _originator) {
         if (args.privileged) {
             if (this.privilegedKeyManager == null) {
                 throw new Error('Privileged operations require the Wallet to be configured with a privileged key manager.');
@@ -204,7 +213,7 @@ class Wallet {
         }
         return await this.proto.createHmac(args);
     }
-    async verifyHmac(args, originator) {
+    async verifyHmac(args, _originator) {
         if (args.privileged) {
             if (this.privilegedKeyManager == null) {
                 throw new Error('Privileged operations require the Wallet to be configured with a privileged key manager.');
@@ -213,7 +222,7 @@ class Wallet {
         }
         return await this.proto.verifyHmac(args);
     }
-    async createSignature(args, originator) {
+    async createSignature(args, _originator) {
         if (args.privileged) {
             if (this.privilegedKeyManager == null) {
                 throw new Error('Privileged operations require the Wallet to be configured with a privileged key manager.');
@@ -222,7 +231,7 @@ class Wallet {
         }
         return await this.proto.createSignature(args);
     }
-    async verifySignature(args, originator) {
+    async verifySignature(args, _originator) {
         if (args.privileged) {
             if (this.privilegedKeyManager == null) {
                 throw new Error('Privileged operations require the Wallet to be configured with a privileged key manager.');
@@ -259,9 +268,32 @@ class Wallet {
         };
     }
     validateAuthAndArgs(args, validate, logger) {
-        const vargs = validate(args, logger);
-        const auth = { identityKey: this.identityKey };
-        return { vargs, auth };
+        if (!this.telemetry.enabled || typeof args !== 'object' || args == null) {
+            const vargs = validate(args, logger);
+            const auth = { identityKey: this.identityKey };
+            return { vargs, auth };
+        }
+        const span = this.telemetry.startSpan('wallet.validate_args', {
+            component: 'wallet-toolbox',
+            carrier: args
+        });
+        try {
+            const vargs = validate(args, logger);
+            if (typeof vargs === 'object' && vargs != null) {
+                this.telemetry.bindContext(vargs, span.context);
+            }
+            const auth = { identityKey: this.identityKey };
+            span.end({ attributes: { 'validation.result': 'ok' } });
+            return { vargs, auth };
+        }
+        catch (error) {
+            span.end({
+                status: 'error',
+                error,
+                attributes: { 'validation.result': 'rejected' }
+            });
+            throw error;
+        }
     }
     /// ///////////////
     // List Methods
@@ -269,7 +301,8 @@ class Wallet {
     async listActions(args, originator) {
         sdk_1.Validation.validateOriginator(originator);
         const { vargs } = this.validateAuthAndArgs(args, sdk_1.Validation.validateListActionsArgs);
-        const r = await this.storage.listActions(vargs);
+        const storageArgs = this.actionBatch.hasWorkspace ? { ...vargs, limit: 10000, offset: 0 } : vargs;
+        const r = this.actionBatch.overlayListActions(await this.storage.listActions(storageArgs), vargs);
         // Implement security policy to block customInstructions from output results.
         for (const action of r.actions) {
             if (action.outputs != null) {
@@ -289,7 +322,10 @@ class Wallet {
         if (this.autoKnownTxids && !vargs.knownTxids) {
             vargs.knownTxids = this.getKnownTxids();
         }
-        const r = await this.storage.listOutputs(vargs);
+        const storageArgs = this.actionBatch.hasWorkspace && vargs.basket !== types_1.specOpWalletBalance && !vargs.tags.includes(types_1.specOpWalletBalance)
+            ? { ...vargs, limit: 10000, offset: 0 }
+            : vargs;
+        const r = this.actionBatch.overlayListOutputs(await this.storage.listOutputs(storageArgs), vargs);
         if (r.BEEF != null) {
             this.beef.mergeBeefFromParty(this.storageParty, (0, utilityHelpers_noBuffer_1.asArray)(r.BEEF));
             r.BEEF = this.verifyReturnedTxidOnlyBEEF(r.BEEF);
@@ -305,110 +341,104 @@ class Wallet {
     /// ///////////////
     // Certificates
     /// ///////////////
+    async acquireDirectCertificateProtocol(args) {
+        const { auth, vargs } = this.validateAuthAndArgs(args, sdk_1.Validation.validateAcquireDirectCertificateArgs);
+        vargs.subject = (await this.getPublicKey({
+            identityKey: true,
+            privileged: args.privileged,
+            privilegedReason: args.privilegedReason
+        })).publicKey;
+        try {
+            const certificate = new sdk_1.MasterCertificate(vargs.type, vargs.serialNumber, vargs.subject, vargs.certifier, vargs.revocationOutpoint, vargs.fields, vargs.keyringForSubject, vargs.signature);
+            await certificate.verify();
+            await sdk_1.MasterCertificate.decryptFields(this, vargs.keyringForSubject, vargs.fields, vargs.certifier, vargs.privileged, vargs.privilegedReason);
+        }
+        catch (error_) {
+            const error = WalletError_1.WalletError.fromUnknown(error_);
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('args', `valid encrypted and signed certificate and keyring from revealer. ${error.name}: ${error.message}`);
+        }
+        return await (0, acquireDirectCertificate_1.acquireDirectCertificate)(this, auth, vargs);
+    }
+    validateIssuedCertificateFields(certificate, expectedFields) {
+        if (Object.keys(certificate.fields).length !== Object.keys(expectedFields).length) {
+            throw new Error('Fields mismatch! Objects have different numbers of keys.');
+        }
+        for (const field of Object.keys(expectedFields)) {
+            if (!(field in certificate.fields)) {
+                throw new Error(`Missing field: ${field} in certificate.fields`);
+            }
+            if (certificate.fields[field] !== expectedFields[field]) {
+                throw new Error(`Invalid field! Expected: ${expectedFields[field]}, Received: ${certificate.fields[field]}`);
+            }
+        }
+    }
+    validateIssuedCertificate(certificate, vargs, expectedFields) {
+        if (certificate.type !== vargs.type) {
+            throw new Error(`Invalid certificate type! Expected: ${vargs.type}, Received: ${certificate.type}`);
+        }
+        if (certificate.subject !== this.identityKey) {
+            throw new Error(`Invalid certificate subject! Expected: ${this.identityKey}, Received: ${certificate.subject}`);
+        }
+        if (certificate.certifier !== vargs.certifier) {
+            throw new Error(`Invalid certifier! Expected: ${vargs.certifier}, Received: ${certificate.certifier}`);
+        }
+        if (!certificate.revocationOutpoint) {
+            throw new Error('Invalid revocationOutpoint!');
+        }
+        this.validateIssuedCertificateFields(certificate, expectedFields);
+    }
+    async acquireIssuedCertificateProtocol(args) {
+        const { auth, vargs } = this.validateAuthAndArgs(args, sdk_1.Validation.validateAcquireIssuanceCertificateArgs);
+        const clientNonce = await (0, sdk_1.createNonce)(this, vargs.certifier);
+        const authClient = new sdk_1.AuthFetch(this);
+        const { certificateFields, masterKeyring } = await sdk_1.MasterCertificate.createCertificateFields(this, vargs.certifier, vargs.fields);
+        const response = await authClient.fetch(`${vargs.certifierUrl}/signCertificate`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                clientNonce,
+                type: vargs.type,
+                fields: certificateFields,
+                masterKeyring
+            })
+        });
+        const responseIdentity = response.headers.get('x-bsv-auth-identity-key');
+        if (responseIdentity !== vargs.certifier) {
+            throw new Error(`Invalid certifier! Expected: ${vargs.certifier}, Received: ${responseIdentity}`);
+        }
+        const { certificate, serverNonce } = await response.json();
+        if (!certificate)
+            throw new Error('No certificate received from certifier!');
+        if (!serverNonce)
+            throw new Error('No serverNonce received from certifier!');
+        const signedCertificate = new sdk_1.Certificate(certificate.type, certificate.serialNumber, certificate.subject, certificate.certifier, certificate.revocationOutpoint, certificate.fields, certificate.signature);
+        await (0, sdk_1.verifyNonce)(serverNonce, this, vargs.certifier);
+        const { valid } = await this.verifyHmac({
+            hmac: sdk_1.Utils.toArray(signedCertificate.serialNumber, 'base64'),
+            data: sdk_1.Utils.toArray(clientNonce + serverNonce, 'base64'),
+            protocolID: [2, 'certificate issuance'],
+            keyID: serverNonce + clientNonce,
+            counterparty: vargs.certifier
+        });
+        if (!valid)
+            throw new Error('Invalid serialNumber');
+        this.validateIssuedCertificate(signedCertificate, vargs, certificateFields);
+        await signedCertificate.verify();
+        await sdk_1.MasterCertificate.decryptFields(this, masterKeyring, certificate.fields, vargs.certifier);
+        return await (0, acquireDirectCertificate_1.acquireDirectCertificate)(this, auth, {
+            ...certificate,
+            keyringRevealer: 'certifier',
+            keyringForSubject: masterKeyring,
+            privileged: vargs.privileged
+        });
+    }
     async acquireCertificate(args, originator) {
         sdk_1.Validation.validateOriginator(originator);
         if (args.acquisitionProtocol === 'direct') {
-            const { auth, vargs } = this.validateAuthAndArgs(args, sdk_1.Validation.validateAcquireDirectCertificateArgs);
-            vargs.subject = (await this.getPublicKey({
-                identityKey: true,
-                privileged: args.privileged,
-                privilegedReason: args.privilegedReason
-            })).publicKey;
-            try {
-                // Confirm that the information received adds up to a usable certificate...
-                // TODO: Clean up MasterCertificate to support decrypt on instance
-                const cert = new sdk_1.MasterCertificate(vargs.type, vargs.serialNumber, vargs.subject, vargs.certifier, vargs.revocationOutpoint, vargs.fields, vargs.keyringForSubject, vargs.signature);
-                await cert.verify();
-                // Verify certificate details
-                await sdk_1.MasterCertificate.decryptFields(this, vargs.keyringForSubject, vargs.fields, vargs.certifier, vargs.privileged, vargs.privilegedReason);
-            }
-            catch (error_) {
-                const e = WalletError_1.WalletError.fromUnknown(error_);
-                throw new WERR_errors_1.WERR_INVALID_PARAMETER('args', `valid encrypted and signed certificate and keyring from revealer. ${e.name}: ${e.message}`);
-            }
-            const r = await (0, acquireDirectCertificate_1.acquireDirectCertificate)(this, auth, vargs);
-            return r;
+            return await this.acquireDirectCertificateProtocol(args);
         }
         if (args.acquisitionProtocol === 'issuance') {
-            const { auth, vargs } = this.validateAuthAndArgs(args, sdk_1.Validation.validateAcquireIssuanceCertificateArgs);
-            // Create a random nonce that the server can verify
-            const clientNonce = await (0, sdk_1.createNonce)(this, vargs.certifier);
-            // TODO: Consider adding support to request certificates from a certifier before acquiring a certificate.
-            const authClient = new sdk_1.AuthFetch(this);
-            // Create a certificate master keyring
-            // The certifier is able to decrypt these fields as they are the counterparty
-            const { certificateFields, masterKeyring } = await sdk_1.MasterCertificate.createCertificateFields(this, vargs.certifier, vargs.fields);
-            // Make a Certificate Signing Request (CSR) to the certifier
-            const response = await authClient.fetch(`${vargs.certifierUrl}/signCertificate`, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify({
-                    clientNonce,
-                    type: vargs.type,
-                    fields: certificateFields,
-                    masterKeyring
-                })
-            });
-            if (response.headers.get('x-bsv-auth-identity-key') !== vargs.certifier) {
-                throw new Error(`Invalid certifier! Expected: ${vargs.certifier}, Received: ${response.headers.get('x-bsv-auth-identity-key')}`);
-            }
-            const { certificate, serverNonce } = await response.json();
-            // Validate the server response
-            if (!certificate) {
-                throw new Error('No certificate received from certifier!');
-            }
-            if (!serverNonce) {
-                throw new Error('No serverNonce received from certifier!');
-            }
-            const signedCertificate = new sdk_1.Certificate(certificate.type, certificate.serialNumber, certificate.subject, certificate.certifier, certificate.revocationOutpoint, certificate.fields, certificate.signature);
-            // Validate server nonce
-            await (0, sdk_1.verifyNonce)(serverNonce, this, vargs.certifier);
-            // Verify the server included our nonce
-            const { valid } = await this.verifyHmac({
-                hmac: sdk_1.Utils.toArray(signedCertificate.serialNumber, 'base64'),
-                data: sdk_1.Utils.toArray(clientNonce + serverNonce, 'base64'),
-                protocolID: [2, 'certificate issuance'],
-                keyID: serverNonce + clientNonce,
-                counterparty: vargs.certifier
-            });
-            if (!valid)
-                throw new Error('Invalid serialNumber');
-            // Validate the certificate received
-            if (signedCertificate.type !== vargs.type) {
-                throw new Error(`Invalid certificate type! Expected: ${vargs.type}, Received: ${signedCertificate.type}`);
-            }
-            if (signedCertificate.subject !== this.identityKey) {
-                throw new Error(`Invalid certificate subject! Expected: ${this.identityKey}, Received: ${signedCertificate.subject}`);
-            }
-            if (signedCertificate.certifier !== vargs.certifier) {
-                throw new Error(`Invalid certifier! Expected: ${vargs.certifier}, Received: ${signedCertificate.certifier}`);
-            }
-            if (!signedCertificate.revocationOutpoint) {
-                throw new Error('Invalid revocationOutpoint!');
-            }
-            if (Object.keys(signedCertificate.fields).length !== Object.keys(certificateFields).length) {
-                throw new Error('Fields mismatch! Objects have different numbers of keys.');
-            }
-            for (const field of Object.keys(certificateFields)) {
-                if (!(field in signedCertificate.fields)) {
-                    throw new Error(`Missing field: ${field} in certificate.fields`);
-                }
-                if (signedCertificate.fields[field] !== certificateFields[field]) {
-                    throw new Error(`Invalid field! Expected: ${certificateFields[field]}, Received: ${signedCertificate.fields[field]}`);
-                }
-            }
-            await signedCertificate.verify();
-            // Test decryption works
-            await sdk_1.MasterCertificate.decryptFields(this, masterKeyring, certificate.fields, vargs.certifier);
-            // Store the newly issued certificate
-            return await (0, acquireDirectCertificate_1.acquireDirectCertificate)(this, auth, {
-                ...certificate,
-                keyringRevealer: 'certifier',
-                keyringForSubject: masterKeyring,
-                privileged: vargs.privileged
-            });
+            return await this.acquireIssuedCertificateProtocol(args);
         }
         throw new WERR_errors_1.WERR_INVALID_PARAMETER('acquisitionProtocol', `valid.${args.acquisitionProtocol} is unrecognized.`);
     }
@@ -447,7 +477,7 @@ class Wallet {
             }
         }
         // --- trustSettings cache (2 minutes) ---
-        let trustSettings = (this._trustSettingsCache != null) && this._trustSettingsCache.expiresAt > now
+        let trustSettings = this._trustSettingsCache != null && this._trustSettingsCache.expiresAt > now
             ? this._trustSettingsCache.trustSettings
             : undefined;
         if (trustSettings == null) {
@@ -463,7 +493,7 @@ class Wallet {
             certifiers
         });
         let cached = forceRefresh ? undefined : this._overlayCache.get(cacheKey);
-        if ((cached == null) || cached.expiresAt <= now) {
+        if (cached == null || cached.expiresAt <= now) {
             const value = await (0, identityUtils_1.queryOverlay)({ identityKey: args.identityKey, certifiers }, this.lookupResolver);
             cached = { value, expiresAt: now + TTL_MS };
             this._overlayCache.set(cacheKey, cached);
@@ -492,7 +522,7 @@ class Wallet {
             }
         }
         // --- trustSettings cache (2 minutes) ---
-        let trustSettings = (this._trustSettingsCache != null) && this._trustSettingsCache.expiresAt > now
+        let trustSettings = this._trustSettingsCache != null && this._trustSettingsCache.expiresAt > now
             ? this._trustSettingsCache.trustSettings
             : undefined;
         if (trustSettings == null) {
@@ -515,7 +545,7 @@ class Wallet {
             certifiers
         });
         let cached = forceRefresh ? undefined : this._overlayCache.get(cacheKey);
-        if ((cached == null) || cached.expiresAt <= now) {
+        if (cached == null || cached.expiresAt <= now) {
             const value = await (0, identityUtils_1.queryOverlay)({ attributes: args.attributes, certifiers }, this.lookupResolver);
             cached = { value, expiresAt: now + TTL_MS };
             this._overlayCache.set(cacheKey, cached);
@@ -588,13 +618,13 @@ class Wallet {
             sdk_1.Validation.validateOriginator(originator);
             args.options ??= {};
             args.options.trustSelf ||= this.trustSelf;
-            if (this.autoKnownTxids && (args.options.knownTxids == null)) {
+            if (this.autoKnownTxids && args.options.knownTxids == null) {
                 args.options.knownTxids = this.getKnownTxids(args.options.knownTxids);
             }
             const { auth, vargs } = this.validateAuthAndArgs(args, sdk_1.Validation.validateCreateActionArgs, logger);
             logger?.log('validated args');
             vargs.includeAllSourceTransactions = this.includeAllSourceTransactions;
-            if ((this.randomVals != null) && this.randomVals.length > 1) {
+            if (this.randomVals != null && this.randomVals.length > 1) {
                 vargs.randomVals = [...this.randomVals];
             }
             const r = await (0, createAction_1.createAction)(this, auth, vargs);
@@ -619,16 +649,17 @@ class Wallet {
     async signAction(args, originator) {
         sdk_1.Validation.validateOriginator(originator);
         const { auth, vargs } = this.validateAuthAndArgs(args, sdk_1.Validation.validateSignActionArgs);
-        // createAction options are merged with undefined signAction options before validation...
-        const r = await (0, signAction_1.signAction)(this, auth, args);
-        if (!vargs.isDelayed)
-            throwIfAnyUnsuccessfulSignActions(r);
         const prior = this.pendingSignActions[args.reference];
         if (!prior) {
             throw new WERR_errors_1.WERR_NOT_IMPLEMENTED('recovery of out-of-session signAction reference data is not yet implemented.');
         }
+        // createAction options are merged with undefined signAction options before validation...
+        const r = await (0, signAction_1.signAction)(this, auth, args);
+        if (!vargs.isDelayed)
+            throwIfAnyUnsuccessfulSignActions(r);
         if (r.tx != null)
             r.tx = this.verifyReturnedTxidOnlyAtomicBEEF(r.tx, prior.args.options?.knownTxids, (0, resultBeef_1.getResultBeef)(r));
+        delete this.pendingSignActions[args.reference];
         return r;
     }
     async internalizeAction(args, originator) {
@@ -643,6 +674,9 @@ class Wallet {
     async abortAction(args, originator) {
         sdk_1.Validation.validateOriginator(originator);
         this.validateAuthAndArgs(args, sdk_1.Validation.validateAbortActionArgs);
+        if (this.actionBatch.ownsReference(args.reference)) {
+            return { aborted: await this.actionBatch.abortAction(args.reference) };
+        }
         const r = await this.storage.abortAction(args);
         return r;
     }
@@ -827,10 +861,11 @@ class Wallet {
     async listNoSendActions(args, abort = false) {
         const { vargs } = this.validateAuthAndArgs(args, sdk_1.Validation.validateListActionsArgs);
         vargs.labels.push(types_1.specOpNoSendActions);
-        if (abort)
+        if (abort) {
+            await this.actionBatch.abort();
             vargs.labels.push('abort');
-        const r = await this.storage.listActions(vargs);
-        return r;
+        }
+        return await this.listActions(vargs);
     }
     /**
      * Uses `listActions` special operation to return only actions with status 'failed'.
@@ -851,21 +886,21 @@ exports.Wallet = Wallet;
 function throwIfAnyUnsuccessfulCreateActions(r) {
     const ndrs = r.notDelayedResults;
     const swrs = r.sendWithResults;
-    if ((ndrs == null) || (swrs == null) || swrs.every(r => r.status === 'unproven'))
+    if (ndrs == null || swrs == null || swrs.every(r => r.status === 'unproven'))
         return;
     throw new WERR_errors_1.WERR_REVIEW_ACTIONS(ndrs, swrs, r.txid, r.tx, r.noSendChange);
 }
 function throwIfAnyUnsuccessfulSignActions(r) {
     const ndrs = r.notDelayedResults;
     const swrs = r.sendWithResults;
-    if ((ndrs == null) || (swrs == null) || swrs.every(r => r.status === 'unproven'))
+    if (ndrs == null || swrs == null || swrs.every(r => r.status === 'unproven'))
         return;
     throw new WERR_errors_1.WERR_REVIEW_ACTIONS(ndrs, swrs, r.txid, r.tx);
 }
 function throwIfUnsuccessfulInternalizeAction(r) {
     const ndrs = r.notDelayedResults;
     const swrs = r.sendWithResults;
-    if ((ndrs == null) || (swrs == null) || swrs.every(r => r.status === 'unproven'))
+    if (ndrs == null || swrs == null || swrs.every(r => r.status === 'unproven'))
         return;
     throw new WERR_errors_1.WERR_REVIEW_ACTIONS(ndrs, swrs, r.txid);
 }