@solana/web3.js 1.43.0 → 1.43.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/web3.js",
-  "version": "1.43.0",
+  "version": "1.43.3",
   "description": "Solana Javascript API",
   "keywords": [
     "api",
@@ -59,15 +59,15 @@
     "@babel/runtime": "^7.12.5",
     "@ethersproject/sha2": "^5.5.0",
     "@solana/buffer-layout": "^4.0.0",
-    "@solana/buffer-layout-utils": "^0.2.0",
+    "bigint-buffer": "^1.1.5",
     "bn.js": "^5.0.0",
     "borsh": "^0.7.0",
     "bs58": "^4.0.1",
     "buffer": "6.0.1",
-    "cross-fetch": "^3.1.4",
     "fast-stable-stringify": "^1.0.0",
     "jayson": "^3.4.4",
     "js-sha3": "^0.8.0",
+    "node-fetch": "2",
     "rpc-websockets": "^7.4.2",
     "secp256k1": "^4.0.2",
     "superstruct": "^0.14.2",
@@ -81,10 +81,10 @@
     "@babel/preset-typescript": "^7.12.16",
     "@babel/register": "^7.12.13",
     "@commitlint/config-conventional": "^15.0.0",
-    "@commitlint/travis-cli": "^16.2.3",
-    "@rollup/plugin-alias": "^3.1.2",
+    "@commitlint/travis-cli": "^17.0.0",
+    "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-babel": "^5.2.3",
-    "@rollup/plugin-commonjs": "^21.0.0",
+    "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-multi-entry": "^4.0.0",
     "@rollup/plugin-node-resolve": "^13.0.0",
@@ -98,6 +98,7 @@
     "@types/mocha": "^9.0.0",
     "@types/mz": "^2.7.3",
     "@types/node": "^17.0.24",
+    "@types/node-fetch": "2",
     "@types/secp256k1": "^4.0.1",
     "@types/sinon": "^10.0.0",
     "@types/sinon-chai": "^3.2.8",
@@ -110,7 +111,7 @@
     "eslint": "^7.19.0",
     "eslint-config-prettier": "^8.0.0",
     "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-mocha": "^9.0.0",
+    "eslint-plugin-mocha": "^10.0.4",
     "eslint-plugin-prettier": "^4.0.0",
     "esm": "^3.2.25",
     "http-server": "^14.0.0",

package/src/__forks__/browser/fetch-impl.ts

@@ -0,0 +1,4 @@
+export const Headers = globalThis.Headers;
+export const Request = globalThis.Request;
+export const Response = globalThis.Response;
+export default globalThis.fetch;

package/src/compute-budget.ts

@@ -1,5 +1,4 @@
 import * as BufferLayout from '@solana/buffer-layout';
-import {u64} from '@solana/buffer-layout-utils';
 
 import {
   encodeData,
@@ -9,6 +8,7 @@ import {
 } from './instruction';
 import {PublicKey} from './publickey';
 import {TransactionInstruction} from './transaction';
+import {u64} from './util/bigint';
 
 /**
  * Compute Budget Instruction class

package/src/connection.ts

@@ -1,6 +1,5 @@
 import bs58 from 'bs58';
 import {Buffer} from 'buffer';
-import crossFetch from 'cross-fetch';
 // @ts-ignore
 import fastStableStringify from 'fast-stable-stringify';
 import {
@@ -28,6 +27,7 @@ import RpcClient from 'jayson/lib/client/browser';
 import {AgentManager} from './agent-manager';
 import {EpochSchedule} from './epoch-schedule';
 import {SendTransactionError} from './errors';
+import fetchImpl, {Response} from './fetch-impl';
 import {NonceAccount} from './nonce-account';
 import {PublicKey} from './publickey';
 import {Signer} from './keypair';
@@ -955,27 +955,25 @@ function createRpcClient(
   url: string,
   useHttps: boolean,
   httpHeaders?: HttpHeaders,
-  customFetch?: typeof crossFetch,
+  customFetch?: FetchFn,
   fetchMiddleware?: FetchMiddleware,
   disableRetryOnRateLimit?: boolean,
 ): RpcClient {
-  const fetch = customFetch ? customFetch : crossFetch;
+  const fetch = customFetch ? customFetch : fetchImpl;
   let agentManager: AgentManager | undefined;
   if (!process.env.BROWSER) {
     agentManager = new AgentManager(useHttps);
   }
 
-  let fetchWithMiddleware:
-    | ((url: string, options: any) => Promise<Response>)
-    | undefined;
+  let fetchWithMiddleware: FetchFn | undefined;
 
   if (fetchMiddleware) {
-    fetchWithMiddleware = async (url: string, options: any) => {
-      const modifiedFetchArgs = await new Promise<[string, any]>(
+    fetchWithMiddleware = async (info, init) => {
+      const modifiedFetchArgs = await new Promise<Parameters<FetchFn>>(
         (resolve, reject) => {
           try {
-            fetchMiddleware(url, options, (modifiedUrl, modifiedOptions) =>
-              resolve([modifiedUrl, modifiedOptions]),
+            fetchMiddleware(info, init, (modifiedInfo, modifiedInit) =>
+              resolve([modifiedInfo, modifiedInit]),
             );
           } catch (error) {
             reject(error);
@@ -2162,13 +2160,18 @@ export type ConfirmedSignatureInfo = {
  */
 export type HttpHeaders = {[header: string]: string};
 
+/**
+ * The type of the JavaScript `fetch()` API
+ */
+export type FetchFn = typeof fetchImpl;
+
 /**
  * A callback used to augment the outgoing HTTP request
  */
 export type FetchMiddleware = (
-  url: string,
-  options: any,
-  fetch: (modifiedUrl: string, modifiedOptions: any) => void,
+  info: Parameters<FetchFn>[0],
+  init: Parameters<FetchFn>[1],
+  fetch: (...a: Parameters<FetchFn>) => void,
 ) => void;
 
 /**
@@ -2182,7 +2185,7 @@ export type ConnectionConfig = {
   /** Optional HTTP headers object */
   httpHeaders?: HttpHeaders;
   /** Optional custom fetch function */
-  fetch?: typeof crossFetch;
+  fetch?: FetchFn;
   /** Optional fetch middleware callback */
   fetchMiddleware?: FetchMiddleware;
   /** Optional Disable retrying calls when server responds with HTTP 429 (Too Many Requests) */

package/src/fetch-impl.ts

@@ -0,0 +1,13 @@
+import * as nodeFetch from 'node-fetch';
+
+export * from 'node-fetch';
+export default async function (
+  input: nodeFetch.RequestInfo,
+  init?: nodeFetch.RequestInit,
+): Promise<nodeFetch.Response> {
+  const processedInput =
+    typeof input === 'string' && input.slice(0, 2) === '//'
+      ? 'https:' + input
+      : input;
+  return await nodeFetch.default(processedInput, init);
+}

package/src/system-program.ts

@@ -1,5 +1,4 @@
 import * as BufferLayout from '@solana/buffer-layout';
-import {u64} from '@solana/buffer-layout-utils';
 
 import {
   encodeData,
@@ -13,6 +12,7 @@ import {PublicKey} from './publickey';
 import {SYSVAR_RECENT_BLOCKHASHES_PUBKEY, SYSVAR_RENT_PUBKEY} from './sysvar';
 import {Transaction, TransactionInstruction} from './transaction';
 import {toBuffer} from './util/to-buffer';
+import {u64} from './util/bigint';
 
 /**
  * Create account system transaction params

package/src/transaction.ts

@@ -376,17 +376,6 @@ export class Transaction {
       });
     });
 
-    // Sort. Prioritizing first by signer, then by writable
-    accountMetas.sort(function (x, y) {
-      const pubkeySorting = x.pubkey
-        .toBase58()
-        .localeCompare(y.pubkey.toBase58());
-      const checkSigner = x.isSigner === y.isSigner ? 0 : x.isSigner ? -1 : 1;
-      const checkWritable =
-        x.isWritable === y.isWritable ? pubkeySorting : x.isWritable ? -1 : 1;
-      return checkSigner || checkWritable;
-    });
-
     // Cull duplicate account metas
     const uniqueMetas: AccountMeta[] = [];
     accountMetas.forEach(accountMeta => {
@@ -397,11 +386,24 @@ export class Transaction {
       if (uniqueIndex > -1) {
         uniqueMetas[uniqueIndex].isWritable =
           uniqueMetas[uniqueIndex].isWritable || accountMeta.isWritable;
+        uniqueMetas[uniqueIndex].isSigner =
+          uniqueMetas[uniqueIndex].isSigner || accountMeta.isSigner;
       } else {
         uniqueMetas.push(accountMeta);
       }
     });
 
+    // Sort. Prioritizing first by signer, then by writable
+    uniqueMetas.sort(function (x, y) {
+      const pubkeySorting = x.pubkey
+        .toBase58()
+        .localeCompare(y.pubkey.toBase58());
+      const checkSigner = x.isSigner === y.isSigner ? 0 : x.isSigner ? -1 : 1;
+      const checkWritable =
+        x.isWritable === y.isWritable ? pubkeySorting : x.isWritable ? -1 : 1;
+      return checkSigner || checkWritable;
+    });
+
     // Move fee payer to the front
     const feePayerIndex = uniqueMetas.findIndex(x => {
       return x.pubkey.equals(feePayer);

package/src/util/bigint.ts

@@ -0,0 +1,43 @@
+import {Buffer} from 'buffer';
+import {blob, Layout} from '@solana/buffer-layout';
+import {toBigIntLE, toBufferLE} from 'bigint-buffer';
+
+interface EncodeDecode<T> {
+  decode(buffer: Buffer, offset?: number): T;
+  encode(src: T, buffer: Buffer, offset?: number): number;
+}
+
+const encodeDecode = <T>(layout: Layout<T>): EncodeDecode<T> => {
+  const decode = layout.decode.bind(layout);
+  const encode = layout.encode.bind(layout);
+  return {decode, encode};
+};
+
+const bigInt =
+  (length: number) =>
+  (property?: string): Layout<bigint> => {
+    const layout = blob(length, property);
+    const {encode, decode} = encodeDecode(layout);
+
+    const bigIntLayout = layout as Layout<unknown> as Layout<bigint>;
+
+    bigIntLayout.decode = (buffer: Buffer, offset: number) => {
+      const src = decode(buffer, offset);
+      return toBigIntLE(Buffer.from(src));
+    };
+
+    bigIntLayout.encode = (bigInt: bigint, buffer: Buffer, offset: number) => {
+      const src = toBufferLE(bigInt, length);
+      return encode(src, buffer, offset);
+    };
+
+    return bigIntLayout;
+  };
+
+export const u64 = bigInt(8);
+
+export const u128 = bigInt(16);
+
+export const u192 = bigInt(24);
+
+export const u256 = bigInt(32);