@solana/web3.js 1.35.1 → 1.37.1

package/lib/index.iife.js

@@ -35,7 +35,7 @@ var solanaWeb3 = (function (exports) {
 		'default': _nodeResolve_empty
 	});
 
-	var require$$0$1 = /*@__PURE__*/getAugmentedNamespace(_nodeResolve_empty$1);
+	var require$$0$2 = /*@__PURE__*/getAugmentedNamespace(_nodeResolve_empty$1);
 
 	(function (module) {
 	(function(nacl) {
@@ -2416,7 +2416,7 @@ var solanaWeb3 = (function (exports) {
 	    });
 	  } else if (typeof commonjsRequire !== 'undefined') {
 	    // Node.js.
-	    crypto = require$$0$1;
+	    crypto = require$$0$2;
 	    if (crypto && crypto.randomBytes) {
 	      nacl.setPRNG(function(x, n) {
 	        var i, v = crypto.randomBytes(n);
@@ -2561,9 +2561,7 @@ var solanaWeb3 = (function (exports) {
 
 	  // go through the array every three bytes, we'll deal with trailing stuff later
 	  for (var i = 0, len2 = len - extraBytes; i < len2; i += maxChunkLength) {
-	    parts.push(encodeChunk(
-	      uint8, i, (i + maxChunkLength) > len2 ? len2 : (i + maxChunkLength)
-	    ));
+	    parts.push(encodeChunk(uint8, i, (i + maxChunkLength) > len2 ? len2 : (i + maxChunkLength)));
 	  }
 
 	  // pad the end with zeros, but make sure to not forget the extra bytes
@@ -8150,9 +8148,10 @@ var solanaWeb3 = (function (exports) {
 
 	var safeBuffer = {exports: {}};
 
-	/* eslint-disable node/no-deprecated-api */
+	/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
 	(function (module, exports) {
+	/* eslint-disable node/no-deprecated-api */
 	var buffer$1 = buffer;
 	var Buffer = buffer$1.Buffer;
 
@@ -8174,6 +8173,8 @@ var solanaWeb3 = (function (exports) {
 	  return Buffer(arg, encodingOrOffset, length)
 	}
 
+	SafeBuffer.prototype = Object.create(Buffer.prototype);
+
 	// Copy static methods from Buffer
 	copyProps(Buffer, SafeBuffer);
 
@@ -8216,100 +8217,126 @@ var solanaWeb3 = (function (exports) {
 	};
 	}(safeBuffer, safeBuffer.exports));
 
-	// base-x encoding
-	// Forked from https://github.com/cryptocoinjs/bs58
-	// Originally written by Mike Hearn for BitcoinJ
-	// Copyright (c) 2011 Google Inc
-	// Ported to JavaScript by Stefan Thomas
-	// Merged Buffer refactorings from base58-native by Stephen Pair
-	// Copyright (c) 2013 BitPay Inc
-
-	var Buffer$1 = safeBuffer.exports.Buffer;
-
-	var baseX = function base (ALPHABET) {
-	  var ALPHABET_MAP = {};
+	// base-x encoding / decoding
+	// Copyright (c) 2018 base-x contributors
+	// Copyright (c) 2014-2018 The Bitcoin Core developers (base58.cpp)
+	// Distributed under the MIT software license, see the accompanying
+	// file LICENSE or http://www.opensource.org/licenses/mit-license.php.
+	// @ts-ignore
+	var _Buffer = safeBuffer.exports.Buffer;
+	function base$1 (ALPHABET) {
+	  if (ALPHABET.length >= 255) { throw new TypeError('Alphabet too long') }
+	  var BASE_MAP = new Uint8Array(256);
+	  for (var j = 0; j < BASE_MAP.length; j++) {
+	    BASE_MAP[j] = 255;
+	  }
+	  for (var i = 0; i < ALPHABET.length; i++) {
+	    var x = ALPHABET.charAt(i);
+	    var xc = x.charCodeAt(0);
+	    if (BASE_MAP[xc] !== 255) { throw new TypeError(x + ' is ambiguous') }
+	    BASE_MAP[xc] = i;
+	  }
 	  var BASE = ALPHABET.length;
 	  var LEADER = ALPHABET.charAt(0);
-
-	  // pre-compute lookup table
-	  for (var z = 0; z < ALPHABET.length; z++) {
-	    var x = ALPHABET.charAt(z);
-
-	    if (ALPHABET_MAP[x] !== undefined) throw new TypeError(x + ' is ambiguous')
-	    ALPHABET_MAP[x] = z;
-	  }
-
+	  var FACTOR = Math.log(BASE) / Math.log(256); // log(BASE) / log(256), rounded up
+	  var iFACTOR = Math.log(256) / Math.log(BASE); // log(256) / log(BASE), rounded up
 	  function encode (source) {
-	    if (source.length === 0) return ''
-
-	    var digits = [0];
-	    for (var i = 0; i < source.length; ++i) {
-	      for (var j = 0, carry = source[i]; j < digits.length; ++j) {
-	        carry += digits[j] << 8;
-	        digits[j] = carry % BASE;
-	        carry = (carry / BASE) | 0;
-	      }
-
-	      while (carry > 0) {
-	        digits.push(carry % BASE);
-	        carry = (carry / BASE) | 0;
-	      }
-	    }
-
-	    var string = '';
-
-	    // deal with leading zeros
-	    for (var k = 0; source[k] === 0 && k < source.length - 1; ++k) string += LEADER;
-	    // convert digits to a string
-	    for (var q = digits.length - 1; q >= 0; --q) string += ALPHABET[digits[q]];
-
-	    return string
-	  }
-
-	  function decodeUnsafe (string) {
-	    if (typeof string !== 'string') throw new TypeError('Expected String')
-	    if (string.length === 0) return Buffer$1.allocUnsafe(0)
-
-	    var bytes = [0];
-	    for (var i = 0; i < string.length; i++) {
-	      var value = ALPHABET_MAP[string[i]];
-	      if (value === undefined) return
-
-	      for (var j = 0, carry = value; j < bytes.length; ++j) {
-	        carry += bytes[j] * BASE;
-	        bytes[j] = carry & 0xff;
-	        carry >>= 8;
-	      }
-
-	      while (carry > 0) {
-	        bytes.push(carry & 0xff);
-	        carry >>= 8;
-	      }
-	    }
-
-	    // deal with leading zeros
-	    for (var k = 0; string[k] === LEADER && k < string.length - 1; ++k) {
-	      bytes.push(0);
-	    }
-
-	    return Buffer$1.from(bytes.reverse())
+	    if (Array.isArray(source) || source instanceof Uint8Array) { source = _Buffer.from(source); }
+	    if (!_Buffer.isBuffer(source)) { throw new TypeError('Expected Buffer') }
+	    if (source.length === 0) { return '' }
+	        // Skip & count leading zeroes.
+	    var zeroes = 0;
+	    var length = 0;
+	    var pbegin = 0;
+	    var pend = source.length;
+	    while (pbegin !== pend && source[pbegin] === 0) {
+	      pbegin++;
+	      zeroes++;
+	    }
+	        // Allocate enough space in big-endian base58 representation.
+	    var size = ((pend - pbegin) * iFACTOR + 1) >>> 0;
+	    var b58 = new Uint8Array(size);
+	        // Process the bytes.
+	    while (pbegin !== pend) {
+	      var carry = source[pbegin];
+	            // Apply "b58 = b58 * 256 + ch".
+	      var i = 0;
+	      for (var it1 = size - 1; (carry !== 0 || i < length) && (it1 !== -1); it1--, i++) {
+	        carry += (256 * b58[it1]) >>> 0;
+	        b58[it1] = (carry % BASE) >>> 0;
+	        carry = (carry / BASE) >>> 0;
+	      }
+	      if (carry !== 0) { throw new Error('Non-zero carry') }
+	      length = i;
+	      pbegin++;
+	    }
+	        // Skip leading zeroes in base58 result.
+	    var it2 = size - length;
+	    while (it2 !== size && b58[it2] === 0) {
+	      it2++;
+	    }
+	        // Translate the result into a string.
+	    var str = LEADER.repeat(zeroes);
+	    for (; it2 < size; ++it2) { str += ALPHABET.charAt(b58[it2]); }
+	    return str
+	  }
+	  function decodeUnsafe (source) {
+	    if (typeof source !== 'string') { throw new TypeError('Expected String') }
+	    if (source.length === 0) { return _Buffer.alloc(0) }
+	    var psz = 0;
+	        // Skip and count leading '1's.
+	    var zeroes = 0;
+	    var length = 0;
+	    while (source[psz] === LEADER) {
+	      zeroes++;
+	      psz++;
+	    }
+	        // Allocate enough space in big-endian base256 representation.
+	    var size = (((source.length - psz) * FACTOR) + 1) >>> 0; // log(58) / log(256), rounded up.
+	    var b256 = new Uint8Array(size);
+	        // Process the characters.
+	    while (source[psz]) {
+	            // Decode character
+	      var carry = BASE_MAP[source.charCodeAt(psz)];
+	            // Invalid character
+	      if (carry === 255) { return }
+	      var i = 0;
+	      for (var it3 = size - 1; (carry !== 0 || i < length) && (it3 !== -1); it3--, i++) {
+	        carry += (BASE * b256[it3]) >>> 0;
+	        b256[it3] = (carry % 256) >>> 0;
+	        carry = (carry / 256) >>> 0;
+	      }
+	      if (carry !== 0) { throw new Error('Non-zero carry') }
+	      length = i;
+	      psz++;
+	    }
+	        // Skip leading zeroes in b256.
+	    var it4 = size - length;
+	    while (it4 !== size && b256[it4] === 0) {
+	      it4++;
+	    }
+	    var vch = _Buffer.allocUnsafe(zeroes + (size - it4));
+	    vch.fill(0x00, 0, zeroes);
+	    var j = zeroes;
+	    while (it4 !== size) {
+	      vch[j++] = b256[it4++];
+	    }
+	    return vch
 	  }
-
 	  function decode (string) {
 	    var buffer = decodeUnsafe(string);
-	    if (buffer) return buffer
-
+	    if (buffer) { return buffer }
 	    throw new Error('Non-base' + BASE + ' character')
 	  }
-
 	  return {
 	    encode: encode,
 	    decodeUnsafe: decodeUnsafe,
 	    decode: decode
 	  }
-	};
+	}
+	var src = base$1;
 
-	var basex = baseX;
+	var basex = src;
 	var ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
 
 	var bs58 = basex(ALPHABET);
@@ -8332,34 +8359,38 @@ var solanaWeb3 = (function (exports) {
 	    throw new Error(msg || ('Assertion failed: ' + l + ' != ' + r));
 	};
 
-	var inherits_browser$1 = {exports: {}};
+	var inherits_browser = {exports: {}};
 
 	if (typeof Object.create === 'function') {
 	  // implementation from standard node.js 'util' module
-	  inherits_browser$1.exports = function inherits(ctor, superCtor) {
-	    ctor.super_ = superCtor;
-	    ctor.prototype = Object.create(superCtor.prototype, {
-	      constructor: {
-	        value: ctor,
-	        enumerable: false,
-	        writable: true,
-	        configurable: true
-	      }
-	    });
+	  inherits_browser.exports = function inherits(ctor, superCtor) {
+	    if (superCtor) {
+	      ctor.super_ = superCtor;
+	      ctor.prototype = Object.create(superCtor.prototype, {
+	        constructor: {
+	          value: ctor,
+	          enumerable: false,
+	          writable: true,
+	          configurable: true
+	        }
+	      });
+	    }
 	  };
 	} else {
 	  // old school shim for old browsers
-	  inherits_browser$1.exports = function inherits(ctor, superCtor) {
-	    ctor.super_ = superCtor;
-	    var TempCtor = function () {};
-	    TempCtor.prototype = superCtor.prototype;
-	    ctor.prototype = new TempCtor();
-	    ctor.prototype.constructor = ctor;
+	  inherits_browser.exports = function inherits(ctor, superCtor) {
+	    if (superCtor) {
+	      ctor.super_ = superCtor;
+	      var TempCtor = function () {};
+	      TempCtor.prototype = superCtor.prototype;
+	      ctor.prototype = new TempCtor();
+	      ctor.prototype.constructor = ctor;
+	    }
 	  };
 	}
 
 	var assert$h = minimalisticAssert;
-	var inherits$4 = inherits_browser$1.exports;
+	var inherits$4 = inherits_browser.exports;
 
 	utils$m.inherits = inherits$4;
 
@@ -9396,7 +9427,7 @@ var solanaWeb3 = (function (exports) {
 	  for (var j = 0; j < 80; j++) {
 	    var T = sum32(
 	      rotl32(
-	        sum32_4(A, f(j, B, C, D), msg[r$1[j] + start], K(j)),
+	        sum32_4(A, f$1(j, B, C, D), msg[r$1[j] + start], K(j)),
 	        s[j]),
 	      E);
 	    A = E;
@@ -9406,7 +9437,7 @@ var solanaWeb3 = (function (exports) {
 	    B = T;
 	    T = sum32(
 	      rotl32(
-	        sum32_4(Ah, f(79 - j, Bh, Ch, Dh), msg[rh[j] + start], Kh(j)),
+	        sum32_4(Ah, f$1(79 - j, Bh, Ch, Dh), msg[rh[j] + start], Kh(j)),
 	        sh[j]),
 	      Eh);
 	    Ah = Eh;
@@ -9430,7 +9461,7 @@ var solanaWeb3 = (function (exports) {
 	    return utils$e.split32(this.h, 'little');
 	};
 
-	function f(j, x, y, z) {
+	function f$1(j, x, y, z) {
 	  if (j <= 15)
 	    return x ^ y ^ z;
 	  else if (j <= 31)
@@ -9567,7 +9598,7 @@ var solanaWeb3 = (function (exports) {
 
 	var hash$2 = hash$3;
 
-	const version$3 = "logger/5.5.0";
+	const version$4 = "logger/5.6.0";
 
 	let _permanentCensorErrors = false;
 	let _censorErrors = false;
@@ -9746,6 +9777,40 @@ var solanaWeb3 = (function (exports) {
 	        messageDetails.push(`code=${code}`);
 	        messageDetails.push(`version=${this.version}`);
 	        const reason = message;
+	        let url = "";
+	        switch (code) {
+	            case ErrorCode.NUMERIC_FAULT: {
+	                url = "NUMERIC_FAULT";
+	                const fault = message;
+	                switch (fault) {
+	                    case "overflow":
+	                    case "underflow":
+	                    case "division-by-zero":
+	                        url += "-" + fault;
+	                        break;
+	                    case "negative-power":
+	                    case "negative-width":
+	                        url += "-unsupported";
+	                        break;
+	                    case "unbound-bitwise-result":
+	                        url += "-unbound-result";
+	                        break;
+	                }
+	                break;
+	            }
+	            case ErrorCode.CALL_EXCEPTION:
+	            case ErrorCode.INSUFFICIENT_FUNDS:
+	            case ErrorCode.MISSING_NEW:
+	            case ErrorCode.NONCE_EXPIRED:
+	            case ErrorCode.REPLACEMENT_UNDERPRICED:
+	            case ErrorCode.TRANSACTION_REPLACED:
+	            case ErrorCode.UNPREDICTABLE_GAS_LIMIT:
+	                url = code;
+	                break;
+	        }
+	        if (url) {
+	            message += " [ See: https:/\/links.ethers.org/v5-errors-" + url + " ]";
+	        }
 	        if (messageDetails.length) {
 	            message += " (" + messageDetails.join(", ") + ")";
 	        }
@@ -9843,7 +9908,7 @@ var solanaWeb3 = (function (exports) {
 	    }
 	    static globalLogger() {
 	        if (!_globalLogger) {
-	            _globalLogger = new Logger(version$3);
+	            _globalLogger = new Logger(version$4);
 	        }
 	        return _globalLogger;
 	    }
@@ -9879,9 +9944,9 @@ var solanaWeb3 = (function (exports) {
 	Logger.errors = ErrorCode;
 	Logger.levels = LogLevel;
 
-	const version$2 = "bytes/5.5.0";
+	const version$3 = "bytes/5.6.0";
 
-	const logger = new Logger(version$2);
+	const logger = new Logger(version$3);
 	///////////////////////////////
 	function isHexable(value) {
 	    return !!(value.toHexString);
@@ -9976,9 +10041,9 @@ var solanaWeb3 = (function (exports) {
 	    return true;
 	}
 
-	const version$1 = "sha2/5.5.0";
+	const version$2 = "sha2/5.6.0";
 
-	new Logger(version$1);
+	new Logger(version$2);
 	function sha256(data) {
 	    return "0x" + (hash$2.sha256().update(arrayify(data)).digest("hex"));
 	}
@@ -10662,11 +10727,11 @@ var solanaWeb3 = (function (exports) {
 	const bs58_1 = __importDefault(bs58);
 	// TODO: Make sure this polyfill not included when not required
 	const encoding = __importStar(encoding_lib);
-	const TextDecoder = (typeof commonjsGlobal.TextDecoder !== 'function') ? encoding.TextDecoder : commonjsGlobal.TextDecoder;
-	const textDecoder = new TextDecoder('utf-8', { fatal: true });
+	const ResolvedTextDecoder = typeof TextDecoder !== "function" ? encoding.TextDecoder : TextDecoder;
+	const textDecoder = new ResolvedTextDecoder("utf-8", { fatal: true });
 	function baseEncode(value) {
-	    if (typeof (value) === 'string') {
-	        value = Buffer.from(value, 'utf8');
+	    if (typeof value === "string") {
+	        value = Buffer.from(value, "utf8");
 	    }
 	    return bs58_1.default.encode(Buffer.from(value));
 	}
@@ -10685,7 +10750,7 @@ var solanaWeb3 = (function (exports) {
 	    addToFieldPath(fieldName) {
 	        this.fieldPath.splice(0, 0, fieldName);
 	        // NOTE: Modifying message directly as jest doesn't use .toString()
-	        this.message = this.originalMessage + ': ' + this.fieldPath.join('.');
+	        this.message = this.originalMessage + ": " + this.fieldPath.join(".");
 	    }
 	}
 	lib$1.BorshError = BorshError;
@@ -10717,28 +10782,32 @@ var solanaWeb3 = (function (exports) {
 	    }
 	    writeU64(value) {
 	        this.maybeResize();
-	        this.writeBuffer(Buffer.from(new bn_js_1.default(value).toArray('le', 8)));
+	        this.writeBuffer(Buffer.from(new bn_js_1.default(value).toArray("le", 8)));
 	    }
 	    writeU128(value) {
 	        this.maybeResize();
-	        this.writeBuffer(Buffer.from(new bn_js_1.default(value).toArray('le', 16)));
+	        this.writeBuffer(Buffer.from(new bn_js_1.default(value).toArray("le", 16)));
 	    }
 	    writeU256(value) {
 	        this.maybeResize();
-	        this.writeBuffer(Buffer.from(new bn_js_1.default(value).toArray('le', 32)));
+	        this.writeBuffer(Buffer.from(new bn_js_1.default(value).toArray("le", 32)));
 	    }
 	    writeU512(value) {
 	        this.maybeResize();
-	        this.writeBuffer(Buffer.from(new bn_js_1.default(value).toArray('le', 64)));
+	        this.writeBuffer(Buffer.from(new bn_js_1.default(value).toArray("le", 64)));
 	    }
 	    writeBuffer(buffer) {
 	        // Buffer.from is needed as this.buf.subarray can return plain Uint8Array in browser
-	        this.buf = Buffer.concat([Buffer.from(this.buf.subarray(0, this.length)), buffer, Buffer.alloc(INITIAL_LENGTH)]);
+	        this.buf = Buffer.concat([
+	            Buffer.from(this.buf.subarray(0, this.length)),
+	            buffer,
+	            Buffer.alloc(INITIAL_LENGTH),
+	        ]);
 	        this.length += buffer.length;
 	    }
 	    writeString(str) {
 	        this.maybeResize();
-	        const b = Buffer.from(str, 'utf8');
+	        const b = Buffer.from(str, "utf8");
 	        this.writeU32(b.length);
 	        this.writeBuffer(b);
 	    }
@@ -10767,8 +10836,8 @@ var solanaWeb3 = (function (exports) {
 	        catch (e) {
 	            if (e instanceof RangeError) {
 	                const code = e.code;
-	                if (['ERR_BUFFER_OUT_OF_BOUNDS', 'ERR_OUT_OF_RANGE'].indexOf(code) >= 0) {
-	                    throw new BorshError('Reached the end of buffer when deserializing');
+	                if (["ERR_BUFFER_OUT_OF_BOUNDS", "ERR_OUT_OF_RANGE"].indexOf(code) >= 0) {
+	                    throw new BorshError("Reached the end of buffer when deserializing");
 	                }
 	            }
 	            throw e;
@@ -10797,22 +10866,22 @@ var solanaWeb3 = (function (exports) {
 	    }
 	    readU64() {
 	        const buf = this.readBuffer(8);
-	        return new bn_js_1.default(buf, 'le');
+	        return new bn_js_1.default(buf, "le");
 	    }
 	    readU128() {
 	        const buf = this.readBuffer(16);
-	        return new bn_js_1.default(buf, 'le');
+	        return new bn_js_1.default(buf, "le");
 	    }
 	    readU256() {
 	        const buf = this.readBuffer(32);
-	        return new bn_js_1.default(buf, 'le');
+	        return new bn_js_1.default(buf, "le");
 	    }
 	    readU512() {
 	        const buf = this.readBuffer(64);
-	        return new bn_js_1.default(buf, 'le');
+	        return new bn_js_1.default(buf, "le");
 	    }
 	    readBuffer(len) {
-	        if ((this.offset + len) > this.buf.length) {
+	        if (this.offset + len > this.buf.length) {
 	            throw new BorshError(`Expected buffer length ${len} isn't within bounds`);
 	        }
 	        const result = this.buf.slice(this.offset, this.offset + len);
@@ -10879,23 +10948,33 @@ var solanaWeb3 = (function (exports) {
 	function serializeField(schema, fieldName, value, fieldType, writer) {
 	    try {
 	        // TODO: Handle missing values properly (make sure they never result in just skipped write)
-	        if (typeof fieldType === 'string') {
+	        if (typeof fieldType === "string") {
 	            writer[`write${capitalizeFirstLetter(fieldType)}`](value);
 	        }
 	        else if (fieldType instanceof Array) {
-	            if (typeof fieldType[0] === 'number') {
+	            if (typeof fieldType[0] === "number") {
 	                if (value.length !== fieldType[0]) {
 	                    throw new BorshError(`Expecting byte array of length ${fieldType[0]}, but got ${value.length} bytes`);
 	                }
 	                writer.writeFixedArray(value);
 	            }
+	            else if (fieldType.length === 2 && typeof fieldType[1] === "number") {
+	                if (value.length !== fieldType[1]) {
+	                    throw new BorshError(`Expecting byte array of length ${fieldType[1]}, but got ${value.length} bytes`);
+	                }
+	                for (let i = 0; i < fieldType[1]; i++) {
+	                    serializeField(schema, null, value[i], fieldType[0], writer);
+	                }
+	            }
 	            else {
-	                writer.writeArray(value, (item) => { serializeField(schema, fieldName, item, fieldType[0], writer); });
+	                writer.writeArray(value, (item) => {
+	                    serializeField(schema, fieldName, item, fieldType[0], writer);
+	                });
 	            }
 	        }
 	        else if (fieldType.kind !== undefined) {
 	            switch (fieldType.kind) {
-	                case 'option': {
+	                case "option": {
 	                    if (value === null || value === undefined) {
 	                        writer.writeU8(0);
 	                    }
@@ -10905,7 +10984,16 @@ var solanaWeb3 = (function (exports) {
 	                    }
 	                    break;
 	                }
-	                default: throw new BorshError(`FieldType ${fieldType} unrecognized`);
+	                case "map": {
+	                    writer.writeU32(value.size);
+	                    value.forEach((val, key) => {
+	                        serializeField(schema, fieldName, key, fieldType.key, writer);
+	                        serializeField(schema, fieldName, val, fieldType.value, writer);
+	                    });
+	                    break;
+	                }
+	                default:
+	                    throw new BorshError(`FieldType ${fieldType} unrecognized`);
 	            }
 	        }
 	        else {
@@ -10920,16 +11008,20 @@ var solanaWeb3 = (function (exports) {
 	    }
 	}
 	function serializeStruct(schema, obj, writer) {
+	    if (typeof obj.borshSerialize === "function") {
+	        obj.borshSerialize(writer);
+	        return;
+	    }
 	    const structSchema = schema.get(obj.constructor);
 	    if (!structSchema) {
 	        throw new BorshError(`Class ${obj.constructor.name} is missing in schema`);
 	    }
-	    if (structSchema.kind === 'struct') {
+	    if (structSchema.kind === "struct") {
 	        structSchema.fields.map(([fieldName, fieldType]) => {
 	            serializeField(schema, fieldName, obj[fieldName], fieldType, writer);
 	        });
 	    }
-	    else if (structSchema.kind === 'enum') {
+	    else if (structSchema.kind === "enum") {
 	        const name = obj[structSchema.field];
 	        for (let idx = 0; idx < structSchema.values.length; ++idx) {
 	            const [fieldName, fieldType] = structSchema.values[idx];
@@ -10946,30 +11038,49 @@ var solanaWeb3 = (function (exports) {
 	}
 	/// Serialize given object using schema of the form:
 	/// { class_name -> [ [field_name, field_type], .. ], .. }
-	function serialize(schema, obj) {
-	    const writer = new BinaryWriter();
+	function serialize(schema, obj, Writer = BinaryWriter) {
+	    const writer = new Writer();
 	    serializeStruct(schema, obj, writer);
 	    return writer.toArray();
 	}
 	var serialize_1 = lib$1.serialize = serialize;
 	function deserializeField(schema, fieldName, fieldType, reader) {
 	    try {
-	        if (typeof fieldType === 'string') {
+	        if (typeof fieldType === "string") {
 	            return reader[`read${capitalizeFirstLetter(fieldType)}`]();
 	        }
 	        if (fieldType instanceof Array) {
-	            if (typeof fieldType[0] === 'number') {
+	            if (typeof fieldType[0] === "number") {
 	                return reader.readFixedArray(fieldType[0]);
 	            }
-	            return reader.readArray(() => deserializeField(schema, fieldName, fieldType[0], reader));
+	            else if (typeof fieldType[1] === "number") {
+	                const arr = [];
+	                for (let i = 0; i < fieldType[1]; i++) {
+	                    arr.push(deserializeField(schema, null, fieldType[0], reader));
+	                }
+	                return arr;
+	            }
+	            else {
+	                return reader.readArray(() => deserializeField(schema, fieldName, fieldType[0], reader));
+	            }
 	        }
-	        if (fieldType.kind === 'option') {
+	        if (fieldType.kind === "option") {
 	            const option = reader.readU8();
 	            if (option) {
 	                return deserializeField(schema, fieldName, fieldType.type, reader);
 	            }
 	            return undefined;
 	        }
+	        if (fieldType.kind === "map") {
+	            let map = new Map();
+	            const length = reader.readU32();
+	            for (let i = 0; i < length; i++) {
+	                const key = deserializeField(schema, fieldName, fieldType.key, reader);
+	                const val = deserializeField(schema, fieldName, fieldType.value, reader);
+	                map.set(key, val);
+	            }
+	            return map;
+	        }
 	        return deserializeStruct(schema, fieldType, reader);
 	    }
 	    catch (error) {
@@ -10980,18 +11091,21 @@ var solanaWeb3 = (function (exports) {
 	    }
 	}
 	function deserializeStruct(schema, classType, reader) {
+	    if (typeof classType.borshDeserialize === "function") {
+	        return classType.borshDeserialize(reader);
+	    }
 	    const structSchema = schema.get(classType);
 	    if (!structSchema) {
 	        throw new BorshError(`Class ${classType.name} is missing in schema`);
 	    }
-	    if (structSchema.kind === 'struct') {
+	    if (structSchema.kind === "struct") {
 	        const result = {};
 	        for (const [fieldName, fieldType] of schema.get(classType).fields) {
 	            result[fieldName] = deserializeField(schema, fieldName, fieldType, reader);
 	        }
 	        return new classType(result);
 	    }
-	    if (structSchema.kind === 'enum') {
+	    if (structSchema.kind === "enum") {
 	        const idx = reader.readU8();
 	        if (idx >= structSchema.values.length) {
 	            throw new BorshError(`Enum index: ${idx} is out of range`);
@@ -11003,8 +11117,8 @@ var solanaWeb3 = (function (exports) {
 	    throw new BorshError(`Unexpected schema kind: ${structSchema.kind} for ${classType.constructor.name}`);
 	}
 	/// Deserializes object from bytes using schema.
-	function deserialize(schema, classType, buffer) {
-	    const reader = new BinaryReader(buffer);
+	function deserialize(schema, classType, buffer, Reader = BinaryReader) {
+	    const reader = new Reader(buffer);
 	    const result = deserializeStruct(schema, classType, reader);
 	    if (reader.offset < buffer.length) {
 	        throw new BorshError(`Unexpected ${buffer.length - reader.offset} bytes after deserialized data`);
@@ -11013,8 +11127,8 @@ var solanaWeb3 = (function (exports) {
 	}
 	var deserialize_1 = lib$1.deserialize = deserialize;
 	/// Deserializes object from bytes using schema, without checking the length read
-	function deserializeUnchecked(schema, classType, buffer) {
-	    const reader = new BinaryReader(buffer);
+	function deserializeUnchecked(schema, classType, buffer, Reader = BinaryReader) {
+	    const reader = new Reader(buffer);
 	    return deserializeStruct(schema, classType, reader);
 	}
 	deserializeUnchecked_1 = lib$1.deserializeUnchecked = deserializeUnchecked;
@@ -11367,25 +11481,10 @@ var solanaWeb3 = (function (exports) {
 	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 	 * THE SOFTWARE.
 	 */
-	var __extends = (commonjsGlobal && commonjsGlobal.__extends) || (function () {
-	    var extendStatics = function (d, b) {
-	        extendStatics = Object.setPrototypeOf ||
-	            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-	            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-	        return extendStatics(d, b);
-	    };
-	    return function (d, b) {
-	        if (typeof b !== "function" && b !== null)
-	            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-	        extendStatics(d, b);
-	        function __() { this.constructor = d; }
-	        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-	    };
-	})();
-	Layout$1.__esModule = true;
+	Object.defineProperty(Layout$1, "__esModule", { value: true });
 	Layout$1.s16 = Layout$1.s8 = Layout$1.nu64be = Layout$1.u48be = Layout$1.u40be = Layout$1.u32be = Layout$1.u24be = Layout$1.u16be = nu64 = Layout$1.nu64 = Layout$1.u48 = Layout$1.u40 = u32 = Layout$1.u32 = Layout$1.u24 = u16 = Layout$1.u16 = u8 = Layout$1.u8 = offset = Layout$1.offset = Layout$1.greedy = Layout$1.Constant = Layout$1.UTF8 = Layout$1.CString = Layout$1.Blob = Layout$1.Boolean = Layout$1.BitField = Layout$1.BitStructure = Layout$1.VariantLayout = Layout$1.Union = Layout$1.UnionLayoutDiscriminator = Layout$1.UnionDiscriminator = Layout$1.Structure = Layout$1.Sequence = Layout$1.DoubleBE = Layout$1.Double = Layout$1.FloatBE = Layout$1.Float = Layout$1.NearInt64BE = Layout$1.NearInt64 = Layout$1.NearUInt64BE = Layout$1.NearUInt64 = Layout$1.IntBE = Layout$1.Int = Layout$1.UIntBE = Layout$1.UInt = Layout$1.OffsetLayout = Layout$1.GreedyCount = Layout$1.ExternalLayout = Layout$1.bindConstructorLayout = Layout$1.nameWithProperty = Layout$1.Layout = Layout$1.uint8ArrayToBuffer = Layout$1.checkUint8Array = void 0;
 	Layout$1.constant = Layout$1.utf8 = Layout$1.cstr = blob = Layout$1.blob = Layout$1.unionLayoutDiscriminator = Layout$1.union = seq = Layout$1.seq = Layout$1.bits = struct = Layout$1.struct = Layout$1.f64be = Layout$1.f64 = Layout$1.f32be = Layout$1.f32 = Layout$1.ns64be = Layout$1.s48be = Layout$1.s40be = Layout$1.s32be = Layout$1.s24be = Layout$1.s16be = ns64 = Layout$1.ns64 = Layout$1.s48 = Layout$1.s40 = Layout$1.s32 = Layout$1.s24 = void 0;
-	var buffer_1 = buffer;
+	const buffer_1 = buffer;
 	/* Check if a value is a Uint8Array.
 	 *
 	 * @ignore */
@@ -11419,8 +11518,8 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @abstract
 	 */
-	var Layout = /** @class */ (function () {
-	    function Layout(span, property) {
+	class Layout {
+	    constructor(span, property) {
 	        if (!Number.isInteger(span)) {
 	            throw new TypeError('span must be an integer');
 	        }
@@ -11459,49 +11558,9 @@ var solanaWeb3 = (function (exports) {
 	     *
 	     * See {@link bindConstructorLayout}.
 	     */
-	    Layout.prototype.makeDestinationObject = function () {
+	    makeDestinationObject() {
 	        return {};
-	    };
-	    /**
-	     * Decode from a Uint8Array into a JavaScript value.
-	     *
-	     * @param {Uint8Array} b - the buffer from which encoded data is read.
-	     *
-	     * @param {Number} [offset] - the offset at which the encoded data
-	     * starts.  If absent a zero offset is inferred.
-	     *
-	     * @returns {(Number|Array|Object)} - the value of the decoded data.
-	     *
-	     * @abstract
-	     */
-	    Layout.prototype.decode = function (b, offset) {
-	        throw new Error('Layout is abstract');
-	    };
-	    /**
-	     * Encode a JavaScript value into a Uint8Array.
-	     *
-	     * @param {(Number|Array|Object)} src - the value to be encoded into
-	     * the buffer.  The type accepted depends on the (sub-)type of {@link
-	     * Layout}.
-	     *
-	     * @param {Uint8Array} b - the buffer into which encoded data will be
-	     * written.
-	     *
-	     * @param {Number} [offset] - the offset at which the encoded data
-	     * starts.  If absent a zero offset is inferred.
-	     *
-	     * @returns {Number} - the number of bytes encoded, including the
-	     * space skipped for internal padding, but excluding data such as
-	     * {@link Sequence#count|lengths} when stored {@link
-	     * ExternalLayout|externally}.  This is the adjustment to `offset`
-	     * producing the offset where data for the next layout would be
-	     * written.
-	     *
-	     * @abstract
-	     */
-	    Layout.prototype.encode = function (src, b, offset) {
-	        throw new Error('Layout is abstract');
-	    };
+	    }
 	    /**
 	     * Calculate the span of a specific instance of a layout.
 	     *
@@ -11518,12 +11577,12 @@ var solanaWeb3 = (function (exports) {
 	     * @throws {RangeError} - if the length of the value cannot be
 	     * determined.
 	     */
-	    Layout.prototype.getSpan = function (b, offset) {
+	    getSpan(b, offset) {
 	        if (0 > this.span) {
 	            throw new RangeError('indeterminate span');
 	        }
 	        return this.span;
-	    };
+	    }
 	    /**
 	     * Replicate the layout using a new property.
 	     *
@@ -11540,12 +11599,12 @@ var solanaWeb3 = (function (exports) {
 	     * @returns {Layout} - the copy with {@link Layout#property|property}
 	     * set to `property`.
 	     */
-	    Layout.prototype.replicate = function (property) {
-	        var rv = Object.create(this.constructor.prototype);
+	    replicate(property) {
+	        const rv = Object.create(this.constructor.prototype);
 	        Object.assign(rv, this);
 	        rv.property = property;
 	        return rv;
-	    };
+	    }
 	    /**
 	     * Create an object from layout properties and an array of values.
 	     *
@@ -11566,11 +11625,10 @@ var solanaWeb3 = (function (exports) {
 	     *
 	     * @return {(Object|undefined)}
 	     */
-	    Layout.prototype.fromArray = function (values) {
+	    fromArray(values) {
 	        return undefined;
-	    };
-	    return Layout;
-	}());
+	    }
+	}
 	Layout$1.Layout = Layout;
 	/* Provide text that carries a name (such as for a function that will
 	 * be throwing an error) annotated with the property of a given layout
@@ -11611,6 +11669,8 @@ var solanaWeb3 = (function (exports) {
 	 * @param {Layout} layout - the {@link Layout} instance used to encode
 	 * instances of `Class`.
 	 */
+	// `Class` must be a constructor Function, but the assignment of a `layout_` property to it makes it difficult to type
+	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	function bindConstructorLayout(Class, layout) {
 	    if ('function' !== typeof Class) {
 	        throw new TypeError('Class must be constructor');
@@ -11626,18 +11686,18 @@ var solanaWeb3 = (function (exports) {
 	    }
 	    Class.layout_ = layout;
 	    layout.boundConstructor_ = Class;
-	    layout.makeDestinationObject = (function () { return new Class(); });
+	    layout.makeDestinationObject = (() => new Class());
 	    Object.defineProperty(Class.prototype, 'encode', {
-	        value: function (b, offset) {
+	        value(b, offset) {
 	            return layout.encode(this, b, offset);
 	        },
-	        writable: true
+	        writable: true,
 	    });
 	    Object.defineProperty(Class, 'decode', {
-	        value: function (b, offset) {
+	        value(b, offset) {
 	            return layout.decode(b, offset);
 	        },
-	        writable: true
+	        writable: true,
 	    });
 	}
 	Layout$1.bindConstructorLayout = bindConstructorLayout;
@@ -11662,11 +11722,7 @@ var solanaWeb3 = (function (exports) {
 	 * @abstract
 	 * @augments {Layout}
 	 */
-	var ExternalLayout = /** @class */ (function (_super) {
-	    __extends(ExternalLayout, _super);
-	    function ExternalLayout() {
-	        return _super !== null && _super.apply(this, arguments) || this;
-	    }
+	class ExternalLayout extends Layout {
 	    /**
 	     * Return `true` iff the external layout decodes to an unsigned
 	     * integer layout.
@@ -11678,11 +11734,10 @@ var solanaWeb3 = (function (exports) {
 	     *
 	     * @abstract
 	     */
-	    ExternalLayout.prototype.isCount = function () {
+	    isCount() {
 	        throw new Error('ExternalLayout is abstract');
-	    };
-	    return ExternalLayout;
-	}(Layout));
+	    }
+	}
 	Layout$1.ExternalLayout = ExternalLayout;
 	/**
 	 * An {@link ExternalLayout} that determines its {@link
@@ -11699,42 +11754,32 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {ExternalLayout}
 	 */
-	var GreedyCount = /** @class */ (function (_super) {
-	    __extends(GreedyCount, _super);
-	    function GreedyCount(elementSpan, property) {
-	        var _this = this;
-	        if (undefined === elementSpan) {
-	            elementSpan = 1;
-	        }
+	class GreedyCount extends ExternalLayout {
+	    constructor(elementSpan = 1, property) {
 	        if ((!Number.isInteger(elementSpan)) || (0 >= elementSpan)) {
 	            throw new TypeError('elementSpan must be a (positive) integer');
 	        }
-	        _this = _super.call(this, -1, property) || this;
+	        super(-1, property);
 	        /** The layout for individual elements of the sequence.  The value
 	         * must be a positive integer.  If not provided, the value will be
 	         * 1. */
-	        _this.elementSpan = elementSpan;
-	        return _this;
+	        this.elementSpan = elementSpan;
 	    }
 	    /** @override */
-	    GreedyCount.prototype.isCount = function () {
+	    isCount() {
 	        return true;
-	    };
+	    }
 	    /** @override */
-	    GreedyCount.prototype.decode = function (b, offset) {
+	    decode(b, offset = 0) {
 	        checkUint8Array(b);
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var rem = b.length - offset;
+	        const rem = b.length - offset;
 	        return Math.floor(rem / this.elementSpan);
-	    };
+	    }
 	    /** @override */
-	    GreedyCount.prototype.encode = function (src, b, offset) {
+	    encode(src, b, offset) {
 	        return 0;
-	    };
-	    return GreedyCount;
-	}(ExternalLayout));
+	    }
+	}
 	Layout$1.GreedyCount = GreedyCount;
 	/**
 	 * An {@link ExternalLayout} that supports accessing a {@link Layout}
@@ -11756,52 +11801,39 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var OffsetLayout = /** @class */ (function (_super) {
-	    __extends(OffsetLayout, _super);
-	    function OffsetLayout(layout, offset, property) {
-	        var _this = this;
+	class OffsetLayout extends ExternalLayout {
+	    constructor(layout, offset = 0, property) {
 	        if (!(layout instanceof Layout)) {
 	            throw new TypeError('layout must be a Layout');
 	        }
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        else if (!Number.isInteger(offset)) {
+	        if (!Number.isInteger(offset)) {
 	            throw new TypeError('offset must be integer or undefined');
 	        }
-	        _this = _super.call(this, layout.span, property || layout.property) || this;
+	        super(layout.span, property || layout.property);
 	        /** The subordinated layout. */
-	        _this.layout = layout;
+	        this.layout = layout;
 	        /** The location of {@link OffsetLayout#layout} relative to the
 	         * start of another layout.
 	         *
 	         * The value may be positive or negative, but an error will thrown
 	         * if at the point of use it goes outside the span of the Uint8Array
 	         * being accessed.  */
-	        _this.offset = offset;
-	        return _this;
+	        this.offset = offset;
 	    }
 	    /** @override */
-	    OffsetLayout.prototype.isCount = function () {
+	    isCount() {
 	        return ((this.layout instanceof UInt)
 	            || (this.layout instanceof UIntBE));
-	    };
+	    }
 	    /** @override */
-	    OffsetLayout.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    decode(b, offset = 0) {
 	        return this.layout.decode(b, offset + this.offset);
-	    };
+	    }
 	    /** @override */
-	    OffsetLayout.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    encode(src, b, offset = 0) {
 	        return this.layout.encode(src, b, offset + this.offset);
-	    };
-	    return OffsetLayout;
-	}(ExternalLayout));
+	    }
+	}
 	Layout$1.OffsetLayout = OffsetLayout;
 	/**
 	 * Represent an unsigned integer in little-endian format.
@@ -11819,32 +11851,23 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var UInt = /** @class */ (function (_super) {
-	    __extends(UInt, _super);
-	    function UInt(span, property) {
-	        var _this = _super.call(this, span, property) || this;
-	        if (6 < _this.span) {
+	class UInt extends Layout {
+	    constructor(span, property) {
+	        super(span, property);
+	        if (6 < this.span) {
 	            throw new RangeError('span must not exceed 6 bytes');
 	        }
-	        return _this;
 	    }
 	    /** @override */
-	    UInt.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    decode(b, offset = 0) {
 	        return uint8ArrayToBuffer(b).readUIntLE(offset, this.span);
-	    };
+	    }
 	    /** @override */
-	    UInt.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    encode(src, b, offset = 0) {
 	        uint8ArrayToBuffer(b).writeUIntLE(src, offset, this.span);
 	        return this.span;
-	    };
-	    return UInt;
-	}(Layout));
+	    }
+	}
 	Layout$1.UInt = UInt;
 	/**
 	 * Represent an unsigned integer in big-endian format.
@@ -11862,32 +11885,23 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var UIntBE = /** @class */ (function (_super) {
-	    __extends(UIntBE, _super);
-	    function UIntBE(span, property) {
-	        var _this = _super.call(this, span, property) || this;
-	        if (6 < _this.span) {
+	class UIntBE extends Layout {
+	    constructor(span, property) {
+	        super(span, property);
+	        if (6 < this.span) {
 	            throw new RangeError('span must not exceed 6 bytes');
 	        }
-	        return _this;
 	    }
 	    /** @override */
-	    UIntBE.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    decode(b, offset = 0) {
 	        return uint8ArrayToBuffer(b).readUIntBE(offset, this.span);
-	    };
+	    }
 	    /** @override */
-	    UIntBE.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    encode(src, b, offset = 0) {
 	        uint8ArrayToBuffer(b).writeUIntBE(src, offset, this.span);
 	        return this.span;
-	    };
-	    return UIntBE;
-	}(Layout));
+	    }
+	}
 	Layout$1.UIntBE = UIntBE;
 	/**
 	 * Represent a signed integer in little-endian format.
@@ -11905,32 +11919,23 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var Int = /** @class */ (function (_super) {
-	    __extends(Int, _super);
-	    function Int(span, property) {
-	        var _this = _super.call(this, span, property) || this;
-	        if (6 < _this.span) {
+	class Int extends Layout {
+	    constructor(span, property) {
+	        super(span, property);
+	        if (6 < this.span) {
 	            throw new RangeError('span must not exceed 6 bytes');
 	        }
-	        return _this;
 	    }
 	    /** @override */
-	    Int.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    decode(b, offset = 0) {
 	        return uint8ArrayToBuffer(b).readIntLE(offset, this.span);
-	    };
+	    }
 	    /** @override */
-	    Int.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    encode(src, b, offset = 0) {
 	        uint8ArrayToBuffer(b).writeIntLE(src, offset, this.span);
 	        return this.span;
-	    };
-	    return Int;
-	}(Layout));
+	    }
+	}
 	Layout$1.Int = Int;
 	/**
 	 * Represent a signed integer in big-endian format.
@@ -11948,40 +11953,31 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var IntBE = /** @class */ (function (_super) {
-	    __extends(IntBE, _super);
-	    function IntBE(span, property) {
-	        var _this = _super.call(this, span, property) || this;
-	        if (6 < _this.span) {
+	class IntBE extends Layout {
+	    constructor(span, property) {
+	        super(span, property);
+	        if (6 < this.span) {
 	            throw new RangeError('span must not exceed 6 bytes');
 	        }
-	        return _this;
 	    }
 	    /** @override */
-	    IntBE.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    decode(b, offset = 0) {
 	        return uint8ArrayToBuffer(b).readIntBE(offset, this.span);
-	    };
+	    }
 	    /** @override */
-	    IntBE.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    encode(src, b, offset = 0) {
 	        uint8ArrayToBuffer(b).writeIntBE(src, offset, this.span);
 	        return this.span;
-	    };
-	    return IntBE;
-	}(Layout));
+	    }
+	}
 	Layout$1.IntBE = IntBE;
-	var V2E32 = Math.pow(2, 32);
+	const V2E32 = Math.pow(2, 32);
 	/* True modulus high and low 32-bit words, where low word is always
 	 * non-negative. */
 	function divmodInt64(src) {
-	    var hi32 = Math.floor(src / V2E32);
-	    var lo32 = src - (hi32 * V2E32);
-	    return { hi32: hi32, lo32: lo32 };
+	    const hi32 = Math.floor(src / V2E32);
+	    const lo32 = src - (hi32 * V2E32);
+	    return { hi32, lo32 };
 	}
 	/* Reconstruct Number from quotient and non-negative remainder */
 	function roundedInt64(hi32, lo32) {
@@ -11998,34 +11994,26 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var NearUInt64 = /** @class */ (function (_super) {
-	    __extends(NearUInt64, _super);
-	    function NearUInt64(property) {
-	        return _super.call(this, 8, property) || this;
+	class NearUInt64 extends Layout {
+	    constructor(property) {
+	        super(8, property);
 	    }
 	    /** @override */
-	    NearUInt64.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var buffer = uint8ArrayToBuffer(b);
-	        var lo32 = buffer.readUInt32LE(offset);
-	        var hi32 = buffer.readUInt32LE(offset + 4);
+	    decode(b, offset = 0) {
+	        const buffer = uint8ArrayToBuffer(b);
+	        const lo32 = buffer.readUInt32LE(offset);
+	        const hi32 = buffer.readUInt32LE(offset + 4);
 	        return roundedInt64(hi32, lo32);
-	    };
+	    }
 	    /** @override */
-	    NearUInt64.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var split = divmodInt64(src);
-	        var buffer = uint8ArrayToBuffer(b);
+	    encode(src, b, offset = 0) {
+	        const split = divmodInt64(src);
+	        const buffer = uint8ArrayToBuffer(b);
 	        buffer.writeUInt32LE(split.lo32, offset);
 	        buffer.writeUInt32LE(split.hi32, offset + 4);
 	        return 8;
-	    };
-	    return NearUInt64;
-	}(Layout));
+	    }
+	}
 	Layout$1.NearUInt64 = NearUInt64;
 	/**
 	 * Represent an unsigned 64-bit integer in big-endian format when
@@ -12038,34 +12026,26 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var NearUInt64BE = /** @class */ (function (_super) {
-	    __extends(NearUInt64BE, _super);
-	    function NearUInt64BE(property) {
-	        return _super.call(this, 8, property) || this;
+	class NearUInt64BE extends Layout {
+	    constructor(property) {
+	        super(8, property);
 	    }
 	    /** @override */
-	    NearUInt64BE.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var buffer = uint8ArrayToBuffer(b);
-	        var hi32 = buffer.readUInt32BE(offset);
-	        var lo32 = buffer.readUInt32BE(offset + 4);
+	    decode(b, offset = 0) {
+	        const buffer = uint8ArrayToBuffer(b);
+	        const hi32 = buffer.readUInt32BE(offset);
+	        const lo32 = buffer.readUInt32BE(offset + 4);
 	        return roundedInt64(hi32, lo32);
-	    };
+	    }
 	    /** @override */
-	    NearUInt64BE.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var split = divmodInt64(src);
-	        var buffer = uint8ArrayToBuffer(b);
+	    encode(src, b, offset = 0) {
+	        const split = divmodInt64(src);
+	        const buffer = uint8ArrayToBuffer(b);
 	        buffer.writeUInt32BE(split.hi32, offset);
 	        buffer.writeUInt32BE(split.lo32, offset + 4);
 	        return 8;
-	    };
-	    return NearUInt64BE;
-	}(Layout));
+	    }
+	}
 	Layout$1.NearUInt64BE = NearUInt64BE;
 	/**
 	 * Represent a signed 64-bit integer in little-endian format when
@@ -12078,34 +12058,26 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var NearInt64 = /** @class */ (function (_super) {
-	    __extends(NearInt64, _super);
-	    function NearInt64(property) {
-	        return _super.call(this, 8, property) || this;
+	class NearInt64 extends Layout {
+	    constructor(property) {
+	        super(8, property);
 	    }
 	    /** @override */
-	    NearInt64.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var buffer = uint8ArrayToBuffer(b);
-	        var lo32 = buffer.readUInt32LE(offset);
-	        var hi32 = buffer.readInt32LE(offset + 4);
+	    decode(b, offset = 0) {
+	        const buffer = uint8ArrayToBuffer(b);
+	        const lo32 = buffer.readUInt32LE(offset);
+	        const hi32 = buffer.readInt32LE(offset + 4);
 	        return roundedInt64(hi32, lo32);
-	    };
+	    }
 	    /** @override */
-	    NearInt64.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var split = divmodInt64(src);
-	        var buffer = uint8ArrayToBuffer(b);
+	    encode(src, b, offset = 0) {
+	        const split = divmodInt64(src);
+	        const buffer = uint8ArrayToBuffer(b);
 	        buffer.writeUInt32LE(split.lo32, offset);
 	        buffer.writeInt32LE(split.hi32, offset + 4);
 	        return 8;
-	    };
-	    return NearInt64;
-	}(Layout));
+	    }
+	}
 	Layout$1.NearInt64 = NearInt64;
 	/**
 	 * Represent a signed 64-bit integer in big-endian format when
@@ -12118,34 +12090,26 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var NearInt64BE = /** @class */ (function (_super) {
-	    __extends(NearInt64BE, _super);
-	    function NearInt64BE(property) {
-	        return _super.call(this, 8, property) || this;
+	class NearInt64BE extends Layout {
+	    constructor(property) {
+	        super(8, property);
 	    }
 	    /** @override */
-	    NearInt64BE.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var buffer = uint8ArrayToBuffer(b);
-	        var hi32 = buffer.readInt32BE(offset);
-	        var lo32 = buffer.readUInt32BE(offset + 4);
+	    decode(b, offset = 0) {
+	        const buffer = uint8ArrayToBuffer(b);
+	        const hi32 = buffer.readInt32BE(offset);
+	        const lo32 = buffer.readUInt32BE(offset + 4);
 	        return roundedInt64(hi32, lo32);
-	    };
+	    }
 	    /** @override */
-	    NearInt64BE.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var split = divmodInt64(src);
-	        var buffer = uint8ArrayToBuffer(b);
+	    encode(src, b, offset = 0) {
+	        const split = divmodInt64(src);
+	        const buffer = uint8ArrayToBuffer(b);
 	        buffer.writeInt32BE(split.hi32, offset);
 	        buffer.writeUInt32BE(split.lo32, offset + 4);
 	        return 8;
-	    };
-	    return NearInt64BE;
-	}(Layout));
+	    }
+	}
 	Layout$1.NearInt64BE = NearInt64BE;
 	/**
 	 * Represent a 32-bit floating point number in little-endian format.
@@ -12157,28 +12121,20 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var Float = /** @class */ (function (_super) {
-	    __extends(Float, _super);
-	    function Float(property) {
-	        return _super.call(this, 4, property) || this;
+	class Float extends Layout {
+	    constructor(property) {
+	        super(4, property);
 	    }
 	    /** @override */
-	    Float.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    decode(b, offset = 0) {
 	        return uint8ArrayToBuffer(b).readFloatLE(offset);
-	    };
+	    }
 	    /** @override */
-	    Float.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    encode(src, b, offset = 0) {
 	        uint8ArrayToBuffer(b).writeFloatLE(src, offset);
 	        return 4;
-	    };
-	    return Float;
-	}(Layout));
+	    }
+	}
 	Layout$1.Float = Float;
 	/**
 	 * Represent a 32-bit floating point number in big-endian format.
@@ -12190,28 +12146,20 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var FloatBE = /** @class */ (function (_super) {
-	    __extends(FloatBE, _super);
-	    function FloatBE(property) {
-	        return _super.call(this, 4, property) || this;
+	class FloatBE extends Layout {
+	    constructor(property) {
+	        super(4, property);
 	    }
 	    /** @override */
-	    FloatBE.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    decode(b, offset = 0) {
 	        return uint8ArrayToBuffer(b).readFloatBE(offset);
-	    };
+	    }
 	    /** @override */
-	    FloatBE.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    encode(src, b, offset = 0) {
 	        uint8ArrayToBuffer(b).writeFloatBE(src, offset);
 	        return 4;
-	    };
-	    return FloatBE;
-	}(Layout));
+	    }
+	}
 	Layout$1.FloatBE = FloatBE;
 	/**
 	 * Represent a 64-bit floating point number in little-endian format.
@@ -12223,28 +12171,20 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var Double = /** @class */ (function (_super) {
-	    __extends(Double, _super);
-	    function Double(property) {
-	        return _super.call(this, 8, property) || this;
+	class Double extends Layout {
+	    constructor(property) {
+	        super(8, property);
 	    }
 	    /** @override */
-	    Double.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    decode(b, offset = 0) {
 	        return uint8ArrayToBuffer(b).readDoubleLE(offset);
-	    };
+	    }
 	    /** @override */
-	    Double.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    encode(src, b, offset = 0) {
 	        uint8ArrayToBuffer(b).writeDoubleLE(src, offset);
 	        return 8;
-	    };
-	    return Double;
-	}(Layout));
+	    }
+	}
 	Layout$1.Double = Double;
 	/**
 	 * Represent a 64-bit floating point number in big-endian format.
@@ -12256,28 +12196,20 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var DoubleBE = /** @class */ (function (_super) {
-	    __extends(DoubleBE, _super);
-	    function DoubleBE(property) {
-	        return _super.call(this, 8, property) || this;
+	class DoubleBE extends Layout {
+	    constructor(property) {
+	        super(8, property);
 	    }
 	    /** @override */
-	    DoubleBE.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    decode(b, offset = 0) {
 	        return uint8ArrayToBuffer(b).readDoubleBE(offset);
-	    };
+	    }
 	    /** @override */
-	    DoubleBE.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    encode(src, b, offset = 0) {
 	        uint8ArrayToBuffer(b).writeDoubleBE(src, offset);
 	        return 8;
-	    };
-	    return DoubleBE;
-	}(Layout));
+	    }
+	}
 	Layout$1.DoubleBE = DoubleBE;
 	/**
 	 * Represent a contiguous sequence of a specific layout as an Array.
@@ -12296,10 +12228,8 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var Sequence = /** @class */ (function (_super) {
-	    __extends(Sequence, _super);
-	    function Sequence(elementLayout, count, property) {
-	        var _this = this;
+	class Sequence extends Layout {
+	    constructor(elementLayout, count, property) {
 	        if (!(elementLayout instanceof Layout)) {
 	            throw new TypeError('elementLayout must be a Layout');
 	        }
@@ -12308,32 +12238,28 @@ var solanaWeb3 = (function (exports) {
 	            throw new TypeError('count must be non-negative integer '
 	                + 'or an unsigned integer ExternalLayout');
 	        }
-	        var span = -1;
+	        let span = -1;
 	        if ((!(count instanceof ExternalLayout))
 	            && (0 < elementLayout.span)) {
 	            span = count * elementLayout.span;
 	        }
-	        _this = _super.call(this, span, property) || this;
+	        super(span, property);
 	        /** The layout for individual elements of the sequence. */
-	        _this.elementLayout = elementLayout;
+	        this.elementLayout = elementLayout;
 	        /** The number of elements in the sequence.
 	         *
 	         * This will be either a non-negative integer or an instance of
 	         * {@link ExternalLayout} for which {@link
 	         * ExternalLayout#isCount|isCount()} is `true`. */
-	        _this.count = count;
-	        return _this;
+	        this.count = count;
 	    }
 	    /** @override */
-	    Sequence.prototype.getSpan = function (b, offset) {
+	    getSpan(b, offset = 0) {
 	        if (0 <= this.span) {
 	            return this.span;
 	        }
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var span = 0;
-	        var count = this.count;
+	        let span = 0;
+	        let count = this.count;
 	        if (count instanceof ExternalLayout) {
 	            count = count.decode(b, offset);
 	        }
@@ -12341,22 +12267,19 @@ var solanaWeb3 = (function (exports) {
 	            span = count * this.elementLayout.span;
 	        }
 	        else {
-	            var idx = 0;
+	            let idx = 0;
 	            while (idx < count) {
 	                span += this.elementLayout.getSpan(b, offset + span);
 	                ++idx;
 	            }
 	        }
 	        return span;
-	    };
+	    }
 	    /** @override */
-	    Sequence.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var rv = [];
-	        var i = 0;
-	        var count = this.count;
+	    decode(b, offset = 0) {
+	        const rv = [];
+	        let i = 0;
+	        let count = this.count;
 	        if (count instanceof ExternalLayout) {
 	            count = count.decode(b, offset);
 	        }
@@ -12366,7 +12289,7 @@ var solanaWeb3 = (function (exports) {
 	            i += 1;
 	        }
 	        return rv;
-	    };
+	    }
 	    /** Implement {@link Layout#encode|encode} for {@link Sequence}.
 	     *
 	     * **NOTE** If `src` is shorter than {@link Sequence#count|count} then
@@ -12377,21 +12300,17 @@ var solanaWeb3 = (function (exports) {
 	     * **NOTE** If {@link Layout#count|count} is an instance of {@link
 	     * ExternalLayout} then the length of `src` will be encoded as the
 	     * count after `src` is encoded. */
-	    Sequence.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var elo = this.elementLayout;
-	        var span = src.reduce(function (span, v) {
+	    encode(src, b, offset = 0) {
+	        const elo = this.elementLayout;
+	        const span = src.reduce((span, v) => {
 	            return span + elo.encode(v, b, offset + span);
 	        }, 0);
 	        if (this.count instanceof ExternalLayout) {
 	            this.count.encode(src.length, b, offset);
 	        }
 	        return span;
-	    };
-	    return Sequence;
-	}(Layout));
+	    }
+	}
 	Layout$1.Sequence = Sequence;
 	/**
 	 * Represent a contiguous sequence of arbitrary layout elements as an
@@ -12425,12 +12344,10 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var Structure = /** @class */ (function (_super) {
-	    __extends(Structure, _super);
-	    function Structure(fields, property, decodePrefixes) {
-	        var _this = this;
+	class Structure extends Layout {
+	    constructor(fields, property, decodePrefixes) {
 	        if (!(Array.isArray(fields)
-	            && fields.reduce(function (acc, v) { return acc && (v instanceof Layout); }, true))) {
+	            && fields.reduce((acc, v) => acc && (v instanceof Layout), true))) {
 	            throw new TypeError('fields must be array of Layout instances');
 	        }
 	        if (('boolean' === typeof property)
@@ -12439,21 +12356,20 @@ var solanaWeb3 = (function (exports) {
 	            property = undefined;
 	        }
 	        /* Verify absence of unnamed variable-length fields. */
-	        for (var _i = 0, fields_1 = fields; _i < fields_1.length; _i++) {
-	            var fd = fields_1[_i];
+	        for (const fd of fields) {
 	            if ((0 > fd.span)
 	                && (undefined === fd.property)) {
 	                throw new Error('fields cannot contain unnamed variable-length layout');
 	            }
 	        }
-	        var span = -1;
+	        let span = -1;
 	        try {
-	            span = fields.reduce(function (span, fd) { return span + fd.getSpan(); }, 0);
+	            span = fields.reduce((span, fd) => span + fd.getSpan(), 0);
 	        }
 	        catch (e) {
 	            // ignore error
 	        }
-	        _this = _super.call(this, span, property) || this;
+	        super(span, property);
 	        /** The sequence of {@link Layout} values that comprise the
 	         * structure.
 	         *
@@ -12464,7 +12380,7 @@ var solanaWeb3 = (function (exports) {
 	         * will not be mutated.
 	         *
 	         * @type {Layout[]} */
-	        _this.fields = fields;
+	        this.fields = fields;
 	        /** Control behavior of {@link Layout#decode|decode()} given short
 	         * buffers.
 	         *
@@ -12474,21 +12390,17 @@ var solanaWeb3 = (function (exports) {
 	         * decoding will accept those buffers and leave subsequent fields
 	         * undefined, as long as the buffer ends at a field boundary.
 	         * Defaults to `false`. */
-	        _this.decodePrefixes = !!decodePrefixes;
-	        return _this;
+	        this.decodePrefixes = !!decodePrefixes;
 	    }
 	    /** @override */
-	    Structure.prototype.getSpan = function (b, offset) {
+	    getSpan(b, offset = 0) {
 	        if (0 <= this.span) {
 	            return this.span;
 	        }
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var span = 0;
+	        let span = 0;
 	        try {
-	            span = this.fields.reduce(function (span, fd) {
-	                var fsp = fd.getSpan(b, offset);
+	            span = this.fields.reduce((span, fd) => {
+	                const fsp = fd.getSpan(b, offset);
 	                offset += fsp;
 	                return span + fsp;
 	            }, 0);
@@ -12497,16 +12409,12 @@ var solanaWeb3 = (function (exports) {
 	            throw new RangeError('indeterminate span');
 	        }
 	        return span;
-	    };
+	    }
 	    /** @override */
-	    Structure.prototype.decode = function (b, offset) {
+	    decode(b, offset = 0) {
 	        checkUint8Array(b);
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var dest = this.makeDestinationObject();
-	        for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-	            var fd = _a[_i];
+	        const dest = this.makeDestinationObject();
+	        for (const fd of this.fields) {
 	            if (undefined !== fd.property) {
 	                dest[fd.property] = fd.decode(b, offset);
 	            }
@@ -12517,25 +12425,21 @@ var solanaWeb3 = (function (exports) {
 	            }
 	        }
 	        return dest;
-	    };
+	    }
 	    /** Implement {@link Layout#encode|encode} for {@link Structure}.
 	     *
 	     * If `src` is missing a property for a member with a defined {@link
 	     * Layout#property|property} the corresponding region of the buffer is
 	     * left unmodified. */
-	    Structure.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var firstOffset = offset;
-	        var lastOffset = 0;
-	        var lastWrote = 0;
-	        for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-	            var fd = _a[_i];
-	            var span = fd.span;
+	    encode(src, b, offset = 0) {
+	        const firstOffset = offset;
+	        let lastOffset = 0;
+	        let lastWrote = 0;
+	        for (const fd of this.fields) {
+	            let span = fd.span;
 	            lastWrote = (0 < span) ? span : 0;
 	            if (undefined !== fd.property) {
-	                var fv = src[fd.property];
+	                const fv = src[fd.property];
 	                if (undefined !== fv) {
 	                    lastWrote = fd.encode(fv, b, offset);
 	                    if (0 > span) {
@@ -12553,19 +12457,18 @@ var solanaWeb3 = (function (exports) {
 	         * the padding between it and the end of the space reserved for
 	         * it. */
 	        return (lastOffset + lastWrote) - firstOffset;
-	    };
+	    }
 	    /** @override */
-	    Structure.prototype.fromArray = function (values) {
-	        var dest = this.makeDestinationObject();
-	        for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-	            var fd = _a[_i];
+	    fromArray(values) {
+	        const dest = this.makeDestinationObject();
+	        for (const fd of this.fields) {
 	            if ((undefined !== fd.property)
 	                && (0 < values.length)) {
 	                dest[fd.property] = values.shift();
 	            }
 	        }
 	        return dest;
-	    };
+	    }
 	    /**
 	     * Get access to the layout of a given property.
 	     *
@@ -12574,18 +12477,17 @@ var solanaWeb3 = (function (exports) {
 	     * @return {Layout} - the layout associated with `property`, or
 	     * undefined if there is no such property.
 	     */
-	    Structure.prototype.layoutFor = function (property) {
+	    layoutFor(property) {
 	        if ('string' !== typeof property) {
 	            throw new TypeError('property must be string');
 	        }
-	        for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-	            var fd = _a[_i];
+	        for (const fd of this.fields) {
 	            if (fd.property === property) {
 	                return fd;
 	            }
 	        }
 	        return undefined;
-	    };
+	    }
 	    /**
 	     * Get the offset of a structure member.
 	     *
@@ -12597,13 +12499,12 @@ var solanaWeb3 = (function (exports) {
 	     * variable-length structure member a negative number will be
 	     * returned.
 	     */
-	    Structure.prototype.offsetOf = function (property) {
+	    offsetOf(property) {
 	        if ('string' !== typeof property) {
 	            throw new TypeError('property must be string');
 	        }
-	        var offset = 0;
-	        for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-	            var fd = _a[_i];
+	        let offset = 0;
+	        for (const fd of this.fields) {
 	            if (fd.property === property) {
 	                return offset;
 	            }
@@ -12615,9 +12516,8 @@ var solanaWeb3 = (function (exports) {
 	            }
 	        }
 	        return undefined;
-	    };
-	    return Structure;
-	}(Layout));
+	    }
+	}
 	Layout$1.Structure = Structure;
 	/**
 	 * An object that can provide a {@link
@@ -12633,8 +12533,8 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @abstract
 	 */
-	var UnionDiscriminator = /** @class */ (function () {
-	    function UnionDiscriminator(property) {
+	class UnionDiscriminator {
+	    constructor(property) {
 	        /** The {@link Layout#property|property} to be used when the
 	         * discriminator is referenced in isolation (generally when {@link
 	         * Union#decode|Union decode} cannot delegate to a specific
@@ -12645,19 +12545,18 @@ var solanaWeb3 = (function (exports) {
 	     *
 	     * The implementation of this method need not reference the buffer if
 	     * variant information is available through other means. */
-	    UnionDiscriminator.prototype.decode = function (b, offset) {
+	    decode(b, offset) {
 	        throw new Error('UnionDiscriminator is abstract');
-	    };
+	    }
 	    /** Analog to {@link Layout#decode|Layout encode} for union discriminators.
 	     *
 	     * The implementation of this method need not store the value if
 	     * variant information is maintained through other means. */
-	    UnionDiscriminator.prototype.encode = function (src, b, offset) {
+	    encode(src, b, offset) {
 	        throw new Error('UnionDiscriminator is abstract');
-	    };
-	    return UnionDiscriminator;
-	}());
-	Layout$1.UnionDiscriminator = UnionDiscriminator;
+	    }
+	}
+	Layout$1.UnionDiscriminator = UnionDiscriminator;
 	/**
 	 * An object that can provide a {@link
 	 * UnionDiscriminator|discriminator API} for {@link Union} using an
@@ -12675,30 +12574,26 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {UnionDiscriminator}
 	 */
-	var UnionLayoutDiscriminator = /** @class */ (function (_super) {
-	    __extends(UnionLayoutDiscriminator, _super);
-	    function UnionLayoutDiscriminator(layout, property) {
-	        var _this = this;
+	class UnionLayoutDiscriminator extends UnionDiscriminator {
+	    constructor(layout, property) {
 	        if (!((layout instanceof ExternalLayout)
 	            && layout.isCount())) {
 	            throw new TypeError('layout must be an unsigned integer ExternalLayout');
 	        }
-	        _this = _super.call(this, property || layout.property || 'variant') || this;
+	        super(property || layout.property || 'variant');
 	        /** The {@link ExternalLayout} used to access the discriminator
 	         * value. */
-	        _this.layout = layout;
-	        return _this;
+	        this.layout = layout;
 	    }
 	    /** Delegate decoding to {@link UnionLayoutDiscriminator#layout|layout}. */
-	    UnionLayoutDiscriminator.prototype.decode = function (b, offset) {
+	    decode(b, offset) {
 	        return this.layout.decode(b, offset);
-	    };
+	    }
 	    /** Delegate encoding to {@link UnionLayoutDiscriminator#layout|layout}. */
-	    UnionLayoutDiscriminator.prototype.encode = function (src, b, offset) {
+	    encode(src, b, offset) {
 	        return this.layout.encode(src, b, offset);
-	    };
-	    return UnionLayoutDiscriminator;
-	}(UnionDiscriminator));
+	    }
+	}
 	Layout$1.UnionLayoutDiscriminator = UnionLayoutDiscriminator;
 	/**
 	 * Represent any number of span-compatible layouts.
@@ -12759,14 +12654,11 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var Union = /** @class */ (function (_super) {
-	    __extends(Union, _super);
-	    function Union(discr, defaultLayout, property) {
-	        var _this = this;
-	        var upv = ((discr instanceof UInt)
-	            || (discr instanceof UIntBE));
-	        var discriminator;
-	        if (upv) {
+	class Union extends Layout {
+	    constructor(discr, defaultLayout, property) {
+	        let discriminator;
+	        if ((discr instanceof UInt)
+	            || (discr instanceof UIntBE)) {
 	            discriminator = new UnionLayoutDiscriminator(new OffsetLayout(discr));
 	        }
 	        else if ((discr instanceof ExternalLayout)
@@ -12799,14 +12691,15 @@ var solanaWeb3 = (function (exports) {
 	         * layout.  The union spans its default layout, plus any prefix
 	         * variant layout.  By construction both layouts, if present, have
 	         * non-negative span. */
-	        var span = -1;
+	        let span = -1;
 	        if (defaultLayout) {
 	            span = defaultLayout.span;
-	            if ((0 <= span) && upv) {
+	            if ((0 <= span) && ((discr instanceof UInt)
+	                || (discr instanceof UIntBE))) {
 	                span += discriminator.layout.span;
 	            }
 	        }
-	        _this = _super.call(this, span, property) || this;
+	        super(span, property);
 	        /** The interface for the discriminator value in isolation.
 	         *
 	         * This a {@link UnionDiscriminator} either passed to the
@@ -12815,13 +12708,14 @@ var solanaWeb3 = (function (exports) {
 	         * Union#usesPrefixDiscriminator|usesPrefixDiscriminator} will be
 	         * `true` iff the `discr` parameter was a non-offset {@link
 	         * Layout} instance. */
-	        _this.discriminator = discriminator;
+	        this.discriminator = discriminator;
 	        /** `true` if the {@link Union#discriminator|discriminator} is the
 	         * first field in the union.
 	         *
 	         * If `false` the discriminator is obtained from somewhere
 	         * else. */
-	        _this.usesPrefixDiscriminator = upv;
+	        this.usesPrefixDiscriminator = (discr instanceof UInt)
+	            || (discr instanceof UIntBE);
 	        /** The layout for non-discriminator content when the value of the
 	         * discriminator is not recognized.
 	         *
@@ -12829,7 +12723,7 @@ var solanaWeb3 = (function (exports) {
 	         * structurally equivalent to the second component of {@link
 	         * Union#layout|layout} but may have a different property
 	         * name. */
-	        _this.defaultLayout = defaultLayout;
+	        this.defaultLayout = defaultLayout;
 	        /** A registry of allowed variants.
 	         *
 	         * The keys are unsigned integers which should be compatible with
@@ -12840,9 +12734,9 @@ var solanaWeb3 = (function (exports) {
 	         * **NOTE** The registry remains mutable so that variants can be
 	         * {@link Union#addVariant|added} at any time.  Users should not
 	         * manipulate the content of this property. */
-	        _this.registry = {};
+	        this.registry = {};
 	        /* Private variable used when invoking getSourceVariant */
-	        var boundGetSourceVariant = _this.defaultGetSourceVariant.bind(_this);
+	        let boundGetSourceVariant = this.defaultGetSourceVariant.bind(this);
 	        /** Function to infer the variant selected by a source object.
 	         *
 	         * Defaults to {@link
@@ -12856,7 +12750,7 @@ var solanaWeb3 = (function (exports) {
 	         * @returns {(undefined|VariantLayout)} The default variant
 	         * (`undefined`) or first registered variant that uses a property
 	         * available in `src`. */
-	        _this.getSourceVariant = function (src) {
+	        this.getSourceVariant = function (src) {
 	            return boundGetSourceVariant(src);
 	        };
 	        /** Function to override the implementation of {@link
@@ -12872,28 +12766,24 @@ var solanaWeb3 = (function (exports) {
 	         *
 	         * @param {Function} gsv - a function that follows the API of
 	         * {@link Union#defaultGetSourceVariant|defaultGetSourceVariant}. */
-	        _this.configGetSourceVariant = function (gsv) {
+	        this.configGetSourceVariant = function (gsv) {
 	            boundGetSourceVariant = gsv.bind(this);
 	        };
-	        return _this;
 	    }
 	    /** @override */
-	    Union.prototype.getSpan = function (b, offset) {
+	    getSpan(b, offset = 0) {
 	        if (0 <= this.span) {
 	            return this.span;
 	        }
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
 	        /* Default layouts always have non-negative span, so we don't have
 	         * one and we have to recognize the variant which will in turn
 	         * determine the span. */
-	        var vlo = this.getVariant(b, offset);
+	        const vlo = this.getVariant(b, offset);
 	        if (!vlo) {
 	            throw new Error('unable to determine span for unrecognized variant');
 	        }
 	        return vlo.getSpan(b, offset);
-	    };
+	    }
 	    /**
 	     * Method to infer a registered Union variant compatible with `src`.
 	     *
@@ -12923,13 +12813,13 @@ var solanaWeb3 = (function (exports) {
 	     * @throws {Error} - if `src` cannot be associated with a default or
 	     * registered variant.
 	     */
-	    Union.prototype.defaultGetSourceVariant = function (src) {
+	    defaultGetSourceVariant(src) {
 	        if (Object.prototype.hasOwnProperty.call(src, this.discriminator.property)) {
 	            if (this.defaultLayout && this.defaultLayout.property
 	                && Object.prototype.hasOwnProperty.call(src, this.defaultLayout.property)) {
 	                return undefined;
 	            }
-	            var vlo = this.registry[src[this.discriminator.property]];
+	            const vlo = this.registry[src[this.discriminator.property]];
 	            if (vlo
 	                && ((!vlo.layout)
 	                    || (vlo.property && Object.prototype.hasOwnProperty.call(src, vlo.property)))) {
@@ -12937,69 +12827,67 @@ var solanaWeb3 = (function (exports) {
 	            }
 	        }
 	        else {
-	            for (var tag in this.registry) {
-	                var vlo = this.registry[tag];
+	            for (const tag in this.registry) {
+	                const vlo = this.registry[tag];
 	                if (vlo.property && Object.prototype.hasOwnProperty.call(src, vlo.property)) {
 	                    return vlo;
 	                }
 	            }
 	        }
 	        throw new Error('unable to infer src variant');
-	    };
+	    }
 	    /** Implement {@link Layout#decode|decode} for {@link Union}.
 	     *
 	     * If the variant is {@link Union#addVariant|registered} the return
 	     * value is an instance of that variant, with no explicit
 	     * discriminator.  Otherwise the {@link Union#defaultLayout|default
 	     * layout} is used to decode the content. */
-	    Union.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var dest;
-	        var dlo = this.discriminator;
-	        var discr = dlo.decode(b, offset);
-	        var clo = this.registry[discr];
+	    decode(b, offset = 0) {
+	        let dest;
+	        const dlo = this.discriminator;
+	        const discr = dlo.decode(b, offset);
+	        const clo = this.registry[discr];
 	        if (undefined === clo) {
-	            var defaultLayout = this.defaultLayout;
-	            var contentOffset = 0;
+	            const defaultLayout = this.defaultLayout;
+	            let contentOffset = 0;
 	            if (this.usesPrefixDiscriminator) {
 	                contentOffset = dlo.layout.span;
 	            }
 	            dest = this.makeDestinationObject();
 	            dest[dlo.property] = discr;
+	            // defaultLayout.property can be undefined, but this is allowed by buffer-layout
+	            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 	            dest[defaultLayout.property] = defaultLayout.decode(b, offset + contentOffset);
 	        }
 	        else {
 	            dest = clo.decode(b, offset);
 	        }
 	        return dest;
-	    };
+	    }
 	    /** Implement {@link Layout#encode|encode} for {@link Union}.
 	     *
 	     * This API assumes the `src` object is consistent with the union's
 	     * {@link Union#defaultLayout|default layout}.  To encode variants
 	     * use the appropriate variant-specific {@link VariantLayout#encode}
 	     * method. */
-	    Union.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var vlo = this.getSourceVariant(src);
+	    encode(src, b, offset = 0) {
+	        const vlo = this.getSourceVariant(src);
 	        if (undefined === vlo) {
-	            var dlo = this.discriminator;
+	            const dlo = this.discriminator;
 	            // this.defaultLayout is not undefined when vlo is undefined
-	            var clo = this.defaultLayout;
-	            var contentOffset = 0;
+	            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+	            const clo = this.defaultLayout;
+	            let contentOffset = 0;
 	            if (this.usesPrefixDiscriminator) {
 	                contentOffset = dlo.layout.span;
 	            }
 	            dlo.encode(src[dlo.property], b, offset);
 	            // clo.property is not undefined when vlo is undefined
+	            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 	            return contentOffset + clo.encode(src[clo.property], b, offset + contentOffset);
 	        }
 	        return vlo.encode(src, b, offset);
-	    };
+	    }
 	    /** Register a new variant structure within a union.  The newly
 	     * created variant is returned.
 	     *
@@ -13013,11 +12901,11 @@ var solanaWeb3 = (function (exports) {
 	     * Layout#property|property}.
 	     *
 	     * @return {VariantLayout} */
-	    Union.prototype.addVariant = function (variant, layout, property) {
-	        var rv = new VariantLayout(this, variant, layout, property);
+	    addVariant(variant, layout, property) {
+	        const rv = new VariantLayout(this, variant, layout, property);
 	        this.registry[variant] = rv;
 	        return rv;
-	    };
+	    }
 	    /**
 	     * Get the layout associated with a registered variant.
 	     *
@@ -13032,21 +12920,17 @@ var solanaWeb3 = (function (exports) {
 	     *
 	     * @return {({VariantLayout}|undefined)}
 	     */
-	    Union.prototype.getVariant = function (vb, offset) {
-	        var variant;
+	    getVariant(vb, offset = 0) {
+	        let variant;
 	        if (vb instanceof Uint8Array) {
-	            if (undefined === offset) {
-	                offset = 0;
-	            }
 	            variant = this.discriminator.decode(vb, offset);
 	        }
 	        else {
 	            variant = vb;
 	        }
 	        return this.registry[variant];
-	    };
-	    return Union;
-	}(Layout));
+	    }
+	}
 	Layout$1.Union = Union;
 	/**
 	 * Represent a specific variant within a containing union.
@@ -13077,10 +12961,8 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var VariantLayout = /** @class */ (function (_super) {
-	    __extends(VariantLayout, _super);
-	    function VariantLayout(union, variant, layout, property) {
-	        var _this = this;
+	class VariantLayout extends Layout {
+	    constructor(union, variant, layout, property) {
 	        if (!(union instanceof Union)) {
 	            throw new TypeError('union must be a Union');
 	        }
@@ -13105,93 +12987,79 @@ var solanaWeb3 = (function (exports) {
 	                throw new TypeError('variant must have a String property');
 	            }
 	        }
-	        var span = union.span;
+	        let span = union.span;
 	        if (0 > union.span) {
 	            span = layout ? layout.span : 0;
 	            if ((0 <= span) && union.usesPrefixDiscriminator) {
 	                span += union.discriminator.layout.span;
 	            }
 	        }
-	        _this = _super.call(this, span, property) || this;
+	        super(span, property);
 	        /** The {@link Union} to which this variant belongs. */
-	        _this.union = union;
+	        this.union = union;
 	        /** The unsigned integral value identifying this variant within
 	         * the {@link Union#discriminator|discriminator} of the containing
 	         * union. */
-	        _this.variant = variant;
+	        this.variant = variant;
 	        /** The {@link Layout} to be used when reading/writing the
 	         * non-discriminator part of the {@link
 	         * VariantLayout#union|union}.  If `null` the variant carries no
 	         * data. */
-	        _this.layout = layout || null;
-	        return _this;
+	        this.layout = layout || null;
 	    }
 	    /** @override */
-	    VariantLayout.prototype.getSpan = function (b, offset) {
+	    getSpan(b, offset = 0) {
 	        if (0 <= this.span) {
 	            /* Will be equal to the containing union span if that is not
 	             * variable. */
 	            return this.span;
 	        }
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var contentOffset = 0;
+	        let contentOffset = 0;
 	        if (this.union.usesPrefixDiscriminator) {
 	            contentOffset = this.union.discriminator.layout.span;
 	        }
 	        /* Span is defined solely by the variant (and prefix discriminator) */
-	        var span = 0;
+	        let span = 0;
 	        if (this.layout) {
 	            span = this.layout.getSpan(b, offset + contentOffset);
 	        }
 	        return contentOffset + span;
-	    };
+	    }
 	    /** @override */
-	    VariantLayout.prototype.decode = function (b, offset) {
-	        var dest = this.makeDestinationObject();
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    decode(b, offset = 0) {
+	        const dest = this.makeDestinationObject();
 	        if (this !== this.union.getVariant(b, offset)) {
 	            throw new Error('variant mismatch');
 	        }
-	        var contentOffset = 0;
+	        let contentOffset = 0;
 	        if (this.union.usesPrefixDiscriminator) {
 	            contentOffset = this.union.discriminator.layout.span;
 	        }
-	        // VariantLayout property is never undefined
-	        var property = this.property;
 	        if (this.layout) {
-	            dest[property] = this.layout.decode(b, offset + contentOffset);
+	            dest[this.property] = this.layout.decode(b, offset + contentOffset);
 	        }
-	        else if (property) {
-	            dest[property] = true;
+	        else if (this.property) {
+	            dest[this.property] = true;
 	        }
 	        else if (this.union.usesPrefixDiscriminator) {
 	            dest[this.union.discriminator.property] = this.variant;
 	        }
 	        return dest;
-	    };
+	    }
 	    /** @override */
-	    VariantLayout.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var contentOffset = 0;
+	    encode(src, b, offset = 0) {
+	        let contentOffset = 0;
 	        if (this.union.usesPrefixDiscriminator) {
 	            contentOffset = this.union.discriminator.layout.span;
 	        }
-	        // VariantLayout property is never undefined
-	        var property = this.property;
 	        if (this.layout
-	            && (!Object.prototype.hasOwnProperty.call(src, property))) {
-	            throw new TypeError('variant lacks property ' + property);
+	            && (!Object.prototype.hasOwnProperty.call(src, this.property))) {
+	            throw new TypeError('variant lacks property ' + this.property);
 	        }
 	        this.union.discriminator.encode(this.variant, b, offset);
-	        var span = contentOffset;
+	        let span = contentOffset;
 	        if (this.layout) {
-	            this.layout.encode(src[property], b, offset + contentOffset);
+	            this.layout.encode(src[this.property], b, offset + contentOffset);
 	            span += this.layout.getSpan(b, offset + contentOffset);
 	            if ((0 <= this.union.span)
 	                && (span > this.union.span)) {
@@ -13199,17 +13067,16 @@ var solanaWeb3 = (function (exports) {
 	            }
 	        }
 	        return span;
-	    };
+	    }
 	    /** Delegate {@link Layout#fromArray|fromArray} to {@link
 	     * VariantLayout#layout|layout}. */
-	    VariantLayout.prototype.fromArray = function (values) {
+	    fromArray(values) {
 	        if (this.layout) {
 	            return this.layout.fromArray(values);
 	        }
 	        return undefined;
-	    };
-	    return VariantLayout;
-	}(Layout));
+	    }
+	}
 	Layout$1.VariantLayout = VariantLayout;
 	/** JavaScript chose to define bitwise operations as operating on
 	 * signed 32-bit values in 2's complement form, meaning any integer
@@ -13254,10 +13121,8 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var BitStructure = /** @class */ (function (_super) {
-	    __extends(BitStructure, _super);
-	    function BitStructure(word, msb, property) {
-	        var _this = this;
+	class BitStructure extends Layout {
+	    constructor(word, msb, property) {
 	        if (!((word instanceof UInt)
 	            || (word instanceof UIntBE))) {
 	            throw new TypeError('word must be a UInt or UIntBE layout');
@@ -13270,11 +13135,11 @@ var solanaWeb3 = (function (exports) {
 	        if (4 < word.span) {
 	            throw new RangeError('word cannot exceed 32 bits');
 	        }
-	        _this = _super.call(this, word.span, property) || this;
+	        super(word.span, property);
 	        /** The layout used for the packed value.  {@link BitField}
 	         * instances are packed sequentially depending on {@link
 	         * BitStructure#msb|msb}. */
-	        _this.word = word;
+	        this.word = word;
 	        /** Whether the bit sequences are packed starting at the most
 	         * significant bit growing down (`true`), or the least significant
 	         * bit growing up (`false`).
@@ -13282,65 +13147,56 @@ var solanaWeb3 = (function (exports) {
 	         * **NOTE** Regardless of this value, the least significant bit of
 	         * any {@link BitField} value is the least significant bit of the
 	         * corresponding section of the packed value. */
-	        _this.msb = !!msb;
+	        this.msb = !!msb;
 	        /** The sequence of {@link BitField} layouts that comprise the
 	         * packed structure.
 	         *
 	         * **NOTE** The array remains mutable to allow fields to be {@link
 	         * BitStructure#addField|added} after construction.  Users should
 	         * not manipulate the content of this property.*/
-	        _this.fields = [];
+	        this.fields = [];
 	        /* Storage for the value.  Capture a variable instead of using an
 	         * instance property because we don't want anything to change the
 	         * value without going through the mutator. */
-	        var value = 0;
-	        _this._packedSetValue = function (v) {
+	        let value = 0;
+	        this._packedSetValue = function (v) {
 	            value = fixBitwiseResult(v);
 	            return this;
 	        };
-	        _this._packedGetValue = function () {
+	        this._packedGetValue = function () {
 	            return value;
 	        };
-	        return _this;
 	    }
 	    /** @override */
-	    BitStructure.prototype.decode = function (b, offset) {
-	        var dest = this.makeDestinationObject();
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var value = this.word.decode(b, offset);
+	    decode(b, offset = 0) {
+	        const dest = this.makeDestinationObject();
+	        const value = this.word.decode(b, offset);
 	        this._packedSetValue(value);
-	        for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-	            var fd = _a[_i];
+	        for (const fd of this.fields) {
 	            if (undefined !== fd.property) {
-	                dest[fd.property] = fd.decode(value);
+	                dest[fd.property] = fd.decode(b);
 	            }
 	        }
 	        return dest;
-	    };
+	    }
 	    /** Implement {@link Layout#encode|encode} for {@link BitStructure}.
 	     *
 	     * If `src` is missing a property for a member with a defined {@link
 	     * Layout#property|property} the corresponding region of the packed
 	     * value is left unmodified.  Unused bits are also left unmodified. */
-	    BitStructure.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var value = this.word.decode(b, offset);
+	    encode(src, b, offset = 0) {
+	        const value = this.word.decode(b, offset);
 	        this._packedSetValue(value);
-	        for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-	            var fd = _a[_i];
+	        for (const fd of this.fields) {
 	            if (undefined !== fd.property) {
-	                var fv = src[fd.property];
+	                const fv = src[fd.property];
 	                if (undefined !== fv) {
 	                    fd.encode(fv);
 	                }
 	            }
 	        }
 	        return this.word.encode(this._packedGetValue(), b, offset);
-	    };
+	    }
 	    /** Register a new bitfield with a containing bit structure.  The
 	     * resulting bitfield is returned.
 	     *
@@ -13350,11 +13206,11 @@ var solanaWeb3 = (function (exports) {
 	     * Layout#property|property}.
 	     *
 	     * @return {BitField} */
-	    BitStructure.prototype.addField = function (bits, property) {
-	        var bf = new BitField(this, bits, property);
+	    addField(bits, property) {
+	        const bf = new BitField(this, bits, property);
 	        this.fields.push(bf);
 	        return bf;
-	    };
+	    }
 	    /** As with {@link BitStructure#addField|addField} for single-bit
 	     * fields with `boolean` value representation.
 	     *
@@ -13362,13 +13218,14 @@ var solanaWeb3 = (function (exports) {
 	     * Layout#property|property}.
 	     *
 	     * @return {Boolean} */
-	    BitStructure.prototype.addBoolean = function (property) {
+	    // `Boolean` conflicts with the native primitive type
+	    // eslint-disable-next-line @typescript-eslint/ban-types
+	    addBoolean(property) {
 	        // This is my Boolean, not the Javascript one.
-	        // eslint-disable-next-line no-new-wrappers
-	        var bf = new Boolean$1(this, property);
+	        const bf = new Boolean$1(this, property);
 	        this.fields.push(bf);
 	        return bf;
-	    };
+	    }
 	    /**
 	     * Get access to the bit field for a given property.
 	     *
@@ -13377,20 +13234,18 @@ var solanaWeb3 = (function (exports) {
 	     * @return {BitField} - the field associated with `property`, or
 	     * undefined if there is no such property.
 	     */
-	    BitStructure.prototype.fieldFor = function (property) {
+	    fieldFor(property) {
 	        if ('string' !== typeof property) {
 	            throw new TypeError('property must be string');
 	        }
-	        for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-	            var fd = _a[_i];
+	        for (const fd of this.fields) {
 	            if (fd.property === property) {
 	                return fd;
 	            }
 	        }
 	        return undefined;
-	    };
-	    return BitStructure;
-	}(Layout));
+	    }
+	}
 	Layout$1.BitStructure = BitStructure;
 	/**
 	 * Represent a sequence of bits within a {@link BitStructure}.
@@ -13412,16 +13267,16 @@ var solanaWeb3 = (function (exports) {
 	 * @param {string} [property] - initializer for {@link
 	 * Layout#property|property}.
 	 */
-	var BitField = /** @class */ (function () {
-	    function BitField(container, bits, property) {
+	class BitField {
+	    constructor(container, bits, property) {
 	        if (!(container instanceof BitStructure)) {
 	            throw new TypeError('container must be a BitStructure');
 	        }
 	        if ((!Number.isInteger(bits)) || (0 >= bits)) {
 	            throw new TypeError('bits must be positive integer');
 	        }
-	        var totalBits = 8 * container.span;
-	        var usedBits = container.fields.reduce(function (sum, fd) { return sum + fd.bits; }, 0);
+	        const totalBits = 8 * container.span;
+	        const usedBits = container.fields.reduce((sum, fd) => sum + fd.bits, 0);
 	        if ((bits + usedBits) > totalBits) {
 	            throw new Error('bits too long for span remainder ('
 	                + (totalBits - usedBits) + ' of '
@@ -13465,30 +13320,30 @@ var solanaWeb3 = (function (exports) {
 	    }
 	    /** Store a value into the corresponding subsequence of the containing
 	     * bit field. */
-	    BitField.prototype.decode = function (b, offset) {
-	        var word = this.container._packedGetValue();
-	        var wordValue = fixBitwiseResult(word & this.wordMask);
-	        var value = wordValue >>> this.start;
+	    decode(b, offset) {
+	        const word = this.container._packedGetValue();
+	        const wordValue = fixBitwiseResult(word & this.wordMask);
+	        const value = wordValue >>> this.start;
 	        return value;
-	    };
+	    }
 	    /** Store a value into the corresponding subsequence of the containing
 	     * bit field.
 	     *
 	     * **NOTE** This is not a specialization of {@link
 	     * Layout#encode|Layout.encode} and there is no return value. */
-	    BitField.prototype.encode = function (value) {
-	        if ((!Number.isInteger(value))
+	    encode(value) {
+	        if ('number' !== typeof value
+	            || !Number.isInteger(value)
 	            || (value !== fixBitwiseResult(value & this.valueMask))) {
 	            throw new TypeError(nameWithProperty('BitField.encode', this)
 	                + ' value must be integer not exceeding ' + this.valueMask);
 	        }
-	        var word = this.container._packedGetValue();
-	        var wordValue = fixBitwiseResult(value << this.start);
+	        const word = this.container._packedGetValue();
+	        const wordValue = fixBitwiseResult(value << this.start);
 	        this.container._packedSetValue(fixBitwiseResult(word & ~this.wordMask)
 	            | wordValue);
-	    };
-	    return BitField;
-	}());
+	    }
+	}
 	Layout$1.BitField = BitField;
 	/**
 	 * Represent a single bit within a {@link BitStructure} as a
@@ -13507,27 +13362,25 @@ var solanaWeb3 = (function (exports) {
 	 * @augments {BitField}
 	 */
 	/* eslint-disable no-extend-native */
-	var Boolean$1 = /** @class */ (function (_super) {
-	    __extends(Boolean, _super);
-	    function Boolean(container, property) {
-	        return _super.call(this, container, 1, property) || this;
+	class Boolean$1 extends BitField {
+	    constructor(container, property) {
+	        super(container, 1, property);
 	    }
 	    /** Override {@link BitField#decode|decode} for {@link Boolean|Boolean}.
 	     *
 	     * @returns {boolean} */
-	    Boolean.prototype.decode = function (b, offset) {
-	        return !!BitField.prototype.decode.call(this, b, offset);
-	    };
+	    decode(b, offset) {
+	        return !!super.decode(b, offset);
+	    }
 	    /** @override */
-	    Boolean.prototype.encode = function (value) {
+	    encode(value) {
 	        if ('boolean' === typeof value) {
 	            // BitField requires integer values
 	            value = +value;
 	        }
-	        return BitField.prototype.encode.call(this, value);
-	    };
-	    return Boolean;
-	}(BitField));
+	        super.encode(value);
+	    }
+	}
 	Layout$1.Boolean = Boolean$1;
 	/* eslint-enable no-extend-native */
 	/**
@@ -13544,54 +13397,48 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var Blob$1 = /** @class */ (function (_super) {
-	    __extends(Blob, _super);
-	    function Blob(length, property) {
-	        var _this = this;
+	class Blob$1 extends Layout {
+	    constructor(length, property) {
 	        if (!(((length instanceof ExternalLayout) && length.isCount())
 	            || (Number.isInteger(length) && (0 <= length)))) {
 	            throw new TypeError('length must be positive integer '
 	                + 'or an unsigned integer ExternalLayout');
 	        }
-	        var span = -1;
+	        let span = -1;
 	        if (!(length instanceof ExternalLayout)) {
 	            span = length;
 	        }
-	        _this = _super.call(this, span, property) || this;
+	        super(span, property);
 	        /** The number of bytes in the blob.
 	         *
 	         * This may be a non-negative integer, or an instance of {@link
 	         * ExternalLayout} that satisfies {@link
 	         * ExternalLayout#isCount|isCount()}. */
-	        _this.length = length;
-	        return _this;
+	        this.length = length;
 	    }
 	    /** @override */
-	    Blob.prototype.getSpan = function (b, offset) {
-	        var span = this.span;
+	    getSpan(b, offset) {
+	        let span = this.span;
 	        if (0 > span) {
 	            span = this.length.decode(b, offset);
 	        }
 	        return span;
-	    };
+	    }
 	    /** @override */
-	    Blob.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var span = this.span;
+	    decode(b, offset = 0) {
+	        let span = this.span;
 	        if (0 > span) {
 	            span = this.length.decode(b, offset);
 	        }
 	        return uint8ArrayToBuffer(b).slice(offset, offset + span);
-	    };
+	    }
 	    /** Implement {@link Layout#encode|encode} for {@link Blob}.
 	     *
 	     * **NOTE** If {@link Layout#count|count} is an instance of {@link
 	     * ExternalLayout} then the length of `src` will be encoded as the
 	     * count after `src` is encoded. */
-	    Blob.prototype.encode = function (src, b, offset) {
-	        var span = this.length;
+	    encode(src, b, offset) {
+	        let span = this.length;
 	        if (this.length instanceof ExternalLayout) {
 	            span = src.length;
 	        }
@@ -13602,15 +13449,14 @@ var solanaWeb3 = (function (exports) {
 	        if ((offset + span) > b.length) {
 	            throw new RangeError('encoding overruns Uint8Array');
 	        }
-	        var srcBuffer = uint8ArrayToBuffer(src);
+	        const srcBuffer = uint8ArrayToBuffer(src);
 	        uint8ArrayToBuffer(b).write(srcBuffer.toString('hex'), offset, span, 'hex');
 	        if (this.length instanceof ExternalLayout) {
 	            this.length.encode(span, b, offset);
 	        }
 	        return span;
-	    };
-	    return Blob;
-	}(Layout));
+	    }
+	}
 	Layout$1.Blob = Blob$1;
 	/**
 	 * Contain a `NUL`-terminated UTF8 string.
@@ -13625,54 +13471,43 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var CString = /** @class */ (function (_super) {
-	    __extends(CString, _super);
-	    function CString(property) {
-	        return _super.call(this, -1, property) || this;
+	class CString extends Layout {
+	    constructor(property) {
+	        super(-1, property);
 	    }
 	    /** @override */
-	    CString.prototype.getSpan = function (b, offset) {
+	    getSpan(b, offset = 0) {
 	        checkUint8Array(b);
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var idx = offset;
+	        let idx = offset;
 	        while ((idx < b.length) && (0 !== b[idx])) {
 	            idx += 1;
 	        }
 	        return 1 + idx - offset;
-	    };
+	    }
 	    /** @override */
-	    CString.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var span = this.getSpan(b, offset);
+	    decode(b, offset = 0) {
+	        const span = this.getSpan(b, offset);
 	        return uint8ArrayToBuffer(b).slice(offset, offset + span - 1).toString('utf-8');
-	    };
+	    }
 	    /** @override */
-	    CString.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    encode(src, b, offset = 0) {
 	        /* Must force this to a string, lest it be a number and the
 	         * "utf8-encoding" below actually allocate a buffer of length
 	         * src */
 	        if ('string' !== typeof src) {
-	            src = src.toString();
+	            src = String(src);
 	        }
-	        var srcb = buffer_1.Buffer.from(src, 'utf8');
-	        var span = srcb.length;
+	        const srcb = buffer_1.Buffer.from(src, 'utf8');
+	        const span = srcb.length;
 	        if ((offset + span) > b.length) {
 	            throw new RangeError('encoding overruns Buffer');
 	        }
-	        var buffer = uint8ArrayToBuffer(b);
+	        const buffer = uint8ArrayToBuffer(b);
 	        srcb.copy(buffer, offset);
 	        buffer[offset + span] = 0;
 	        return span + 1;
-	    };
-	    return CString;
-	}(Layout));
+	    }
+	}
 	Layout$1.CString = CString;
 	/**
 	 * Contain a UTF8 string with implicit length.
@@ -13693,10 +13528,8 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var UTF8 = /** @class */ (function (_super) {
-	    __extends(UTF8, _super);
-	    function UTF8(maxSpan, property) {
-	        var _this = this;
+	class UTF8 extends Layout {
+	    constructor(maxSpan, property) {
 	        if (('string' === typeof maxSpan) && (undefined === property)) {
 	            property = maxSpan;
 	            maxSpan = undefined;
@@ -13707,7 +13540,7 @@ var solanaWeb3 = (function (exports) {
 	        else if (!Number.isInteger(maxSpan)) {
 	            throw new TypeError('maxSpan must be an integer');
 	        }
-	        _this = _super.call(this, -1, property) || this;
+	        super(-1, property);
 	        /** The maximum span of the layout in bytes.
 	         *
 	         * Positive values are generally expected.  Zero is abnormal.
@@ -13716,42 +13549,32 @@ var solanaWeb3 = (function (exports) {
 	         *
 	         * A negative value indicates that there is no bound on the length
 	         * of the content. */
-	        _this.maxSpan = maxSpan;
-	        return _this;
+	        this.maxSpan = maxSpan;
 	    }
 	    /** @override */
-	    UTF8.prototype.getSpan = function (b, offset) {
+	    getSpan(b, offset = 0) {
 	        checkUint8Array(b);
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
 	        return b.length - offset;
-	    };
+	    }
 	    /** @override */
-	    UTF8.prototype.decode = function (b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
-	        var span = this.getSpan(b, offset);
+	    decode(b, offset = 0) {
+	        const span = this.getSpan(b, offset);
 	        if ((0 <= this.maxSpan)
 	            && (this.maxSpan < span)) {
 	            throw new RangeError('text length exceeds maxSpan');
 	        }
 	        return uint8ArrayToBuffer(b).slice(offset, offset + span).toString('utf-8');
-	    };
+	    }
 	    /** @override */
-	    UTF8.prototype.encode = function (src, b, offset) {
-	        if (undefined === offset) {
-	            offset = 0;
-	        }
+	    encode(src, b, offset = 0) {
 	        /* Must force this to a string, lest it be a number and the
 	         * "utf8-encoding" below actually allocate a buffer of length
 	         * src */
 	        if ('string' !== typeof src) {
-	            src = src.toString();
+	            src = String(src);
 	        }
-	        var srcb = buffer_1.Buffer.from(src, 'utf8');
-	        var span = srcb.length;
+	        const srcb = buffer_1.Buffer.from(src, 'utf8');
+	        const span = srcb.length;
 	        if ((0 <= this.maxSpan)
 	            && (this.maxSpan < span)) {
 	            throw new RangeError('text length exceeds maxSpan');
@@ -13761,9 +13584,8 @@ var solanaWeb3 = (function (exports) {
 	        }
 	        srcb.copy(uint8ArrayToBuffer(b), offset);
 	        return span;
-	    };
-	    return UTF8;
-	}(Layout));
+	    }
+	}
 	Layout$1.UTF8 = UTF8;
 	/**
 	 * Contain a constant value.
@@ -13784,10 +13606,9 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @augments {Layout}
 	 */
-	var Constant = /** @class */ (function (_super) {
-	    __extends(Constant, _super);
-	    function Constant(value, property) {
-	        var _this = _super.call(this, 0, property) || this;
+	class Constant extends Layout {
+	    constructor(value, property) {
+	        super(0, property);
 	        /** The value produced by this constant when the layout is {@link
 	         * Constant#decode|decoded}.
 	         *
@@ -13797,135 +13618,127 @@ var solanaWeb3 = (function (exports) {
 	         * **WARNING** If `value` passed in the constructor was not
 	         * frozen, it is possible for users of decoded values to change
 	         * the content of the value. */
-	        _this.value = value;
-	        return _this;
+	        this.value = value;
 	    }
 	    /** @override */
-	    Constant.prototype.decode = function (b, offset) {
+	    decode(b, offset) {
 	        return this.value;
-	    };
+	    }
 	    /** @override */
-	    Constant.prototype.encode = function (src, b, offset) {
+	    encode(src, b, offset) {
 	        /* Constants take no space */
 	        return 0;
-	    };
-	    return Constant;
-	}(Layout));
+	    }
+	}
 	Layout$1.Constant = Constant;
 	/** Factory for {@link GreedyCount}. */
-	Layout$1.greedy = (function (elementSpan, property) { return new GreedyCount(elementSpan, property); });
+	Layout$1.greedy = ((elementSpan, property) => new GreedyCount(elementSpan, property));
 	/** Factory for {@link OffsetLayout}. */
-	var offset = Layout$1.offset = (function (layout, offset, property) { return new OffsetLayout(layout, offset, property); });
+	var offset = Layout$1.offset = ((layout, offset, property) => new OffsetLayout(layout, offset, property));
 	/** Factory for {@link UInt|unsigned int layouts} spanning one
 	 * byte. */
-	var u8 = Layout$1.u8 = (function (property) { return new UInt(1, property); });
+	var u8 = Layout$1.u8 = ((property) => new UInt(1, property));
 	/** Factory for {@link UInt|little-endian unsigned int layouts}
 	 * spanning two bytes. */
-	var u16 = Layout$1.u16 = (function (property) { return new UInt(2, property); });
+	var u16 = Layout$1.u16 = ((property) => new UInt(2, property));
 	/** Factory for {@link UInt|little-endian unsigned int layouts}
 	 * spanning three bytes. */
-	Layout$1.u24 = (function (property) { return new UInt(3, property); });
+	Layout$1.u24 = ((property) => new UInt(3, property));
 	/** Factory for {@link UInt|little-endian unsigned int layouts}
 	 * spanning four bytes. */
-	var u32 = Layout$1.u32 = (function (property) { return new UInt(4, property); });
+	var u32 = Layout$1.u32 = ((property) => new UInt(4, property));
 	/** Factory for {@link UInt|little-endian unsigned int layouts}
 	 * spanning five bytes. */
-	Layout$1.u40 = (function (property) { return new UInt(5, property); });
+	Layout$1.u40 = ((property) => new UInt(5, property));
 	/** Factory for {@link UInt|little-endian unsigned int layouts}
 	 * spanning six bytes. */
-	Layout$1.u48 = (function (property) { return new UInt(6, property); });
+	Layout$1.u48 = ((property) => new UInt(6, property));
 	/** Factory for {@link NearUInt64|little-endian unsigned int
 	 * layouts} interpreted as Numbers. */
-	var nu64 = Layout$1.nu64 = (function (property) { return new NearUInt64(property); });
+	var nu64 = Layout$1.nu64 = ((property) => new NearUInt64(property));
 	/** Factory for {@link UInt|big-endian unsigned int layouts}
 	 * spanning two bytes. */
-	Layout$1.u16be = (function (property) { return new UIntBE(2, property); });
+	Layout$1.u16be = ((property) => new UIntBE(2, property));
 	/** Factory for {@link UInt|big-endian unsigned int layouts}
 	 * spanning three bytes. */
-	Layout$1.u24be = (function (property) { return new UIntBE(3, property); });
+	Layout$1.u24be = ((property) => new UIntBE(3, property));
 	/** Factory for {@link UInt|big-endian unsigned int layouts}
 	 * spanning four bytes. */
-	Layout$1.u32be = (function (property) { return new UIntBE(4, property); });
+	Layout$1.u32be = ((property) => new UIntBE(4, property));
 	/** Factory for {@link UInt|big-endian unsigned int layouts}
 	 * spanning five bytes. */
-	Layout$1.u40be = (function (property) { return new UIntBE(5, property); });
+	Layout$1.u40be = ((property) => new UIntBE(5, property));
 	/** Factory for {@link UInt|big-endian unsigned int layouts}
 	 * spanning six bytes. */
-	Layout$1.u48be = (function (property) { return new UIntBE(6, property); });
+	Layout$1.u48be = ((property) => new UIntBE(6, property));
 	/** Factory for {@link NearUInt64BE|big-endian unsigned int
 	 * layouts} interpreted as Numbers. */
-	Layout$1.nu64be = (function (property) { return new NearUInt64BE(property); });
+	Layout$1.nu64be = ((property) => new NearUInt64BE(property));
 	/** Factory for {@link Int|signed int layouts} spanning one
 	 * byte. */
-	Layout$1.s8 = (function (property) { return new Int(1, property); });
+	Layout$1.s8 = ((property) => new Int(1, property));
 	/** Factory for {@link Int|little-endian signed int layouts}
 	 * spanning two bytes. */
-	Layout$1.s16 = (function (property) { return new Int(2, property); });
+	Layout$1.s16 = ((property) => new Int(2, property));
 	/** Factory for {@link Int|little-endian signed int layouts}
 	 * spanning three bytes. */
-	Layout$1.s24 = (function (property) { return new Int(3, property); });
+	Layout$1.s24 = ((property) => new Int(3, property));
 	/** Factory for {@link Int|little-endian signed int layouts}
 	 * spanning four bytes. */
-	Layout$1.s32 = (function (property) { return new Int(4, property); });
+	Layout$1.s32 = ((property) => new Int(4, property));
 	/** Factory for {@link Int|little-endian signed int layouts}
 	 * spanning five bytes. */
-	Layout$1.s40 = (function (property) { return new Int(5, property); });
+	Layout$1.s40 = ((property) => new Int(5, property));
 	/** Factory for {@link Int|little-endian signed int layouts}
 	 * spanning six bytes. */
-	Layout$1.s48 = (function (property) { return new Int(6, property); });
+	Layout$1.s48 = ((property) => new Int(6, property));
 	/** Factory for {@link NearInt64|little-endian signed int layouts}
 	 * interpreted as Numbers. */
-	var ns64 = Layout$1.ns64 = (function (property) { return new NearInt64(property); });
+	var ns64 = Layout$1.ns64 = ((property) => new NearInt64(property));
 	/** Factory for {@link Int|big-endian signed int layouts}
 	 * spanning two bytes. */
-	Layout$1.s16be = (function (property) { return new IntBE(2, property); });
+	Layout$1.s16be = ((property) => new IntBE(2, property));
 	/** Factory for {@link Int|big-endian signed int layouts}
 	 * spanning three bytes. */
-	Layout$1.s24be = (function (property) { return new IntBE(3, property); });
+	Layout$1.s24be = ((property) => new IntBE(3, property));
 	/** Factory for {@link Int|big-endian signed int layouts}
 	 * spanning four bytes. */
-	Layout$1.s32be = (function (property) { return new IntBE(4, property); });
+	Layout$1.s32be = ((property) => new IntBE(4, property));
 	/** Factory for {@link Int|big-endian signed int layouts}
 	 * spanning five bytes. */
-	Layout$1.s40be = (function (property) { return new IntBE(5, property); });
+	Layout$1.s40be = ((property) => new IntBE(5, property));
 	/** Factory for {@link Int|big-endian signed int layouts}
 	 * spanning six bytes. */
-	Layout$1.s48be = (function (property) { return new IntBE(6, property); });
+	Layout$1.s48be = ((property) => new IntBE(6, property));
 	/** Factory for {@link NearInt64BE|big-endian signed int layouts}
 	 * interpreted as Numbers. */
-	Layout$1.ns64be = (function (property) { return new NearInt64BE(property); });
+	Layout$1.ns64be = ((property) => new NearInt64BE(property));
 	/** Factory for {@link Float|little-endian 32-bit floating point} values. */
-	Layout$1.f32 = (function (property) { return new Float(property); });
+	Layout$1.f32 = ((property) => new Float(property));
 	/** Factory for {@link FloatBE|big-endian 32-bit floating point} values. */
-	Layout$1.f32be = (function (property) { return new FloatBE(property); });
+	Layout$1.f32be = ((property) => new FloatBE(property));
 	/** Factory for {@link Double|little-endian 64-bit floating point} values. */
-	Layout$1.f64 = (function (property) { return new Double(property); });
+	Layout$1.f64 = ((property) => new Double(property));
 	/** Factory for {@link DoubleBE|big-endian 64-bit floating point} values. */
-	Layout$1.f64be = (function (property) { return new DoubleBE(property); });
+	Layout$1.f64be = ((property) => new DoubleBE(property));
 	/** Factory for {@link Structure} values. */
-	var struct = Layout$1.struct = (function (fields, property, decodePrefixes) {
-	    return new Structure(fields, property, decodePrefixes);
-	});
+	var struct = Layout$1.struct = ((fields, property, decodePrefixes) => new Structure(fields, property, decodePrefixes));
 	/** Factory for {@link BitStructure} values. */
-	Layout$1.bits = (function (word, msb, property) { return new BitStructure(word, msb, property); });
+	Layout$1.bits = ((word, msb, property) => new BitStructure(word, msb, property));
 	/** Factory for {@link Sequence} values. */
-	var seq = Layout$1.seq = (function (elementLayout, count, property) {
-	    return new Sequence(elementLayout, count, property);
-	});
+	var seq = Layout$1.seq = ((elementLayout, count, property) => new Sequence(elementLayout, count, property));
 	/** Factory for {@link Union} values. */
-	Layout$1.union = (function (discr, defaultLayout, property) {
-	    return new Union(discr, defaultLayout, property);
-	});
+	Layout$1.union = ((discr, defaultLayout, property) => new Union(discr, defaultLayout, property));
 	/** Factory for {@link UnionLayoutDiscriminator} values. */
-	Layout$1.unionLayoutDiscriminator = (function (layout, property) { return new UnionLayoutDiscriminator(layout, property); });
+	Layout$1.unionLayoutDiscriminator = ((layout, property) => new UnionLayoutDiscriminator(layout, property));
 	/** Factory for {@link Blob} values. */
-	var blob = Layout$1.blob = (function (length, property) { return new Blob$1(length, property); });
+	var blob = Layout$1.blob = ((length, property) => new Blob$1(length, property));
 	/** Factory for {@link CString} values. */
-	Layout$1.cstr = (function (property) { return new CString(property); });
+	Layout$1.cstr = ((property) => new CString(property));
 	/** Factory for {@link UTF8} values. */
-	Layout$1.utf8 = (function (maxSpan, property) { return new UTF8(maxSpan, property); });
+	Layout$1.utf8 = ((maxSpan, property) => new UTF8(maxSpan, property));
 	/** Factory for {@link Constant} values. */
-	Layout$1.constant = (function (value, property) { return new Constant(value, property); });
+	Layout$1.constant = ((value, property) => new Constant(value, property));
 
 	/**
 	 * Layout for a public key
@@ -13934,10 +13747,10 @@ var solanaWeb3 = (function (exports) {
 	const publicKey = (property = 'publicKey') => {
 	  return blob(32, property);
 	};
+
 	/**
 	 * Layout for a Rust String type
 	 */
-
 	const rustString = (property = 'string') => {
 	  const rsl = struct([u32('length'), u32('lengthPadding'), blob(offset(u32(), -8), 'chars')], property);
 
@@ -13945,24 +13758,26 @@ var solanaWeb3 = (function (exports) {
 
 	  const _encode = rsl.encode.bind(rsl);
 
-	  rsl.decode = (buffer, offset) => {
-	    const data = _decode(buffer, offset);
+	  const rslShim = rsl;
 
-	    return data['chars'].toString('utf8');
+	  rslShim.decode = (b, offset) => {
+	    const data = _decode(b, offset);
+
+	    return data['chars'].toString();
 	  };
 
-	  rsl.encode = (str, buffer$1, offset) => {
+	  rslShim.encode = (str, b, offset) => {
 	    const data = {
 	      chars: buffer.Buffer.from(str, 'utf8')
 	    };
-	    return _encode(data, buffer$1, offset);
+	    return _encode(data, b, offset);
 	  };
 
-	  rsl.alloc = str => {
+	  rslShim.alloc = str => {
 	    return u32().span + u32().span + buffer.Buffer.from(str, 'utf8').length;
 	  };
 
-	  return rsl;
+	  return rslShim;
 	};
 	/**
 	 * Layout for an Authorized object
@@ -14082,7 +13897,7 @@ var solanaWeb3 = (function (exports) {
 	        accounts,
 	        programIdIndex
 	      } = instruction;
-	      const data = bs58$1.decode(instruction.data);
+	      const data = Array.from(bs58$1.decode(instruction.data));
 	      let keyIndicesCount = [];
 	      encodeLength(keyIndicesCount, accounts.length);
 	      let dataCount = [];
@@ -14090,7 +13905,7 @@ var solanaWeb3 = (function (exports) {
 	      return {
 	        programIdIndex,
 	        keyIndicesCount: buffer.Buffer.from(keyIndicesCount),
-	        keyIndices: buffer.Buffer.from(accounts),
+	        keyIndices: accounts,
 	        dataLength: buffer.Buffer.from(dataCount),
 	        data
 	      };
@@ -14494,6 +14309,14 @@ var solanaWeb3 = (function (exports) {
 	  serializeMessage() {
 	    return this._compile().serialize();
 	  }
+	  /**
+	   * Get the estimated fee associated with a transaction
+	   */
+
+
+	  async getEstimatedFee(connection) {
+	    return (await connection.getFeeForMessage(this.compileMessage())).value;
+	  }
 	  /**
 	   * Specify the public keys which will be used to sign the Transaction.
 	   * The first signer will be used as the transaction fee payer account.
@@ -14857,10 +14680,6 @@ var solanaWeb3 = (function (exports) {
 	  return new Promise(resolve => setTimeout(resolve, ms));
 	}
 
-	/**
-	 * @internal
-	 */
-
 	/**
 	 * Populate a buffer of instruction data using an InstructionType
 	 * @internal
@@ -15660,11 +15479,11 @@ var solanaWeb3 = (function (exports) {
 	}
 	SystemProgram.programId = new PublicKey('11111111111111111111111111111111');
 
+	// Keep program chunks under PACKET_DATA_SIZE, leaving enough room for the
 	// rest of the Transaction fields
 	//
 	// TODO: replace 300 with a proper constant for the size of the other
 	// Transaction fields
-
 	const CHUNK_SIZE = PACKET_DATA_SIZE - 300;
 	/**
 	 * Program loader interface
@@ -15772,7 +15591,9 @@ var solanaWeb3 = (function (exports) {
 	        instruction: 0,
 	        // Load instruction
 	        offset: offset$1,
-	        bytes
+	        bytes: bytes,
+	        bytesLength: 0,
+	        bytesLengthPadding: 0
 	      }, data);
 	      const transaction = new Transaction().add({
 	        keys: [{
@@ -16404,7 +16225,7 @@ var solanaWeb3 = (function (exports) {
 
 	  return exports;
 
-	})({}));
+	}))({});
 	})(__self__);
 	__self__.fetch.ponyfill = true;
 	// Remove "polyfill" property added by whatwg-fetch
@@ -16705,7 +16526,7 @@ var solanaWeb3 = (function (exports) {
 
 
 	  validate(value, options = {}) {
-	    return validate(value, this, options);
+	    return validate$1(value, this, options);
 	  }
 
 	}
@@ -16714,7 +16535,7 @@ var solanaWeb3 = (function (exports) {
 	 */
 
 	function assert$b(value, struct) {
-	  const result = validate(value, struct);
+	  const result = validate$1(value, struct);
 
 	  if (result[0]) {
 	    throw result[0];
@@ -16725,7 +16546,7 @@ var solanaWeb3 = (function (exports) {
 	 */
 
 	function create(value, struct) {
-	  const result = validate(value, struct, {
+	  const result = validate$1(value, struct, {
 	    coerce: true
 	  });
 
@@ -16740,7 +16561,7 @@ var solanaWeb3 = (function (exports) {
 	 */
 
 	function mask(value, struct) {
-	  const result = validate(value, struct, {
+	  const result = validate$1(value, struct, {
 	    coerce: true,
 	    mask: true
 	  });
@@ -16756,7 +16577,7 @@ var solanaWeb3 = (function (exports) {
 	 */
 
 	function is(value, struct) {
-	  const result = validate(value, struct);
+	  const result = validate$1(value, struct);
 	  return !result[0];
 	}
 	/**
@@ -16764,7 +16585,7 @@ var solanaWeb3 = (function (exports) {
 	 * value (with potential coercion) if valid.
 	 */
 
-	function validate(value, struct, options = {}) {
+	function validate$1(value, struct, options = {}) {
 	  const tuples = run(value, struct, options);
 	  const tuple = shiftIterator(tuples);
 
@@ -17044,8 +16865,7 @@ var solanaWeb3 = (function (exports) {
 	  };
 	}
 
-	module.exports = _interopRequireDefault;
-	module.exports["default"] = module.exports, module.exports.__esModule = true;
+	module.exports = _interopRequireDefault, module.exports.__esModule = true, module.exports["default"] = module.exports;
 	}(interopRequireDefault));
 
 	var classCallCheck = {exports: {}};
@@ -17057,8 +16877,7 @@ var solanaWeb3 = (function (exports) {
 	  }
 	}
 
-	module.exports = _classCallCheck;
-	module.exports["default"] = module.exports, module.exports.__esModule = true;
+	module.exports = _classCallCheck, module.exports.__esModule = true, module.exports["default"] = module.exports;
 	}(classCallCheck));
 
 	var inherits$3 = {exports: {}};
@@ -17070,14 +16889,11 @@ var solanaWeb3 = (function (exports) {
 	  module.exports = _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
 	    o.__proto__ = p;
 	    return o;
-	  };
-
-	  module.exports["default"] = module.exports, module.exports.__esModule = true;
+	  }, module.exports.__esModule = true, module.exports["default"] = module.exports;
 	  return _setPrototypeOf(o, p);
 	}
 
-	module.exports = _setPrototypeOf;
-	module.exports["default"] = module.exports, module.exports.__esModule = true;
+	module.exports = _setPrototypeOf, module.exports.__esModule = true, module.exports["default"] = module.exports;
 	}(setPrototypeOf));
 
 	(function (module) {
@@ -17095,11 +16911,13 @@ var solanaWeb3 = (function (exports) {
 	      configurable: true
 	    }
 	  });
+	  Object.defineProperty(subClass, "prototype", {
+	    writable: false
+	  });
 	  if (superClass) setPrototypeOf$1(subClass, superClass);
 	}
 
-	module.exports = _inherits;
-	module.exports["default"] = module.exports, module.exports.__esModule = true;
+	module.exports = _inherits, module.exports.__esModule = true, module.exports["default"] = module.exports;
 	}(inherits$3));
 
 	var possibleConstructorReturn = {exports: {}};
@@ -17110,25 +16928,14 @@ var solanaWeb3 = (function (exports) {
 	function _typeof(obj) {
 	  "@babel/helpers - typeof";
 
-	  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-	    module.exports = _typeof = function _typeof(obj) {
-	      return typeof obj;
-	    };
-
-	    module.exports["default"] = module.exports, module.exports.__esModule = true;
-	  } else {
-	    module.exports = _typeof = function _typeof(obj) {
-	      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-	    };
-
-	    module.exports["default"] = module.exports, module.exports.__esModule = true;
-	  }
-
-	  return _typeof(obj);
+	  return (module.exports = _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+	    return typeof obj;
+	  } : function (obj) {
+	    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+	  }, module.exports.__esModule = true, module.exports["default"] = module.exports), _typeof(obj);
 	}
 
-	module.exports = _typeof;
-	module.exports["default"] = module.exports, module.exports.__esModule = true;
+	module.exports = _typeof, module.exports.__esModule = true, module.exports["default"] = module.exports;
 	}(_typeof));
 
 	var assertThisInitialized = {exports: {}};
@@ -17142,8 +16949,7 @@ var solanaWeb3 = (function (exports) {
 	  return self;
 	}
 
-	module.exports = _assertThisInitialized;
-	module.exports["default"] = module.exports, module.exports.__esModule = true;
+	module.exports = _assertThisInitialized, module.exports.__esModule = true, module.exports["default"] = module.exports;
 	}(assertThisInitialized));
 
 	(function (module) {
@@ -17161,8 +16967,7 @@ var solanaWeb3 = (function (exports) {
 	  return assertThisInitialized$1(self);
 	}
 
-	module.exports = _possibleConstructorReturn;
-	module.exports["default"] = module.exports, module.exports.__esModule = true;
+	module.exports = _possibleConstructorReturn, module.exports.__esModule = true, module.exports["default"] = module.exports;
 	}(possibleConstructorReturn));
 
 	var getPrototypeOf = {exports: {}};
@@ -17171,13 +16976,11 @@ var solanaWeb3 = (function (exports) {
 	function _getPrototypeOf(o) {
 	  module.exports = _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
 	    return o.__proto__ || Object.getPrototypeOf(o);
-	  };
-	  module.exports["default"] = module.exports, module.exports.__esModule = true;
+	  }, module.exports.__esModule = true, module.exports["default"] = module.exports;
 	  return _getPrototypeOf(o);
 	}
 
-	module.exports = _getPrototypeOf;
-	module.exports["default"] = module.exports, module.exports.__esModule = true;
+	module.exports = _getPrototypeOf, module.exports.__esModule = true, module.exports["default"] = module.exports;
 	}(getPrototypeOf));
 
 	var websocket_browser = {};
@@ -17198,11 +17001,13 @@ var solanaWeb3 = (function (exports) {
 	function _createClass(Constructor, protoProps, staticProps) {
 	  if (protoProps) _defineProperties(Constructor.prototype, protoProps);
 	  if (staticProps) _defineProperties(Constructor, staticProps);
+	  Object.defineProperty(Constructor, "prototype", {
+	    writable: false
+	  });
 	  return Constructor;
 	}
 
-	module.exports = _createClass;
-	module.exports["default"] = module.exports, module.exports.__esModule = true;
+	module.exports = _createClass, module.exports.__esModule = true, module.exports["default"] = module.exports;
 	}(createClass));
 
 	var eventemitter3 = {exports: {}};
@@ -17762,9 +17567,9 @@ var solanaWeb3 = (function (exports) {
 	  // This is a polyfill for %IteratorPrototype% for environments that
 	  // don't natively support it.
 	  var IteratorPrototype = {};
-	  IteratorPrototype[iteratorSymbol] = function () {
+	  define(IteratorPrototype, iteratorSymbol, function () {
 	    return this;
-	  };
+	  });
 
 	  var getProto = Object.getPrototypeOf;
 	  var NativeIteratorPrototype = getProto && getProto(getProto(values([])));
@@ -17778,8 +17583,9 @@ var solanaWeb3 = (function (exports) {
 
 	  var Gp = GeneratorFunctionPrototype.prototype =
 	    Generator.prototype = Object.create(IteratorPrototype);
-	  GeneratorFunction.prototype = Gp.constructor = GeneratorFunctionPrototype;
-	  GeneratorFunctionPrototype.constructor = GeneratorFunction;
+	  GeneratorFunction.prototype = GeneratorFunctionPrototype;
+	  define(Gp, "constructor", GeneratorFunctionPrototype);
+	  define(GeneratorFunctionPrototype, "constructor", GeneratorFunction);
 	  GeneratorFunction.displayName = define(
 	    GeneratorFunctionPrototype,
 	    toStringTagSymbol,
@@ -17893,9 +17699,9 @@ var solanaWeb3 = (function (exports) {
 	  }
 
 	  defineIteratorMethods(AsyncIterator.prototype);
-	  AsyncIterator.prototype[asyncIteratorSymbol] = function () {
+	  define(AsyncIterator.prototype, asyncIteratorSymbol, function () {
 	    return this;
-	  };
+	  });
 	  exports.AsyncIterator = AsyncIterator;
 
 	  // Note that simple async functions are implemented on top of
@@ -18088,13 +17894,13 @@ var solanaWeb3 = (function (exports) {
 	  // iterator prototype chain incorrectly implement this, causing the Generator
 	  // object to not be returned from this call. This ensures that doesn't happen.
 	  // See https://github.com/facebook/regenerator/issues/274 for more details.
-	  Gp[iteratorSymbol] = function() {
+	  define(Gp, iteratorSymbol, function() {
 	    return this;
-	  };
+	  });
 
-	  Gp.toString = function() {
+	  define(Gp, "toString", function() {
 	    return "[object Generator]";
-	  };
+	  });
 
 	  function pushTryEntry(locs) {
 	    var entry = { tryLoc: locs[0] };
@@ -18413,14 +18219,19 @@ var solanaWeb3 = (function (exports) {
 	} catch (accidentalStrictMode) {
 	  // This module should not be running in strict mode, so the above
 	  // assignment should always work unless something is misconfigured. Just
-	  // in case runtime.js accidentally runs in strict mode, we can escape
+	  // in case runtime.js accidentally runs in strict mode, in modern engines
+	  // we can explicitly access globalThis. In older engines we can escape
 	  // strict mode using a global Function call. This could conceivably fail
 	  // if a Content Security Policy forbids using Function, but in that case
 	  // the proper solution is to fix the accidental strict mode problem. If
 	  // you've misconfigured your bundler to force strict mode and applied a
 	  // CSP to forbid Function, and you're not willing to fix either of those
 	  // problems, please detail your unique predicament in a GitHub issue.
-	  Function("r", "regeneratorRuntime = r")(runtime);
+	  if (typeof globalThis === "object") {
+	    globalThis.regeneratorRuntime = runtime;
+	  } else {
+	    Function("r", "regeneratorRuntime = r")(runtime);
+	  }
 	}
 	}(runtime));
 
@@ -18465,8 +18276,7 @@ var solanaWeb3 = (function (exports) {
 	  };
 	}
 
-	module.exports = _asyncToGenerator;
-	module.exports["default"] = module.exports, module.exports.__esModule = true;
+	module.exports = _asyncToGenerator, module.exports.__esModule = true, module.exports["default"] = module.exports;
 	}(asyncToGenerator));
 
 	/*!
@@ -19090,231 +18900,736 @@ var solanaWeb3 = (function (exports) {
 	      this.socket.addEventListener("open", function () {
 	        _this4.ready = true;
 
-	        _this4.emit("open");
+	        _this4.emit("open");
+
+	        _this4.current_reconnects = 0;
+	      });
+	      this.socket.addEventListener("message", function (_ref) {
+	        var message = _ref.data;
+	        if (message instanceof ArrayBuffer) message = Buffer.from(message).toString();
+
+	        try {
+	          message = _circularJson["default"].parse(message);
+	        } catch (error) {
+	          return;
+	        } // check if any listeners are attached and forward event
+
+
+	        if (message.notification && _this4.listeners(message.notification).length) {
+	          if (!Object.keys(message.params).length) return _this4.emit(message.notification);
+	          var args = [message.notification];
+	          if (message.params.constructor === Object) args.push(message.params);else // using for-loop instead of unshift/spread because performance is better
+	            for (var i = 0; i < message.params.length; i++) {
+	              args.push(message.params[i]);
+	            } // run as microtask so that pending queue messages are resolved first
+	          // eslint-disable-next-line prefer-spread
+
+	          return Promise.resolve().then(function () {
+	            _this4.emit.apply(_this4, args);
+	          });
+	        }
+
+	        if (!_this4.queue[message.id]) {
+	          // general JSON RPC 2.0 events
+	          if (message.method && message.params) {
+	            // run as microtask so that pending queue messages are resolved first
+	            return Promise.resolve().then(function () {
+	              _this4.emit(message.method, message.params);
+	            });
+	          }
+
+	          return;
+	        } // reject early since server's response is invalid
+
+
+	        if ("error" in message === "result" in message) _this4.queue[message.id].promise[1](new Error("Server response malformed. Response must include either \"result\"" + " or \"error\", but not both."));
+	        if (_this4.queue[message.id].timeout) clearTimeout(_this4.queue[message.id].timeout);
+	        if (message.error) _this4.queue[message.id].promise[1](message.error);else _this4.queue[message.id].promise[0](message.result);
+	        delete _this4.queue[message.id];
+	      });
+	      this.socket.addEventListener("error", function (error) {
+	        return _this4.emit("error", error);
+	      });
+	      this.socket.addEventListener("close", function (_ref2) {
+	        var code = _ref2.code,
+	            reason = _ref2.reason;
+	        if (_this4.ready) // Delay close event until internal state is updated
+	          setTimeout(function () {
+	            return _this4.emit("close", code, reason);
+	          }, 0);
+	        _this4.ready = false;
+	        _this4.socket = undefined;
+	        if (code === 1000) return;
+	        _this4.current_reconnects++;
+	        if (_this4.reconnect && (_this4.max_reconnects > _this4.current_reconnects || _this4.max_reconnects === 0)) setTimeout(function () {
+	          return _this4._connect(address, options);
+	        }, _this4.reconnect_interval);
+	      });
+	    }
+	  }]);
+	  return CommonClient;
+	}(_eventemitter.EventEmitter);
+
+	exports["default"] = CommonClient;
+	}(client));
+
+	var _interopRequireDefault = interopRequireDefault.exports;
+
+	Object.defineProperty(index_browser, "__esModule", {
+	  value: true
+	});
+	var Client_1 = index_browser.Client = void 0;
+
+	var _classCallCheck2 = _interopRequireDefault(classCallCheck.exports);
+
+	var _inherits2 = _interopRequireDefault(inherits$3.exports);
+
+	var _possibleConstructorReturn2 = _interopRequireDefault(possibleConstructorReturn.exports);
+
+	var _getPrototypeOf2 = _interopRequireDefault(getPrototypeOf.exports);
+
+	var _websocket = _interopRequireDefault(websocket_browser);
+
+	var _client = _interopRequireDefault(client);
+
+	function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
+
+	function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+
+	var Client = /*#__PURE__*/function (_CommonClient) {
+	  (0, _inherits2["default"])(Client, _CommonClient);
+
+	  var _super = _createSuper(Client);
+
+	  function Client() {
+	    var address = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "ws://localhost:8080";
+
+	    var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+	        _ref$autoconnect = _ref.autoconnect,
+	        autoconnect = _ref$autoconnect === void 0 ? true : _ref$autoconnect,
+	        _ref$reconnect = _ref.reconnect,
+	        reconnect = _ref$reconnect === void 0 ? true : _ref$reconnect,
+	        _ref$reconnect_interv = _ref.reconnect_interval,
+	        reconnect_interval = _ref$reconnect_interv === void 0 ? 1000 : _ref$reconnect_interv,
+	        _ref$max_reconnects = _ref.max_reconnects,
+	        max_reconnects = _ref$max_reconnects === void 0 ? 5 : _ref$max_reconnects;
+
+	    var generate_request_id = arguments.length > 2 ? arguments[2] : undefined;
+	    (0, _classCallCheck2["default"])(this, Client);
+	    return _super.call(this, _websocket["default"], address, {
+	      autoconnect: autoconnect,
+	      reconnect: reconnect,
+	      reconnect_interval: reconnect_interval,
+	      max_reconnects: max_reconnects
+	    }, generate_request_id);
+	  }
+
+	  return Client;
+	}(_client["default"]);
+
+	Client_1 = index_browser.Client = Client;
+
+	// Unique ID creation requires a high quality random # generator. In the browser we therefore
+	// require the crypto API and do not support built-in fallback to lower quality random number
+	// generators (like Math.random()).
+	var getRandomValues;
+	var rnds8 = new Uint8Array(16);
+	function rng() {
+	  // lazy load so that environments that need to polyfill have a chance to do so
+	  if (!getRandomValues) {
+	    // getRandomValues needs to be invoked in a context where "this" is a Crypto implementation. Also,
+	    // find the complete implementation of crypto (msCrypto) on IE11.
+	    getRandomValues = typeof crypto !== 'undefined' && crypto.getRandomValues && crypto.getRandomValues.bind(crypto) || typeof msCrypto !== 'undefined' && typeof msCrypto.getRandomValues === 'function' && msCrypto.getRandomValues.bind(msCrypto);
+
+	    if (!getRandomValues) {
+	      throw new Error('crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported');
+	    }
+	  }
+
+	  return getRandomValues(rnds8);
+	}
+
+	var REGEX = /^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i;
+
+	function validate(uuid) {
+	  return typeof uuid === 'string' && REGEX.test(uuid);
+	}
+
+	/**
+	 * Convert array of 16 byte values to UUID string format of the form:
+	 * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
+	 */
+
+	var byteToHex = [];
+
+	for (var i = 0; i < 256; ++i) {
+	  byteToHex.push((i + 0x100).toString(16).substr(1));
+	}
+
+	function stringify(arr) {
+	  var offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+	  // Note: Be careful editing this code!  It's been tuned for performance
+	  // and works in ways you may not expect. See https://github.com/uuidjs/uuid/pull/434
+	  var uuid = (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + '-' + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + '-' + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + '-' + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + '-' + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase(); // Consistency check for valid UUID.  If this throws, it's likely due to one
+	  // of the following:
+	  // - One or more input array values don't map to a hex octet (leading to
+	  // "undefined" in the uuid)
+	  // - Invalid input values for the RFC `version` or `variant` fields
+
+	  if (!validate(uuid)) {
+	    throw TypeError('Stringified UUID is invalid');
+	  }
+
+	  return uuid;
+	}
+
+	//
+	// Inspired by https://github.com/LiosK/UUID.js
+	// and http://docs.python.org/library/uuid.html
+
+	var _nodeId;
+
+	var _clockseq; // Previous uuid creation time
+
+
+	var _lastMSecs = 0;
+	var _lastNSecs = 0; // See https://github.com/uuidjs/uuid for API details
+
+	function v1(options, buf, offset) {
+	  var i = buf && offset || 0;
+	  var b = buf || new Array(16);
+	  options = options || {};
+	  var node = options.node || _nodeId;
+	  var clockseq = options.clockseq !== undefined ? options.clockseq : _clockseq; // node and clockseq need to be initialized to random values if they're not
+	  // specified.  We do this lazily to minimize issues related to insufficient
+	  // system entropy.  See #189
+
+	  if (node == null || clockseq == null) {
+	    var seedBytes = options.random || (options.rng || rng)();
+
+	    if (node == null) {
+	      // Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1)
+	      node = _nodeId = [seedBytes[0] | 0x01, seedBytes[1], seedBytes[2], seedBytes[3], seedBytes[4], seedBytes[5]];
+	    }
+
+	    if (clockseq == null) {
+	      // Per 4.2.2, randomize (14 bit) clockseq
+	      clockseq = _clockseq = (seedBytes[6] << 8 | seedBytes[7]) & 0x3fff;
+	    }
+	  } // UUID timestamps are 100 nano-second units since the Gregorian epoch,
+	  // (1582-10-15 00:00).  JSNumbers aren't precise enough for this, so
+	  // time is handled internally as 'msecs' (integer milliseconds) and 'nsecs'
+	  // (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01 00:00.
+
+
+	  var msecs = options.msecs !== undefined ? options.msecs : Date.now(); // Per 4.2.1.2, use count of uuid's generated during the current clock
+	  // cycle to simulate higher resolution clock
+
+	  var nsecs = options.nsecs !== undefined ? options.nsecs : _lastNSecs + 1; // Time since last uuid creation (in msecs)
+
+	  var dt = msecs - _lastMSecs + (nsecs - _lastNSecs) / 10000; // Per 4.2.1.2, Bump clockseq on clock regression
+
+	  if (dt < 0 && options.clockseq === undefined) {
+	    clockseq = clockseq + 1 & 0x3fff;
+	  } // Reset nsecs if clock regresses (new clockseq) or we've moved onto a new
+	  // time interval
+
+
+	  if ((dt < 0 || msecs > _lastMSecs) && options.nsecs === undefined) {
+	    nsecs = 0;
+	  } // Per 4.2.1.2 Throw error if too many uuids are requested
+
+
+	  if (nsecs >= 10000) {
+	    throw new Error("uuid.v1(): Can't create more than 10M uuids/sec");
+	  }
+
+	  _lastMSecs = msecs;
+	  _lastNSecs = nsecs;
+	  _clockseq = clockseq; // Per 4.1.4 - Convert from unix epoch to Gregorian epoch
+
+	  msecs += 12219292800000; // `time_low`
+
+	  var tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000;
+	  b[i++] = tl >>> 24 & 0xff;
+	  b[i++] = tl >>> 16 & 0xff;
+	  b[i++] = tl >>> 8 & 0xff;
+	  b[i++] = tl & 0xff; // `time_mid`
+
+	  var tmh = msecs / 0x100000000 * 10000 & 0xfffffff;
+	  b[i++] = tmh >>> 8 & 0xff;
+	  b[i++] = tmh & 0xff; // `time_high_and_version`
+
+	  b[i++] = tmh >>> 24 & 0xf | 0x10; // include version
+
+	  b[i++] = tmh >>> 16 & 0xff; // `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant)
+
+	  b[i++] = clockseq >>> 8 | 0x80; // `clock_seq_low`
+
+	  b[i++] = clockseq & 0xff; // `node`
+
+	  for (var n = 0; n < 6; ++n) {
+	    b[i + n] = node[n];
+	  }
+
+	  return buf || stringify(b);
+	}
+
+	function parse(uuid) {
+	  if (!validate(uuid)) {
+	    throw TypeError('Invalid UUID');
+	  }
+
+	  var v;
+	  var arr = new Uint8Array(16); // Parse ########-....-....-....-............
+
+	  arr[0] = (v = parseInt(uuid.slice(0, 8), 16)) >>> 24;
+	  arr[1] = v >>> 16 & 0xff;
+	  arr[2] = v >>> 8 & 0xff;
+	  arr[3] = v & 0xff; // Parse ........-####-....-....-............
+
+	  arr[4] = (v = parseInt(uuid.slice(9, 13), 16)) >>> 8;
+	  arr[5] = v & 0xff; // Parse ........-....-####-....-............
+
+	  arr[6] = (v = parseInt(uuid.slice(14, 18), 16)) >>> 8;
+	  arr[7] = v & 0xff; // Parse ........-....-....-####-............
+
+	  arr[8] = (v = parseInt(uuid.slice(19, 23), 16)) >>> 8;
+	  arr[9] = v & 0xff; // Parse ........-....-....-....-############
+	  // (Use "/" to avoid 32-bit truncation when bit-shifting high-order bytes)
+
+	  arr[10] = (v = parseInt(uuid.slice(24, 36), 16)) / 0x10000000000 & 0xff;
+	  arr[11] = v / 0x100000000 & 0xff;
+	  arr[12] = v >>> 24 & 0xff;
+	  arr[13] = v >>> 16 & 0xff;
+	  arr[14] = v >>> 8 & 0xff;
+	  arr[15] = v & 0xff;
+	  return arr;
+	}
+
+	function stringToBytes(str) {
+	  str = unescape(encodeURIComponent(str)); // UTF8 escape
+
+	  var bytes = [];
+
+	  for (var i = 0; i < str.length; ++i) {
+	    bytes.push(str.charCodeAt(i));
+	  }
+
+	  return bytes;
+	}
+
+	var DNS = '6ba7b810-9dad-11d1-80b4-00c04fd430c8';
+	var URL$1 = '6ba7b811-9dad-11d1-80b4-00c04fd430c8';
+	function v35 (name, version, hashfunc) {
+	  function generateUUID(value, namespace, buf, offset) {
+	    if (typeof value === 'string') {
+	      value = stringToBytes(value);
+	    }
+
+	    if (typeof namespace === 'string') {
+	      namespace = parse(namespace);
+	    }
+
+	    if (namespace.length !== 16) {
+	      throw TypeError('Namespace must be array-like (16 iterable integer values, 0-255)');
+	    } // Compute hash of namespace and value, Per 4.3
+	    // Future: Use spread syntax when supported on all platforms, e.g. `bytes =
+	    // hashfunc([...namespace, ... value])`
+
+
+	    var bytes = new Uint8Array(16 + value.length);
+	    bytes.set(namespace);
+	    bytes.set(value, namespace.length);
+	    bytes = hashfunc(bytes);
+	    bytes[6] = bytes[6] & 0x0f | version;
+	    bytes[8] = bytes[8] & 0x3f | 0x80;
+
+	    if (buf) {
+	      offset = offset || 0;
+
+	      for (var i = 0; i < 16; ++i) {
+	        buf[offset + i] = bytes[i];
+	      }
+
+	      return buf;
+	    }
+
+	    return stringify(bytes);
+	  } // Function#name is not settable on some platforms (#270)
+
+
+	  try {
+	    generateUUID.name = name; // eslint-disable-next-line no-empty
+	  } catch (err) {} // For CommonJS default export support
+
+
+	  generateUUID.DNS = DNS;
+	  generateUUID.URL = URL$1;
+	  return generateUUID;
+	}
+
+	/*
+	 * Browser-compatible JavaScript MD5
+	 *
+	 * Modification of JavaScript MD5
+	 * https://github.com/blueimp/JavaScript-MD5
+	 *
+	 * Copyright 2011, Sebastian Tschan
+	 * https://blueimp.net
+	 *
+	 * Licensed under the MIT license:
+	 * https://opensource.org/licenses/MIT
+	 *
+	 * Based on
+	 * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+	 * Digest Algorithm, as defined in RFC 1321.
+	 * Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
+	 * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+	 * Distributed under the BSD License
+	 * See http://pajhome.org.uk/crypt/md5 for more info.
+	 */
+	function md5(bytes) {
+	  if (typeof bytes === 'string') {
+	    var msg = unescape(encodeURIComponent(bytes)); // UTF8 escape
+
+	    bytes = new Uint8Array(msg.length);
+
+	    for (var i = 0; i < msg.length; ++i) {
+	      bytes[i] = msg.charCodeAt(i);
+	    }
+	  }
+
+	  return md5ToHexEncodedArray(wordsToMd5(bytesToWords(bytes), bytes.length * 8));
+	}
+	/*
+	 * Convert an array of little-endian words to an array of bytes
+	 */
+
+
+	function md5ToHexEncodedArray(input) {
+	  var output = [];
+	  var length32 = input.length * 32;
+	  var hexTab = '0123456789abcdef';
+
+	  for (var i = 0; i < length32; i += 8) {
+	    var x = input[i >> 5] >>> i % 32 & 0xff;
+	    var hex = parseInt(hexTab.charAt(x >>> 4 & 0x0f) + hexTab.charAt(x & 0x0f), 16);
+	    output.push(hex);
+	  }
+
+	  return output;
+	}
+	/**
+	 * Calculate output length with padding and bit length
+	 */
+
+
+	function getOutputLength(inputLength8) {
+	  return (inputLength8 + 64 >>> 9 << 4) + 14 + 1;
+	}
+	/*
+	 * Calculate the MD5 of an array of little-endian words, and a bit length.
+	 */
+
+
+	function wordsToMd5(x, len) {
+	  /* append padding */
+	  x[len >> 5] |= 0x80 << len % 32;
+	  x[getOutputLength(len) - 1] = len;
+	  var a = 1732584193;
+	  var b = -271733879;
+	  var c = -1732584194;
+	  var d = 271733878;
+
+	  for (var i = 0; i < x.length; i += 16) {
+	    var olda = a;
+	    var oldb = b;
+	    var oldc = c;
+	    var oldd = d;
+	    a = md5ff(a, b, c, d, x[i], 7, -680876936);
+	    d = md5ff(d, a, b, c, x[i + 1], 12, -389564586);
+	    c = md5ff(c, d, a, b, x[i + 2], 17, 606105819);
+	    b = md5ff(b, c, d, a, x[i + 3], 22, -1044525330);
+	    a = md5ff(a, b, c, d, x[i + 4], 7, -176418897);
+	    d = md5ff(d, a, b, c, x[i + 5], 12, 1200080426);
+	    c = md5ff(c, d, a, b, x[i + 6], 17, -1473231341);
+	    b = md5ff(b, c, d, a, x[i + 7], 22, -45705983);
+	    a = md5ff(a, b, c, d, x[i + 8], 7, 1770035416);
+	    d = md5ff(d, a, b, c, x[i + 9], 12, -1958414417);
+	    c = md5ff(c, d, a, b, x[i + 10], 17, -42063);
+	    b = md5ff(b, c, d, a, x[i + 11], 22, -1990404162);
+	    a = md5ff(a, b, c, d, x[i + 12], 7, 1804603682);
+	    d = md5ff(d, a, b, c, x[i + 13], 12, -40341101);
+	    c = md5ff(c, d, a, b, x[i + 14], 17, -1502002290);
+	    b = md5ff(b, c, d, a, x[i + 15], 22, 1236535329);
+	    a = md5gg(a, b, c, d, x[i + 1], 5, -165796510);
+	    d = md5gg(d, a, b, c, x[i + 6], 9, -1069501632);
+	    c = md5gg(c, d, a, b, x[i + 11], 14, 643717713);
+	    b = md5gg(b, c, d, a, x[i], 20, -373897302);
+	    a = md5gg(a, b, c, d, x[i + 5], 5, -701558691);
+	    d = md5gg(d, a, b, c, x[i + 10], 9, 38016083);
+	    c = md5gg(c, d, a, b, x[i + 15], 14, -660478335);
+	    b = md5gg(b, c, d, a, x[i + 4], 20, -405537848);
+	    a = md5gg(a, b, c, d, x[i + 9], 5, 568446438);
+	    d = md5gg(d, a, b, c, x[i + 14], 9, -1019803690);
+	    c = md5gg(c, d, a, b, x[i + 3], 14, -187363961);
+	    b = md5gg(b, c, d, a, x[i + 8], 20, 1163531501);
+	    a = md5gg(a, b, c, d, x[i + 13], 5, -1444681467);
+	    d = md5gg(d, a, b, c, x[i + 2], 9, -51403784);
+	    c = md5gg(c, d, a, b, x[i + 7], 14, 1735328473);
+	    b = md5gg(b, c, d, a, x[i + 12], 20, -1926607734);
+	    a = md5hh(a, b, c, d, x[i + 5], 4, -378558);
+	    d = md5hh(d, a, b, c, x[i + 8], 11, -2022574463);
+	    c = md5hh(c, d, a, b, x[i + 11], 16, 1839030562);
+	    b = md5hh(b, c, d, a, x[i + 14], 23, -35309556);
+	    a = md5hh(a, b, c, d, x[i + 1], 4, -1530992060);
+	    d = md5hh(d, a, b, c, x[i + 4], 11, 1272893353);
+	    c = md5hh(c, d, a, b, x[i + 7], 16, -155497632);
+	    b = md5hh(b, c, d, a, x[i + 10], 23, -1094730640);
+	    a = md5hh(a, b, c, d, x[i + 13], 4, 681279174);
+	    d = md5hh(d, a, b, c, x[i], 11, -358537222);
+	    c = md5hh(c, d, a, b, x[i + 3], 16, -722521979);
+	    b = md5hh(b, c, d, a, x[i + 6], 23, 76029189);
+	    a = md5hh(a, b, c, d, x[i + 9], 4, -640364487);
+	    d = md5hh(d, a, b, c, x[i + 12], 11, -421815835);
+	    c = md5hh(c, d, a, b, x[i + 15], 16, 530742520);
+	    b = md5hh(b, c, d, a, x[i + 2], 23, -995338651);
+	    a = md5ii(a, b, c, d, x[i], 6, -198630844);
+	    d = md5ii(d, a, b, c, x[i + 7], 10, 1126891415);
+	    c = md5ii(c, d, a, b, x[i + 14], 15, -1416354905);
+	    b = md5ii(b, c, d, a, x[i + 5], 21, -57434055);
+	    a = md5ii(a, b, c, d, x[i + 12], 6, 1700485571);
+	    d = md5ii(d, a, b, c, x[i + 3], 10, -1894986606);
+	    c = md5ii(c, d, a, b, x[i + 10], 15, -1051523);
+	    b = md5ii(b, c, d, a, x[i + 1], 21, -2054922799);
+	    a = md5ii(a, b, c, d, x[i + 8], 6, 1873313359);
+	    d = md5ii(d, a, b, c, x[i + 15], 10, -30611744);
+	    c = md5ii(c, d, a, b, x[i + 6], 15, -1560198380);
+	    b = md5ii(b, c, d, a, x[i + 13], 21, 1309151649);
+	    a = md5ii(a, b, c, d, x[i + 4], 6, -145523070);
+	    d = md5ii(d, a, b, c, x[i + 11], 10, -1120210379);
+	    c = md5ii(c, d, a, b, x[i + 2], 15, 718787259);
+	    b = md5ii(b, c, d, a, x[i + 9], 21, -343485551);
+	    a = safeAdd(a, olda);
+	    b = safeAdd(b, oldb);
+	    c = safeAdd(c, oldc);
+	    d = safeAdd(d, oldd);
+	  }
+
+	  return [a, b, c, d];
+	}
+	/*
+	 * Convert an array bytes to an array of little-endian words
+	 * Characters >255 have their high-byte silently ignored.
+	 */
+
 
-	        _this4.current_reconnects = 0;
-	      });
-	      this.socket.addEventListener("message", function (_ref) {
-	        var message = _ref.data;
-	        if (message instanceof ArrayBuffer) message = Buffer.from(message).toString();
+	function bytesToWords(input) {
+	  if (input.length === 0) {
+	    return [];
+	  }
 
-	        try {
-	          message = _circularJson["default"].parse(message);
-	        } catch (error) {
-	          return;
-	        } // check if any listeners are attached and forward event
+	  var length8 = input.length * 8;
+	  var output = new Uint32Array(getOutputLength(length8));
 
+	  for (var i = 0; i < length8; i += 8) {
+	    output[i >> 5] |= (input[i / 8] & 0xff) << i % 32;
+	  }
 
-	        if (message.notification && _this4.listeners(message.notification).length) {
-	          if (!Object.keys(message.params).length) return _this4.emit(message.notification);
-	          var args = [message.notification];
-	          if (message.params.constructor === Object) args.push(message.params);else // using for-loop instead of unshift/spread because performance is better
-	            for (var i = 0; i < message.params.length; i++) {
-	              args.push(message.params[i]);
-	            } // run as microtask so that pending queue messages are resolved first
-	          // eslint-disable-next-line prefer-spread
+	  return output;
+	}
+	/*
+	 * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+	 * to work around bugs in some JS interpreters.
+	 */
 
-	          return Promise.resolve().then(function () {
-	            _this4.emit.apply(_this4, args);
-	          });
-	        }
 
-	        if (!_this4.queue[message.id]) {
-	          // general JSON RPC 2.0 events
-	          if (message.method && message.params) {
-	            // run as microtask so that pending queue messages are resolved first
-	            return Promise.resolve().then(function () {
-	              _this4.emit(message.method, message.params);
-	            });
-	          }
+	function safeAdd(x, y) {
+	  var lsw = (x & 0xffff) + (y & 0xffff);
+	  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+	  return msw << 16 | lsw & 0xffff;
+	}
+	/*
+	 * Bitwise rotate a 32-bit number to the left.
+	 */
 
-	          return;
-	        } // reject early since server's response is invalid
 
+	function bitRotateLeft(num, cnt) {
+	  return num << cnt | num >>> 32 - cnt;
+	}
+	/*
+	 * These functions implement the four basic operations the algorithm uses.
+	 */
 
-	        if ("error" in message === "result" in message) _this4.queue[message.id].promise[1](new Error("Server response malformed. Response must include either \"result\"" + " or \"error\", but not both."));
-	        if (_this4.queue[message.id].timeout) clearTimeout(_this4.queue[message.id].timeout);
-	        if (message.error) _this4.queue[message.id].promise[1](message.error);else _this4.queue[message.id].promise[0](message.result);
-	        delete _this4.queue[message.id];
-	      });
-	      this.socket.addEventListener("error", function (error) {
-	        return _this4.emit("error", error);
-	      });
-	      this.socket.addEventListener("close", function (_ref2) {
-	        var code = _ref2.code,
-	            reason = _ref2.reason;
-	        if (_this4.ready) // Delay close event until internal state is updated
-	          setTimeout(function () {
-	            return _this4.emit("close", code, reason);
-	          }, 0);
-	        _this4.ready = false;
-	        _this4.socket = undefined;
-	        if (code === 1000) return;
-	        _this4.current_reconnects++;
-	        if (_this4.reconnect && (_this4.max_reconnects > _this4.current_reconnects || _this4.max_reconnects === 0)) setTimeout(function () {
-	          return _this4._connect(address, options);
-	        }, _this4.reconnect_interval);
-	      });
-	    }
-	  }]);
-	  return CommonClient;
-	}(_eventemitter.EventEmitter);
 
-	exports["default"] = CommonClient;
-	}(client));
+	function md5cmn(q, a, b, x, s, t) {
+	  return safeAdd(bitRotateLeft(safeAdd(safeAdd(a, q), safeAdd(x, t)), s), b);
+	}
 
-	var _interopRequireDefault = interopRequireDefault.exports;
+	function md5ff(a, b, c, d, x, s, t) {
+	  return md5cmn(b & c | ~b & d, a, b, x, s, t);
+	}
 
-	Object.defineProperty(index_browser, "__esModule", {
-	  value: true
-	});
-	var Client_1 = index_browser.Client = void 0;
+	function md5gg(a, b, c, d, x, s, t) {
+	  return md5cmn(b & d | c & ~d, a, b, x, s, t);
+	}
 
-	var _classCallCheck2 = _interopRequireDefault(classCallCheck.exports);
+	function md5hh(a, b, c, d, x, s, t) {
+	  return md5cmn(b ^ c ^ d, a, b, x, s, t);
+	}
 
-	var _inherits2 = _interopRequireDefault(inherits$3.exports);
+	function md5ii(a, b, c, d, x, s, t) {
+	  return md5cmn(c ^ (b | ~d), a, b, x, s, t);
+	}
 
-	var _possibleConstructorReturn2 = _interopRequireDefault(possibleConstructorReturn.exports);
+	var v3 = v35('v3', 0x30, md5);
+	var v3$1 = v3;
 
-	var _getPrototypeOf2 = _interopRequireDefault(getPrototypeOf.exports);
+	function v4(options, buf, offset) {
+	  options = options || {};
+	  var rnds = options.random || (options.rng || rng)(); // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
 
-	var _websocket = _interopRequireDefault(websocket_browser);
+	  rnds[6] = rnds[6] & 0x0f | 0x40;
+	  rnds[8] = rnds[8] & 0x3f | 0x80; // Copy bytes to buffer, if provided
 
-	var _client = _interopRequireDefault(client);
+	  if (buf) {
+	    offset = offset || 0;
 
-	function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
+	    for (var i = 0; i < 16; ++i) {
+	      buf[offset + i] = rnds[i];
+	    }
 
-	function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+	    return buf;
+	  }
 
-	var Client = /*#__PURE__*/function (_CommonClient) {
-	  (0, _inherits2["default"])(Client, _CommonClient);
+	  return stringify(rnds);
+	}
 
-	  var _super = _createSuper(Client);
+	// Adapted from Chris Veness' SHA1 code at
+	// http://www.movable-type.co.uk/scripts/sha1.html
+	function f(s, x, y, z) {
+	  switch (s) {
+	    case 0:
+	      return x & y ^ ~x & z;
 
-	  function Client() {
-	    var address = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "ws://localhost:8080";
+	    case 1:
+	      return x ^ y ^ z;
 
-	    var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-	        _ref$autoconnect = _ref.autoconnect,
-	        autoconnect = _ref$autoconnect === void 0 ? true : _ref$autoconnect,
-	        _ref$reconnect = _ref.reconnect,
-	        reconnect = _ref$reconnect === void 0 ? true : _ref$reconnect,
-	        _ref$reconnect_interv = _ref.reconnect_interval,
-	        reconnect_interval = _ref$reconnect_interv === void 0 ? 1000 : _ref$reconnect_interv,
-	        _ref$max_reconnects = _ref.max_reconnects,
-	        max_reconnects = _ref$max_reconnects === void 0 ? 5 : _ref$max_reconnects;
+	    case 2:
+	      return x & y ^ x & z ^ y & z;
 
-	    var generate_request_id = arguments.length > 2 ? arguments[2] : undefined;
-	    (0, _classCallCheck2["default"])(this, Client);
-	    return _super.call(this, _websocket["default"], address, {
-	      autoconnect: autoconnect,
-	      reconnect: reconnect,
-	      reconnect_interval: reconnect_interval,
-	      max_reconnects: max_reconnects
-	    }, generate_request_id);
+	    case 3:
+	      return x ^ y ^ z;
 	  }
+	}
 
-	  return Client;
-	}(_client["default"]);
+	function ROTL(x, n) {
+	  return x << n | x >>> 32 - n;
+	}
 
-	Client_1 = index_browser.Client = Client;
+	function sha1(bytes) {
+	  var K = [0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6];
+	  var H = [0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476, 0xc3d2e1f0];
 
-	var rngBrowser = {exports: {}};
+	  if (typeof bytes === 'string') {
+	    var msg = unescape(encodeURIComponent(bytes)); // UTF8 escape
 
-	// Unique ID creation requires a high quality random # generator.  In the
-	// browser this is a little complicated due to unknown quality of Math.random()
-	// and inconsistent support for the `crypto` API.  We do the best we can via
-	// feature-detection
+	    bytes = [];
 
-	// getRandomValues needs to be invoked in a context where "this" is a Crypto
-	// implementation. Also, find the complete implementation of crypto on IE11.
-	var getRandomValues = (typeof(crypto) != 'undefined' && crypto.getRandomValues && crypto.getRandomValues.bind(crypto)) ||
-	                      (typeof(msCrypto) != 'undefined' && typeof window.msCrypto.getRandomValues == 'function' && msCrypto.getRandomValues.bind(msCrypto));
+	    for (var i = 0; i < msg.length; ++i) {
+	      bytes.push(msg.charCodeAt(i));
+	    }
+	  } else if (!Array.isArray(bytes)) {
+	    // Convert Array-like to Array
+	    bytes = Array.prototype.slice.call(bytes);
+	  }
 
-	if (getRandomValues) {
-	  // WHATWG crypto RNG - http://wiki.whatwg.org/wiki/Crypto
-	  var rnds8 = new Uint8Array(16); // eslint-disable-line no-undef
+	  bytes.push(0x80);
+	  var l = bytes.length / 4 + 2;
+	  var N = Math.ceil(l / 16);
+	  var M = new Array(N);
 
-	  rngBrowser.exports = function whatwgRNG() {
-	    getRandomValues(rnds8);
-	    return rnds8;
-	  };
-	} else {
-	  // Math.random()-based (RNG)
-	  //
-	  // If all else fails, use Math.random().  It's fast, but is of unspecified
-	  // quality.
-	  var rnds = new Array(16);
+	  for (var _i = 0; _i < N; ++_i) {
+	    var arr = new Uint32Array(16);
 
-	  rngBrowser.exports = function mathRNG() {
-	    for (var i = 0, r; i < 16; i++) {
-	      if ((i & 0x03) === 0) r = Math.random() * 0x100000000;
-	      rnds[i] = r >>> ((i & 0x03) << 3) & 0xff;
+	    for (var j = 0; j < 16; ++j) {
+	      arr[j] = bytes[_i * 64 + j * 4] << 24 | bytes[_i * 64 + j * 4 + 1] << 16 | bytes[_i * 64 + j * 4 + 2] << 8 | bytes[_i * 64 + j * 4 + 3];
 	    }
 
-	    return rnds;
-	  };
-	}
+	    M[_i] = arr;
+	  }
 
-	/**
-	 * Convert array of 16 byte values to UUID string format of the form:
-	 * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
-	 */
+	  M[N - 1][14] = (bytes.length - 1) * 8 / Math.pow(2, 32);
+	  M[N - 1][14] = Math.floor(M[N - 1][14]);
+	  M[N - 1][15] = (bytes.length - 1) * 8 & 0xffffffff;
 
-	var byteToHex = [];
-	for (var i = 0; i < 256; ++i) {
-	  byteToHex[i] = (i + 0x100).toString(16).substr(1);
-	}
+	  for (var _i2 = 0; _i2 < N; ++_i2) {
+	    var W = new Uint32Array(80);
 
-	function bytesToUuid$1(buf, offset) {
-	  var i = offset || 0;
-	  var bth = byteToHex;
-	  // join used to fix memory issue caused by concatenation: https://bugs.chromium.org/p/v8/issues/detail?id=3175#c4
-	  return ([
-	    bth[buf[i++]], bth[buf[i++]],
-	    bth[buf[i++]], bth[buf[i++]], '-',
-	    bth[buf[i++]], bth[buf[i++]], '-',
-	    bth[buf[i++]], bth[buf[i++]], '-',
-	    bth[buf[i++]], bth[buf[i++]], '-',
-	    bth[buf[i++]], bth[buf[i++]],
-	    bth[buf[i++]], bth[buf[i++]],
-	    bth[buf[i++]], bth[buf[i++]]
-	  ]).join('');
-	}
+	    for (var t = 0; t < 16; ++t) {
+	      W[t] = M[_i2][t];
+	    }
 
-	var bytesToUuid_1 = bytesToUuid$1;
+	    for (var _t = 16; _t < 80; ++_t) {
+	      W[_t] = ROTL(W[_t - 3] ^ W[_t - 8] ^ W[_t - 14] ^ W[_t - 16], 1);
+	    }
 
-	var rng = rngBrowser.exports;
-	var bytesToUuid = bytesToUuid_1;
+	    var a = H[0];
+	    var b = H[1];
+	    var c = H[2];
+	    var d = H[3];
+	    var e = H[4];
 
-	function v4(options, buf, offset) {
-	  var i = buf && offset || 0;
+	    for (var _t2 = 0; _t2 < 80; ++_t2) {
+	      var s = Math.floor(_t2 / 20);
+	      var T = ROTL(a, 5) + f(s, b, c, d) + e + K[s] + W[_t2] >>> 0;
+	      e = d;
+	      d = c;
+	      c = ROTL(b, 30) >>> 0;
+	      b = a;
+	      a = T;
+	    }
 
-	  if (typeof(options) == 'string') {
-	    buf = options === 'binary' ? new Array(16) : null;
-	    options = null;
+	    H[0] = H[0] + a >>> 0;
+	    H[1] = H[1] + b >>> 0;
+	    H[2] = H[2] + c >>> 0;
+	    H[3] = H[3] + d >>> 0;
+	    H[4] = H[4] + e >>> 0;
 	  }
-	  options = options || {};
 
-	  var rnds = options.random || (options.rng || rng)();
+	  return [H[0] >> 24 & 0xff, H[0] >> 16 & 0xff, H[0] >> 8 & 0xff, H[0] & 0xff, H[1] >> 24 & 0xff, H[1] >> 16 & 0xff, H[1] >> 8 & 0xff, H[1] & 0xff, H[2] >> 24 & 0xff, H[2] >> 16 & 0xff, H[2] >> 8 & 0xff, H[2] & 0xff, H[3] >> 24 & 0xff, H[3] >> 16 & 0xff, H[3] >> 8 & 0xff, H[3] & 0xff, H[4] >> 24 & 0xff, H[4] >> 16 & 0xff, H[4] >> 8 & 0xff, H[4] & 0xff];
+	}
 
-	  // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
-	  rnds[6] = (rnds[6] & 0x0f) | 0x40;
-	  rnds[8] = (rnds[8] & 0x3f) | 0x80;
+	var v5 = v35('v5', 0x50, sha1);
+	var v5$1 = v5;
 
-	  // Copy bytes to buffer, if provided
-	  if (buf) {
-	    for (var ii = 0; ii < 16; ++ii) {
-	      buf[i + ii] = rnds[ii];
-	    }
+	var nil = '00000000-0000-0000-0000-000000000000';
+
+	function version$1(uuid) {
+	  if (!validate(uuid)) {
+	    throw TypeError('Invalid UUID');
 	  }
 
-	  return buf || bytesToUuid(rnds);
+	  return parseInt(uuid.substr(14, 1), 16);
 	}
 
-	var v4_1 = v4;
+	var esmBrowser = /*#__PURE__*/Object.freeze({
+		__proto__: null,
+		v1: v1,
+		v3: v3$1,
+		v4: v4,
+		v5: v5$1,
+		NIL: nil,
+		version: version$1,
+		validate: validate,
+		stringify: stringify,
+		parse: parse
+	});
+
+	var require$$0$1 = /*@__PURE__*/getAugmentedNamespace(esmBrowser);
 
-	const uuid$1 = v4_1;
+	const uuid$1 = require$$0$1.v4;
 
 	/**
 	 *  Generates a JSON-RPC 1.0 or 2.0 request
@@ -19376,7 +19691,7 @@ var solanaWeb3 = (function (exports) {
 
 	var generateRequest_1 = generateRequest$1;
 
-	const uuid = v4_1;
+	const uuid = require$$0$1.v4;
 	const generateRequest = generateRequest_1;
 
 	/**
@@ -19861,6 +20176,20 @@ var solanaWeb3 = (function (exports) {
 	  unitsConsumed: optional(number())
 	}));
 
+	/**
+	 * Expected JSON RPC response for the "getBlockProduction" message
+	 */
+	const BlockProductionResponseStruct = jsonRpcResultAndContext(type({
+	  byIdentity: record(string(), array(number())),
+	  range: type({
+	    firstSlot: number(),
+	    lastSlot: number()
+	  })
+	}));
+	/**
+	 * A performance sample
+	 */
+
 	function createRpcClient(url, useHttps, httpHeaders, fetchMiddleware, disableRetryOnRateLimit) {
 
 	  let fetchWithMiddleware;
@@ -20715,6 +21044,14 @@ var solanaWeb3 = (function (exports) {
 	  get commitment() {
 	    return this._commitment;
 	  }
+	  /**
+	   * The RPC endpoint
+	   */
+
+
+	  get rpcEndpoint() {
+	    return this._rpcEndpoint;
+	  }
 	  /**
 	   * Fetch the balance for the specified public key, return with context
 	   */
@@ -21000,35 +21337,32 @@ var solanaWeb3 = (function (exports) {
 	    }
 	  }
 	  /**
-	   * Fetch all the account info for multiple accounts specified by an array of public keys
+	   * Fetch all the account info for multiple accounts specified by an array of public keys, return with context
 	   */
 
 
-	  async getMultipleAccountsInfo(publicKeys, configOrCommitment) {
+	  async getMultipleAccountsInfoAndContext(publicKeys, commitment) {
 	    const keys = publicKeys.map(key => key.toBase58());
-	    let commitment;
-	    let encoding = 'base64';
-
-	    if (configOrCommitment) {
-	      if (typeof configOrCommitment === 'string') {
-	        commitment = configOrCommitment;
-	        encoding = 'base64';
-	      } else {
-	        commitment = configOrCommitment.commitment;
-	        encoding = configOrCommitment.encoding || 'base64';
-	      }
-	    }
 
-	    const args = this._buildArgs([keys], commitment, encoding);
+	    const args = this._buildArgs([keys], commitment, 'base64');
 
 	    const unsafeRes = await this._rpcRequest('getMultipleAccounts', args);
-	    const res = create(unsafeRes, jsonRpcResultAndContext(array(nullable(ParsedAccountInfoResult))));
+	    const res = create(unsafeRes, jsonRpcResultAndContext(array(nullable(AccountInfoResult))));
 
 	    if ('error' in res) {
 	      throw new Error('failed to get info for accounts ' + keys + ': ' + res.error.message);
 	    }
 
-	    return res.result.value;
+	    return res.result;
+	  }
+	  /**
+	   * Fetch all the account info for multiple accounts specified by an array of public keys
+	   */
+
+
+	  async getMultipleAccountsInfo(publicKeys, commitment) {
+	    const res = await this.getMultipleAccountsInfoAndContext(publicKeys, commitment);
+	    return res.value;
 	  }
 	  /**
 	   * Returns epoch activation information for a stake account that has been delegated
@@ -21640,6 +21974,54 @@ var solanaWeb3 = (function (exports) {
 	      })
 	    };
 	  }
+	  /*
+	   * Returns the current block height of the node
+	   */
+
+
+	  async getBlockHeight(commitment) {
+	    const args = this._buildArgs([], commitment);
+
+	    const unsafeRes = await this._rpcRequest('getBlockHeight', args);
+	    const res = create(unsafeRes, jsonRpcResult(number()));
+
+	    if ('error' in res) {
+	      throw new Error('failed to get block height information: ' + res.error.message);
+	    }
+
+	    return res.result;
+	  }
+	  /*
+	   * Returns recent block production information from the current or previous epoch
+	   */
+
+
+	  async getBlockProduction(configOrCommitment) {
+	    let extra;
+	    let commitment;
+
+	    if (typeof configOrCommitment === 'string') {
+	      commitment = configOrCommitment;
+	    } else if (configOrCommitment) {
+	      const {
+	        commitment: c,
+	        ...rest
+	      } = configOrCommitment;
+	      commitment = c;
+	      extra = rest;
+	    }
+
+	    const args = this._buildArgs([], commitment, 'base64', extra);
+
+	    const unsafeRes = await this._rpcRequest('getBlockProduction', args);
+	    const res = create(unsafeRes, BlockProductionResponseStruct);
+
+	    if ('error' in res) {
+	      throw new Error('failed to get block production information: ' + res.error.message);
+	    }
+
+	    return res.result;
+	  }
 	  /**
 	   * Fetch a confirmed or finalized transaction from the cluster.
 	   */
@@ -22300,12 +22682,6 @@ var solanaWeb3 = (function (exports) {
 
 	      if ('data' in res.error) {
 	        logs = res.error.data.logs;
-
-	        if (logs && Array.isArray(logs)) {
-	          const traceIndent = '\n    ';
-	          const logTrace = traceIndent + logs.join(traceIndent);
-	          console.error(res.error.message, logTrace);
-	        }
 	      }
 
 	      throw new SendTransactionError('failed to send transaction: ' + res.error.message, logs);
@@ -23121,16 +23497,18 @@ var solanaWeb3 = (function (exports) {
 	    const messageDataOffset = signatureOffset + signature.length;
 	    const numSignatures = 1;
 	    const instructionData = buffer.Buffer.alloc(messageDataOffset + message.length);
+	    const index = instructionIndex == null ? 0xffff // An index of `u16::MAX` makes it default to the current instruction.
+	    : instructionIndex;
 	    ED25519_INSTRUCTION_LAYOUT.encode({
 	      numSignatures,
 	      padding: 0,
 	      signatureOffset,
-	      signatureInstructionIndex: instructionIndex,
+	      signatureInstructionIndex: index,
 	      publicKeyOffset,
-	      publicKeyInstructionIndex: instructionIndex,
+	      publicKeyInstructionIndex: index,
 	      messageDataOffset,
 	      messageDataSize: message.length,
-	      messageInstructionIndex: instructionIndex
+	      messageInstructionIndex: index
 	    }, instructionData);
 	    instructionData.fill(publicKey, publicKeyOffset);
 	    instructionData.fill(signature, signatureOffset);
@@ -23201,10 +23579,10 @@ var solanaWeb3 = (function (exports) {
 	  }
 
 	}
+
 	/**
 	 * Stake account lockup info
 	 */
-
 	class Lockup {
 	  /** Unix timestamp of lockup expiration */
 
@@ -23229,10 +23607,6 @@ var solanaWeb3 = (function (exports) {
 
 
 	}
-	/**
-	 * Create stake account transaction params
-	 */
-
 	Lockup.default = new Lockup(0, 0, PublicKey.default);
 
 	/**
@@ -25005,36 +25379,6 @@ var solanaWeb3 = (function (exports) {
 	  return r;
 	};
 
-	var inherits_browser = {exports: {}};
-
-	if (typeof Object.create === 'function') {
-	  // implementation from standard node.js 'util' module
-	  inherits_browser.exports = function inherits(ctor, superCtor) {
-	    if (superCtor) {
-	      ctor.super_ = superCtor;
-	      ctor.prototype = Object.create(superCtor.prototype, {
-	        constructor: {
-	          value: ctor,
-	          enumerable: false,
-	          writable: true,
-	          configurable: true
-	        }
-	      });
-	    }
-	  };
-	} else {
-	  // old school shim for old browsers
-	  inherits_browser.exports = function inherits(ctor, superCtor) {
-	    if (superCtor) {
-	      ctor.super_ = superCtor;
-	      var TempCtor = function () {};
-	      TempCtor.prototype = superCtor.prototype;
-	      ctor.prototype = new TempCtor();
-	      ctor.prototype.constructor = ctor;
-	    }
-	  };
-	}
-
 	var utils$9 = utils$c;
 	var BN$7 = bn.exports;
 	var inherits$2 = inherits_browser.exports;
@@ -29094,8 +29438,8 @@ var solanaWeb3 = (function (exports) {
 	}
 
 	function parseAuthorizedVoter({
-	  epoch,
-	  authorizedVoter
+	  authorizedVoter,
+	  epoch
 	}) {
 	  return {
 	    epoch,
@@ -29124,7 +29468,7 @@ var solanaWeb3 = (function (exports) {
 	    return [];
 	  }
 
-	  return [...buf.slice(idx + 1).map(parsePriorVoters), ...buf.slice(0, idx)];
+	  return [...buf.slice(idx + 1).map(parsePriorVoters), ...buf.slice(0, idx).map(parsePriorVoters)];
 	}
 
 	/**