@solana/web3.js 1.2.8 → 1.3.1

package/lib/index.d.ts

@@ -730,6 +730,21 @@ declare module '@solana/web3.js' {
     /** The unix timestamp of when the block was processed */
     blockTime: number | null;
   };
+  /**
+   * A ConfirmedBlock on the ledger with signatures only
+   */
+  export type ConfirmedBlockSignatures = {
+    /** Blockhash of this block */
+    blockhash: Blockhash;
+    /** Blockhash of this block's parent */
+    previousBlockhash: Blockhash;
+    /** Slot index of this block's parent */
+    parentSlot: number;
+    /** Vector of signatures */
+    signatures: Array<string>;
+    /** The unix timestamp of when the block was processed */
+    blockTime: number | null;
+  };
   /**
    * A performance sample
    */
@@ -1174,6 +1189,7 @@ declare module '@solana/web3.js' {
     getTransactionCount(commitment?: Commitment): Promise<number>;
     /**
      * Fetch the current total currency supply of the cluster in lamports
+     * @deprecated Deprecated since v1.2.8. Use `Connection.getSupply()` instead.
      */
     getTotalSupply(commitment?: Commitment): Promise<number>;
     /**
@@ -1244,6 +1260,12 @@ declare module '@solana/web3.js' {
      * for a confirmed block
      */
     getConfirmedBlock(slot: number): Promise<ConfirmedBlock>;
+    /**
+     * Fetch a list of Signatures from the cluster for a confirmed block, excluding rewards
+     */
+    getConfirmedBlockSignatures(
+      slot: number,
+    ): Promise<ConfirmedBlockSignatures>;
     /**
      * Fetch a transaction details for a confirmed transaction
      */
@@ -1265,6 +1287,7 @@ declare module '@solana/web3.js' {
     /**
      * Fetch a list of all the confirmed signatures for transactions involving an address
      * within a specified slot range. Max range allowed is 10,000 slots.
+     * @deprecated Deprecated since v1.3. Use `Connection.getConfirmedSignaturesForAddress2()` instead.
      *
      * @param address queried address
      * @param startSlot start slot, inclusive

package/lib/index.esm.js

@@ -2704,11 +2704,6 @@ const StakeActivationResult = type({
   active: number(),
   inactive: number()
 });
-/**
- * Expected JSON RPC response for the "getConfirmedSignaturesForAddress" message
- */
-
-const GetConfirmedSignaturesForAddressRpcResult = jsonRpcResult(array(string()));
 /**
  * Expected JSON RPC response for the "getConfirmedSignaturesForAddress2" message
  */
@@ -2953,6 +2948,17 @@ const GetConfirmedBlockRpcResult = jsonRpcResult(nullable(type({
   }))),
   blockTime: nullable(number())
 })));
+/**
+ * Expected JSON RPC response for the "getConfirmedBlockSignatures" message
+ */
+
+const GetConfirmedBlockSignaturesRpcResult = jsonRpcResult(nullable(type({
+  blockhash: string(),
+  previousBlockhash: string(),
+  parentSlot: number(),
+  signatures: array(string()),
+  blockTime: nullable(number())
+})));
 /**
  * Expected JSON RPC response for the "getConfirmedTransaction" message
  */
@@ -3715,20 +3721,21 @@ class Connection {
   }
   /**
    * Fetch the current total currency supply of the cluster in lamports
+   * @deprecated Deprecated since v1.2.8. Use `Connection.getSupply()` instead.
    */
 
 
   async getTotalSupply(commitment) {
     const args = this._buildArgs([], commitment);
 
-    const unsafeRes = await this._rpcRequest('getTotalSupply', args);
-    const res = create(unsafeRes, jsonRpcResult(number()));
+    const unsafeRes = await this._rpcRequest('getSupply', args);
+    const res = create(unsafeRes, GetSupplyRpcResult);
 
     if ('error' in res) {
       throw new Error('failed to get total supply: ' + res.error.message);
     }
 
-    return res.result;
+    return res.result.value.total;
   }
   /**
    * Fetch the cluster InflationGovernor parameters
@@ -3925,6 +3932,30 @@ class Connection {
 
     return result;
   }
+  /**
+   * Fetch a list of Signatures from the cluster for a confirmed block, excluding rewards
+   */
+
+
+  async getConfirmedBlockSignatures(slot) {
+    const unsafeRes = await this._rpcRequest('getConfirmedBlock', [slot, {
+      transactionDetails: 'signatures',
+      rewards: false
+    }]);
+    const res = create(unsafeRes, GetConfirmedBlockSignaturesRpcResult);
+
+    if ('error' in res) {
+      throw new Error('failed to get confirmed block: ' + res.error.message);
+    }
+
+    const result = res.result;
+
+    if (!result) {
+      throw new Error('Confirmed block ' + slot + ' not found');
+    }
+
+    return result;
+  }
   /**
    * Fetch a transaction details for a confirmed transaction
    */
@@ -3982,6 +4013,7 @@ class Connection {
   /**
    * Fetch a list of all the confirmed signatures for transactions involving an address
    * within a specified slot range. Max range allowed is 10,000 slots.
+   * @deprecated Deprecated since v1.3. Use `Connection.getConfirmedSignaturesForAddress2()` instead.
    *
    * @param address queried address
    * @param startSlot start slot, inclusive
@@ -3990,14 +4022,57 @@ class Connection {
 
 
   async getConfirmedSignaturesForAddress(address, startSlot, endSlot) {
-    const unsafeRes = await this._rpcRequest('getConfirmedSignaturesForAddress', [address.toBase58(), startSlot, endSlot]);
-    const res = create(unsafeRes, GetConfirmedSignaturesForAddressRpcResult);
+    let options = {};
+    let firstAvailableBlock = await this.getFirstAvailableBlock();
 
-    if ('error' in res) {
-      throw new Error('failed to get confirmed signatures for address: ' + res.error.message);
+    while (!('until' in options)) {
+      startSlot--;
+
+      if (startSlot <= 0 || startSlot < firstAvailableBlock) {
+        break;
+      }
+
+      try {
+        const block = await this.getConfirmedBlockSignatures(startSlot);
+
+        if (block.signatures.length > 0) {
+          options.until = block.signatures[block.signatures.length - 1].toString();
+        }
+      } catch (err) {
+        if (err.message.includes('skipped')) {
+          continue;
+        } else {
+          throw err;
+        }
+      }
     }
 
-    return res.result;
+    let highestConfirmedRoot = await this.getSlot('finalized');
+
+    while (!('before' in options)) {
+      endSlot++;
+
+      if (endSlot > highestConfirmedRoot) {
+        break;
+      }
+
+      try {
+        const block = await this.getConfirmedBlockSignatures(endSlot);
+
+        if (block.signatures.length > 0) {
+          options.before = block.signatures[block.signatures.length - 1].toString();
+        }
+      } catch (err) {
+        if (err.message.includes('skipped')) {
+          continue;
+        } else {
+          throw err;
+        }
+      }
+    }
+
+    const confirmedSignatureInfo = await this.getConfirmedSignaturesForAddress2(address, options);
+    return confirmedSignatureInfo.map(info => info.signature);
   }
   /**
    * Returns confirmed signatures for transactions involving an