postchain-client 2.0.1 → 2.0.3

package/built/umd/index.js

@@ -33201,7 +33201,19 @@
 	    return sortedDict;
 	}
 
+	const MERKLE_HASH_VERSIONS = {
+	    ONE: 1,
+	    TWO: 2,
+	    UNSET: NaN,
+	};
+
 	const gtvHash2 = (obj, merkleHashVersion) => {
+	    if (!Object.values(MERKLE_HASH_VERSIONS).includes(merkleHashVersion)) {
+	        throw new Error("Merkle hash version is not valid");
+	    }
+	    if (isNaN(merkleHashVersion)) {
+	        throw new Error("Merkle hash version is not set");
+	    }
 	    return gtvHash_1(obj, merkleHashVersion);
 	};
 	const encode$1 = encodeValue;
@@ -34174,7 +34186,7 @@
 	        else {
 	            // Removes signatures and extract the rawgtxBody
 	            const rawGtxBody = gtxToRawGtxBody(gtx);
-	            const signature = yield privOrSigProv.sign(rawGtxBody);
+	            const signature = yield privOrSigProv.sign(rawGtxBody, merkleHashVersion);
 	            return addSignature(privOrSigProv.pubKey, signature, gtx);
 	        }
 	    });
@@ -34244,7 +34256,7 @@
 	    }
 	    return true;
 	}
-	function newSignatureProvider(merkleHashVersion, keyPair) {
+	function newSignatureProvider(keyPair) {
 	    let pub, priv;
 	    if (keyPair) {
 	        priv = ensureBuffer(keyPair.privKey);
@@ -34255,7 +34267,7 @@
 	    }
 	    return {
 	        pubKey: pub,
-	        sign: (gtx) => __awaiter$9(this, void 0, void 0, function* () {
+	        sign: (gtx, merkleHashVersion) => __awaiter$9(this, void 0, void 0, function* () {
 	            const signature = getDigestToSignFromRawGtxBody(gtx, merkleHashVersion);
 	            return signDigest(signature, priv);
 	        }),
@@ -37348,6 +37360,7 @@
 	    TransactionEvent["DappConfirmed"] = "dappConfirmed";
 	    TransactionEvent["DappReceived"] = "dappReceived";
 	    TransactionEvent["Signed"] = "signed";
+	    TransactionEvent["Rejected"] = "rejected";
 	})(exports.TransactionEvent || (exports.TransactionEvent = {}));
 	exports.AnchoringStatus = void 0;
 	(function (AnchoringStatus) {
@@ -37656,11 +37669,6 @@
 	    return serialize(gtx);
 	}
 
-	const MERKLE_HASH_VERSIONS = {
-	    ONE: 1,
-	    TWO: 2,
-	};
-
 	const MerkleHashSchema = z.object({
 	    merkle_hash_version: z.number().int().positive(),
 	});
@@ -37943,7 +37951,8 @@
 	        let error = null;
 	        let transactionTimestamp = undefined;
 	        const { nodeManager } = config;
-	        for (const endpoint of nodeManager.getAvailableNodes()) {
+	        const availableNodes = nodeManager.getAvailableNodes();
+	        for (const endpoint of availableNodes) {
 	            for (let attempt = 0; attempt < config.attemptsPerEndpoint; attempt++) {
 	                const response = yield handleRequest(method, path, endpoint.url, postObject);
 	                error = (_a = response === null || response === void 0 ? void 0 : response.error) !== null && _a !== void 0 ? _a : null;
@@ -37954,6 +37963,7 @@
 	                const isServerError = statusCode ? hasServerError(statusCode) : false;
 	                if (isStatusCodeValid && !error) {
 	                    // Find a way to have this handled more elegantly in the node manager.
+	                    nodeManager.lastUsedNode = endpoint;
 	                    if (nodeManager.stickedNode !== endpoint) {
 	                        nodeManager.setStickyNode(endpoint);
 	                    }
@@ -38104,7 +38114,7 @@
 	                    nodeManager,
 	                    endpointPool,
 	                    chainId: settings.blockchainIid,
-	                    merkleHashVersion: (_k = settings.merkleHashVersion) !== null && _k !== void 0 ? _k : 0,
+	                    merkleHashVersion: (_k = settings.merkleHashVersion) !== null && _k !== void 0 ? _k : MERKLE_HASH_VERSIONS.UNSET,
 	                });
 	            }
 	            throw new MissingBlockchainIdentifierError();
@@ -38119,17 +38129,18 @@
 	                nodeManager,
 	                endpointPool,
 	                chainId: directoryChainIid,
-	                merkleHashVersion: (_l = settings.merkleHashVersion) !== null && _l !== void 0 ? _l : 0,
+	                merkleHashVersion: (_l = settings.merkleHashVersion) !== null && _l !== void 0 ? _l : MERKLE_HASH_VERSIONS.UNSET,
 	            });
 	        }))();
 	        return {
 	            endpointPool,
 	            nodeManager: nodeManager,
 	            blockchainRid: blockchainRidToUse,
-	            merkleHashVersion: (_e = settings.merkleHashVersion) !== null && _e !== void 0 ? _e : 0,
+	            merkleHashVersion: (_e = settings.merkleHashVersion) !== null && _e !== void 0 ? _e : MERKLE_HASH_VERSIONS.UNSET,
 	            dappStatusPolling: setStatusPolling(settings.dappStatusPolling),
 	            clusterAnchoringStatusPolling: setStatusPolling(settings.clusterAnchoringStatusPolling),
 	            systemAnchoringStatusPolling: setStatusPolling(settings.systemAnchoringStatusPolling),
+	            retryTransactionPolling: setRetryTransactionPolling(settings.retryTransactionPolling),
 	            failoverStrategy: ((_f = settings.failOverConfig) === null || _f === void 0 ? void 0 : _f.strategy) || defaultFailoverConfig.strategy,
 	            attemptsPerEndpoint: ((_g = settings.failOverConfig) === null || _g === void 0 ? void 0 : _g.attemptsPerEndpoint) || defaultFailoverConfig.attemptsPerEndpoint,
 	            attemptInterval: ((_h = settings.failOverConfig) === null || _h === void 0 ? void 0 : _h.attemptInterval) || defaultFailoverConfig.attemptInterval,
@@ -38165,7 +38176,6 @@
 	            endpointPool: directoryEndpointPool,
 	            chainId: directoryIid,
 	            failOverConfig,
-	            merkleHashVersion: 0,
 	        });
 	        const blockchainRidToUse = yield (() => __awaiter$5(this, void 0, void 0, function* () {
 	            if (blockchainRid) {
@@ -38177,7 +38187,6 @@
 	                    endpointPool: directoryEndpointPool,
 	                    chainId: blockchainIid,
 	                    failOverConfig,
-	                    merkleHashVersion: 0,
 	                });
 	            }
 	            throw new MissingBlockchainIdentifierError();
@@ -38185,7 +38194,6 @@
 	        const D1Client = yield createClient({
 	            nodeUrlPool: getUrlsFromEndpoints(directoryEndpointPool),
 	            blockchainRid: directoryBRID,
-	            merkleHashVersion: 0,
 	        });
 	        return yield getBlockchainApiUrls(D1Client, ensureBuffer(blockchainRidToUse));
 	    });
@@ -38358,7 +38366,6 @@
 	        return yield createClient({
 	            directoryNodeUrlPool,
 	            blockchainRid: directoryChainRid,
-	            merkleHashVersion: 0,
 	        });
 	    });
 	}
@@ -38397,7 +38404,7 @@
 	function awaitDappConfirmation(txRID, dappStatusPolling, getTransactionStatus) {
 	    var _a;
 	    return __awaiter$5(this, void 0, void 0, function* () {
-	        let lastKnownResult;
+	        let lastKnownResult = null;
 	        for (let i = 0; i < dappStatusPolling.count; i++) {
 	            lastKnownResult = yield getTransactionStatus(txRID);
 	            if (lastKnownResult.status === exports.ResponseStatus.Confirmed) {
@@ -38408,10 +38415,7 @@
 	            }
 	            yield sleep(dappStatusPolling.interval);
 	        }
-	        // TS issue. This could be fixed by implementing new retry strategy
-	        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-	        //@ts-expect-error
-	        return lastKnownResult;
+	        throw new Error(`Retry count exceeded. Confirmation not received. Last transaction status: ${lastKnownResult === null || lastKnownResult === void 0 ? void 0 : lastKnownResult.status}`);
 	    });
 	}
 	function awaitClusterAnchoringChainConfirmation(txRID, clusterAnchoringStatusPolling, getClusterAnchoringTransactionConfirmation) {
@@ -38525,6 +38529,13 @@
 	        count: (_b = statusPolling === null || statusPolling === void 0 ? void 0 : statusPolling.count) !== null && _b !== void 0 ? _b : 20,
 	    };
 	}
+	function setRetryTransactionPolling(statusPolling) {
+	    var _a, _b;
+	    return {
+	        interval: (_a = statusPolling === null || statusPolling === void 0 ? void 0 : statusPolling.interval) !== null && _a !== void 0 ? _a : 500,
+	        count: (_b = statusPolling === null || statusPolling === void 0 ? void 0 : statusPolling.count) !== null && _b !== void 0 ? _b : 3,
+	    };
+	}
 	function linkPromiEvents(event1, event2) {
 	    const transactionEvents = Object.values(exports.TransactionEvent).filter((event) => typeof event === "string");
 	    /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -38596,11 +38607,12 @@
 	            dappStatusPolling: setStatusPolling(),
 	            clusterAnchoringStatusPolling: setStatusPolling(),
 	            systemAnchoringStatusPolling: setStatusPolling(),
+	            retryTransactionPolling: setRetryTransactionPolling(),
 	            failoverStrategy: mergedFailOverConfig.strategy,
 	            attemptsPerEndpoint: mergedFailOverConfig.attemptsPerEndpoint,
 	            attemptInterval: mergedFailOverConfig.attemptInterval,
 	            unreachableDuration: mergedFailOverConfig.unreachableDuration,
-	            merkleHashVersion: 0,
+	            merkleHashVersion: MERKLE_HASH_VERSIONS.UNSET,
 	        };
 	        const { error, statusCode, rspBody } = yield requestWithFailoverStrategy(Method.GET, `/brid/iid_${chainId}`, config);
 	        const blockchainRid = isString(rspBody);
@@ -38908,7 +38920,7 @@
 	        if (!sourceClusterInfo || !sourceClusterInfo.anchoring_chain) {
 	            throw Error("Cluster info could not be found");
 	        }
-	        const networkSettings = Object.assign(Object.assign({}, client.config), { directoryNodeUrlPool: getUrlsFromEndpoints(client.config.endpointPool), blockchainRid: toString(sourceClusterInfo.anchoring_chain), merkleHashVersion: 0 });
+	        const networkSettings = Object.assign(Object.assign({}, client.config), { directoryNodeUrlPool: getUrlsFromEndpoints(client.config.endpointPool), blockchainRid: toString(sourceClusterInfo.anchoring_chain) });
 	        const clientConfiguredToAnchoringchain = yield createClient(networkSettings);
 	        return clientConfiguredToAnchoringchain;
 	    });
@@ -39266,6 +39278,48 @@
 	                    }
 	                });
 	            },
+	            sendTransactionWithRetries(transaction, callback, confirmationLevel = exports.ChainConfirmationLevel.Dapp) {
+	                const client = this;
+	                function sendOnce() {
+	                    return client.sendTransaction(transaction, true, callback, confirmationLevel);
+	                }
+	                const promiEvent = new Web3PromiEvent((resolve, reject) => __awaiter$1(this, void 0, void 0, function* () {
+	                    let error = null;
+	                    // await sleep(1000);
+	                    for (let i = 0; i < config.retryTransactionPolling.count; i++) {
+	                        info(`sendTransactionWithRetries attempt ${i + 1} of ${config.retryTransactionPolling.count}`);
+	                        const tmpPromiEvent = sendOnce()
+	                            .on(exports.TransactionEvent.ClusterAnchoringConfirmation, receipt => {
+	                            promiEvent.emit(exports.TransactionEvent.ClusterAnchoringConfirmation, receipt);
+	                        })
+	                            .on(exports.TransactionEvent.SystemAnchoringConfirmation, receipt => {
+	                            promiEvent.emit(exports.TransactionEvent.SystemAnchoringConfirmation, receipt);
+	                        })
+	                            .on(exports.TransactionEvent.DappReceived, receipt => {
+	                            promiEvent.emit(exports.TransactionEvent.DappReceived, receipt);
+	                        })
+	                            .on(exports.TransactionEvent.Signed, receipt => {
+	                            promiEvent.emit(exports.TransactionEvent.Signed, receipt);
+	                        })
+	                            .on(exports.TransactionEvent.DappConfirmed, receipt => {
+	                            promiEvent.emit(exports.TransactionEvent.DappConfirmed, receipt);
+	                        })
+	                            .catch(tmpError => {
+	                            warning(`sendTransactionWithRetries error on attempt ${i + 1} of ${config.retryTransactionPolling.count}: ${tmpError}`);
+	                            promiEvent.emit(exports.TransactionEvent.Rejected, tmpError);
+	                            error = tmpError;
+	                        });
+	                        const tmpReceipt = yield tmpPromiEvent;
+	                        if (tmpReceipt) {
+	                            resolve(tmpReceipt);
+	                            return;
+	                        }
+	                        yield sleep(config.retryTransactionPolling.interval);
+	                    }
+	                    reject(error);
+	                }));
+	                return promiEvent;
+	            },
 	            sendTransaction(transaction, doStatusPolling = true, callback, confirmationLevel = exports.ChainConfirmationLevel.Dapp) {
 	                const promiEvent = new Web3PromiEvent((resolve, reject) => __awaiter$1(this, void 0, void 0, function* () {
 	                    var _a, _b;
@@ -39300,14 +39354,15 @@
 	                            clusterAnchoringStatusPolling: client.config.clusterAnchoringStatusPolling,
 	                            systemAnchoringStatusPolling: client.config.systemAnchoringStatusPolling,
 	                        };
-	                        let transactionReceipt = yield handleDappConfirmations(transactionRid, doStatusPolling, confirmationLevel, promiEvent, statusPollingConfig.dappStatusPolling, () => client.getTransactionStatus(transactionRid, callback), client);
+	                        const stickyNodeClient = yield createStickyNodeClient(client); //to avoid false rejections by oblivious nodes
+	                        let transactionReceipt = yield handleDappConfirmations(transactionRid, doStatusPolling, confirmationLevel, promiEvent, statusPollingConfig.dappStatusPolling, () => stickyNodeClient.getTransactionStatus(transactionRid, callback), stickyNodeClient);
 	                        if (confirmationLevel === exports.ChainConfirmationLevel.None ||
 	                            confirmationLevel === exports.ChainConfirmationLevel.Dapp) {
 	                            resolve(transactionReceipt);
 	                            return;
 	                        }
 	                        const { anchoringClient, systemAnchoringChainBridString } = yield getAnchoringClientAndSystemChainRid(client);
-	                        transactionReceipt = yield handleSystemConfirmations(transactionReceipt, confirmationLevel, promiEvent, statusPollingConfig, anchoringClient, systemAnchoringChainBridString, () => client.getClusterAnchoringTransactionConfirmation(transactionRid, anchoringClient, callback), anchoredTxRid => client.getSystemAnchoringTransactionConfirmation(anchoredTxRid, anchoringClient, systemAnchoringChainBridString, callback));
+	                        transactionReceipt = yield handleSystemConfirmations(transactionReceipt, confirmationLevel, promiEvent, statusPollingConfig, anchoringClient, systemAnchoringChainBridString, () => stickyNodeClient.getClusterAnchoringTransactionConfirmation(transactionRid, anchoringClient, callback), anchoredTxRid => stickyNodeClient.getSystemAnchoringTransactionConfirmation(anchoredTxRid, anchoringClient, systemAnchoringChainBridString, callback));
 	                        resolve(transactionReceipt);
 	                    }
 	                    catch (error) {
@@ -39727,6 +39782,21 @@
 	                return merkleHashVersion;
 	            });
 	        }
+	        function createStickyNodeClient(client) {
+	            var _a;
+	            return __awaiter$1(this, void 0, void 0, function* () {
+	                if (!client.config.nodeManager.lastUsedNode) {
+	                    throw new Error("No last used node found; cannot create sticky node client");
+	                }
+	                const stickyNodeClient = yield createClient({
+	                    nodeUrlPool: (_a = client.config.nodeManager.lastUsedNode) === null || _a === void 0 ? void 0 : _a.url,
+	                    blockchainRid: client.config.blockchainRid,
+	                    merkleHashVersion: client.config.merkleHashVersion,
+	                    useStickyNode: true,
+	                });
+	                return stickyNodeClient;
+	            });
+	        }
 	    });
 	}
 
@@ -39752,6 +39822,7 @@
 	                dappStatusPolling: setStatusPolling({ interval: 5000, count: 5 }),
 	                clusterAnchoringStatusPolling: setStatusPolling(),
 	                systemAnchoringStatusPolling: setStatusPolling(),
+	                retryTransactionPolling: setRetryTransactionPolling(),
 	                failoverStrategy: exports.FailoverStrategy.AbortOnError,
 	                attemptsPerEndpoint: 3,
 	                attemptInterval: 5000,
@@ -39771,6 +39842,9 @@
 	            sendTransaction() {
 	                return new Web3PromiEvent((_resolve, reject) => reject("sendTransaction rejected"));
 	            },
+	            sendTransactionWithRetries() {
+	                return new Web3PromiEvent((_resolve, reject) => reject("sendTransactionWithRetries rejected"));
+	            },
 	            signAndSendUniqueTransaction() {
 	                return new Web3PromiEvent((_resolve, reject) => reject("signAndSendUniqueTransaction rejected"));
 	            },