@@ -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 ../../../
@@ -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
@@ -40,6 +40,7 @@ jobs:
@@ -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",
@@ -32,7 +32,7 @@ export default {
}),
],
external: [
- "@project-serum/borsh",
+ "@coral-xyz/borsh",
"@solana/web3.js",
"assert",
"base64-js",
@@ -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";
@@ -4,7 +4,7 @@ import { Layout } from "buffer-layout";
import { snakeCase } from "snake-case";
import { sha256 } from "js-sha256";
import { AccountMeta, PublicKey } from "@solana/web3.js";
import {
Idl,
import { Buffer } from "buffer";
import { PublicKey } from "@solana/web3.js";
export type Idl = {
version: string;
import BN from "bn.js";
import fetch from "cross-fetch";
import { Connection, PublicKey } from "@solana/web3.js";
/**
@@ -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"
+ }
}
@@ -33,7 +33,7 @@ export default {
terser(),