Use @coral-xyz/borsh package

coral-xyz · Dec 2, 2022 · 35e48fd · 35e48fd
1 parent 66e4295
commit 35e48fd
Show file tree

Hide file tree

Showing 24 changed files with 313 additions and 296 deletions.
diff --git a/.github/actions/setup-ts/action.yaml b/.github/actions/setup-ts/action.yaml
@@ -20,6 +20,8 @@ runs:
         path: |
           ./ts/dist/
         key: solana-${{ runner.os }}-v0000-${{ env.NODE_VERSION }}-${{ hashFiles('./ts/**/*.ts') }}
+    - run: cd ts/packages/borsh && yarn --frozen-lockfile && yarn build && cd ../../../
+      shell: bash
     - run: cd ts/packages/anchor && yarn --frozen-lockfile && yarn build:node && yarn link && cd ../../../
       shell: bash
     - run: cd ts/packages/spl-associated-token-account && yarn --frozen-lockfile && yarn build:node && yarn link && cd ../../../

diff --git a/.github/workflows/no-cashing-tests.yaml b/.github/workflows/no-cashing-tests.yaml
@@ -25,6 +25,8 @@ jobs:
       - run: cargo test
       # using singlethreaded testing for avm so that tests that change files do not conflict with each other
       - run: cd avm && cargo fmt -- --check && cargo clippy --all-targets -- -D warnings && cargo test -- --test-threads=1
+      # Init local borsh package
+      - run: cd ts/packages/borsh && yarn --frozen-lockfile && yarn build
       - run: cd ts/packages/anchor && yarn --frozen-lockfile
       - run: cd ts/packages/anchor && yarn test
       - run: cd ts/packages/anchor && yarn lint

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -40,6 +40,7 @@ jobs:
       - run: cargo test
       # using singlethreaded testing for avm so that tests that change files do not conflict with each other
       - run: cd avm && cargo fmt -- --check && cargo clippy --all-targets -- -D warnings && cargo test -- --test-threads=1
+      - run: cd ts/packages/borsh && yarn --frozen-lockfile && yarn build
       - run: cd ts/packages/anchor && yarn --frozen-lockfile
       - run: cd ts/packages/anchor && yarn test
       - run: cd ts/packages/anchor && yarn lint

diff --git a/ts/packages/anchor/package.json b/ts/packages/anchor/package.json
@@ -33,8 +33,8 @@
     "test": "jest tests --detectOpenHandles"
   },
   "dependencies": {
-    "@project-serum/borsh": "^0.2.5",
-    "@solana/web3.js": "^1.64.0",
+    "@coral-xyz/borsh": "^0.2.6",
+    "@solana/web3.js": "^1.68.0",
     "base64-js": "^1.5.1",
     "bn.js": "^5.1.2",
     "bs58": "^4.0.1",

diff --git a/ts/packages/anchor/rollup.config.ts b/ts/packages/anchor/rollup.config.ts
@@ -32,7 +32,7 @@ export default {
     }),
   ],
   external: [
-    "@project-serum/borsh",
+    "@coral-xyz/borsh",
     "@solana/web3.js",
     "assert",
     "base64-js",

diff --git a/ts/packages/anchor/src/coder/borsh/idl.ts b/ts/packages/anchor/src/coder/borsh/idl.ts
@@ -1,6 +1,6 @@
 import camelCase from "camelcase";
 import { Layout } from "buffer-layout";
-import * as borsh from "@project-serum/borsh";
+import * as borsh from "@coral-xyz/borsh";
 import { IdlField, IdlTypeDef, IdlEnumVariant, IdlType } from "../../idl.js";
 import { IdlError } from "../../error.js";
 

diff --git a/ts/packages/anchor/src/coder/borsh/instruction.ts b/ts/packages/anchor/src/coder/borsh/instruction.ts
@@ -4,7 +4,7 @@ import { Layout } from "buffer-layout";
 import camelCase from "camelcase";
 import { snakeCase } from "snake-case";
 import { sha256 } from "js-sha256";
-import * as borsh from "@project-serum/borsh";
+import * as borsh from "@coral-xyz/borsh";
 import { AccountMeta, PublicKey } from "@solana/web3.js";
 import {
   Idl,

diff --git a/ts/packages/anchor/src/idl.ts b/ts/packages/anchor/src/idl.ts
@@ -1,6 +1,6 @@
 import { Buffer } from "buffer";
 import { PublicKey } from "@solana/web3.js";
-import * as borsh from "@project-serum/borsh";
+import * as borsh from "@coral-xyz/borsh";
 
 export type Idl = {
   version: string;

diff --git a/ts/packages/anchor/src/utils/registry.ts b/ts/packages/anchor/src/utils/registry.ts
@@ -1,6 +1,6 @@
 import BN from "bn.js";
 import fetch from "cross-fetch";
-import * as borsh from "@project-serum/borsh";
+import * as borsh from "@coral-xyz/borsh";
 import { Connection, PublicKey } from "@solana/web3.js";
 
 /**

diff --git a/ts/packages/borsh/package.json b/ts/packages/borsh/package.json
@@ -24,9 +24,12 @@
     "buffer-layout": "^1.2.0"
   },
   "peerDependencies": {
-    "@solana/web3.js": "^1.2.0"
+    "@solana/web3.js": "^1.68.0"
   },
   "files": [
     "dist"
-  ]
+  ],
+  "devDependencies": {
+    "@types/node": "^18.11.10"
+  }
 }
diff --git a/ts/packages/spl-associated-token-account/rollup.config.ts b/ts/packages/spl-associated-token-account/rollup.config.ts
@@ -33,7 +33,7 @@ export default {
     terser(),
   ],
   external: [
-    "@project-serum/borsh",
+    "@coral-xyz/borsh",
     "@solana/web3.js",
     "assert",
     "base64-js",

diff --git a/ts/packages/spl-binary-option/rollup.config.ts b/ts/packages/spl-binary-option/rollup.config.ts
@@ -33,7 +33,7 @@ export default {
     terser(),
   ],
   external: [
-    "@project-serum/borsh",
+    "@coral-xyz/borsh",
     "@solana/web3.js",
     "assert",
     "base64-js",

diff --git a/ts/packages/spl-binary-oracle-pair/rollup.config.ts b/ts/packages/spl-binary-oracle-pair/rollup.config.ts
@@ -33,7 +33,7 @@ export default {
     terser(),
   ],
   external: [
-    "@project-serum/borsh",
+    "@coral-xyz/borsh",
     "@solana/web3.js",
     "assert",
     "base64-js",

diff --git a/ts/packages/spl-feature-proposal/rollup.config.ts b/ts/packages/spl-feature-proposal/rollup.config.ts
@@ -33,7 +33,7 @@ export default {
     terser(),
   ],
   external: [
-    "@project-serum/borsh",
+    "@coral-xyz/borsh",
     "@solana/web3.js",
     "assert",
     "base64-js",

diff --git a/ts/packages/spl-governance/rollup.config.ts b/ts/packages/spl-governance/rollup.config.ts
@@ -33,7 +33,7 @@ export default {
     terser(),
   ],
   external: [
-    "@project-serum/borsh",
+    "@coral-xyz/borsh",
     "@solana/web3.js",
     "assert",
     "base64-js",

diff --git a/ts/packages/spl-memo/rollup.config.ts b/ts/packages/spl-memo/rollup.config.ts
@@ -33,7 +33,7 @@ export default {
     terser(),
   ],
   external: [
-    "@project-serum/borsh",
+    "@coral-xyz/borsh",
     "@solana/web3.js",
     "assert",
     "base64-js",

diff --git a/ts/packages/spl-name-service/rollup.config.ts b/ts/packages/spl-name-service/rollup.config.ts
@@ -33,7 +33,7 @@ export default {
     terser(),
   ],
   external: [
-    "@project-serum/borsh",
+    "@coral-xyz/borsh",
     "@solana/web3.js",
     "assert",
     "base64-js",

diff --git a/ts/packages/spl-record/rollup.config.ts b/ts/packages/spl-record/rollup.config.ts
@@ -33,7 +33,7 @@ export default {
     terser(),
   ],
   external: [
-    "@project-serum/borsh",
+    "@coral-xyz/borsh",
     "@solana/web3.js",
     "assert",
     "base64-js",

diff --git a/ts/packages/spl-stake-pool/rollup.config.ts b/ts/packages/spl-stake-pool/rollup.config.ts
@@ -33,7 +33,7 @@ export default {
     terser(),
   ],
   external: [
-    "@project-serum/borsh",
+    "@coral-xyz/borsh",
     "@solana/web3.js",
     "assert",
     "base64-js",

diff --git a/ts/packages/spl-stateless-asks/rollup.config.ts b/ts/packages/spl-stateless-asks/rollup.config.ts
@@ -33,7 +33,7 @@ export default {
     terser(),
   ],
   external: [
-    "@project-serum/borsh",
+    "@coral-xyz/borsh",
     "@solana/web3.js",
     "assert",
     "base64-js",

diff --git a/ts/packages/spl-token-lending/rollup.config.ts b/ts/packages/spl-token-lending/rollup.config.ts
@@ -33,7 +33,7 @@ export default {
     terser(),
   ],
   external: [
-    "@project-serum/borsh",
+    "@coral-xyz/borsh",
     "@solana/web3.js",
     "assert",
     "base64-js",

diff --git a/ts/packages/spl-token-swap/rollup.config.ts b/ts/packages/spl-token-swap/rollup.config.ts
@@ -33,7 +33,7 @@ export default {
     terser(),
   ],
   external: [
-    "@project-serum/borsh",
+    "@coral-xyz/borsh",
     "@solana/web3.js",
     "assert",
     "base64-js",

diff --git a/ts/packages/spl-token/rollup.config.ts b/ts/packages/spl-token/rollup.config.ts
@@ -33,7 +33,7 @@ export default {
     terser(),
   ],
   external: [
-    "@project-serum/borsh",
+    "@coral-xyz/borsh",
     "@solana/web3.js",
     "assert",
     "base64-js",