quais 1.0.0-alpha.21 → 1.0.0-alpha.22

package/dist/quais.js

@@ -20867,7 +20867,12 @@ function addressFromTransactionRequest(tx) {
         return tx.from;
     }
     if ('txInputs' in tx && !!tx.txInputs) {
-        return computeAddress(tx.txInputs[0].pubkey);
+        const inputs = tx.txInputs;
+        return computeAddress(inputs[0].pubkey);
+    }
+    if ('txIn' in tx && !!tx.txIn) {
+        const inputs = tx.txIn;
+        return computeAddress(inputs[0].pubkey);
     }
     if ('to' in tx && !!tx.to) {
         return tx.to;
@@ -21623,9 +21628,7 @@ class TransactionReceipt {
      * @ignore
      */
     constructor(tx, provider) {
-        this.#logs = Object.freeze(tx.logs.map((log) => {
-            return new Log(log, provider);
-        }));
+        this.#logs = Object.freeze(Array.isArray(tx.logs) ? tx.logs.map((log) => new Log(log, provider)) : []);
         let gasPrice = BN_0$1;
         if (tx.effectiveGasPrice != null) {
             gasPrice = tx.effectiveGasPrice;
@@ -27662,7 +27665,7 @@ class PaymentCodePublic {
      * @protected
      */
     getAddressFromPubkey(pubKey) {
-        return getAddress(keccak256('0x' + hexlify(pubKey).substring(4)).substring(26));
+        return computeAddress(hexlify(pubKey));
     }
     /**
      * Retrieves a payment address based on the provided parameters.
@@ -27673,8 +27676,8 @@ class PaymentCodePublic {
      * @throws {Error} - If unable to derive public key or if an unknown address type is specified.
      */
     getPaymentAddress(paymentCode, idx) {
-        const pubkey = hexlify(this.derivePaymentPublicKey(paymentCode, idx));
-        return getAddress(keccak256('0x' + pubkey.substring(4)).substring(26));
+        const pubkey = this.derivePaymentPublicKey(paymentCode, idx);
+        return this.getAddressFromPubkey(pubkey);
     }
 }
 class PaymentCodePrivate extends PaymentCodePublic {
@@ -28440,14 +28443,14 @@ class QiHDWallet extends AbstractHDWallet {
         this._addressUseChecker = checker;
     }
     /**
-     * Finds the last used index in an array of QiAddressInfo objects.
+     * Finds the last used index in an array of QiAddressInfo objects. If no index is found, returns -1.
      *
      * @param {QiAddressInfo[]} addresses - The array of QiAddressInfo objects.
      * @returns {number} The last used index.
      */
     _findLastUsedIndex(addresses, account, zone) {
         const filteredAddresses = addresses?.filter((addressInfo) => addressInfo.account === account && addressInfo.zone === zone);
-        return filteredAddresses?.reduce((maxIndex, addressInfo) => Math.max(maxIndex, addressInfo.index), -1) || 0;
+        return filteredAddresses?.reduce((maxIndex, addressInfo) => Math.max(maxIndex, addressInfo.index), -1) || -1;
     }
     /**
      * Derives the next Qi BIP 44 address for the specified account and zone.
@@ -28685,66 +28688,93 @@ class QiHDWallet extends AbstractHDWallet {
         let selection = fewestCoinSelector.performSelection(spendTarget);
         // 3. Generate as many unused addresses as required to populate the spend outputs
         const sendAddresses = await getDestinationAddresses(selection.spendOutputs.length);
-        const getChangeAddresses = async (count) => {
-            const changeAddresses = this._addressesMap.get('BIP44:change') || [];
-            const addresses = [];
-            for (let i = 0; i < changeAddresses.length; i++) {
-                if (changeAddresses[i].status === AddressStatus.UNUSED) {
-                    addresses.push(changeAddresses[i]);
-                }
-                if (addresses.length === count)
+        const getChangeAddressesForOutputs = async (count) => {
+            const currentChangeAddresses = this._addressesMap.get('BIP44:change') || [];
+            const outpusChangeAddresses = [];
+            for (let i = 0; i < currentChangeAddresses.length; i++) {
+                if (currentChangeAddresses[i].status === AddressStatus.UNUSED) {
+                    outpusChangeAddresses.push(currentChangeAddresses[i]);
+                }
+                if (outpusChangeAddresses.length === count)
                     break;
             }
             // Generate the remaining number of change addresses if needed
-            const remainingAddressesNeeded = count - addresses.length;
+            const remainingAddressesNeeded = count - outpusChangeAddresses.length;
             if (remainingAddressesNeeded > 0) {
-                addresses.push(...Array(remainingAddressesNeeded)
+                outpusChangeAddresses.push(...Array(remainingAddressesNeeded)
                     .fill(0)
                     .map(() => this.getNextChangeAddressSync(0, originZone)));
             }
             // Combine the existing change addresses with the newly generated addresses and ensure they are unique and sorted by index
             const mergedChangeAddresses = [
-                ...addresses.map((address) => ({ ...address, status: AddressStatus.ATTEMPTED_USE })),
-                ...changeAddresses,
+                ...outpusChangeAddresses.map((address) => ({ ...address, status: AddressStatus.ATTEMPTED_USE })),
+                ...currentChangeAddresses,
             ];
             const sortedAndFilteredChangeAddresses = mergedChangeAddresses
                 .filter((address, index, self) => self.findIndex((t) => t.address === address.address) === index)
                 .sort((a, b) => a.index - b.index);
             // Update the _addressesMap with the modified change addresses and statuses
             this._addressesMap.set('BIP44:change', sortedAndFilteredChangeAddresses);
-            return addresses.map((address) => address.address);
+            return outpusChangeAddresses.map((address) => address.address);
         };
         // 4. Get change addresses
-        const changeAddresses = await getChangeAddresses(selection.changeOutputs.length);
+        const changeAddresses = await getChangeAddressesForOutputs(selection.changeOutputs.length);
         // 5. Create the transaction and sign it using the signTransaction method
         let inputPubKeys = selection.inputs.map((input) => this.locateAddressInfo(input.address)?.pubKey);
         if (inputPubKeys.some((pubkey) => !pubkey)) {
             throw new Error('Missing public key for input address');
         }
+        let attempts = 0;
+        let finalFee = 0n;
+        let satisfiedFeeEstimation = false;
+        const MAX_FEE_ESTIMATION_ATTEMPTS = 5;
+        while (attempts < MAX_FEE_ESTIMATION_ATTEMPTS) {
+            const feeEstimationTx = this.prepareFeeEstimationTransaction(selection, inputPubKeys.map((pubkey) => pubkey), sendAddresses, changeAddresses);
+            finalFee = await this.provider.estimateFeeForQi(feeEstimationTx);
+            // Get new selection with updated fee
+            selection = fewestCoinSelector.performSelection(spendTarget, finalFee);
+            // Determine if new addresses are needed for the change outputs
+            const changeAddressesNeeded = selection.changeOutputs.length - changeAddresses.length;
+            if (changeAddressesNeeded > 0) {
+                // Need more change addresses
+                const newChangeAddresses = await getChangeAddressesForOutputs(changeAddressesNeeded);
+                changeAddresses.push(...newChangeAddresses);
+            }
+            else if (changeAddressesNeeded < 0) {
+                // Have extra change addresses, remove the addresses starting from the end
+                // TODO: Set the status of the addresses to UNUSED in _addressesMap. This fine for now as it will be fixed during next sync
+                changeAddresses.splice(changeAddressesNeeded);
+            }
+            // Determine if new addresses are needed for the spend outputs
+            const spendAddressesNeeded = selection.spendOutputs.length - sendAddresses.length;
+            if (spendAddressesNeeded > 0) {
+                // Need more send addresses
+                const newSendAddresses = await getDestinationAddresses(spendAddressesNeeded);
+                sendAddresses.push(...newSendAddresses);
+            }
+            else if (spendAddressesNeeded < 0) {
+                // Have extra send addresses, remove the excess
+                // TODO: Set the status of the addresses to UNUSED in _addressesMap. This fine for now as it will be fixed during next sync
+                sendAddresses.splice(spendAddressesNeeded);
+            }
+            inputPubKeys = selection.inputs.map((input) => this.locateAddressInfo(input.address)?.pubKey);
+            // Calculate total new outputs needed (absolute value)
+            const totalNewOutputsNeeded = Math.abs(changeAddressesNeeded) + Math.abs(spendAddressesNeeded);
+            // If we need 5 or fewer new outputs, we can break the loop
+            if ((changeAddressesNeeded <= 0 && spendAddressesNeeded <= 0) || totalNewOutputsNeeded <= 5) {
+                finalFee *= 3n; // Increase the fee 3x to ensure it's accepted
+                satisfiedFeeEstimation = true;
+                break;
+            }
+            attempts++;
+        }
+        // If we didn't satisfy the fee estimation, increase the fee 10x to ensure it's accepted
+        if (!satisfiedFeeEstimation) {
+            finalFee *= 10n;
+        }
+        // Proceed with creating and signing the transaction
         const chainId = (await this.provider.getNetwork()).chainId;
-        let tx = await this.prepareTransaction(selection, inputPubKeys.map((pubkey) => pubkey), sendAddresses, changeAddresses, Number(chainId));
-        const gasLimit = await this.provider.estimateGas(tx);
-        const gasPrice = denominations[1]; // 0.005 Qi
-        const minerTip = (gasLimit * gasPrice) / 100n; // 1% extra as tip
-        // const feeData = await this.provider.getFeeData(originZone, true);
-        // const conversionRate = await this.provider.getLatestQuaiRate(originZone, feeData.gasPrice!);
-        // 5.6 Calculate total fee for the transaction using the gasLimit, gasPrice, and minerTip
-        const totalFee = gasLimit * gasPrice + minerTip;
-        // Get new selection with fee
-        selection = fewestCoinSelector.performSelection(spendTarget, totalFee);
-        // Determine if new addresses are needed for the change and spend outputs
-        const changeAddressesNeeded = selection.changeOutputs.length - changeAddresses.length;
-        if (changeAddressesNeeded > 0) {
-            const newChangeAddresses = await getChangeAddresses(changeAddressesNeeded);
-            changeAddresses.push(...newChangeAddresses);
-        }
-        const spendAddressesNeeded = selection.spendOutputs.length - sendAddresses.length;
-        if (spendAddressesNeeded > 0) {
-            const newSendAddresses = await getDestinationAddresses(spendAddressesNeeded);
-            sendAddresses.push(...newSendAddresses);
-        }
-        inputPubKeys = selection.inputs.map((input) => this.locateAddressInfo(input.address)?.pubKey);
-        tx = await this.prepareTransaction(selection, inputPubKeys.map((pubkey) => pubkey), sendAddresses, changeAddresses, Number(chainId));
+        const tx = await this.prepareTransaction(selection, inputPubKeys.map((pubkey) => pubkey), sendAddresses, changeAddresses, Number(chainId));
         // Move used outpoints to pendingOutpoints
         this.moveOutpointsToPending(tx.txInputs);
         // Sign the transaction
@@ -28832,6 +28862,31 @@ class QiHDWallet extends AbstractHDWallet {
         tx.chainId = chainId;
         return tx;
     }
+    prepareFeeEstimationTransaction(selection, inputPubKeys, sendAddresses, changeAddresses) {
+        const txIn = selection.inputs.map((input, index) => ({
+            previousOutpoint: { txHash: input.txhash, index: toQuantity(input.index) },
+            pubkey: inputPubKeys[index],
+        }));
+        // 5.3 Create the "sender" outputs
+        const senderOutputs = selection.spendOutputs.map((output, index) => ({
+            address: sendAddresses[index],
+            denomination: output.denomination,
+        }));
+        // 5.4 Create the "change" outputs
+        const changeOutputs = selection.changeOutputs.map((output, index) => ({
+            address: changeAddresses[index],
+            denomination: output.denomination,
+        }));
+        const txOut = [...senderOutputs, ...changeOutputs].map((output) => ({
+            address: output.address,
+            denomination: toQuantity(output.denomination),
+        }));
+        return {
+            txType: 2,
+            txIn,
+            txOut,
+        };
+    }
     /**
      * Checks the status of pending outpoints and updates the wallet's UTXO set accordingly.
      *
@@ -28970,7 +29025,7 @@ class QiHDWallet extends AbstractHDWallet {
             // (BIP47 addresses)
             const pcAddressInfo = addressInfo;
             const account = pcAddressInfo.account;
-            const index = pcAddressInfo.index - 1;
+            const index = pcAddressInfo.index;
             const counterpartyPaymentCode = pcAddressInfo.derivationPath;
             if (!counterpartyPaymentCode) {
                 throw new Error('Counterparty payment code not found for payment channel address');
@@ -29380,11 +29435,11 @@ class QiHDWallet extends AbstractHDWallet {
         const receiverPCodePublic = new PaymentCodePublic(ecc, bip32, buf.slice(1));
         const paymentCodeInfoArray = this._paymentCodeSendAddressMap.get(receiverPaymentCode);
         const lastIndex = this._findLastUsedIndex(paymentCodeInfoArray, account, zone);
-        let addrIndex = lastIndex;
+        let addrIndex = lastIndex + 1;
         for (let attempts = 0; attempts < MAX_ADDRESS_DERIVATION_ATTEMPTS; attempts++) {
-            const address = receiverPCodePublic.getPaymentAddress(walletPCodePrivate, addrIndex++);
+            const address = receiverPCodePublic.getPaymentAddress(walletPCodePrivate, addrIndex);
             if (this.isValidAddressForZone(address, zone)) {
-                const pubkey = receiverPCodePublic.derivePaymentPublicKey(walletPCodePrivate, addrIndex - 1);
+                const pubkey = receiverPCodePublic.derivePaymentPublicKey(walletPCodePrivate, addrIndex);
                 const pcInfo = {
                     address,
                     pubKey: hexlify(pubkey),
@@ -29403,6 +29458,7 @@ class QiHDWallet extends AbstractHDWallet {
                 }
                 return pcInfo;
             }
+            addrIndex++;
         }
         throw new Error(`Failed to derive a valid address for the zone ${zone} after ${MAX_ADDRESS_DERIVATION_ATTEMPTS} attempts.`);
     }
@@ -29424,11 +29480,11 @@ class QiHDWallet extends AbstractHDWallet {
         const walletPCodePrivate = this._getPaymentCodePrivate(account);
         const paymentCodeInfoArray = this._addressesMap.get(senderPaymentCode);
         const lastIndex = this._findLastUsedIndex(paymentCodeInfoArray, account, zone);
-        let addrIndex = lastIndex;
+        let addrIndex = lastIndex + 1;
         for (let attempts = 0; attempts < MAX_ADDRESS_DERIVATION_ATTEMPTS; attempts++) {
-            const address = walletPCodePrivate.getPaymentAddress(senderPCodePublic, addrIndex++);
+            const address = walletPCodePrivate.getPaymentAddress(senderPCodePublic, addrIndex);
             if (this.isValidAddressForZone(address, zone)) {
-                const pubkey = walletPCodePrivate.derivePaymentPublicKey(senderPCodePublic, addrIndex - 1);
+                const pubkey = walletPCodePrivate.derivePaymentPublicKey(senderPCodePublic, addrIndex);
                 const pcInfo = {
                     address,
                     pubKey: hexlify(pubkey),
@@ -29447,6 +29503,7 @@ class QiHDWallet extends AbstractHDWallet {
                 }
                 return pcInfo;
             }
+            addrIndex++;
         }
         throw new Error(`Failed to derive a valid address for the zone ${zone} after ${MAX_ADDRESS_DERIVATION_ATTEMPTS} attempts.`);
     }
@@ -30171,7 +30228,7 @@ async function getSubscription(_event, zone) {
     }
     if (isHexString(_event, 32)) {
         const eventBytes = getBytes(_event);
-        const ninthBit = (eventBytes[1] & 0x01) === 0x01;
+        const ninthBit = (eventBytes[1] & 0x80) === 0x80;
         const hash = _event.toLowerCase();
         zone = toZone(hash.slice(0, 4));
         if (ninthBit) {
@@ -30997,6 +31054,14 @@ class AbstractProvider {
             zone: zone,
         }), '%response') * BigInt(2));
     }
+    async estimateFeeForQi(_tx) {
+        const zone = await this.zoneFromAddress(addressFromTransactionRequest(_tx));
+        return getBigInt(await this.#perform({
+            method: 'estimateFeeForQi',
+            transaction: _tx,
+            zone: zone,
+        }), '%response');
+    }
     async createAccessList(_tx) {
         let tx = this._getTransactionRequest(_tx);
         if (isPromise(tx)) {
@@ -31032,10 +31097,6 @@ class AbstractProvider {
             tx: this._getTransactionRequest(_tx),
             blockTag: this._getBlockTag(shard, _tx.blockTag),
         });
-        tx.accessList = (await this.createAccessList(tx)).map((it) => {
-            it.address = formatMixedCaseChecksumAddress(it.address);
-            return it;
-        });
         return await this.#checkNetwork(this.#call(tx, blockTag, -1, zone), shard);
     }
     // Account
@@ -31404,6 +31465,15 @@ class AbstractProvider {
         }
         return sub;
     }
+    async startZoneSubscriptions(zone) {
+        for (const sub of Array.from(this.#subs.values())) {
+            if (sub.zone === zone) {
+                if (sub.started) {
+                    await sub.subscriber.start();
+                }
+            }
+        }
+    }
     async on(event, listener, zone) {
         const sub = await this.#getSub(event, zone);
         sub.listeners.push({ listener, once: false });
@@ -32724,6 +32794,12 @@ class JsonRpcApiProvider extends AbstractProvider {
                     args: [this.getRpcTransaction(req.transaction)],
                 };
             }
+            case 'estimateFeeForQi': {
+                return {
+                    method: 'quai_estimateFeeForQi',
+                    args: [req.transaction],
+                };
+            }
             case 'createAccessList': {
                 return {
                     method: 'quai_createAccessList',
@@ -33927,7 +34003,7 @@ class WebSocketProvider extends SocketProvider {
      * @param {WebSocketLike} websocket - The WebSocket object.
      * @param {Shard} shard - The shard identifier.
      */
-    initWebSocket(websocket, shard) {
+    initWebSocket(websocket, shard, port) {
         websocket.onerror = (error) => {
             console.log('WebsocketProvider error', error);
             websocket.close();
@@ -33937,6 +34013,13 @@ class WebSocketProvider extends SocketProvider {
                 await this._start();
                 this.resume();
                 this.readyMap.set(shard, true);
+                try {
+                    const zone = toZone(shard);
+                    this.provider.startZoneSubscriptions(zone);
+                }
+                catch (error) {
+                    // Intentionally left empty. Will catch if shard is prime or region, which isn't a zone
+                }
             }
             catch (error) {
                 console.log('failed to start WebsocketProvider', error);
@@ -33944,18 +34027,16 @@ class WebSocketProvider extends SocketProvider {
                 // @TODO: now what? Attempt reconnect?
             }
         };
-        // @TODO: implement onclose
-        //        websocket.onclose = () => {
-        //            console.log('WebSocket closed. Attempting to reconnect...');
-        //            setTimeout(() => {
-        //                const baseUrl = websocket.url.split(':').slice(0, 2).join(':');
-        //                const shardSuffix = this._getOption('usePathing') ? `/${fromShard(shard, 'nickname')}` : `:${port}`;
-        //                const newWebSocket = this.createWebSocket(baseUrl, shardSuffix);
-        //                this.initWebSocket(newWebSocket, shard, port);
-        //                this.#websockets.push(newWebSocket);
-        //                this._urlMap.set(shard, newWebSocket);
-        //            }, 500); // Reconnect after 5 seconds
-        //        };
+        websocket.onclose = () => {
+            setTimeout(() => {
+                const baseUrl = websocket.url.split(':').slice(0, 2).join(':').split('/').slice(0, 3).join('/');
+                const shardSuffix = this._getOption('usePathing') ? `/${fromShard(shard, 'nickname')}` : `:${port}`;
+                const newWebSocket = this.createWebSocket(baseUrl, shardSuffix);
+                this.initWebSocket(newWebSocket, shard, port);
+                this.#websockets.push(newWebSocket);
+                this._urlMap.set(shard, newWebSocket);
+            }, 500); // Reconnect after .5 seconds
+        };
         websocket.onmessage = (message) => {
             this._processMessage(message.data);
         };
@@ -34005,7 +34086,7 @@ class WebSocketProvider extends SocketProvider {
                         : `:${port}`;
                     const shardUrl = baseUrl.split(':').slice(0, 2).join(':');
                     const websocket = this.createWebSocket(shardUrl, shardSuffix);
-                    this.initWebSocket(websocket, shardEnum);
+                    this.initWebSocket(websocket, shardEnum, port);
                     this.#websockets.push(websocket);
                     this._urlMap.set(shardEnum, websocket);
                     try {
@@ -34021,7 +34102,7 @@ class WebSocketProvider extends SocketProvider {
                 for (const url of urls) {
                     const baseUrl = `${url.split(':')[0]}:${url.split(':')[1]}`;
                     const primeWebsocket = this.createWebSocket(baseUrl, primeSuffix);
-                    this.initWebSocket(primeWebsocket, Shard.Prime);
+                    this.initWebSocket(primeWebsocket, Shard.Prime, 8001);
                     this.#websockets.push(primeWebsocket);
                     this._urlMap.set(Shard.Prime, primeWebsocket);
                     await this.waitShardReady(Shard.Prime);
@@ -34030,7 +34111,7 @@ class WebSocketProvider extends SocketProvider {
             }
             else if (typeof urls === 'function') {
                 const primeWebsocket = urls();
-                this.initWebSocket(primeWebsocket, Shard.Prime);
+                this.initWebSocket(primeWebsocket, Shard.Prime, 8001);
                 this.#websockets.push(primeWebsocket);
                 this._urlMap.set(Shard.Prime, primeWebsocket);
                 await this.waitShardReady(Shard.Prime);
@@ -34039,7 +34120,7 @@ class WebSocketProvider extends SocketProvider {
             }
             else {
                 const primeWebsocket = urls;
-                this.initWebSocket(primeWebsocket, Shard.Prime);
+                this.initWebSocket(primeWebsocket, Shard.Prime, 8001);
                 this.#websockets.push(primeWebsocket);
                 this._urlMap.set(Shard.Prime, primeWebsocket);
                 await this.waitShardReady(Shard.Prime);