Browse Source

update lockfiles (#1662)

Paul 3 years ago
parent
commit
4b4b8007fb

+ 9 - 9
examples/tutorial/yarn.lock

@@ -30,13 +30,13 @@
     "@ethersproject/logger" "^5.5.0"
     hash.js "1.1.7"
 
-"@project-serum/anchor@^0.22.1":
-  version "0.22.1"
-  resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.22.1.tgz#698a9620f94691de0a12bbc650a5c8380e2f0e8a"
-  integrity sha512-5pHeyvQhzLahIQ8aZymmDMZJAJFklN0joZdI+YIqFkK2uU/mlKr6rBLQjxysf/j1mLLiNG00tdyLfUtTAdQz7w==
+"@project-serum/anchor@^0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.23.0.tgz#2b2eb6b51601b073e8db26663aa2d6c2f2841771"
+  integrity sha512-LV2/ifZOJVFTZ4GbEloXln3iVfCvO1YM8i7BBCrUm4tehP7irMx4nr4/IabHWOzrQcQElsxSP/lb1tBp+2ff8A==
   dependencies:
     "@project-serum/borsh" "^0.2.5"
-    "@solana/web3.js" "^1.17.0"
+    "@solana/web3.js" "^1.36.0"
     base64-js "^1.5.1"
     bn.js "^5.1.2"
     bs58 "^4.0.1"
@@ -66,10 +66,10 @@
   dependencies:
     buffer "~6.0.3"
 
-"@solana/web3.js@^1.17.0":
-  version "1.30.2"
-  resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.30.2.tgz#e85da75e0825dc64f53eb64a1ff0115b27bec135"
-  integrity sha512-hznCj+rkfvM5taRP3Z+l5lumB7IQnDrB4l55Wpsg4kDU9Zds8pE5YOH5Z9bbF/pUzZJKQjyBjnY/6kScBm3Ugg==
+"@solana/web3.js@^1.36.0":
+  version "1.36.0"
+  resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.36.0.tgz#79d7d5217b49b80139f4de68953adc5b9a9a264f"
+  integrity sha512-RNT1451iRR7TyW7EJKMCrH/0OXawIe4zVm0DWQASwXlR/u1jmW6FrmH0lujIh7cGTlfOVbH+2ZU9AVUPLBFzwA==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@ethersproject/sha2" "^5.5.0"

+ 25 - 5
tests/yarn.lock

@@ -50,13 +50,13 @@
     snake-case "^3.0.4"
     toml "^3.0.0"
 
-"@project-serum/anchor@^0.22.1":
-  version "0.22.1"
-  resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.22.1.tgz#698a9620f94691de0a12bbc650a5c8380e2f0e8a"
-  integrity sha512-5pHeyvQhzLahIQ8aZymmDMZJAJFklN0joZdI+YIqFkK2uU/mlKr6rBLQjxysf/j1mLLiNG00tdyLfUtTAdQz7w==
+"@project-serum/anchor@^0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.23.0.tgz#2b2eb6b51601b073e8db26663aa2d6c2f2841771"
+  integrity sha512-LV2/ifZOJVFTZ4GbEloXln3iVfCvO1YM8i7BBCrUm4tehP7irMx4nr4/IabHWOzrQcQElsxSP/lb1tBp+2ff8A==
   dependencies:
     "@project-serum/borsh" "^0.2.5"
-    "@solana/web3.js" "^1.17.0"
+    "@solana/web3.js" "^1.36.0"
     base64-js "^1.5.1"
     bn.js "^5.1.2"
     bs58 "^4.0.1"
@@ -146,6 +146,26 @@
     superstruct "^0.14.2"
     tweetnacl "^1.0.0"
 
+"@solana/web3.js@^1.36.0":
+  version "1.36.0"
+  resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.36.0.tgz#79d7d5217b49b80139f4de68953adc5b9a9a264f"
+  integrity sha512-RNT1451iRR7TyW7EJKMCrH/0OXawIe4zVm0DWQASwXlR/u1jmW6FrmH0lujIh7cGTlfOVbH+2ZU9AVUPLBFzwA==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@ethersproject/sha2" "^5.5.0"
+    "@solana/buffer-layout" "^3.0.0"
+    bn.js "^5.0.0"
+    borsh "^0.4.0"
+    bs58 "^4.0.1"
+    buffer "6.0.1"
+    cross-fetch "^3.1.4"
+    jayson "^3.4.4"
+    js-sha3 "^0.8.0"
+    rpc-websockets "^7.4.2"
+    secp256k1 "^4.0.2"
+    superstruct "^0.14.2"
+    tweetnacl "^1.0.0"
+
 "@types/bn.js@^4.11.5":
   version "4.11.6"
   resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c"

+ 2 - 1
ts/src/coder/borsh/accounts.ts

@@ -17,7 +17,8 @@ export const ACCOUNT_DISCRIMINATOR_SIZE = 8;
  * Encodes and decodes account objects.
  */
 export class BorshAccountsCoder<A extends string = string>
-  implements AccountsCoder {
+  implements AccountsCoder
+{
   /**
    * Maps account type identifier to a layout.
    */

+ 2 - 1
ts/src/coder/spl-token/accounts.ts

@@ -5,7 +5,8 @@ import { Idl, IdlTypeDef } from "../../idl.js";
 import { accountSize } from "../common";
 
 export class SplTokenAccountsCoder<A extends string = string>
-  implements AccountsCoder {
+  implements AccountsCoder
+{
   constructor(private idl: Idl) {}
 
   public async encode<T = any>(accountName: A, account: T): Promise<Buffer> {

+ 12 - 21
ts/src/error.ts

@@ -116,18 +116,18 @@ export class AnchorError extends Error {
         comparedValues = [leftValue, rightValue];
       }
     }
-    const regexNoInfo = /^Program log: AnchorError occurred\. Error Code: (.*)\. Error Number: (\d*)\. Error Message: (.*)\./;
+    const regexNoInfo =
+      /^Program log: AnchorError occurred\. Error Code: (.*)\. Error Number: (\d*)\. Error Message: (.*)\./;
     const noInfoAnchorErrorLog = regexNoInfo.exec(anchorErrorLog);
-    const regexFileLine = /^Program log: AnchorError thrown in (.*):(\d*)\. Error Code: (.*)\. Error Number: (\d*)\. Error Message: (.*)\./;
+    const regexFileLine =
+      /^Program log: AnchorError thrown in (.*):(\d*)\. Error Code: (.*)\. Error Number: (\d*)\. Error Message: (.*)\./;
     const fileLineAnchorErrorLog = regexFileLine.exec(anchorErrorLog);
-    const regexAccountName = /^Program log: AnchorError caused by account: (.*)\. Error Code: (.*)\. Error Number: (\d*)\. Error Message: (.*)\./;
+    const regexAccountName =
+      /^Program log: AnchorError caused by account: (.*)\. Error Code: (.*)\. Error Number: (\d*)\. Error Message: (.*)\./;
     const accountNameAnchorErrorLog = regexAccountName.exec(anchorErrorLog);
     if (noInfoAnchorErrorLog) {
-      const [
-        errorCodeString,
-        errorNumber,
-        errorMessage,
-      ] = noInfoAnchorErrorLog.slice(1, 4);
+      const [errorCodeString, errorNumber, errorMessage] =
+        noInfoAnchorErrorLog.slice(1, 4);
       const errorCode = {
         code: errorCodeString,
         number: parseInt(errorNumber),
@@ -141,13 +141,8 @@ export class AnchorError extends Error {
         comparedValues
       );
     } else if (fileLineAnchorErrorLog) {
-      const [
-        file,
-        line,
-        errorCodeString,
-        errorNumber,
-        errorMessage,
-      ] = fileLineAnchorErrorLog.slice(1, 6);
+      const [file, line, errorCodeString, errorNumber, errorMessage] =
+        fileLineAnchorErrorLog.slice(1, 6);
       const errorCode = {
         code: errorCodeString,
         number: parseInt(errorNumber),
@@ -162,12 +157,8 @@ export class AnchorError extends Error {
         comparedValues
       );
     } else if (accountNameAnchorErrorLog) {
-      const [
-        accountName,
-        errorCodeString,
-        errorNumber,
-        errorMessage,
-      ] = accountNameAnchorErrorLog.slice(1, 5);
+      const [accountName, errorCodeString, errorNumber, errorMessage] =
+        accountNameAnchorErrorLog.slice(1, 5);
       const origin = accountName;
       const errorCode = {
         code: errorCodeString,

+ 2 - 9
ts/src/program/index.ts

@@ -280,15 +280,8 @@ export class Program<IDL extends Idl = Idl> {
     this._events = new EventManager(this._programId, provider, this._coder);
 
     // Dynamic namespaces.
-    const [
-      rpc,
-      instruction,
-      transaction,
-      account,
-      simulate,
-      methods,
-      state,
-    ] = NamespaceFactory.build(idl, this._coder, programId, provider);
+    const [rpc, instruction, transaction, account, simulate, methods, state] =
+      NamespaceFactory.build(idl, this._coder, programId, provider);
     this.rpc = rpc;
     this.instruction = instruction;
     this.transaction = transaction;

+ 4 - 3
ts/src/program/namespace/account.ts

@@ -291,9 +291,10 @@ export class AccountClient<
       fromPubkey: this._provider.wallet.publicKey,
       newAccountPubkey: signer.publicKey,
       space: sizeOverride ?? size,
-      lamports: await this._provider.connection.getMinimumBalanceForRentExemption(
-        sizeOverride ?? size
-      ),
+      lamports:
+        await this._provider.connection.getMinimumBalanceForRentExemption(
+          sizeOverride ?? size
+        ),
       programId: this._programId,
     });
   }

+ 4 - 6
ts/src/program/namespace/types.ts

@@ -100,10 +100,9 @@ type TypeMap = {
   string: string;
 } & {
   [K in "u8" | "i8" | "u16" | "i16" | "u32" | "i32" | "f32" | "f64"]: number;
-} &
-  {
-    [K in "u64" | "i64" | "u128" | "i128"]: BN;
-  };
+} & {
+  [K in "u64" | "i64" | "u128" | "i128"]: BN;
+};
 
 export type DecodeType<T extends IdlType, Defined> = T extends keyof TypeMap
   ? TypeMap[T]
@@ -126,8 +125,7 @@ type ArgsTuple<A extends IdlField[], Defined> = {
   [K in keyof A]: A[K] extends IdlField
     ? DecodeType<A[K]["type"], Defined>
     : unknown;
-} &
-  unknown[];
+} & unknown[];
 
 type FieldsOfType<I extends IdlTypeDef> = NonNullable<
   I["type"] extends IdlTypeDefTyStruct

+ 3 - 4
ts/src/utils/common.ts

@@ -14,8 +14,7 @@ export const isBrowser =
  * @returns A two dimensional array where each T[] length is < the provided size.
  */
 export function chunks<T>(array: T[], size: number): T[][] {
-  return Array.apply(
-    0,
-    new Array(Math.ceil(array.length / size))
-  ).map((_, index) => array.slice(index * size, (index + 1) * size));
+  return Array.apply(0, new Array(Math.ceil(array.length / size))).map(
+    (_, index) => array.slice(index * size, (index + 1) * size)
+  );
 }

+ 2 - 4
ts/tests/error.spec.ts

@@ -163,8 +163,7 @@ describe("AnchorError", () => {
       "An unexpected oracle account was provided for the transaction."
     );
     expect(anchorError.error.origin).toEqual({
-      file:
-        "programs/switchboard_v2/src/actions/aggregator_save_result_action.rs",
+      file: "programs/switchboard_v2/src/actions/aggregator_save_result_action.rs",
       line: 235,
     });
     expect(
@@ -208,8 +207,7 @@ describe("AnchorError", () => {
       "An unexpected oracle account was provided for the transaction."
     );
     expect(anchorError.error.origin).toEqual({
-      file:
-        "programs/switchboard_v2/src/actions/aggregator_save_result_action.rs",
+      file: "programs/switchboard_v2/src/actions/aggregator_save_result_action.rs",
       line: 235,
     });
     expect(anchorError.error.comparedValues!).toEqual(["1337", "4220"]);

+ 2 - 2
ts/tests/program-common.spec.ts

@@ -29,9 +29,9 @@ describe("program/common", () => {
     });
 
     it("should accept an object with a PublicKey shape { _bn }", () => {
-      const obj = ({
+      const obj = {
         _bn: new BN(bs58.decode("11111111111111111111111111111111")),
-      } as any) as PublicKey;
+      } as any as PublicKey;
       const func = () => translateAddress(obj);
 
       expect(func).not.toThrow();

File diff suppressed because it is too large
+ 338 - 515
ts/yarn.lock


Some files were not shown because too many files changed in this diff