@keetanetwork/keetanet-client 0.14.13 → 0.14.14

package/client/index.js

@@ -58806,11 +58806,12 @@ class Client {
      * @param account The account to get the history for -- if null then the history for all accounts will be returned
      * @param options The options to use for the request
      * @param options.startBlocksHash The block hash to start from -- this is used to paginate the request
-     * @param options.depth The maximum number of vote staples to return -- this is used to limit the number of vote staples returned
+     * @param options.depth The maximum number of vote staples to return -- this is used to limit the number of vote staples returned, default is everything)
+     * @param options.pageSize How large of a page size to request at a given time (default is 200)
      * @return The history of vote staples for the given account, in reverse order starting with the most recent vote staple
      */
     async getHistory(account, options = {}) {
-        const { depth = Infinity, startBlocksHash } = options;
+        const { depth = Infinity, pageSize = 200, startBlocksHash } = options;
         account = account_1.default.toPublicKeyString(account);
         let startVoteStapleID = undefined;
         if (startBlocksHash !== undefined) {
@@ -58823,7 +58824,7 @@ class Client {
         }
         const retval = [];
         while (retval.length < depth) {
-            const limit = Math.min(depth - retval.length, 200);
+            const limit = Math.min(depth - retval.length, pageSize);
             const query = {
                 limit: String(limit)
             };
@@ -58861,7 +58862,16 @@ class Client {
                     break;
                 }
             }
-            startVoteStapleID = history.history.slice(-1)[0]['$id'];
+            if (typeof history.nextKey === 'string' || history.nextKey === null) {
+                if (history.nextKey === null) {
+                    break;
+                }
+                startVoteStapleID = history.nextKey;
+            }
+            else {
+                /* @deprecated -- workaround broken API */
+                startVoteStapleID = history.history.slice(-1)[0]['$id'];
+            }
         }
         return (retval);
     }
@@ -61090,6 +61100,9 @@ exports.baseValidationConfig = {
             maxLength: 256,
             regex: /^[-_A-Za-z0-9+/= ]+$/,
             canBeEmpty: true
+        },
+        validateNumericValues: {
+            cutoffEpoch: 1763683200000n // 2025-11-21T00:00:00.000Z
         }
     },
     idempotentKey: {
@@ -63842,11 +63855,10 @@ class BlockBuilder {
                 __classPrivateFieldSet(this, _BlockBuilder_block, new Block(block), "f");
             }
             else {
-                const incompleteBlockJSON = {
-                    date: (new Date()).toISOString(),
-                    version: 1,
-                    ...block
-                };
+                const incompleteBlockJSON = { version: 1, ...block };
+                if (incompleteBlockJSON.date === undefined) {
+                    incompleteBlockJSON.date = (new Date()).toISOString();
+                }
                 /*
                  * Map input to our values
                  */
@@ -64397,11 +64409,7 @@ class BlockOperation {
         if (amount === undefined || amount === null) {
             throw (new Error('internal error: "amount" is invalid'));
         }
-        const bigintAmount = BigInt(amount);
-        if (bigintAmount < 0n) {
-            throw (new block_1.default('BLOCK_AMOUNT_BELOW_ZERO', 'value cannot be negative'));
-        }
-        return (bigintAmount);
+        return (BigInt(amount));
     }
 }
 BlockOperation.isInstance = (0, helper_1.checkableGenerator)(BlockOperation);
@@ -64442,6 +64450,7 @@ class BlockOperationSEND extends BlockOperation {
     validate(context) {
         const { block } = context;
         const account = block.account;
+        (0, common_1.validateNumericValue)(this.amount, block, 'amount');
         // Only allow tokens to use send if they are the token being sent
         if (account.keyType === account_1.AccountKeyAlgorithm.TOKEN && this.token.comparePublicKey(account) === false) {
             throw (new block_1.default('BLOCK_NO_TOKEN_OP', 'Tokens cannot use SEND, did you mean to use TOKEN_ADMIN_MODIFY_BALANCE'));
@@ -64540,6 +64549,7 @@ class BlockOperationRECEIVE extends BlockOperation {
     validate(context) {
         const { block } = context;
         const account = block.account;
+        (0, common_1.validateNumericValue)(this.amount, block, 'amount');
         if (account.isToken()) {
             throw (new block_1.default('BLOCK_NO_TOKEN_OP', 'Token addresses cannot use RECEIVE'));
         }
@@ -64619,6 +64629,7 @@ class BlockOperationTOKEN_ADMIN_MODIFY_BALANCE extends BlockOperation {
     }
     validate(context) {
         const { block } = context;
+        (0, common_1.validateNumericValue)(__classPrivateFieldGet(this, _BlockOperationTOKEN_ADMIN_MODIFY_BALANCE_amount, "f"), block, 'amount');
         if (block.account.keyType === account_1.AccountKeyAlgorithm.TOKEN) {
             throw (new block_1.default('BLOCK_NO_TOKEN_OP', 'You cannot use TOKEN_ADMIN_MODIFY_BALANCE on a token account'));
         }
@@ -65019,6 +65030,7 @@ class BlockOperationTOKEN_ADMIN_SUPPLY extends BlockOperation {
     }
     validate(context) {
         const { block } = context;
+        (0, common_1.validateNumericValue)(__classPrivateFieldGet(this, _BlockOperationTOKEN_ADMIN_SUPPLY_amount, "f"), block, 'amount');
         if (block.account.keyType !== account_1.AccountKeyAlgorithm.TOKEN) {
             throw (new block_1.default('BLOCK_ONLY_TOKEN_OP', 'Only token accounts can use TOKEN_ADMIN_SUPPLY'));
         }
@@ -66492,6 +66504,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.LedgerStorageBase = void 0;
 exports.findPermissionMatch = findPermissionMatch;
 exports.validateSupply = validateSupply;
+exports.validateNumericValue = validateNumericValue;
 exports.validateBlockSignerCount = validateBlockSignerCount;
 exports.validateBlockSignerDepth = validateBlockSignerDepth;
 exports.computeLedgerEffect = computeLedgerEffect;
@@ -66533,6 +66546,16 @@ function validateSupply(amount, network) {
         throw (new block_2.default('BLOCK_SUPPLY_INVALID', `supply does not fit proper format -- GOT: '${amount}' MaxValue: ${maxValue}`));
     }
 }
+function validateNumericValue(value, block, fieldName, context) {
+    if (value >= 0n) {
+        return;
+    }
+    const config = (0, config_1.getValidation)(block.network).blockOperations.validateNumericValues;
+    if (BigInt(block.date.valueOf()) < config.cutoffEpoch) {
+        return;
+    }
+    throw (new block_2.default('BLOCK_AMOUNT_BELOW_ZERO', `${fieldName ?? 'value'} cannot be negative`));
+}
 function validateBlockSignerCount(amount, network) {
     const { maxValue } = (0, config_1.getValidation)(network).accountInfoFieldRules['blockSignerCount'];
     if (amount > maxValue || amount < 1n) {
@@ -67386,9 +67409,6 @@ function updateAccountInfoInState(state, account, info) {
  * Compute the effect of a SEND operation
  */
 function computeEffectOfOperationSEND(state, block, operation) {
-    if (operation.amount < 0n) {
-        throw (new Error('Internal error: SEND operation with negative amount'));
-    }
     // Decrement sender balance
     const senderChange = {
         state,
@@ -67416,9 +67436,6 @@ function computeEffectOfOperationSEND(state, block, operation) {
  * Compute the effect of a RECEIVE operation
  */
 function computeEffectOfOperationRECEIVE(state, block, operation) {
-    if (operation.amount < 0n) {
-        throw (new Error('Internal error: RECEIVE operation with negative amount'));
-    }
     // Increment recipient balance
     const recipientChange = {
         state,
@@ -67454,9 +67471,6 @@ function computeEffectOfOperationRECEIVE(state, block, operation) {
     }
 }
 function computeEffectOfOperationTOKEN_ADMIN_MODIFY_BALANCE(state, block, operation) {
-    if (operation.amount < 0n) {
-        throw (new Error('Internal error: TOKEN_ADMIN_MODIFY_BALANCE operation with negative amount'));
-    }
     if (operation.method === block_1.Block.AdjustMethod.SET) {
         const setChange = {
             state,
@@ -67570,9 +67584,6 @@ function computeEffectOfOperationMODIFY_PERMISSIONS(state, block, operation) {
     });
 }
 function computeEffectOfOperationTOKEN_ADMIN_SUPPLY(state, block, operation) {
-    if (operation.amount < 0n) {
-        throw (new Error('Internal error: TOKEN_ADMIN_SUPPLY operation with negative amount'));
-    }
     const tokenPubKey = block.account.publicKeyString.get();
     let value = 0n;
     switch (operation.method) {
@@ -68970,6 +68981,13 @@ _LedgerAtomicInterface_network = new WeakMap(), _LedgerAtomicInterface_subnet =
     for (const block of blocks) {
         for (const operation of block.operations) {
             switch (operation.type) {
+                case block_1.Block.OperationType.RECEIVE:
+                case block_1.Block.OperationType.SEND:
+                case block_1.Block.OperationType.TOKEN_ADMIN_SUPPLY:
+                    if (operation.amount < 0n) {
+                        throw (new Error(`Operation amount cannot be negative: ${operation.amount}`));
+                    }
+                    break;
                 case block_1.Block.OperationType.SET_REP:
                     if (__classPrivateFieldGet(this, _LedgerAtomicInterface_operations, "f").setRep !== undefined) {
                         const validRep = await __classPrivateFieldGet(this, _LedgerAtomicInterface_operations, "f").setRep(block.account, operation.to);
@@ -68982,6 +69000,9 @@ _LedgerAtomicInterface_network = new WeakMap(), _LedgerAtomicInterface_subnet =
                     if (!__classPrivateFieldGet(this, _LedgerAtomicInterface_operations, "f").enableTokenAdminModifyBalance) {
                         throw (new ledger_1.KeetaNetLedgerError('LEDGER_OPERATION_NOT_SUPPORTED', 'TOKEN_ADMIN_MODIFY_BALANCE operation not supported'));
                     }
+                    if (operation.amount < 0n) {
+                        throw (new Error(`Operation amount cannot be negative: ${operation.amount}`));
+                    }
                     break;
                 default:
                     break;
@@ -69821,6 +69842,10 @@ class Log {
          * The maximum number of log entries to send to each target at a time
          */
         this.batchSize = 10;
+        /**
+         * Parent logger, if any -- used for creating hierarchical loggers
+         */
+        this.parent = null;
         if (options?.logDebugTracing !== undefined) {
             __classPrivateFieldSet(this, _Log_logDebugTracing, options.logDebugTracing, "f");
         }
@@ -69853,9 +69878,15 @@ class Log {
         if (__classPrivateFieldGet(this, _Log_destroyed, "f")) {
             throw (new Error('Cannot register target on destroyed Log instance'));
         }
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const id = Symbol('LogTargetID');
-        __classPrivateFieldGet(this, _Log_targets, "f").set(id, target);
+        let id;
+        if (this.parent) {
+            id = this.parent.registerTarget(target);
+        }
+        else {
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            id = Symbol('LogTargetID');
+            __classPrivateFieldGet(this, _Log_targets, "f").set(id, target);
+        }
         return (id);
     }
     /**
@@ -69875,7 +69906,46 @@ class Log {
         if (__classPrivateFieldGet(this, _Log_destroyed, "f")) {
             return;
         }
-        __classPrivateFieldGet(this, _Log_targets, "f").delete(id);
+        if (this.parent) {
+            this.parent.unregisterTarget(id);
+        }
+        else {
+            __classPrivateFieldGet(this, _Log_targets, "f").delete(id);
+        }
+    }
+    /**
+     * Get the currently registered log targets.
+     *
+     * If this is a child logger, this will return the parent's targets
+     * because child loggers share the same targets as their parent.
+     */
+    get targets() {
+        if (__classPrivateFieldGet(this, _Log_destroyed, "f")) {
+            return ([]);
+        }
+        if (this.parent) {
+            return (this.parent.targets);
+        }
+        return (Array.from(__classPrivateFieldGet(this, _Log_targets, "f").values()));
+    }
+    /**
+     * Create a child logger instance that shares the same targets as this instance
+     * but has its own log queue, this is useful for creating hierarchical loggers
+     * which can call sync independently.
+     *
+     * 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")
+        });
+        /**
+         * Attach child nodes to our own parent to collapse
+         * chains of loggers
+         */
+        child.parent = this.parent ?? this;
+        return (child);
     }
     /**
      * Emit a set of logs to all registered targets
@@ -69921,7 +69991,7 @@ class Log {
          * in case a target is added later;  However, if there are
          * too many logs, drop the oldest ones
          */
-        if (__classPrivateFieldGet(this, _Log_targets, "f").size === 0) {
+        if (this.targets.length === 0) {
             if (__classPrivateFieldGet(this, _Log_logs, "f").length > MAX_LOGS_TO_ENQUEUE_WITH_NO_TARGETS) {
                 __classPrivateFieldGet(this, _Log_logs, "f").splice(0, __classPrivateFieldGet(this, _Log_logs, "f").length - MAX_LOGS_TO_ENQUEUE_WITH_NO_TARGETS);
             }
@@ -69944,7 +70014,7 @@ class Log {
          * while a sync is in progress -- they will continue to be sent
          * to the registered targets at the time of the sync
          */
-        const targets = Array.from(__classPrivateFieldGet(this, _Log_targets, "f").values());
+        const targets = [...this.targets];
         do {
             try {
                 __classPrivateFieldSet(this, _Log_shouldSyncAgain, false, "f");
@@ -73372,6 +73442,7 @@ const util_2 = __importDefault(__webpack_require__(9023));
  * native bindings.
  */
 const ASN1_ENCODE_DECODE_PARANOID = process.env['KEETANET_NODE_ASN1_ENCODE_DECODE_PARANOID'] === '1';
+const MAXIMUM_BIGINT_BYTE_LENGTH = 1024;
 function jsBigIntToBuffer(value) {
     /**
      * Convert value to Hex
@@ -73391,38 +73462,80 @@ function jsBigIntToBuffer(value) {
     if (valueStr.length % 2 !== 0) {
         valueStr = '0' + valueStr;
     }
-    /*
-     * Pad with a leading 0 byte if the MSB is 1 to avoid writing a
-     * negative number
-     */
-    const leader = valueStr.slice(0, 2);
-    const leaderValue = Number(`0x${leader}`);
-    if (!isNegative) {
-        if (leaderValue > 127) {
-            valueStr = '00' + valueStr;
+    if (isNegative) {
+        // Convert to minimal two's complement
+        let n = BigInt('0x' + valueStr);
+        n = -n;
+        // Find minimal byte length
+        const leader = Number('0x' + valueStr.slice(0, 2));
+        let extraByteLength = 0;
+        if (leader > 0x80) {
+            extraByteLength = 1;
+        }
+        const byteLength = valueStr.length / 2 + extraByteLength;
+        // Compute two's complement
+        const mod = 1n << (BigInt(8 * byteLength));
+        const twos = mod + n;
+        let hex = twos.toString(16);
+        if (hex.length % 2 !== 0) {
+            hex = '0' + hex;
         }
+        // Remove redundant leading ff bytes
+        while (hex.length > 2 && hex.startsWith('ff') && Number.parseInt(hex.slice(2, 4), 16) >= 0x80) {
+            hex = hex.slice(2);
+        }
+        valueStr = hex;
     }
     else {
-        if (leaderValue <= 127) {
-            valueStr = 'FF' + valueStr;
+        const leader = valueStr.slice(0, 2);
+        const leaderValue = Number(`0x${leader}`);
+        if (leaderValue > 127) {
+            valueStr = '00' + valueStr;
         }
     }
+    if (valueStr.length / 2 >= MAXIMUM_BIGINT_BYTE_LENGTH) {
+        throw (new Error(`jsBigIntToBuffer: Unable to encode bigint, too large, goes over maximum byte length of ${MAXIMUM_BIGINT_BYTE_LENGTH}`));
+    }
     /*
      * Convert to a buffer
      */
     const valueBuffer = Buffer.from(valueStr, 'hex');
     return (valueBuffer);
 }
-/* XXX:TODO: This does not correctly deal with negative values */
+function assertDERInteger(data) {
+    const buf = Buffer.from(data.valueBlock.valueHex);
+    // Check for zero-length integer
+    if (buf.length === 0) {
+        throw (new Error('Invalid DER: Integer has zero length'));
+    }
+    // Check for unnecessary leading zeros (positive numbers)
+    // Only check multi-byte integers
+    if (buf.length > 1 && buf[0] === 0x00 && (buf[1] & 0x80) === 0) {
+        throw (new Error('Invalid DER: Integer has unnecessary leading zero byte'));
+    }
+    // Check for unnecessary leading 0xFF (negative numbers)
+    // Only check multi-byte integers
+    if (buf.length > 1 && buf[0] === 0xFF && (buf[1] & 0x80) !== 0) {
+        throw (new Error('Invalid DER: Integer has unnecessary leading 0xFF byte'));
+    }
+}
 function jsIntegerToBigInt(value) {
-    let valueStr;
-    if (value instanceof asn1js.Integer) {
-        valueStr = value.toString().split(':')[1].trim();
+    if (typeof value === 'number') {
+        return (BigInt(value));
+    }
+    assertDERInteger(value);
+    const buf = Buffer.from(value.valueBlock.valueHex);
+    const isNegative = (buf[0] & 0x80) !== 0;
+    if (!isNegative) {
+        return (BigInt('0x' + buf.toString('hex')));
     }
     else {
-        valueStr = value;
+        // Two's complement: value = unsigned - 2^(8*len)
+        const unsigned = BigInt('0x' + buf.toString('hex'));
+        const bits = BigInt(buf.length * 8);
+        const twosComp = unsigned - (1n << bits);
+        return (twosComp);
     }
-    return (BigInt(valueStr));
 }
 function isASN1Object(input) {
     if (input === null || input === undefined || typeof input !== 'object') {
@@ -75530,6 +75643,9 @@ class BufferStorage {
                 throw (new Error(`Unsupported conversion: ${encoding}`));
         }
     }
+    toJSON() {
+        return (this.toString('hex'));
+    }
     toBigInt() {
         const hex_value = `0x${this.toString('hex')}`;
         const value = BigInt(hex_value);
@@ -79766,7 +79882,7 @@ exports.Testing = { findRDN, blockHashesFromVote, feeFromVote };
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.version = void 0;
-exports.version = '0.14.13+g566b8de2c01660608e6eb5257113db271d7fc075';
+exports.version = '0.14.14+gdd8e58acb0e1edfb9050da584aaa65b7e5f722a2';
 exports["default"] = exports.version;
 
 

package/config/index.d.ts

@@ -72,6 +72,9 @@ export interface ValidationConfig {
     };
     blockOperations: {
         external: TextValidationRule;
+        validateNumericValues: {
+            cutoffEpoch: bigint;
+        };
     };
     idempotentKey: {
         maxByteLength: number;

package/docs/assets/hierarchy.js

@@ -1 +1 @@
-window.hierarchyData = "eJy1m11zozYUhv+Lr9UU8c3eOTa76yZxXNvdTqez4yG24tAl4ALubKaz/706QBJJGFsS9IbNxtGrRzpCHL0H/zvKs6wsRh/+9EzTRr7pecizXAv52HeQZ2MXfrKQ59gY2YZJPzV9jFwL059cJ6CfOia9YPq7wDSRZxg+tKAXy6AqphvQv7PoB9g3kOm5BrIty0a2b1lf0SgnjwnZlnGWUoR/R9hyXfg3jZ7J6MPoS1aSVRkdEjJCo29xuht9wKaPRsc8oZ9uk6goSPHzDSFlNCflanpztSSPJCfpluyu3htfPZXPCVWoGtCGZbH7CdR+qn/xA42whz2h31+P9KLZbdVWolfftYVeNTu83BcNLtvXdZJtv32OiieNDt/ayvTqB0yvi+NDEhdP94c64K9dm4772nWcliR/jLbdvfManQhvQhWGjX0GY0LyMn6Mt1FJNKdAUJCYCNtxhFD3CQHXXqJ3etsxvf9WkHySxCQte0WiJSMRDPrhU5zsqALdcWB1wJYQfK0Zg5OMkyx9jPd9EWsVueViGR67XF61wzzPco1gce0vB8syHbb322yv0SdtJdGT47C7Ld0sy0Kjr6qdRG+ug5nexqs5vp9N9eJa5NtNEj9sjmWcFJuoSPFVoycZYdexBZYVKQdloXrSLIHAch2XqzKPU81V30H0pirL5VoC1zRinlBDIIGgNI0nRmz4KVKbH09cz7T5cTvwMqok5YggPWOf8cdHqr4qszza6yQWPNFDpXbFiV646YXN3rYRPIgRPAuR7dFs0zFsEzlB4CDXMGm2Gdg00Qxcm14CmlQangFPBsgXTz07r4/pTjszZBRURgEJasVkeyzTIiuK+CF5Cb8f4pzsNDO5EypKbDSdrNjo1J5MonskG+8Clzd6SO2F/m/jb+Q6KnSD9dpcaTZoSo8gTNWUBF5wKr+/PtK/JzoPdVHi8rTAYhcYegRELhQOvYXEW6fXkOVHi7nRVrfb/YHkEWSKq3A+1QBoi8hwcCcQUWK9WYaLAVAqHQka0zw3K+vNbP7xfhAcEJLh8ZxOnrv76ezjH5tFuLybrVaz+/mqN1lbUoLRMt1OxskyHK/DzWwaztezj7Nw2RuxpShDyJ0XeL31/U0434ynd7P5ZvXbYnH7R2/EtqQEo4277wNWsAnR9fh2PJ+Eg7Ly0jLMbvfqXIaTcPalP2CjI0Hj8NkVv7DH8/GncDMJl7BoJnQF9b9XWpISjD5mc1J4ZrLnGgWUuqVMj9wZMvxO89E0SvR6ZVpL9BxwY31te0NeFlGs83wTFGQIAnZ9hpPparwKJwua99/gyqfaUi0dktNKl4kgje4gWg5GtFQj4oyvcGo6Dg56oQgSMgz+mTjl8T/0FDpIoN6kJJgwtrojNRTTUpHJxidi1QtG1JCh4IzA2Y6k4LWSXI+Aay/Ru2mYnWtlFe/TqDzmOueYDiUZIsvoXClDES3ViDiHsolxLxRBQoLB4io2nMeqedJsaagcN8EzRq5lwcW16MX3v1aY1ikr+Zbs9iTvaygzKjITxtl5vAYc7YaheVOSIfK754bets8HqpWW9LYdBq0tKcEYcNt0LdS4X+s8SouoKl5qrrhzcjJs3GHyNtvvmXO9kvlYt1Wt30ClolrkgS+ArKN8T6DmUmRaDp0ocXkyoO58ikF7PurmqlMCUwFTAtVusbSyIOmONawVKyxNc6VNyXEqtxJK+2Lp5eEvomtVv7dXXjGugxEUX+ASICgxwMVDYKYjiunSi4UbZldgDr8faMoXw6IoyfdyHWma/6e15Dx2wBOwZs/DYbW1ZLF8Fgtum6pwkGluCIyAaowpSrPofDaAv8fl06yYUdko3WpWkXgNyZmxOCNylsZlHCV1OXh1PBySFz2WE0KyQNyDGPb6TyR9dZ96FLtPKSkHj85WFTwbuwJkP/NYUFDZxcC8R05TDIL3kDpdmN6eiwoWONwI7GUEri4CKxWBV4nADkTgtyEwsBD4RjV52836ZXU/P+2Kq0X+pJZq7GFANajXelVIEOdt896s593zTlw/aHBbvlxLn/PVB+A9a693AdNlUgP71lngM8Z7T3QF/71zEJ7TDKLlJ3NddTvzPccgb9B3DYHepPUQAnbh3B2TMqYn0HfDYJKTqCTjfH98pr/SfEvqoqzkU8M1WvseNy1n6gw9J1yh3NA54151UKCDOL8FShQiBhyMZD2ia1B0h68HhY2zgxIrFT1HcKlg0YnrOg3u+e3yTCmj7+4jX9HoGsTrs9S12KRuQfLnuChgbybl50wzRTmhopQP+BgjKIfUgNxLXTfkZcaMSN3HeG+uhBRQJM8NPOT5dkAvQQPHbXyVD9ijbMI0V4HzPHiZ3Kt9MvhPp+3ak03UkTATPM6Z4o3SYWiWCjQ0dm27tQcGJyDTf8CeBThDXROhpSFBEdhs1vRW/hHfb1N/mZxRUd6P3t5dgzoXgtJFtZoD7sX+E5RK977G23Y1juEDE7YQVHYYuoDdPN9Md31GUUKJ1DRMBDUO5DZ2os+/tMTZtnpr7b395XUGX2WRdHx7vT0vIaxuPmKrmkBss2nWwlwsCMlv46IEd0DzTuFF5JJWCsI5/F/og7UZ2/rloHnPiiqyKI7JoVROSbwdAKetpBo4mKc6cBdOhkNlYsq2kOM6CHwBuNCntlN9I8yHr3YZkGEY9FOaBsPFawbiCPbRwMeqs5LqwwtesX3xRFjE+z6mHK+hDca7zsKbKh+Paf0VOrAhs7wswnSbvxz0F4y8vuTNZ1qeBP48+7/AWWVZZBe399AlOXClPp0ttNGQxgjaGL0ZJAHETcqB73PiekHyphvV65p7/fu7S1GZnN49CNZgRW4Z7B47pzsG3by/RMmRhGmZa1YDWjLKjHaDZ3Nlr7tsFz++rLNvhCYGCVQ9ekB2iEmuRJs7ci/J30dSlJXYkmxJ/E8fsi41aTR2MVYqTUB6MLVk1ENqugim7euPHz/+A10YNQE="
+window.hierarchyData = "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"