@solana/web3.js 1.11.1 → 1.12.1

package/lib/index.d.ts

@@ -1,18 +1,37 @@
 /// <reference types="node" />
 declare module '@solana/web3.js' {
+  export class Struct {
+    constructor(properties: any);
+    encode(): Buffer;
+    static decode(data: Buffer): any;
+  }
+  export class Enum extends Struct {
+    enum: string;
+    constructor(properties: any);
+  }
+  export const SOLANA_SCHEMA: Map<Function, any>;
+
   /**
    * Maximum length of derived pubkey seed
    */
   export const MAX_SEED_LENGTH = 32;
+  export type PublicKeyInitData =
+    | number
+    | string
+    | Buffer
+    | Uint8Array
+    | Array<number>
+    | PublicKeyData;
+  export type PublicKeyData = {};
   /**
    * A public key
    */
-  export class PublicKey {
+  export class PublicKey extends Struct {
     /**
      * Create a new PublicKey object
      * @param value ed25519 public key as buffer or base-58 encoded string
      */
-    constructor(value: number | string | Buffer | Uint8Array | Array<number>);
+    constructor(value: PublicKeyInitData);
     /**
      * Default public key value. (All zeros)
      */

package/lib/index.esm.js

@@ -5,6 +5,7 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import BN from 'bn.js';
 import bs58 from 'bs58';
 import { sha256 } from 'crypto-hash';
+import { serialize, deserialize } from 'borsh';
 import * as BufferLayout from 'buffer-layout';
 import invariant from 'assert';
 import { parse, format } from 'url';
@@ -27,16 +28,55 @@ const toBuffer = arr => {
   }
 };
 
+class Struct {
+  constructor(properties) {
+    Object.assign(this, properties);
+  }
+
+  encode() {
+    return Buffer.from(serialize(SOLANA_SCHEMA, this));
+  }
+
+  static decode(data) {
+    return deserialize(SOLANA_SCHEMA, this, data);
+  }
+
+} // Class representing a Rust-compatible enum, since enums are only strings or
+// numbers in pure JS
+
+class Enum extends Struct {
+  constructor(properties) {
+    super(properties);
+
+    _defineProperty(this, "enum", '');
+
+    if (Object.keys(properties).length !== 1) {
+      throw new Error('Enum can only take single value');
+    }
+
+    Object.keys(properties).map(key => {
+      this.enum = key;
+    });
+  }
+
+}
+const SOLANA_SCHEMA = new Map();
+
 /**
  * Maximum length of derived pubkey seed
  */
 
 const MAX_SEED_LENGTH = 32;
+
+function isPublicKeyData(value) {
+  return value._bn !== undefined;
+}
 /**
  * A public key
  */
 
-class PublicKey {
+
+class PublicKey extends Struct {
   /** @internal */
 
   /**
@@ -44,21 +84,27 @@ class PublicKey {
    * @param value ed25519 public key as buffer or base-58 encoded string
    */
   constructor(value) {
-    if (typeof value === 'string') {
-      // assume base 58 encoding by default
-      const decoded = bs58.decode(value);
-
-      if (decoded.length != 32) {
-        throw new Error("Invalid public key input");
-      }
+    super({});
 
-      this._bn = new BN(decoded);
+    if (isPublicKeyData(value)) {
+      this._bn = value._bn;
     } else {
-      this._bn = new BN(value);
-    }
+      if (typeof value === 'string') {
+        // assume base 58 encoding by default
+        const decoded = bs58.decode(value);
+
+        if (decoded.length != 32) {
+          throw new Error("Invalid public key input");
+        }
+
+        this._bn = new BN(decoded);
+      } else {
+        this._bn = new BN(value);
+      }
 
-    if (this._bn.byteLength() > 32) {
-      throw new Error("Invalid public key input");
+      if (this._bn.byteLength() > 32) {
+        throw new Error("Invalid public key input");
+      }
     }
   }
   /**
@@ -186,10 +232,15 @@ class PublicKey {
     return is_on_curve(pubkey) == 1;
   }
 
-} // @ts-ignore
+}
 
 _defineProperty(PublicKey, "default", new PublicKey('11111111111111111111111111111111'));
 
+SOLANA_SCHEMA.set(PublicKey, {
+  kind: 'struct',
+  fields: [['_bn', 'u256']]
+}); // @ts-ignore
+
 let naclLowLevel = nacl__default.lowlevel; // Check that a pubkey is on the curve.
 // This function and its dependents were sourced from:
 // https://github.com/dchest/tweetnacl-js/blob/f1ec050ceae0861f34280e62498b1d3ed9c350c6/nacl.js#L792
@@ -6297,5 +6348,5 @@ function clusterApiUrl(cluster, tls) {
 
 const LAMPORTS_PER_SOL = 1000000000;
 
-export { Account, Authorized, BLOCKHASH_CACHE_TIMEOUT_MS, BPF_LOADER_DEPRECATED_PROGRAM_ID, BPF_LOADER_PROGRAM_ID, BpfLoader, Connection, FeeCalculatorLayout, Keypair, LAMPORTS_PER_SOL, Loader, Lockup, MAX_SEED_LENGTH, Message, NONCE_ACCOUNT_LENGTH, NonceAccount, PACKET_DATA_SIZE, PublicKey, STAKE_CONFIG_ID, STAKE_INSTRUCTION_LAYOUTS, SYSTEM_INSTRUCTION_LAYOUTS, SYSVAR_CLOCK_PUBKEY, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_RECENT_BLOCKHASHES_PUBKEY, SYSVAR_RENT_PUBKEY, SYSVAR_REWARDS_PUBKEY, SYSVAR_STAKE_HISTORY_PUBKEY, Secp256k1Program, StakeAuthorizationLayout, StakeInstruction, StakeProgram, SystemInstruction, SystemProgram, Transaction, TransactionInstruction, VALIDATOR_INFO_KEY, VOTE_PROGRAM_ID, ValidatorInfo, VoteAccount, clusterApiUrl, sendAndConfirmRawTransaction, sendAndConfirmTransaction };
+export { Account, Authorized, BLOCKHASH_CACHE_TIMEOUT_MS, BPF_LOADER_DEPRECATED_PROGRAM_ID, BPF_LOADER_PROGRAM_ID, BpfLoader, Connection, Enum, FeeCalculatorLayout, Keypair, LAMPORTS_PER_SOL, Loader, Lockup, MAX_SEED_LENGTH, Message, NONCE_ACCOUNT_LENGTH, NonceAccount, PACKET_DATA_SIZE, PublicKey, SOLANA_SCHEMA, STAKE_CONFIG_ID, STAKE_INSTRUCTION_LAYOUTS, SYSTEM_INSTRUCTION_LAYOUTS, SYSVAR_CLOCK_PUBKEY, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_RECENT_BLOCKHASHES_PUBKEY, SYSVAR_RENT_PUBKEY, SYSVAR_REWARDS_PUBKEY, SYSVAR_STAKE_HISTORY_PUBKEY, Secp256k1Program, StakeAuthorizationLayout, StakeInstruction, StakeProgram, Struct, SystemInstruction, SystemProgram, Transaction, TransactionInstruction, VALIDATOR_INFO_KEY, VOTE_PROGRAM_ID, ValidatorInfo, VoteAccount, clusterApiUrl, sendAndConfirmRawTransaction, sendAndConfirmTransaction };
 //# sourceMappingURL=index.esm.js.map