@keetanetwork/keetanet-client 0.18.0 → 0.18.2

package/client/index.js

@@ -57418,14 +57418,28 @@ class UserClientBuilder {
                 }
                 if (operations.permissionsChanges !== undefined) {
                     pendingOperations.permissionsChanges = {};
-                    for (const accountPubKey in operations.permissionsChanges) {
-                        pendingOperations.permissionsChanges[accountPubKey] = {};
-                        for (const targetPubKey in operations.permissionsChanges[accountPubKey]) {
+                    for (const [certificateOrAccountKey, changes] of Object.entries(operations.permissionsChanges)) {
+                        pendingOperations.permissionsChanges[certificateOrAccountKey] = {
+                            principal: (() => {
+                                if (typeof changes.principal === 'string') {
+                                    return (account_1.Account.toAccount(changes.principal));
+                                }
+                                else {
+                                    return ({
+                                        usingCertificate: true,
+                                        certificate: new certificate_1.Certificate.Hash(changes.principal.certificate),
+                                        certificateAccount: account_1.Account.toAccount(changes.principal.certificateAccount)
+                                    });
+                                }
+                            })(),
+                            targets: {}
+                        };
+                        for (const targetPubKey in changes.targets) {
                             const updateArray = [];
-                            for (const { method, permissions } of operations.permissionsChanges[accountPubKey][targetPubKey]) {
+                            for (const { method, permissions } of changes.targets[targetPubKey]) {
                                 updateArray.push({ method, permissions: permissions_1.Permissions.FromAcceptedTypes(permissions) });
                             }
-                            pendingOperations.permissionsChanges[accountPubKey][targetPubKey] = updateArray;
+                            pendingOperations.permissionsChanges[certificateOrAccountKey].targets[targetPubKey] = updateArray;
                         }
                     }
                 }
@@ -57802,9 +57816,9 @@ class UserClientBuilder {
                     amount: amount
                 });
             }
-            for (const principalPubKey in pending.permissionsChanges) {
-                for (const targetPubKey in pending.permissionsChanges[principalPubKey]) {
-                    for (const change of pending.permissionsChanges[principalPubKey][targetPubKey]) {
+            for (const { targets, principal } of Object.values(pending.permissionsChanges ?? {})) {
+                for (const targetPubKey in targets) {
+                    for (const change of targets[targetPubKey]) {
                         const { method, permissions } = change;
                         let target;
                         if (!account.comparePublicKey(targetPubKey)) {
@@ -57812,7 +57826,18 @@ class UserClientBuilder {
                         }
                         operations.push({
                             type: block_1.Block.OperationType.MODIFY_PERMISSIONS,
-                            principal: account_1.Account.fromPublicKeyString(principalPubKey),
+                            principal: (() => {
+                                if (account_1.Account.isInstance(principal)) {
+                                    return (principal);
+                                }
+                                else {
+                                    return ({
+                                        usingCertificate: true,
+                                        certificateHash: principal.certificate,
+                                        certificateAccount: principal.certificateAccount
+                                    });
+                                }
+                            })(),
                             target: target,
                             method: method,
                             permissions: permissions
@@ -57860,18 +57885,24 @@ class UserClientBuilder {
     updatePermissions(principal, permissions, target, method, options = {}) {
         __classPrivateFieldGet(this, _UserClientBuilder_instances, "m", _UserClientBuilder_useOptions).call(this, options);
         method = method ?? block_1.Block.AdjustMethod.SET;
-        const principalPubKey = principal.publicKeyString.get();
-        const targetPubKey = (target ?? __classPrivateFieldGet(this, _UserClientBuilder_pendingOptions, "f").account).publicKeyString.get();
+        let principalKey;
+        if (typeof principal === 'string' || account_1.Account.isInstance(principal)) {
+            principalKey = account_1.Account.toAccount(principal).publicKeyString.get();
+        }
+        else {
+            principalKey = principal.certificate.toString();
+        }
         if (!__classPrivateFieldGet(this, _UserClientBuilder_pendingOperations, "f").permissionsChanges) {
             __classPrivateFieldGet(this, _UserClientBuilder_pendingOperations, "f").permissionsChanges = {};
         }
-        if (!__classPrivateFieldGet(this, _UserClientBuilder_pendingOperations, "f").permissionsChanges[principalPubKey]) {
-            __classPrivateFieldGet(this, _UserClientBuilder_pendingOperations, "f").permissionsChanges[principalPubKey] = {};
+        if (!__classPrivateFieldGet(this, _UserClientBuilder_pendingOperations, "f").permissionsChanges[principalKey]) {
+            __classPrivateFieldGet(this, _UserClientBuilder_pendingOperations, "f").permissionsChanges[principalKey] = { principal, targets: {} };
         }
-        if (!__classPrivateFieldGet(this, _UserClientBuilder_pendingOperations, "f").permissionsChanges[principalPubKey][targetPubKey]) {
-            __classPrivateFieldGet(this, _UserClientBuilder_pendingOperations, "f").permissionsChanges[principalPubKey][targetPubKey] = [];
+        const targetPubKey = (target ?? __classPrivateFieldGet(this, _UserClientBuilder_pendingOptions, "f").account).publicKeyString.get();
+        if (!__classPrivateFieldGet(this, _UserClientBuilder_pendingOperations, "f").permissionsChanges[principalKey].targets[targetPubKey]) {
+            __classPrivateFieldGet(this, _UserClientBuilder_pendingOperations, "f").permissionsChanges[principalKey].targets[targetPubKey] = [];
         }
-        __classPrivateFieldGet(this, _UserClientBuilder_pendingOperations, "f").permissionsChanges[principalPubKey][targetPubKey].push({
+        __classPrivateFieldGet(this, _UserClientBuilder_pendingOperations, "f").permissionsChanges[principalKey].targets[targetPubKey].push({
             method: method,
             permissions: permissions_1.Permissions.FromAcceptedTypes(permissions)
         });
@@ -60563,7 +60594,14 @@ class UserClient {
      */
     async updatePermissions(principal, permissions, target, method, options = {}) {
         const builder = this.initBuilder(options);
-        builder.updatePermissions(account_1.default.toAccount(principal), permissions, account_1.default.toAccount(target), method, options);
+        let principalValue;
+        if (typeof principal === 'string' || account_1.default.isInstance(principal)) {
+            principalValue = account_1.default.toAccount(principal);
+        }
+        else {
+            principalValue = principal;
+        }
+        builder.updatePermissions(principalValue, permissions, account_1.default.toAccount(target), method, options);
         return (await this.publishBuilder(builder));
     }
     /**
@@ -67160,11 +67198,13 @@ async function computeLedgerEffect(options, effects, storageProvider, network, t
                 }
             }
         }
-        if (prefetchPromises.length > 70) {
+        // Process promises in batches to avoid spanner's 100 concurrent read per session limit
+        if (prefetchPromises.length > 50) {
             const toAwait = prefetchPromises.splice(0);
             await Promise.all(toAwait);
         }
     }
+    // Wait for the final batch to complete
     await Promise.all(prefetchPromises);
     const supplies = {};
     const balances = {};
@@ -69720,13 +69760,17 @@ _LedgerAtomicInterface_network = new WeakMap(), _LedgerAtomicInterface_subnet =
             throw (new ledger_1.KeetaNetLedgerError('LEDGER_INVALID_PERMISSIONS', `Quorum of ${foundInfo.multisigQuorum} not reached for ${multisigPubKey} -- got ${foundSingerLength}`));
         }
     }
-    const checkPromises = [];
-    for (const principalPubKey in requirementsByPrincipal) {
-        const accountRequirements = requirementsByPrincipal[principalPubKey];
-        const principal = account_1.default.fromPublicKeyString(principalPubKey);
-        checkPromises.push(__classPrivateFieldGet(this, _LedgerAtomicInterface_instances, "m", _LedgerAtomicInterface_checkSingleAccountPermissions).call(this, principal, accountRequirements, foundAccountInfo));
+    // Process promises in batches to avoid spanner's 100 concurrent read per session limit
+    const batchSize = 50;
+    const principalPubKeys = Object.keys(requirementsByPrincipal);
+    for (let i = 0; i < principalPubKeys.length; i += batchSize) {
+        const batch = principalPubKeys.slice(i, i + batchSize).map((principalPubKey) => {
+            const accountRequirements = requirementsByPrincipal[principalPubKey];
+            const principal = account_1.default.fromPublicKeyString(principalPubKey);
+            return (__classPrivateFieldGet(this, _LedgerAtomicInterface_instances, "m", _LedgerAtomicInterface_checkSingleAccountPermissions).call(this, principal, accountRequirements, foundAccountInfo));
+        });
+        await Promise.all(batch);
     }
-    await Promise.all(checkPromises);
     return ({ newOwners });
 }, _LedgerAtomicInterface_validateBlockOperations = async function _LedgerAtomicInterface_validateBlockOperations(blocks) {
     if (__classPrivateFieldGet(this, _LedgerAtomicInterface_operations, "f") === undefined) {
@@ -70542,8 +70586,9 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _Log_instances, _Log_logs, _Log_autoSyncInterval, _Log_isSyncing, _Log_shouldSyncAgain, _Log_destroyed, _Log_emitOnLog, _Log_logDebugTracing, _Log_targets, _Log_log, _Log_extractArguments;
+var _Log_instances, _Log_logs, _Log_autoSyncInterval, _Log_isSyncing, _Log_shouldSyncAgain, _Log_destroyed, _Log_emitOnLog, _Log__logDebugTracing, _Log_targets, _Log__filter, _Log__logLevel, _Log_logDebugTracing_get, _Log_filter_get, _Log_logLevel_get, _Log_log, _Log_extractArguments;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+const common_1 = __webpack_require__(7364);
 const helper_generated_1 = __webpack_require__(5910);
 const target_console_1 = __importDefault(__webpack_require__(9022));
 /**
@@ -70642,18 +70687,36 @@ class Log {
         /**
          * Whether or not to generate debug tracing information for each log entry
          */
-        _Log_logDebugTracing.set(this, false);
+        _Log__logDebugTracing.set(this, void 0);
+        /**
+         * Registered log targets (sinks) to send logs to, keyed by a unique
+         * ID returned by `registerTarget()`
+         */
         _Log_targets.set(this, new Map());
         /**
-         * The maximum number of log entries to send to each target at a time
+         * Filter to apply before sending to targets
          */
-        this.batchSize = 10;
+        _Log__filter.set(this, void 0);
+        /**
+         * Log-level to filter for at the logger level
+         */
+        _Log__logLevel.set(this, void 0);
         /**
          * Parent logger, if any -- used for creating hierarchical loggers
          */
         this.parent = null;
+        /**
+         * The maximum number of log entries to send to each target at a time
+         */
+        this.batchSize = 10;
         if (options?.logDebugTracing !== undefined) {
-            __classPrivateFieldSet(this, _Log_logDebugTracing, options.logDebugTracing, "f");
+            __classPrivateFieldSet(this, _Log__logDebugTracing, options.logDebugTracing, "f");
+        }
+        if (options?.filter !== undefined) {
+            __classPrivateFieldSet(this, _Log__filter, options.filter, "f");
+        }
+        if (options?.logLevel !== undefined) {
+            __classPrivateFieldSet(this, _Log__logLevel, options.logLevel, "f");
         }
     }
     log(...args) {
@@ -70742,10 +70805,8 @@ class Log {
      * Since the child shares the same targets, registering or unregistering targets
      * from either the parent or child will affect both.
      */
-    createChild() {
-        const child = new Log({
-            logDebugTracing: __classPrivateFieldGet(this, _Log_logDebugTracing, "f")
-        });
+    createChild(options) {
+        const child = new Log(options);
         /**
          * Attach child nodes to our own parent to collapse
          * chains of loggers
@@ -70838,12 +70899,39 @@ class Log {
     /**
      * Dispose of the logger instance, clearing all logs and targets
      */
-    [(_Log_logs = new WeakMap(), _Log_autoSyncInterval = new WeakMap(), _Log_isSyncing = new WeakMap(), _Log_shouldSyncAgain = new WeakMap(), _Log_destroyed = new WeakMap(), _Log_emitOnLog = new WeakMap(), _Log_logDebugTracing = new WeakMap(), _Log_targets = new WeakMap(), _Log_instances = new WeakSet(), _Log_log = function _Log_log(level, options, from, ...args) {
+    [(_Log_logs = new WeakMap(), _Log_autoSyncInterval = new WeakMap(), _Log_isSyncing = new WeakMap(), _Log_shouldSyncAgain = new WeakMap(), _Log_destroyed = new WeakMap(), _Log_emitOnLog = new WeakMap(), _Log__logDebugTracing = new WeakMap(), _Log_targets = new WeakMap(), _Log__filter = new WeakMap(), _Log__logLevel = new WeakMap(), _Log_instances = new WeakSet(), _Log_logDebugTracing_get = function _Log_logDebugTracing_get() {
+        if (__classPrivateFieldGet(this, _Log__logDebugTracing, "f") !== undefined) {
+            return (__classPrivateFieldGet(this, _Log__logDebugTracing, "f"));
+        }
+        if (this.parent) {
+            return (__classPrivateFieldGet(this.parent, _Log_instances, "a", _Log_logDebugTracing_get));
+        }
+        return (false);
+    }, _Log_filter_get = function _Log_filter_get() {
+        if (__classPrivateFieldGet(this, _Log__filter, "f") !== undefined) {
+            return (__classPrivateFieldGet(this, _Log__filter, "f"));
+        }
+        if (this.parent) {
+            return (__classPrivateFieldGet(this.parent, _Log_instances, "a", _Log_filter_get));
+        }
+        return (null);
+    }, _Log_logLevel_get = function _Log_logLevel_get() {
+        if (__classPrivateFieldGet(this, _Log__logLevel, "f") !== undefined) {
+            return (__classPrivateFieldGet(this, _Log__logLevel, "f"));
+        }
+        if (this.parent) {
+            return (__classPrivateFieldGet(this.parent, _Log_instances, "a", _Log_logLevel_get));
+        }
+        return ('ALL');
+    }, _Log_log = function _Log_log(level, options, from, ...args) {
         if (__classPrivateFieldGet(this, _Log_destroyed, "f")) {
             return;
         }
         const log = { options, level, from, args };
-        if (__classPrivateFieldGet(this, _Log_logDebugTracing, "f")) {
+        if ((0, common_1.filterLog)({ logLevel: __classPrivateFieldGet(this, _Log_instances, "a", _Log_logLevel_get), filter: __classPrivateFieldGet(this, _Log_instances, "a", _Log_filter_get) }, log) === null) {
+            return;
+        }
+        if (__classPrivateFieldGet(this, _Log_instances, "a", _Log_logDebugTracing_get)) {
             log.trace = new Error().stack?.split('\n').slice(2).join('\n') ?? '[No stack trace available]';
         }
         __classPrivateFieldGet(this, _Log_logs, "f").push(log);
@@ -76618,7 +76706,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _CertificateBuilder_params, _CertificateBuilder_caPathLen, _CertificateBundle_raw, _CertificateBundle_contents, _Certificate_instances, _Certificate_raw, _Certificate_hash, _Certificate_extensionsRaw, _Certificate_extensionsProcessed, _Certificate_finalizeConstructionCalled, _Certificate_isSelfSigned, _Certificate_processExtensionsInternal, _Certificate_processBaseExtensions, _Certificate_parseKeyUsage, _Certificate_processBaseExtension, _Certificate_assertAllCriticalExtensionsProcessed, _Certificate_checkValid, _Certificate_checkIssued;
+var _CertificateBuilder_params, _CertificateBuilder_caPathLen, _CertificateBundle_raw, _CertificateBundle_contents, _Certificate_instances, _Certificate_raw, _Certificate_hash, _Certificate_extensionsRaw, _Certificate_extensionsProcessed, _Certificate_finalizeConstructionCalled, _Certificate_isSelfSigned, _Certificate_processExtensionsInternal, _Certificate_processBaseExtensions, _Certificate_parseKeyUsage, _Certificate_processBaseExtension, _Certificate_assertAllCriticalExtensionsProcessed, _Certificate_checkValid, _Certificate_checkIssued, _Certificate_computeHash;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Certificate = exports.CertificateBundle = exports.CertificateHash = exports.CertificateBuilder = void 0;
 const ASN1 = __importStar(__webpack_require__(6045));
@@ -77598,7 +77686,18 @@ class Certificate {
             }
         }
     }
-    verifyChain(store, _ignore_seenCerts /* XXX:TODO */) {
+    verifyChain(store, seenHashes = new CertificateHash.Set()) {
+        /**
+         * Loop detection: reject any certificate already on the current
+         * verification path, per RFC 4158 Section 2.4.1 (no certificate may
+         * repeat in a path) and Section 5.2 (detection guidance).
+         *
+         * @see {@link https://datatracker.ietf.org/doc/html/rfc4158#section-5.2 RFC 4158 Section 5.2}
+         * @see {@link https://datatracker.ietf.org/doc/html/rfc4158#section-2.4.1 RFC 4158 Section 2.4.1}
+         */
+        if (seenHashes.has(__classPrivateFieldGet(this, _Certificate_instances, "m", _Certificate_computeHash).call(this))) {
+            return (null);
+        }
         /*
          * Check to see if the certificate is signed by any of the Root CAs
          */
@@ -77629,6 +77728,8 @@ class Certificate {
          * Check to see if the certificate is signed by any of the specified intermediates
          */
         if (store.intermediate !== undefined) {
+            const nextSeen = new CertificateHash.Set(seenHashes);
+            nextSeen.add(__classPrivateFieldGet(this, _Certificate_instances, "m", _Certificate_computeHash).call(this));
             store.intermediate.forEach((intermediateCertificate) => {
                 if (retval !== null) {
                     return;
@@ -77636,7 +77737,7 @@ class Certificate {
                 const checkIssued = __classPrivateFieldGet(this, _Certificate_instances, "m", _Certificate_checkIssued).call(this, intermediateCertificate);
                 if (checkIssued.issued) {
                     if (intermediateCertificate.checkValid(this.moment)) {
-                        const moreChain = intermediateCertificate.verifyChain(store, undefined /* seenCerts XXX:TODO */);
+                        const moreChain = intermediateCertificate.verifyChain(store, nextSeen);
                         if (moreChain !== null) {
                             const checkRetval = [...moreChain, intermediateCertificate];
                             const validChain = Certificate.verifyChainDepth([...checkRetval, this]);
@@ -77792,10 +77893,7 @@ class Certificate {
      */
     hash() {
         this.assertConstructed();
-        if (!__classPrivateFieldGet(this, _Certificate_hash, "f")) {
-            __classPrivateFieldSet(this, _Certificate_hash, CertificateHash.fromData(Buffer.from(__classPrivateFieldGet(this, _Certificate_raw, "f"))), "f");
-        }
-        return (__classPrivateFieldGet(this, _Certificate_hash, "f"));
+        return (__classPrivateFieldGet(this, _Certificate_instances, "m", _Certificate_computeHash).call(this));
     }
     /**
      * Get a JSON representation of the certificate
@@ -78033,6 +78131,11 @@ _Certificate_raw = new WeakMap(), _Certificate_hash = new WeakMap(), _Certificat
         return ({ issued: false, reason: 'Signature verification failed' });
     }
     return ({ issued: true });
+}, _Certificate_computeHash = function _Certificate_computeHash() {
+    if (!__classPrivateFieldGet(this, _Certificate_hash, "f")) {
+        __classPrivateFieldSet(this, _Certificate_hash, CertificateHash.fromData(Buffer.from(__classPrivateFieldGet(this, _Certificate_raw, "f"))), "f");
+    }
+    return (__classPrivateFieldGet(this, _Certificate_hash, "f"));
 };
 /**
  * The Certificate Builder
@@ -81230,7 +81333,7 @@ exports.Testing = { findRDN, blockHashesFromVote, feeFromVote, hashDataSchema, f
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.version = void 0;
-exports.version = '0.18.0+g5417d9af948be899fcebb75694edb492ff971891';
+exports.version = '0.18.2+gac0baac4139da80613edd4a1ebc7532f37fc834a';
 exports["default"] = exports.version;
 
 

package/docs/assets/hierarchy.js

@@ -1 +1 @@
-window.hierarchyData = "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"
+window.hierarchyData = "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"