@solana/web3.js 1.24.2 → 1.28.0

package/lib/index.cjs.js

@@ -10,7 +10,7 @@ var bs58 = require('bs58');
 var cryptoHash = require('crypto-hash');
 var borsh = require('borsh');
 var BufferLayout = require('@solana/buffer-layout');
-var fetch = require('node-fetch');
+var fetch = require('cross-fetch');
 var superstruct = require('superstruct');
 var rpcWebsockets = require('rpc-websockets');
 var RpcClient = require('jayson/lib/client/browser');
@@ -106,6 +106,9 @@ const SOLANA_SCHEMA = new Map();
  */
 
 const MAX_SEED_LENGTH = 32;
+/**
+ * Value to be converted into public key
+ */
 
 function isPublicKeyData(value) {
   return value._bn !== undefined;
@@ -495,16 +498,35 @@ class Message {
 
     _defineProperty__default['default'](this, "instructions", void 0);
 
+    _defineProperty__default['default'](this, "indexToProgramIds", new Map());
+
     this.header = args.header;
     this.accountKeys = args.accountKeys.map(account => new PublicKey(account));
     this.recentBlockhash = args.recentBlockhash;
     this.instructions = args.instructions;
+    this.instructions.forEach(ix => this.indexToProgramIds.set(ix.programIdIndex, this.accountKeys[ix.programIdIndex]));
+  }
+
+  isAccountSigner(index) {
+    return index < this.header.numRequiredSignatures;
   }
 
   isAccountWritable(index) {
     return index < this.header.numRequiredSignatures - this.header.numReadonlySignedAccounts || index >= this.header.numRequiredSignatures && index < this.accountKeys.length - this.header.numReadonlyUnsignedAccounts;
   }
 
+  isProgramId(index) {
+    return this.indexToProgramIds.has(index);
+  }
+
+  programIds() {
+    return [...this.indexToProgramIds.values()];
+  }
+
+  nonProgramIds() {
+    return this.accountKeys.filter((_, index) => !this.isProgramId(index));
+  }
+
   serialize() {
     const numKeys = this.accountKeys.length;
     let keyCount = [];
@@ -1219,7 +1241,7 @@ class Transaction {
    */
 
 
-  static populate(message, signatures) {
+  static populate(message, signatures = []) {
     const transaction = new Transaction();
     transaction.recentBlockhash = message.recentBlockhash;
 
@@ -1239,7 +1261,7 @@ class Transaction {
         const pubkey = message.accountKeys[account];
         return {
           pubkey,
-          isSigner: transaction.signatures.some(keyObj => keyObj.publicKey.toString() === pubkey.toString()),
+          isSigner: transaction.signatures.some(keyObj => keyObj.publicKey.toString() === pubkey.toString()) || message.isAccountSigner(account),
           isWritable: message.isAccountWritable(account)
         };
       });
@@ -2671,7 +2693,15 @@ const VersionResult = superstruct.type({
 });
 const SimulatedTransactionResponseStruct = jsonRpcResultAndContext(superstruct.type({
   err: superstruct.nullable(superstruct.union([superstruct.type({}), superstruct.string()])),
-  logs: superstruct.nullable(superstruct.array(superstruct.string()))
+  logs: superstruct.nullable(superstruct.array(superstruct.string())),
+  accounts: superstruct.optional(superstruct.nullable(superstruct.array(superstruct.type({
+    executable: superstruct.boolean(),
+    owner: superstruct.string(),
+    lamports: superstruct.number(),
+    data: superstruct.array(superstruct.string()),
+    rentEpoch: superstruct.optional(superstruct.number())
+  })))),
+  unitsConsumed: superstruct.optional(superstruct.number())
 }));
 
 function createRpcClient(url, useHttps, httpHeaders, fetchMiddleware, disableRetryOnRateLimit) {
@@ -3403,6 +3433,8 @@ class Connection {
 
   /** @internal */
 
+  /** @internal */
+
   /**
    * Establish a JSON RPC connection
    *
@@ -3412,6 +3444,8 @@ class Connection {
   constructor(endpoint, commitmentOrConfig) {
     _defineProperty__default['default'](this, "_commitment", void 0);
 
+    _defineProperty__default['default'](this, "_confirmTransactionInitialTimeout", void 0);
+
     _defineProperty__default['default'](this, "_rpcEndpoint", void 0);
 
     _defineProperty__default['default'](this, "_rpcWsEndpoint", void 0);
@@ -3480,6 +3514,7 @@ class Connection {
       this._commitment = commitmentOrConfig;
     } else if (commitmentOrConfig) {
       this._commitment = commitmentOrConfig.commitment;
+      this._confirmTransactionInitialTimeout = commitmentOrConfig.confirmTransactionInitialTimeout;
       wsEndpoint = commitmentOrConfig.wsEndpoint;
       httpHeaders = commitmentOrConfig.httpHeaders;
       fetchMiddleware = commitmentOrConfig.fetchMiddleware;
@@ -3939,7 +3974,7 @@ class Connection {
         reject(err);
       }
     });
-    let timeoutMs = 60 * 1000;
+    let timeoutMs = this._confirmTransactionInitialTimeout || 60 * 1000;
 
     switch (subscriptionCommitment) {
       case 'processed':
@@ -3948,7 +3983,7 @@ class Connection {
       case 'confirmed':
       case 'singleGossip':
         {
-          timeoutMs = 30 * 1000;
+          timeoutMs = this._confirmTransactionInitialTimeout || 30 * 1000;
           break;
         }
     }
@@ -4320,6 +4355,21 @@ class Connection {
 
     return res.result;
   }
+  /**
+   * Fetch the genesis hash
+   */
+
+
+  async getGenesisHash() {
+    const unsafeRes = await this._rpcRequest('getGenesisHash', []);
+    const res = superstruct.create(unsafeRes, jsonRpcResult(superstruct.string()));
+
+    if ('error' in res) {
+      throw new Error('failed to get genesis hash: ' + res.error.message);
+    }
+
+    return res.result;
+  }
   /**
    * Fetch a processed block from the cluster.
    */
@@ -4720,7 +4770,15 @@ class Connection {
    */
 
 
-  async simulateTransaction(transaction, signers) {
+  async simulateTransaction(transactionOrMessage, signers, includeAccounts) {
+    let transaction;
+
+    if (transactionOrMessage instanceof Transaction) {
+      transaction = transactionOrMessage;
+    } else {
+      transaction = Transaction.populate(transactionOrMessage);
+    }
+
     if (transaction.nonceInfo && signers) {
       transaction.sign(...signers);
     } else {
@@ -4753,7 +4811,9 @@ class Connection {
       }
     }
 
-    const signData = transaction.serializeMessage();
+    const message = transaction._compile();
+
+    const signData = message.serialize();
 
     const wireTransaction = transaction._serialize(signData);
 
@@ -4763,6 +4823,14 @@ class Connection {
       commitment: this.commitment
     };
 
+    if (includeAccounts) {
+      const addresses = (Array.isArray(includeAccounts) ? includeAccounts : message.nonProgramIds()).map(key => key.toBase58());
+      config['accounts'] = {
+        encoding: 'base64',
+        addresses
+      };
+    }
+
     if (signers) {
       config.sigVerify = true;
     }
@@ -5643,6 +5711,96 @@ class Keypair {
 
 }
 
+const PRIVATE_KEY_BYTES$1 = 64;
+const PUBLIC_KEY_BYTES$1 = 32;
+const SIGNATURE_BYTES = 64;
+/**
+ * Params for creating an ed25519 instruction using a public key
+ */
+
+const ED25519_INSTRUCTION_LAYOUT = BufferLayout__namespace.struct([BufferLayout__namespace.u8('numSignatures'), BufferLayout__namespace.u8('padding'), BufferLayout__namespace.u16('signatureOffset'), BufferLayout__namespace.u16('signatureInstructionIndex'), BufferLayout__namespace.u16('publicKeyOffset'), BufferLayout__namespace.u16('publicKeyInstructionIndex'), BufferLayout__namespace.u16('messageDataOffset'), BufferLayout__namespace.u16('messageDataSize'), BufferLayout__namespace.u16('messageInstructionIndex')]);
+class Ed25519Program {
+  /**
+   * @internal
+   */
+  constructor() {}
+  /**
+   * Public key that identifies the ed25519 program
+   */
+
+
+  /**
+   * Create an ed25519 instruction with a public key and signature. The
+   * public key must be a buffer that is 32 bytes long, and the signature
+   * must be a buffer of 64 bytes.
+   */
+  static createInstructionWithPublicKey(params) {
+    const {
+      publicKey,
+      message,
+      signature,
+      instructionIndex
+    } = params;
+    assert(publicKey.length === PUBLIC_KEY_BYTES$1, `Public Key must be ${PUBLIC_KEY_BYTES$1} bytes but received ${publicKey.length} bytes`);
+    assert(signature.length === SIGNATURE_BYTES, `Signature must be ${SIGNATURE_BYTES} bytes but received ${signature.length} bytes`);
+    const publicKeyOffset = ED25519_INSTRUCTION_LAYOUT.span;
+    const signatureOffset = publicKeyOffset + publicKey.length;
+    const messageDataOffset = signatureOffset + signature.length;
+    const numSignatures = 1;
+    const instructionData = buffer.Buffer.alloc(messageDataOffset + message.length);
+    ED25519_INSTRUCTION_LAYOUT.encode({
+      numSignatures,
+      padding: 0,
+      signatureOffset,
+      signatureInstructionIndex: instructionIndex,
+      publicKeyOffset,
+      publicKeyInstructionIndex: instructionIndex,
+      messageDataOffset,
+      messageDataSize: message.length,
+      messageInstructionIndex: instructionIndex
+    }, instructionData);
+    instructionData.fill(publicKey, publicKeyOffset);
+    instructionData.fill(signature, signatureOffset);
+    instructionData.fill(message, messageDataOffset);
+    return new TransactionInstruction({
+      keys: [],
+      programId: Ed25519Program.programId,
+      data: instructionData
+    });
+  }
+  /**
+   * Create an ed25519 instruction with a private key. The private key
+   * must be a buffer that is 64 bytes long.
+   */
+
+
+  static createInstructionWithPrivateKey(params) {
+    const {
+      privateKey,
+      message,
+      instructionIndex
+    } = params;
+    assert(privateKey.length === PRIVATE_KEY_BYTES$1, `Private key must be ${PRIVATE_KEY_BYTES$1} bytes but received ${privateKey.length} bytes`);
+
+    try {
+      const keypair = Keypair.fromSecretKey(privateKey);
+      const publicKey = keypair.publicKey.toBytes();
+      const signature = nacl__default['default'].sign.detached(message, keypair.secretKey);
+      return this.createInstructionWithPublicKey({
+        publicKey,
+        message,
+        signature,
+        instructionIndex
+      });
+    } catch (error) {
+      throw new Error(`Error creating instruction; ${error}`);
+    }
+  }
+
+}
+
+_defineProperty__default['default'](Ed25519Program, "programId", new PublicKey('Ed25519SigVerify111111111111111111111111111'));
+
 /**
  * Address of the stake config account which configures the rate
  * of stake warmup and cooldown as well as the slashing penalty.
@@ -6782,6 +6940,7 @@ exports.BPF_LOADER_DEPRECATED_PROGRAM_ID = BPF_LOADER_DEPRECATED_PROGRAM_ID;
 exports.BPF_LOADER_PROGRAM_ID = BPF_LOADER_PROGRAM_ID;
 exports.BpfLoader = BpfLoader;
 exports.Connection = Connection;
+exports.Ed25519Program = Ed25519Program;
 exports.Enum = Enum;
 exports.EpochSchedule = EpochSchedule;
 exports.FeeCalculatorLayout = FeeCalculatorLayout;