@keetanetwork/keetanet-client 0.14.12 → 0.14.13

package/client/index.js

@@ -59991,7 +59991,7 @@ class UserClient {
         }
         const builder = userClient.initBuilder({ ...options, account: request.from.account });
         builder.send(to.account, from.amount, from.token);
-        builder.receive(to.account, to.amount, to.token, true);
+        builder.receive(to.account, to.amount, to.token, request.to.exact ?? false);
         const blocks = await builder.computeBlocks();
         if (blocks.blocks.length !== 1) {
             throw (new Error('Compute Swap Request Generated more than 1 block'));
@@ -60009,7 +60009,7 @@ class UserClient {
             let userClient;
             if (UserClient.isInstance(builderOrUserClient)) {
                 userClient = builderOrUserClient;
-                account = builderOrUserClient.account;
+                account = options?.account ?? builderOrUserClient.account;
             }
             else {
                 const env_1 = { stack: [], error: void 0, hasError: false };
@@ -60051,13 +60051,41 @@ class UserClient {
         if (!sendOperation.to.comparePublicKey(account)) {
             throw (new client_1.default('CLIENT_SWAP_SEND_ACCOUNT_MISMATCH', 'Swap Request send account does not match'));
         }
-        if (request.expected?.token !== undefined && !sendOperation.token.comparePublicKey(request.expected?.token)) {
-            throw (new client_1.default('CLIENT_SWAP_REQUEST_TOKEN_MISMATCH', 'Swap Request send token does not match expected'));
-        }
-        if (request.expected?.amount !== undefined && sendOperation.amount !== request.expected?.amount) {
-            throw (new client_1.default('CLIENT_SWAP_REQUEST_AMOUNT_MISMATCH', 'Swap Request send amount does not match expected'));
+        let sendAmount = receiveOperation.amount;
+        if (request.expected) {
+            let expectedReceive;
+            let expectedSend;
+            if ('receive' in request.expected || 'send' in request.expected) {
+                expectedReceive = request.expected?.receive;
+                expectedSend = request.expected?.send;
+            }
+            else if ('token' in request.expected || 'amount' in request.expected) {
+                expectedReceive = request.expected;
+            }
+            if (expectedReceive) {
+                if (expectedReceive.token !== undefined && !sendOperation.token.comparePublicKey(expectedReceive.token)) {
+                    throw (new client_1.default('CLIENT_SWAP_REQUEST_TOKEN_MISMATCH', 'Swap Request send token does not match expected'));
+                }
+                if (expectedReceive.amount !== undefined && sendOperation.amount !== expectedReceive.amount) {
+                    throw (new client_1.default('CLIENT_SWAP_REQUEST_AMOUNT_MISMATCH', 'Swap Request send amount does not match expected'));
+                }
+            }
+            if (expectedSend) {
+                if (expectedSend.token !== undefined && !(expectedSend.token.comparePublicKey(receiveOperation.token))) {
+                    throw (new client_1.default('CLIENT_SWAP_SEND_TOKEN_MISMATCH', 'Swap acceptance send token does not match swap request receive token'));
+                }
+                if (expectedSend.amount !== undefined) {
+                    if (expectedSend.amount < receiveOperation.amount) {
+                        throw (new client_1.default('CLIENT_SWAP_SEND_AMOUNT_TOO_LOW', 'Send amount must be at least the receive amount specified in the swap request'));
+                    }
+                    if (receiveOperation.exact && receiveOperation.amount !== expectedSend.amount) {
+                        throw (new client_1.default('CLIENT_SWAP_SEND_AMOUNT_RECEIVE_EXACT_MISMATCH', 'Send value is not allowed to differ from expected receive amount for exact receives'));
+                    }
+                    sendAmount = expectedSend.amount;
+                }
+            }
         }
-        builder.send(request.block.account, receiveOperation.amount, receiveOperation.token);
+        builder.send(request.block.account, sendAmount, receiveOperation.token);
         const blocks = await builder.computeBlocks();
         return ([...blocks.blocks, request.block]);
     }
@@ -62822,7 +62850,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _Block_instances, _a, _Block_valueBytes, _Block_valueHash, _Block_getSortedRequiredSigners, _Block_validateOperationsPurpose, _Block_validateSignerField, _Block_validateSignatures, _BlockBuilder_block;
+var _Block_instances, _a, _Block_valueBytes, _Block_valueHash, _Block_getSortedRequiredSigners, _Block_validateBytes, _Block_validateOperationsPurpose, _Block_validateSignerField, _Block_validateSignatures, _BlockBuilder_block;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.BlockBuilder = exports.Block = exports.BlockHash = exports.AdjustMethod = exports.BlockPurpose = void 0;
 exports.toAdjustMethod = toAdjustMethod;
@@ -63501,6 +63529,7 @@ class Block {
         if (this.account.isMultisig()) {
             throw (new block_1.default('BLOCK_NO_MULTISIG_OP', 'Cannot create a block for a multisig account'));
         }
+        __classPrivateFieldGet(this, _Block_instances, "m", _Block_validateBytes).call(this);
         __classPrivateFieldGet(this, _Block_instances, "m", _Block_validateSignerField).call(this);
         __classPrivateFieldGet(this, _Block_instances, "m", _Block_validateOperationsPurpose).call(this);
         __classPrivateFieldGet(this, _Block_instances, "m", _Block_validateSignatures).call(this);
@@ -63508,9 +63537,11 @@ class Block {
     static getAccountOpeningHash(account) {
         return (BlockHash.getAccountOpeningHash(account));
     }
-    toBytes(includeSignatures = true) {
-        if (__classPrivateFieldGet(this, _Block_valueBytes, "f") !== undefined && includeSignatures) {
-            return (__classPrivateFieldGet(this, _Block_valueBytes, "f"));
+    toBytes(includeSignatures = true, useCached = true) {
+        if (useCached) {
+            if (__classPrivateFieldGet(this, _Block_valueBytes, "f") !== undefined && includeSignatures) {
+                return (__classPrivateFieldGet(this, _Block_valueBytes, "f"));
+            }
         }
         const sharedBlockValues = {
             previous: this.previous,
@@ -63712,6 +63743,18 @@ _a = Block, _Block_valueBytes = new WeakMap(), _Block_valueHash = new WeakMap(),
         }
     }
     return (out);
+}, _Block_validateBytes = function _Block_validateBytes() {
+    const existingBytes = __classPrivateFieldGet(this, _Block_valueBytes, "f");
+    if (existingBytes === undefined) {
+        return;
+    }
+    const recalculatedBytesBuffer = Buffer.from(this.toBytes(true, false));
+    const existingBytesBuffer = Buffer.from(existingBytes);
+    if (!recalculatedBytesBuffer.equals(existingBytesBuffer)) {
+        const existingBytesHash = Buffer.from((0, hash_1.Hash)(existingBytesBuffer)).toString('hex').toUpperCase();
+        const recalculatedBytesHash = Buffer.from((0, hash_1.Hash)(recalculatedBytesBuffer)).toString('hex').toUpperCase();
+        throw (new block_1.default('BLOCK_INVALID_SIGNATURE', `Block signed bytes (${existingBytesHash}) do not match calculated bytes (${recalculatedBytesHash})`));
+    }
 }, _Block_validateOperationsPurpose = function _Block_validateOperationsPurpose() {
     /**
      * Do not allow blocks to contain invalid constructions
@@ -63767,7 +63810,7 @@ _a = Block, _Block_valueBytes = new WeakMap(), _Block_valueHash = new WeakMap(),
         const signature = new buffer_1.BufferStorage(this.signatures[i], 64);
         const valid = signers[i].verify(this.hash.get(), signature.get());
         if (valid !== true) {
-            throw (new Error(`Unable to validate signature of ${this.hash.toString()} against signature ${this.signatures[i]} for account ${signers[i].publicKeyString.get()}`));
+            throw (new block_1.default('BLOCK_INVALID_SIGNATURE', `Unable to validate signature of ${this.hash.toString()} against signature ${this.signatures[i].toString('hex')} for account ${signers[i].publicKeyString.get()}`));
         }
     }
 };
@@ -64354,7 +64397,11 @@ class BlockOperation {
         if (amount === undefined || amount === null) {
             throw (new Error('internal error: "amount" is invalid'));
         }
-        return (BigInt(amount));
+        const bigintAmount = BigInt(amount);
+        if (bigintAmount < 0n) {
+            throw (new block_1.default('BLOCK_AMOUNT_BELOW_ZERO', 'value cannot be negative'));
+        }
+        return (bigintAmount);
     }
 }
 BlockOperation.isInstance = (0, helper_1.checkableGenerator)(BlockOperation);
@@ -64550,7 +64597,7 @@ class BlockOperationTOKEN_ADMIN_MODIFY_BALANCE extends BlockOperation {
         }
         __classPrivateFieldSet(this, _BlockOperationTOKEN_ADMIN_MODIFY_BALANCE_token, __classPrivateFieldGet(this, _BlockOperationTOKEN_ADMIN_MODIFY_BALANCE_instances, "m", _BlockOperationTOKEN_ADMIN_MODIFY_BALANCE_computeToken).call(this, input.token), "f");
         __classPrivateFieldSet(this, _BlockOperationTOKEN_ADMIN_MODIFY_BALANCE_amount, this.computeAmount(input.amount), "f");
-        __classPrivateFieldSet(this, _BlockOperationTOKEN_ADMIN_MODIFY_BALANCE_method, input.method, "f");
+        __classPrivateFieldSet(this, _BlockOperationTOKEN_ADMIN_MODIFY_BALANCE_method, (0, _1.toAdjustMethod)(input.method), "f");
     }
     set token(token) {
         __classPrivateFieldSet(this, _BlockOperationTOKEN_ADMIN_MODIFY_BALANCE_token, __classPrivateFieldGet(this, _BlockOperationTOKEN_ADMIN_MODIFY_BALANCE_instances, "m", _BlockOperationTOKEN_ADMIN_MODIFY_BALANCE_computeToken).call(this, token), "f");
@@ -64559,7 +64606,7 @@ class BlockOperationTOKEN_ADMIN_MODIFY_BALANCE extends BlockOperation {
         return (__classPrivateFieldGet(this, _BlockOperationTOKEN_ADMIN_MODIFY_BALANCE_token, "f"));
     }
     set method(newMethod) {
-        __classPrivateFieldSet(this, _BlockOperationTOKEN_ADMIN_MODIFY_BALANCE_method, newMethod, "f");
+        __classPrivateFieldSet(this, _BlockOperationTOKEN_ADMIN_MODIFY_BALANCE_method, (0, _1.toAdjustMethod)(newMethod), "f");
     }
     get method() {
         return (Number(__classPrivateFieldGet(this, _BlockOperationTOKEN_ADMIN_MODIFY_BALANCE_method, "f")));
@@ -64846,7 +64893,7 @@ class BlockOperationMODIFY_PERMISSIONS extends BlockOperation {
         }
         __classPrivateFieldSet(this, _BlockOperationMODIFY_PERMISSIONS_principal, this.computeTo(input.principal), "f");
         __classPrivateFieldSet(this, _BlockOperationMODIFY_PERMISSIONS_target, account_1.default.toAccount(input.target), "f");
-        __classPrivateFieldSet(this, _BlockOperationMODIFY_PERMISSIONS_method, input.method, "f");
+        __classPrivateFieldSet(this, _BlockOperationMODIFY_PERMISSIONS_method, (0, _1.toAdjustMethod)(input.method), "f");
         __classPrivateFieldSet(this, _BlockOperationMODIFY_PERMISSIONS_permissions, __classPrivateFieldGet(this, _BlockOperationMODIFY_PERMISSIONS_instances, "m", _BlockOperationMODIFY_PERMISSIONS_computePermissions).call(this, input.permissions), "f");
     }
     set principal(principal) {
@@ -64868,7 +64915,7 @@ class BlockOperationMODIFY_PERMISSIONS extends BlockOperation {
         return (__classPrivateFieldGet(this, _BlockOperationMODIFY_PERMISSIONS_target, "f"));
     }
     set method(method) {
-        __classPrivateFieldSet(this, _BlockOperationMODIFY_PERMISSIONS_method, method, "f");
+        __classPrivateFieldSet(this, _BlockOperationMODIFY_PERMISSIONS_method, (0, _1.toAdjustMethod)(method), "f");
     }
     get method() {
         return (Number(__classPrivateFieldGet(this, _BlockOperationMODIFY_PERMISSIONS_method, "f")));
@@ -65495,47 +65542,49 @@ const base_1 = __webpack_require__(1096);
 const helper_1 = __webpack_require__(3208);
 const BlockErrorType = 'BLOCK';
 exports.BlockErrorCodes = [
-    'INVALID_TYPE',
-    'INVALID_VERSION',
-    'NO_MULTIPLE_SET_REP',
-    'IDENTIFIER_NEED_DEFAULT_PERMISSIONS',
+    'AMOUNT_BELOW_ZERO',
+    'CANNOT_FORWARD_TO_SELF',
     'CANNOT_SEND_NON_TOKEN',
-    'TOKEN_RECEIVE_DIFFERS',
-    'ONLY_TOKEN_OP',
-    'ONLY_IDENTIFIER_OP',
-    'NO_TOKEN_OP',
-    'NO_IDENTIFIER_OP',
-    'INVALID_SIGNER',
-    'INVALID_PURPOSE_VALIDATION',
+    'CERTIFICATE_SUBJECT_MISMATCH',
+    'EXACT_TRUE_WHEN_FORWARDING',
+    'EXTERNAL_INVALID',
+    'EXTERNAL_MISSING',
+    'EXTERNAL_TOO_LONG',
+    'GENERAL_FIELD_INVALID',
+    'IDENTIFIER_INVALID',
+    'IDENTIFIER_NEED_DEFAULT_PERMISSIONS',
+    'INTERMEDIATE_CERTIFICATES_ONLY_ADD',
+    'INVALID_ACCOUNT_TYPE',
+    'INVALID_CERTIFICATE_VALUE',
+    'INVALID_CREATE_IDENTIFIER_ARGS',
+    'INVALID_IDEMPOTENT_FORMAT',
+    'INVALID_IDEMPOTENT_LENGTH',
     'INVALID_MULTISIG_QUORUM',
-    'INVALID_MULTISIG_SIGNER_DEPTH',
     'INVALID_MULTISIG_SIGNER_COUNT',
+    'INVALID_MULTISIG_SIGNER_DEPTH',
     'INVALID_MULTISIG_SIGNER_DUPLICATE',
-    'INVALID_CREATE_IDENTIFIER_ARGS',
+    'INVALID_PURPOSE_VALIDATION',
+    'INVALID_SIGNATURE',
+    'INVALID_SIGNER',
+    'INVALID_TYPE',
+    'INVALID_VERSION',
+    'NO_ADMIN_ON_TARGET',
+    'NO_DELEGATE_ADMIN',
+    'NO_DUPLICATE_CERTIFICATE_OPERATION',
+    'NO_IDENTIFIER_OP',
+    'NO_MODIFY_PERMISSION_DUPE',
+    'NO_MULTIPLE_SET_REP',
     'NO_MULTISIG_OP',
-    'IDENTIFIER_INVALID',
-    'GENERAL_FIELD_INVALID',
+    'NO_TOKEN_OP',
+    'ONLY_IDENTIFIER_OP',
+    'ONLY_TOKEN_OP',
     'PERMISSIONS_INVALID_DEFAULT',
     'PERMISSIONS_INVALID_ENTITY',
     'PERMISSIONS_INVALID_PRINCIPAL',
     'PERMISSIONS_INVALID_TARGET',
-    'INVALID_ACCOUNT_TYPE',
-    'NO_ADMIN_ON_TARGET',
     'PREVIOUS_SELF',
-    'NO_DELEGATE_ADMIN',
-    'NO_MODIFY_PERMISSION_DUPE',
-    'CANNOT_FORWARD_TO_SELF',
-    'EXACT_TRUE_WHEN_FORWARDING',
-    'CERTIFICATE_SUBJECT_MISMATCH',
-    'NO_DUPLICATE_CERTIFICATE_OPERATION',
-    'INTERMEDIATE_CERTIFICATES_ONLY_ADD',
-    'INVALID_CERTIFICATE_VALUE',
-    'EXTERNAL_TOO_LONG',
-    'EXTERNAL_INVALID',
-    'EXTERNAL_MISSING',
     'SUPPLY_INVALID',
-    'INVALID_IDEMPOTENT_FORMAT',
-    'INVALID_IDEMPOTENT_LENGTH'
+    'TOKEN_RECEIVE_DIFFERS'
 ];
 exports.FullBlockErrorCodes = exports.BlockErrorCodes.map(code => `${BlockErrorType}_${code}`);
 class KeetaNetBlockError extends base_1.KeetaNetErrorBase {
@@ -65611,6 +65660,9 @@ exports.ClientErrorCodes = [
     'SWAP_MISSING_RECEIVE',
     'SWAP_SEND_RECEIVE_ACCOUNT_MISMATCH',
     'SWAP_SEND_ACCOUNT_MISMATCH',
+    'SWAP_SEND_TOKEN_MISMATCH',
+    'SWAP_SEND_AMOUNT_TOO_LOW',
+    'SWAP_SEND_AMOUNT_RECEIVE_EXACT_MISMATCH',
     'SWAP_REQUEST_TOKEN_MISMATCH',
     'SWAP_REQUEST_AMOUNT_MISMATCH'
 ];
@@ -67334,6 +67386,9 @@ 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,
@@ -67361,6 +67416,9 @@ 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,
@@ -67396,6 +67454,9 @@ 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,
@@ -67465,6 +67526,9 @@ function computeEffectOfOperationCREATE_IDENTIFIER(state, block, operation, cont
             throw (new Error('Invalid identifier creation arguments'));
         }
         updateAccountInfoInState(state, operation.identifier, { multisigQuorum: operation.createArguments.quorum });
+        if (operation.createArguments.quorum < 1n || operation.createArguments.quorum > BigInt(operation.createArguments.signers.length)) {
+            throw (new Error('Internal error: operation.createArguments.quorum is invalid'));
+        }
         for (const multisigSigner of operation.createArguments.signers) {
             state.possibleNewAccounts.add(multisigSigner);
             addPermission(state, {
@@ -67506,6 +67570,9 @@ 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) {
@@ -79699,7 +79766,7 @@ exports.Testing = { findRDN, blockHashesFromVote, feeFromVote };
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.version = void 0;
-exports.version = '0.14.12+g091eeeea12610658c71c9ee6a7c5e2eac6aabdde';
+exports.version = '0.14.13+g566b8de2c01660608e6eb5257113db271d7fc075';
 exports["default"] = exports.version;
 
 

package/docs/assets/hierarchy.js

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