@solana/web3.js 1.11.1 → 1.12.1

package/lib/index.cjs.js

@@ -8,6 +8,7 @@ var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var BN = require('bn.js');
 var bs58 = require('bs58');
 var cryptoHash = require('crypto-hash');
+var borsh = require('borsh');
 var BufferLayout = require('buffer-layout');
 var invariant = require('assert');
 var url = require('url');
@@ -65,16 +66,55 @@ const toBuffer = arr => {
   }
 };
 
+class Struct {
+  constructor(properties) {
+    Object.assign(this, properties);
+  }
+
+  encode() {
+    return buffer.Buffer.from(borsh.serialize(SOLANA_SCHEMA, this));
+  }
+
+  static decode(data) {
+    return borsh.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__default['default'](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 */
 
   /**
@@ -82,21 +122,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__default['default'].decode(value);
-
-      if (decoded.length != 32) {
-        throw new Error("Invalid public key input");
-      }
+    super({});
 
-      this._bn = new BN__default['default'](decoded);
+    if (isPublicKeyData(value)) {
+      this._bn = value._bn;
     } else {
-      this._bn = new BN__default['default'](value);
-    }
+      if (typeof value === 'string') {
+        // assume base 58 encoding by default
+        const decoded = bs58__default['default'].decode(value);
+
+        if (decoded.length != 32) {
+          throw new Error("Invalid public key input");
+        }
+
+        this._bn = new BN__default['default'](decoded);
+      } else {
+        this._bn = new BN__default['default'](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");
+      }
     }
   }
   /**
@@ -224,10 +270,15 @@ class PublicKey {
     return is_on_curve(pubkey) == 1;
   }
 
-} // @ts-ignore
+}
 
 _defineProperty__default['default'](PublicKey, "default", new PublicKey('11111111111111111111111111111111'));
 
+SOLANA_SCHEMA.set(PublicKey, {
+  kind: 'struct',
+  fields: [['_bn', 'u256']]
+}); // @ts-ignore
+
 let naclLowLevel = nacl__default['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
@@ -6342,6 +6393,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.Enum = Enum;
 exports.FeeCalculatorLayout = FeeCalculatorLayout;
 exports.Keypair = Keypair;
 exports.LAMPORTS_PER_SOL = LAMPORTS_PER_SOL;
@@ -6353,6 +6405,7 @@ exports.NONCE_ACCOUNT_LENGTH = NONCE_ACCOUNT_LENGTH;
 exports.NonceAccount = NonceAccount;
 exports.PACKET_DATA_SIZE = PACKET_DATA_SIZE;
 exports.PublicKey = PublicKey;
+exports.SOLANA_SCHEMA = SOLANA_SCHEMA;
 exports.STAKE_CONFIG_ID = STAKE_CONFIG_ID;
 exports.STAKE_INSTRUCTION_LAYOUTS = STAKE_INSTRUCTION_LAYOUTS;
 exports.SYSTEM_INSTRUCTION_LAYOUTS = SYSTEM_INSTRUCTION_LAYOUTS;
@@ -6366,6 +6419,7 @@ exports.Secp256k1Program = Secp256k1Program;
 exports.StakeAuthorizationLayout = StakeAuthorizationLayout;
 exports.StakeInstruction = StakeInstruction;
 exports.StakeProgram = StakeProgram;
+exports.Struct = Struct;
 exports.SystemInstruction = SystemInstruction;
 exports.SystemProgram = SystemProgram;
 exports.Transaction = Transaction;