diff --git a/.github/actions/setup-ts/action.yaml b/.github/actions/setup-ts/action.yaml index 1c09544ac..2db49efd1 100644 --- a/.github/actions/setup-ts/action.yaml +++ b/.github/actions/setup-ts/action.yaml @@ -28,7 +28,7 @@ runs: shell: bash - run: cd ts/packages/spl-token && yarn --frozen-lockfile && yarn build:node && yarn link && cd ../../../ shell: bash - - run: cd examples/tutorial && yarn link @project-serum/anchor && yarn --frozen-lockfile && cd ../../ + - run: cd examples/tutorial && yarn link @coral-xyz/anchor && yarn --frozen-lockfile && cd ../../ shell: bash - - run: cd tests && yarn link @project-serum/anchor && yarn link @project-serum/spl-associated-token-account && yarn link @project-serum/spl-token && yarn --frozen-lockfile && cd .. + - run: cd tests && yarn link @coral-xyz/anchor && yarn link @coral-xyz/spl-associated-token-account && yarn link @coral-xyz/spl-token && yarn --frozen-lockfile && cd .. shell: bash diff --git a/.github/workflows/no-cashing-tests.yaml b/.github/workflows/no-cashing-tests.yaml index e502de3b0..f5a0c920f 100644 --- a/.github/workflows/no-cashing-tests.yaml +++ b/.github/workflows/no-cashing-tests.yaml @@ -229,7 +229,7 @@ jobs: path: ~/.cargo/bin/ - run: chmod +x ~/.cargo/bin/anchor - - run: cd "$(mktemp -d)" && anchor init hello-anchor && cd hello-anchor && yarn link @project-serum/anchor && yarn && anchor test && yarn lint:fix + - run: cd "$(mktemp -d)" && anchor init hello-anchor && cd hello-anchor && yarn link @coral-xyz/anchor && yarn && anchor test && yarn lint:fix - uses: ./.github/actions/git-diff/ test-programs: diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 3b8fe11e9..2e5a12e5d 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -339,7 +339,7 @@ jobs: path: ~/.cargo/bin/ - run: chmod +x ~/.cargo/bin/anchor - - run: cd "$(mktemp -d)" && anchor init hello-anchor && cd hello-anchor && yarn link @project-serum/anchor && yarn && anchor test && yarn lint:fix + - run: cd "$(mktemp -d)" && anchor init hello-anchor && cd hello-anchor && yarn link @coral-xyz/anchor && yarn && anchor test && yarn lint:fix - uses: ./.github/actions/git-diff/ test-programs: diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b1974589..9073e7dc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ The minor version will be incremented upon a breaking change and the patch versi ### Features -- cli: Add `--run` to `anchor test` for running a subset of test suites ([#1828](https://github.com/project-serum/anchor/issues/1828)). +- cli: Add `--run` to `anchor test` for running a subset of test suites ([#1828](https://github.com/coral-xyz/anchor/issues/1828)). - client: Add `transaction` functions to RequestBuilder ([#1958](https://github.com/coral-xyz/anchor/pull/1958)). - spl: Add `create_metadata_accounts_v3` and `set_collection_size` wrappers ([#2119](https://github.com/coral-xyz/anchor/pull/2119)). - spl: Add `MetadataAccount` account deserialization. ([#2014](https://github.com/coral-xyz/anchor/pull/2014)). @@ -38,7 +38,7 @@ The minor version will be incremented upon a breaking change and the patch versi - cli: Allow custom cluster config ([#2271](https://github.com/coral-xyz/anchor/pull/2271)). - ts: Add optional flag to parseLogs to throw an error on decoding failure ([#2043](https://github.com/coral-xyz/anchor/pull/2043)). - cli: Add `test.validator.geyser_plugin_config` support ([#2016](https://github.com/coral-xyz/anchor/pull/2016)). -- cli: Add `account` subcommand to cli ([#1923](https://github.com/project-serum/anchor/pull/1923)) +- cli: Add `account` subcommand to cli ([#1923](https://github.com/coral-xyz/anchor/pull/1923)) - cli: Add `ticks_per_slot` option to Validator args ([#1875](https://github.com/coral-xyz/anchor/pull/1875)). ### Fixes @@ -61,6 +61,7 @@ The minor version will be incremented upon a breaking change and the patch versi - lang: Add `Discriminator` and `Owner` trait implementation for structures representing instructions ([#1997](https://github.com/coral-xyz/anchor/pull/1997)). - ts: '@coral-xyz/borsh' package is now part of the yarn monorepo ([#2290](https://github.com/coral-xyz/anchor/pull/2290)). The borsh package needs to be built before the anchor package can be built but this should happen automatically when running `yarn build` in packages/anchor, see [#2299](https://github.com/coral-xyz/anchor/pull/2299) and [#2306](https://github.com/coral-xyz/anchor/pull/2306). - lang: Add support for optionally passing in accounts using the syntax `Optional>`. Shouldn't affect existing programs but may be a breaking change to tools that use the anchor generated IDL. [#2101](https://github.com/coral-xyz/anchor/pull/2101). +- ts: Switch from `@project-serum/anchor` to the `@coral-xyz/anchor` package [#2318](https://github.com/coral-xyz/anchor/pull/2318). ## [0.25.0] - 2022-07-05 diff --git a/README.md b/README.md index 1392c66ed..1ecd954dc 100644 --- a/README.md +++ b/README.md @@ -31,18 +31,18 @@ To jump straight to examples, go [here](https://github.com/coral-xyz/anchor/tree ## Packages -| Package | Description | Version | Docs | -| :-------------------------- | :------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------------- | -| `anchor-lang` | Rust primitives for writing programs on Solana | [![Crates.io](https://img.shields.io/crates/v/anchor-lang?color=blue)](https://crates.io/crates/anchor-lang) | [![Docs.rs](https://docs.rs/anchor-lang/badge.svg)](https://docs.rs/anchor-lang) | -| `anchor-spl` | CPI clients for SPL programs on Solana | ![crates](https://img.shields.io/crates/v/anchor-spl?color=blue) | [![Docs.rs](https://docs.rs/anchor-spl/badge.svg)](https://docs.rs/anchor-spl) | -| `anchor-client` | Rust client for Anchor programs | ![crates](https://img.shields.io/crates/v/anchor-client?color=blue) | [![Docs.rs](https://docs.rs/anchor-client/badge.svg)](https://docs.rs/anchor-client) | -| `@project-serum/anchor` | TypeScript client for Anchor programs | [![npm](https://img.shields.io/npm/v/@project-serum/anchor.svg?color=blue)](https://www.npmjs.com/package/@project-serum/anchor) | [![Docs](https://img.shields.io/badge/docs-typedoc-blue)](https://coral-xyz.github.io/anchor/ts/index.html) | -| `@project-serum/anchor-cli` | CLI to support building and managing an Anchor workspace | [![npm](https://img.shields.io/npm/v/@project-serum/anchor-cli.svg?color=blue)](https://www.npmjs.com/package/@project-serum/anchor-cli) | [![Docs](https://img.shields.io/badge/docs-typedoc-blue)](https://coral-xyz.github.io/anchor/cli/commands.html) | +| Package | Description | Version | Docs | +| :---------------------- | :------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------------- | +| `anchor-lang` | Rust primitives for writing programs on Solana | [![Crates.io](https://img.shields.io/crates/v/anchor-lang?color=blue)](https://crates.io/crates/anchor-lang) | [![Docs.rs](https://docs.rs/anchor-lang/badge.svg)](https://docs.rs/anchor-lang) | +| `anchor-spl` | CPI clients for SPL programs on Solana | ![crates](https://img.shields.io/crates/v/anchor-spl?color=blue) | [![Docs.rs](https://docs.rs/anchor-spl/badge.svg)](https://docs.rs/anchor-spl) | +| `anchor-client` | Rust client for Anchor programs | ![crates](https://img.shields.io/crates/v/anchor-client?color=blue) | [![Docs.rs](https://docs.rs/anchor-client/badge.svg)](https://docs.rs/anchor-client) | +| `@coral-xyz/anchor` | TypeScript client for Anchor programs | [![npm](https://img.shields.io/npm/v/@coral-xyz/anchor.svg?color=blue)](https://www.npmjs.com/package/@coral-xyz/anchor) | [![Docs](https://img.shields.io/badge/docs-typedoc-blue)](https://coral-xyz.github.io/anchor/ts/index.html) | +| `@coral-xyz/anchor-cli` | CLI to support building and managing an Anchor workspace | [![npm](https://img.shields.io/npm/v/@coral-xyz/anchor-cli.svg?color=blue)](https://www.npmjs.com/package/@coral-xyz/anchor-cli) | [![Docs](https://img.shields.io/badge/docs-typedoc-blue)](https://coral-xyz.github.io/anchor/cli/commands.html) | ## Note -* **Anchor is in active development, so all APIs are subject to change.** -* **This code is unaudited. Use at your own risk.** +- **Anchor is in active development, so all APIs are subject to change.** +- **This code is unaudited. Use at your own risk.** ## Examples diff --git a/cli/npm-package/package.json b/cli/npm-package/package.json index 778019426..8738215fd 100644 --- a/cli/npm-package/package.json +++ b/cli/npm-package/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/anchor-cli", + "name": "@coral-xyz/anchor-cli", "version": "0.26.0", "description": "Anchor CLI tool", "homepage": "https://github.com/coral-xyz/anchor#readme", diff --git a/cli/src/template.rs b/cli/src/template.rs index 0517cf10b..4329ac6cc 100644 --- a/cli/src/template.rs +++ b/cli/src/template.rs @@ -87,7 +87,7 @@ anchor-lang = "{2}" pub fn deploy_js_script_host(cluster_url: &str, script_path: &str) -> String { format!( r#" -const anchor = require('@project-serum/anchor'); +const anchor = require('@coral-xyz/anchor'); // Deploy script defined by the user. const userScript = require("{0}"); @@ -114,7 +114,7 @@ main(); pub fn deploy_ts_script_host(cluster_url: &str, script_path: &str) -> String { format!( - r#"import * as anchor from '@project-serum/anchor'; + r#"import * as anchor from '@coral-xyz/anchor'; // Deploy script defined by the user. const userScript = require("{0}"); @@ -144,7 +144,7 @@ pub fn deploy_script() -> &'static str { // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. @@ -160,7 +160,7 @@ pub fn ts_deploy_script() -> &'static str { // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. @@ -202,7 +202,7 @@ pub struct Initialize {{}} pub fn mocha(name: &str) -> String { format!( - r#"const anchor = require("@project-serum/anchor"); + r#"const anchor = require("@coral-xyz/anchor"); describe("{}", () => {{ // Configure the client to use the local cluster. @@ -223,7 +223,7 @@ describe("{}", () => {{ pub fn jest(name: &str) -> String { format!( - r#"const anchor = require("@project-serum/anchor"); + r#"const anchor = require("@coral-xyz/anchor"); describe("{}", () => {{ // Configure the client to use the local cluster. @@ -251,7 +251,7 @@ pub fn package_json(jest: bool) -> String { "lint": "prettier */*.js \"*/**/*{{.js,.ts}}\" --check" }}, "dependencies": {{ - "@project-serum/anchor": "^{0}" + "@coral-xyz/anchor": "^{0}" }}, "devDependencies": {{ "jest": "^29.0.3", @@ -269,7 +269,7 @@ pub fn package_json(jest: bool) -> String { "lint": "prettier */*.js \"*/**/*{{.js,.ts}}\" --check" }}, "dependencies": {{ - "@project-serum/anchor": "^{0}" + "@coral-xyz/anchor": "^{0}" }}, "devDependencies": {{ "chai": "^4.3.4", @@ -292,7 +292,7 @@ pub fn ts_package_json(jest: bool) -> String { "lint": "prettier */*.js \"*/**/*{{.js,.ts}}\" --check" }}, "dependencies": {{ - "@project-serum/anchor": "^{0}" + "@coral-xyz/anchor": "^{0}" }}, "devDependencies": {{ "@types/bn.js": "^5.1.0", @@ -314,7 +314,7 @@ pub fn ts_package_json(jest: bool) -> String { "lint": "prettier */*.js \"*/**/*{{.js,.ts}}\" --check" }}, "dependencies": {{ - "@project-serum/anchor": "^{0}" + "@coral-xyz/anchor": "^{0}" }}, "devDependencies": {{ "chai": "^4.3.4", @@ -335,8 +335,8 @@ pub fn ts_package_json(jest: bool) -> String { pub fn ts_mocha(name: &str) -> String { format!( - r#"import * as anchor from "@project-serum/anchor"; -import {{ Program }} from "@project-serum/anchor"; + r#"import * as anchor from "@coral-xyz/anchor"; +import {{ Program }} from "@coral-xyz/anchor"; import {{ {} }} from "../target/types/{}"; describe("{}", () => {{ @@ -362,8 +362,8 @@ describe("{}", () => {{ pub fn ts_jest(name: &str) -> String { format!( - r#"import * as anchor from "@project-serum/anchor"; -import {{ Program }} from "@project-serum/anchor"; + r#"import * as anchor from "@coral-xyz/anchor"; +import {{ Program }} from "@coral-xyz/anchor"; import {{ {} }} from "../target/types/{}"; describe("{}", () => {{ @@ -445,7 +445,7 @@ pub fn node_shell( ) -> Result { let mut eval_string = format!( r#" -const anchor = require('@project-serum/anchor'); +const anchor = require('@coral-xyz/anchor'); const web3 = anchor.web3; const PublicKey = anchor.web3.PublicKey; const Keypair = anchor.web3.Keypair; diff --git a/docs/src/pages/docs/cli.md b/docs/src/pages/docs/cli.md index e796e2121..ca15c1509 100644 --- a/docs/src/pages/docs/cli.md +++ b/docs/src/pages/docs/cli.md @@ -209,7 +209,7 @@ from the workspace's `Anchor.toml`. For example, ```javascript // File: migrations/deploys.js -const anchor = require('@project-serum/anchor') +const anchor = require('@coral-xyz/anchor') module.exports = async function (provider) { anchor.setProvider(provider) diff --git a/docs/src/pages/docs/cross-program-invocations.md b/docs/src/pages/docs/cross-program-invocations.md index 93d95bd98..3c9613529 100644 --- a/docs/src/pages/docs/cross-program-invocations.md +++ b/docs/src/pages/docs/cross-program-invocations.md @@ -147,8 +147,8 @@ impl<'info> PullStrings<'info> { We can verify that everything works as expected by replacing the contents of the `puppet.ts` file with: ```ts -import * as anchor from '@project-serum/anchor' -import { Program } from '@project-serum/anchor' +import * as anchor from '@coral-xyz/anchor' +import { Program } from '@coral-xyz/anchor' import { Keypair } from '@solana/web3.js' import { expect } from 'chai' import { Puppet } from '../target/types/puppet' @@ -286,8 +286,8 @@ impl<'info> PullStrings<'info> { Finally, change the test: ```ts -import * as anchor from '@project-serum/anchor' -import { Program } from '@project-serum/anchor' +import * as anchor from '@coral-xyz/anchor' +import { Program } from '@coral-xyz/anchor' import { Keypair } from '@solana/web3.js' import { Puppet } from '../target/types/puppet' import { PuppetMaster } from '../target/types/puppet_master' diff --git a/docs/src/pages/docs/installation.md b/docs/src/pages/docs/installation.md index 815312285..bd08bce11 100644 --- a/docs/src/pages/docs/installation.md +++ b/docs/src/pages/docs/installation.md @@ -56,7 +56,7 @@ anchor --version ### Install using pre-build binary on x86_64 Linux -Anchor binaries are available via an NPM package [`@project-serum/anchor-cli`](https://www.npmjs.com/package/@project-serum/anchor-cli). Only `x86_64` Linux is supported currently, you must build from source for other OS'. +Anchor binaries are available via an NPM package [`@coral-xyz/anchor-cli`](https://www.npmjs.com/package/@coral-xyz/anchor-cli). Only `x86_64` Linux is supported currently, you must build from source for other OS'. ### Build from source for other operating systems without avm diff --git a/docs/src/pages/docs/pdas.md b/docs/src/pages/docs/pdas.md index 6f1893c45..6f0496dc6 100644 --- a/docs/src/pages/docs/pdas.md +++ b/docs/src/pages/docs/pdas.md @@ -190,8 +190,8 @@ pub fn change_user_name(ctx: Context, new_name: String) -> Resul Finally, let's add a test. Copy this into `game.ts` ```ts -import * as anchor from '@project-serum/anchor' -import { Program } from '@project-serum/anchor' +import * as anchor from '@coral-xyz/anchor' +import { Program } from '@coral-xyz/anchor' import { PublicKey } from '@solana/web3.js' import { Game } from '../target/types/game' import { expect } from 'chai' @@ -306,8 +306,8 @@ The `authority` account is now an `UncheckedAccount` instead of a `Signer`. When Finally, this is the new `puppet.ts`: ```ts -import * as anchor from '@project-serum/anchor' -import { Program } from '@project-serum/anchor' +import * as anchor from '@coral-xyz/anchor' +import { Program } from '@coral-xyz/anchor' import { Keypair, PublicKey } from '@solana/web3.js' import { Puppet } from '../target/types/puppet' import { PuppetMaster } from '../target/types/puppet_master' diff --git a/examples/tutorial/basic-0/client.js b/examples/tutorial/basic-0/client.js index 77a7f08b1..a3ce42347 100644 --- a/examples/tutorial/basic-0/client.js +++ b/examples/tutorial/basic-0/client.js @@ -2,7 +2,7 @@ // It is not expected users directly test with this example. For a more // ergonomic example, see `tests/basic-0.js` in this workspace. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); // Configure the local cluster. anchor.setProvider(anchor.AnchorProvider.local()); diff --git a/examples/tutorial/basic-0/tests/basic-0.js b/examples/tutorial/basic-0/tests/basic-0.js index 1caf2411a..616ee5730 100644 --- a/examples/tutorial/basic-0/tests/basic-0.js +++ b/examples/tutorial/basic-0/tests/basic-0.js @@ -1,4 +1,4 @@ -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); describe("basic-0", () => { // Configure the client to use the local cluster. diff --git a/examples/tutorial/basic-1/tests/basic-1.js b/examples/tutorial/basic-1/tests/basic-1.js index 84dceab96..4728ec3df 100644 --- a/examples/tutorial/basic-1/tests/basic-1.js +++ b/examples/tutorial/basic-1/tests/basic-1.js @@ -1,5 +1,5 @@ const assert = require("assert"); -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const { SystemProgram } = anchor.web3; describe("basic-1", () => { diff --git a/examples/tutorial/basic-2/tests/basic-2.js b/examples/tutorial/basic-2/tests/basic-2.js index 85221ce46..442235751 100644 --- a/examples/tutorial/basic-2/tests/basic-2.js +++ b/examples/tutorial/basic-2/tests/basic-2.js @@ -1,5 +1,5 @@ const assert = require("assert"); -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const { SystemProgram } = anchor.web3; describe("basic-2", () => { diff --git a/examples/tutorial/basic-3/tests/basic-3.js b/examples/tutorial/basic-3/tests/basic-3.js index 91afee680..7ff05079a 100644 --- a/examples/tutorial/basic-3/tests/basic-3.js +++ b/examples/tutorial/basic-3/tests/basic-3.js @@ -1,5 +1,5 @@ const assert = require("assert"); -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const { SystemProgram } = anchor.web3; describe("basic-3", () => { diff --git a/examples/tutorial/basic-4/tests/basic-4.js b/examples/tutorial/basic-4/tests/basic-4.js index fddc7514c..b2d6b819a 100644 --- a/examples/tutorial/basic-4/tests/basic-4.js +++ b/examples/tutorial/basic-4/tests/basic-4.js @@ -1,5 +1,5 @@ const assert = require("assert"); -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); describe("basic-4", () => { const provider = anchor.AnchorProvider.local(); diff --git a/examples/tutorial/package.json b/examples/tutorial/package.json index 40f098fc6..f4980cf84 100644 --- a/examples/tutorial/package.json +++ b/examples/tutorial/package.json @@ -13,7 +13,7 @@ "basic-4" ], "dependencies": { - "@project-serum/anchor": "file:../../ts/packages/anchor" + "@coral-xyz/anchor": "file:../../ts/packages/anchor" }, "devDependencies": { "mocha": "^9.1.3", diff --git a/examples/tutorial/yarn.lock b/examples/tutorial/yarn.lock index 4e9380e5d..5ba6bcad7 100644 --- a/examples/tutorial/yarn.lock +++ b/examples/tutorial/yarn.lock @@ -16,10 +16,29 @@ dependencies: regenerator-runtime "^0.13.11" -"@coral-xyz/borsh@^0.2.6": - version "0.2.6" - resolved "https://registry.yarnpkg.com/@coral-xyz/borsh/-/borsh-0.2.6.tgz#0f11b223bf2967574310705afd3c53ce26688ada" - integrity sha512-y6nmHw1bFcJib7sMHsQPpC8r47xhqDZVvhUdna7NUPzpSbOZG6f46N21+aXsQ2w/tG8Ggls488J/ZmwbgVmyjg== +"@coral-xyz/anchor@file:../../ts/packages/anchor": + version "0.26.0" + dependencies: + "@coral-xyz/borsh" "^0.26.0" + "@solana/web3.js" "^1.68.0" + base64-js "^1.5.1" + bn.js "^5.1.2" + bs58 "^4.0.1" + buffer-layout "^1.2.2" + camelcase "^6.3.0" + cross-fetch "^3.1.5" + crypto-hash "^1.3.0" + eventemitter3 "^4.0.7" + js-sha256 "^0.9.0" + pako "^2.0.3" + snake-case "^3.0.4" + superstruct "^0.15.4" + toml "^3.0.0" + +"@coral-xyz/borsh@^0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@coral-xyz/borsh/-/borsh-0.26.0.tgz#d054f64536d824634969e74138f9f7c52bbbc0d5" + integrity sha512-uCZ0xus0CszQPHYfWAqKS5swS1UxvePu83oOF+TWpUkedsNlg6p2p4azxZNSSqwXb9uXMFgxhuMBX9r3Xoi0vQ== dependencies: bn.js "^5.1.2" buffer-layout "^1.2.0" @@ -39,25 +58,6 @@ resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.7.0.tgz#d15357f7c227e751d90aa06b05a0e5cf993ba8c1" integrity sha512-kbacwGSsH/CTout0ZnZWxnW1B+jH/7r/WAAKLBtrRJ/+CUH7lgmQzl3GTrQua3SGKWNSDsS6lmjnDpIJ5Dxyaw== -"@project-serum/anchor@file:../../ts/packages/anchor": - version "0.26.0" - dependencies: - "@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" - buffer-layout "^1.2.2" - camelcase "^6.3.0" - cross-fetch "^3.1.5" - crypto-hash "^1.3.0" - eventemitter3 "^4.0.7" - js-sha256 "^0.9.0" - pako "^2.0.3" - snake-case "^3.0.4" - superstruct "^0.15.4" - toml "^3.0.0" - "@solana/buffer-layout@^4.0.0": version "4.0.1" resolved "https://registry.yarnpkg.com/@solana/buffer-layout/-/buffer-layout-4.0.1.tgz#b996235eaec15b1e0b5092a8ed6028df77fa6c15" diff --git a/tests/anchor-cli-account/tests/account.ts b/tests/anchor-cli-account/tests/account.ts index 3e8428a12..913d8f5d1 100644 --- a/tests/anchor-cli-account/tests/account.ts +++ b/tests/anchor-cli-account/tests/account.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Program } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Program } from "@coral-xyz/anchor"; import { AccountCommand } from "../target/types/account_command"; import { assert } from "chai"; import { execSync } from "child_process"; diff --git a/tests/anchor-cli-idl/migrations/deploy.ts b/tests/anchor-cli-idl/migrations/deploy.ts index 5e3df0dc3..82fb175fa 100644 --- a/tests/anchor-cli-idl/migrations/deploy.ts +++ b/tests/anchor-cli-idl/migrations/deploy.ts @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/anchor-cli-idl/tests/idl.ts b/tests/anchor-cli-idl/tests/idl.ts index 59028efc2..245a04084 100644 --- a/tests/anchor-cli-idl/tests/idl.ts +++ b/tests/anchor-cli-idl/tests/idl.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Program } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Program } from "@coral-xyz/anchor"; import { IdlCommandsOne } from "../target/types/idl_commands_one"; import { IdlCommandsTwo } from "../target/types/idl_commands_two"; import { assert } from "chai"; diff --git a/tests/bpf-upgradeable-state/migrations/deploy.ts b/tests/bpf-upgradeable-state/migrations/deploy.ts index 5e3df0dc3..82fb175fa 100644 --- a/tests/bpf-upgradeable-state/migrations/deploy.ts +++ b/tests/bpf-upgradeable-state/migrations/deploy.ts @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/bpf-upgradeable-state/tests/bpf-upgradable-state.ts b/tests/bpf-upgradeable-state/tests/bpf-upgradable-state.ts index 4b4391e3a..398aca57d 100644 --- a/tests/bpf-upgradeable-state/tests/bpf-upgradable-state.ts +++ b/tests/bpf-upgradeable-state/tests/bpf-upgradable-state.ts @@ -1,6 +1,6 @@ -import * as anchor from "@project-serum/anchor"; -import { AnchorError, Program } from "@project-serum/anchor"; -import { findProgramAddressSync } from "@project-serum/anchor/dist/cjs/utils/pubkey"; +import * as anchor from "@coral-xyz/anchor"; +import { AnchorError, Program } from "@coral-xyz/anchor"; +import { findProgramAddressSync } from "@coral-xyz/anchor/dist/cjs/utils/pubkey"; import { PublicKey } from "@solana/web3.js"; import { assert } from "chai"; import { BpfUpgradeableState } from "../target/types/bpf_upgradeable_state"; diff --git a/tests/cashiers-check/migrations/deploy.js b/tests/cashiers-check/migrations/deploy.js index 5e3df0dc3..82fb175fa 100644 --- a/tests/cashiers-check/migrations/deploy.js +++ b/tests/cashiers-check/migrations/deploy.js @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/cashiers-check/tests/cashiers-check.js b/tests/cashiers-check/tests/cashiers-check.js index 8ddcebe37..a5edd096e 100644 --- a/tests/cashiers-check/tests/cashiers-check.js +++ b/tests/cashiers-check/tests/cashiers-check.js @@ -1,4 +1,4 @@ -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const serumCmn = require("@project-serum/common"); const { assert } = require("chai"); const { TOKEN_PROGRAM_ID } = require("@solana/spl-token"); diff --git a/tests/cfo/migrations/deploy.js b/tests/cfo/migrations/deploy.js index 5e3df0dc3..82fb175fa 100644 --- a/tests/cfo/migrations/deploy.js +++ b/tests/cfo/migrations/deploy.js @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/cfo/scripts/fees.js b/tests/cfo/scripts/fees.js index b559330be..d7cfd9889 100755 --- a/tests/cfo/scripts/fees.js +++ b/tests/cfo/scripts/fees.js @@ -2,7 +2,7 @@ const process = require("process"); const fs = require("fs"); -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const { Market, OpenOrders } = require("@project-serum/serum"); const Account = anchor.web3.Account; const Program = anchor.Program; diff --git a/tests/cfo/scripts/list-market.js b/tests/cfo/scripts/list-market.js index 94c907690..062c48b53 100755 --- a/tests/cfo/scripts/list-market.js +++ b/tests/cfo/scripts/list-market.js @@ -4,7 +4,7 @@ const utils = require("../tests/utils"); const fs = require("fs"); -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const provider = anchor.AnchorProvider.local(); // hack so we don't have to update serum-common library // to the new AnchorProvider class and Provider interface diff --git a/tests/cfo/scripts/trade-bot.js b/tests/cfo/scripts/trade-bot.js index b7d2be59d..9df71aa99 100755 --- a/tests/cfo/scripts/trade-bot.js +++ b/tests/cfo/scripts/trade-bot.js @@ -3,7 +3,7 @@ // Script to infinitely post orders that are immediately filled. const process = require("process"); -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const PublicKey = anchor.web3.PublicKey; const { runTradeBot } = require("../tests/utils"); diff --git a/tests/cfo/tests/cfo.js b/tests/cfo/tests/cfo.js index c5ed40965..1f888938e 100644 --- a/tests/cfo/tests/cfo.js +++ b/tests/cfo/tests/cfo.js @@ -1,6 +1,6 @@ const { assert } = require("chai"); const { Token } = require("@solana/spl-token"); -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const serumCmn = require("@project-serum/common"); const { Market } = require("@project-serum/serum"); const utf8 = anchor.utils.bytes.utf8; diff --git a/tests/cfo/tests/utils/index.js b/tests/cfo/tests/utils/index.js index 369ca3f47..d331e8d65 100644 --- a/tests/cfo/tests/utils/index.js +++ b/tests/cfo/tests/utils/index.js @@ -9,9 +9,9 @@ const TOKEN_PROGRAM_ID = require("@solana/spl-token").TOKEN_PROGRAM_ID; const TokenInstructions = require("@project-serum/serum").TokenInstructions; const { Market, OpenOrders } = require("@project-serum/serum"); const DexInstructions = require("@project-serum/serum").DexInstructions; -const web3 = require("@project-serum/anchor").web3; +const web3 = require("@coral-xyz/anchor").web3; const Connection = web3.Connection; -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const BN = anchor.BN; const serumCmn = require("@project-serum/common"); const Account = web3.Account; diff --git a/tests/cfo/tests/utils/stake.js b/tests/cfo/tests/utils/stake.js index 1a9d00359..d51b3172b 100644 --- a/tests/cfo/tests/utils/stake.js +++ b/tests/cfo/tests/utils/stake.js @@ -1,4 +1,4 @@ -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const serumCmn = require("@project-serum/common"); const TokenInstructions = require("@project-serum/serum").TokenInstructions; const utils = require("../../deps/stake/tests/utils"); diff --git a/tests/chat/migrations/deploy.js b/tests/chat/migrations/deploy.js index 5e3df0dc3..82fb175fa 100644 --- a/tests/chat/migrations/deploy.js +++ b/tests/chat/migrations/deploy.js @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/chat/tests/chat.js b/tests/chat/tests/chat.js index 08c2b4a62..79af01bab 100644 --- a/tests/chat/tests/chat.js +++ b/tests/chat/tests/chat.js @@ -1,4 +1,4 @@ -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const { assert } = require("chai"); const { PublicKey } = anchor.web3; diff --git a/tests/composite/tests/composite.js b/tests/composite/tests/composite.js index e7c3a76bf..2a5e1eca5 100644 --- a/tests/composite/tests/composite.js +++ b/tests/composite/tests/composite.js @@ -1,5 +1,5 @@ const { assert } = require("chai"); -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); describe("composite", () => { const provider = anchor.AnchorProvider.local(); diff --git a/tests/cpi-returns/migrations/deploy.ts b/tests/cpi-returns/migrations/deploy.ts index 5e3df0dc3..82fb175fa 100644 --- a/tests/cpi-returns/migrations/deploy.ts +++ b/tests/cpi-returns/migrations/deploy.ts @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/cpi-returns/tests/cpi-return.ts b/tests/cpi-returns/tests/cpi-return.ts index 0910388f2..22217577d 100644 --- a/tests/cpi-returns/tests/cpi-return.ts +++ b/tests/cpi-returns/tests/cpi-return.ts @@ -1,7 +1,7 @@ import assert from "assert"; -import * as anchor from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; import * as borsh from "borsh"; -import { Program } from "@project-serum/anchor"; +import { Program } from "@coral-xyz/anchor"; import { Callee } from "../target/types/callee"; import { Caller } from "../target/types/caller"; import { ConfirmOptions } from "@solana/web3.js"; diff --git a/tests/custom-coder/migrations/deploy.ts b/tests/custom-coder/migrations/deploy.ts index 5e3df0dc3..82fb175fa 100644 --- a/tests/custom-coder/migrations/deploy.ts +++ b/tests/custom-coder/migrations/deploy.ts @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/custom-coder/tests/spl-associated-token-coder.ts b/tests/custom-coder/tests/spl-associated-token-coder.ts index 6eea73d97..e0b7a1761 100644 --- a/tests/custom-coder/tests/spl-associated-token-coder.ts +++ b/tests/custom-coder/tests/spl-associated-token-coder.ts @@ -1,6 +1,6 @@ -import { Native, AnchorProvider, setProvider } from "@project-serum/anchor"; -import { splAssociatedTokenAccountProgram } from "@project-serum/spl-associated-token-account"; -import { splTokenProgram } from "@project-serum/spl-token"; +import { Native, AnchorProvider, setProvider } from "@coral-xyz/anchor"; +import { splAssociatedTokenAccountProgram } from "@coral-xyz/spl-associated-token-account"; +import { splTokenProgram } from "@coral-xyz/spl-token"; import { Keypair, PublicKey, SYSVAR_RENT_PUBKEY } from "@solana/web3.js"; import * as assert from "assert"; diff --git a/tests/custom-coder/tests/spl-token-coder.ts b/tests/custom-coder/tests/spl-token-coder.ts index cbf842d06..566770ca0 100644 --- a/tests/custom-coder/tests/spl-token-coder.ts +++ b/tests/custom-coder/tests/spl-token-coder.ts @@ -1,5 +1,5 @@ -import { AnchorProvider, setProvider } from "@project-serum/anchor"; -import { splTokenProgram } from "@project-serum/spl-token"; +import { AnchorProvider, setProvider } from "@coral-xyz/anchor"; +import { splTokenProgram } from "@coral-xyz/spl-token"; import { Keypair, SYSVAR_RENT_PUBKEY, PublicKey } from "@solana/web3.js"; import BN from "bn.js"; import { assert } from "chai"; diff --git a/tests/custom-coder/tests/system-coder.ts b/tests/custom-coder/tests/system-coder.ts index 766fd3a4d..efbfdb8b8 100644 --- a/tests/custom-coder/tests/system-coder.ts +++ b/tests/custom-coder/tests/system-coder.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Native } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Native } from "@coral-xyz/anchor"; import { TOKEN_PROGRAM_ID } from "@solana/spl-token"; import { Keypair, diff --git a/tests/declare-id/tests/declare-id.ts b/tests/declare-id/tests/declare-id.ts index 07c904c38..fa90cd571 100644 --- a/tests/declare-id/tests/declare-id.ts +++ b/tests/declare-id/tests/declare-id.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { AnchorError, Program } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { AnchorError, Program } from "@coral-xyz/anchor"; import splToken from "@solana/spl-token"; import { DeclareId } from "../target/types/declare_id"; import { assert } from "chai"; diff --git a/tests/errors/tests/errors.ts b/tests/errors/tests/errors.ts index a4b337d1a..b7066d7d1 100644 --- a/tests/errors/tests/errors.ts +++ b/tests/errors/tests/errors.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Program, AnchorError } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Program, AnchorError } from "@coral-xyz/anchor"; import { Keypair, Transaction, TransactionInstruction } from "@solana/web3.js"; import { TOKEN_PROGRAM_ID, Token } from "@solana/spl-token"; import { assert, expect } from "chai"; diff --git a/tests/escrow/tests/escrow.ts b/tests/escrow/tests/escrow.ts index c12ae81c0..7ae588fa1 100644 --- a/tests/escrow/tests/escrow.ts +++ b/tests/escrow/tests/escrow.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Program, BN, IdlAccounts } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Program, BN, IdlAccounts } from "@coral-xyz/anchor"; import { PublicKey, Keypair, SystemProgram } from "@solana/web3.js"; import { TOKEN_PROGRAM_ID, Token } from "@solana/spl-token"; import { assert } from "chai"; diff --git a/tests/events/migrations/deploy.js b/tests/events/migrations/deploy.js index 5e3df0dc3..82fb175fa 100644 --- a/tests/events/migrations/deploy.js +++ b/tests/events/migrations/deploy.js @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/events/tests/events.js b/tests/events/tests/events.js index 348408cb0..b938e0555 100644 --- a/tests/events/tests/events.js +++ b/tests/events/tests/events.js @@ -1,4 +1,4 @@ -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const { assert } = require("chai"); describe("events", () => { diff --git a/tests/floats/migrations/deploy.ts b/tests/floats/migrations/deploy.ts index 5e3df0dc3..82fb175fa 100644 --- a/tests/floats/migrations/deploy.ts +++ b/tests/floats/migrations/deploy.ts @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/floats/tests/floats.ts b/tests/floats/tests/floats.ts index f0ef9f57e..e17c3ea7e 100644 --- a/tests/floats/tests/floats.ts +++ b/tests/floats/tests/floats.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Program, getProvider } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Program, getProvider } from "@coral-xyz/anchor"; import { Keypair, SystemProgram } from "@solana/web3.js"; import { Floats } from "../target/types/floats"; import { assert } from "chai"; diff --git a/tests/ido-pool/migrations/deploy.js b/tests/ido-pool/migrations/deploy.js index 5e3df0dc3..82fb175fa 100644 --- a/tests/ido-pool/migrations/deploy.js +++ b/tests/ido-pool/migrations/deploy.js @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/ido-pool/tests/ido-pool.js b/tests/ido-pool/tests/ido-pool.js index efda7f2dd..a0ed236a7 100644 --- a/tests/ido-pool/tests/ido-pool.js +++ b/tests/ido-pool/tests/ido-pool.js @@ -1,4 +1,4 @@ -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const { assert } = require("chai"); const { ASSOCIATED_TOKEN_PROGRAM_ID, @@ -11,7 +11,7 @@ const { createMint, createTokenAccount, } = require("./utils"); -const { token } = require("@project-serum/anchor/dist/cjs/utils"); +const { token } = require("@coral-xyz/anchor/dist/cjs/utils"); describe("ido-pool", () => { const provider = anchor.AnchorProvider.local(); diff --git a/tests/ido-pool/tests/utils/index.js b/tests/ido-pool/tests/utils/index.js index 7356d406d..c96b9bfb2 100644 --- a/tests/ido-pool/tests/utils/index.js +++ b/tests/ido-pool/tests/utils/index.js @@ -1,5 +1,5 @@ const spl = require("@solana/spl-token"); -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const serumCmn = require("@project-serum/common"); const TokenInstructions = require("@project-serum/serum").TokenInstructions; diff --git a/tests/interface/tests/interface.js b/tests/interface/tests/interface.js index bbc3549ed..4320944b5 100644 --- a/tests/interface/tests/interface.js +++ b/tests/interface/tests/interface.js @@ -1,4 +1,4 @@ -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const { assert } = require("chai"); const nativeAssert = require("assert"); diff --git a/tests/lockup/migrations/deploy.js b/tests/lockup/migrations/deploy.js index c1ac6f1d3..bb0ed9646 100644 --- a/tests/lockup/migrations/deploy.js +++ b/tests/lockup/migrations/deploy.js @@ -2,7 +2,7 @@ // immediately after a deploy. const serumCmn = require("@project-serum/common"); -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const PublicKey = anchor.web3.PublicKey; module.exports = async function (provider) { diff --git a/tests/lockup/tests/lockup.js b/tests/lockup/tests/lockup.js index 239839eda..ace310473 100644 --- a/tests/lockup/tests/lockup.js +++ b/tests/lockup/tests/lockup.js @@ -1,4 +1,4 @@ -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const serumCmn = require("@project-serum/common"); const { TOKEN_PROGRAM_ID } = require("@solana/spl-token"); const utils = require("./utils"); diff --git a/tests/lockup/tests/utils.js b/tests/lockup/tests/utils.js index ce53bba01..bb4007958 100644 --- a/tests/lockup/tests/utils.js +++ b/tests/lockup/tests/utils.js @@ -1,4 +1,4 @@ -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const serumCmn = require("@project-serum/common"); async function createBalanceSandbox(provider, r, registrySigner) { diff --git a/tests/misc/migrations/deploy.js b/tests/misc/migrations/deploy.js index 5e3df0dc3..82fb175fa 100644 --- a/tests/misc/migrations/deploy.js +++ b/tests/misc/migrations/deploy.js @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/misc/miscNonRentExempt.ts b/tests/misc/miscNonRentExempt.ts index 69b493dd8..45472d65a 100644 --- a/tests/misc/miscNonRentExempt.ts +++ b/tests/misc/miscNonRentExempt.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Program, AnchorError } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Program, AnchorError } from "@coral-xyz/anchor"; import { PublicKey, Keypair, diff --git a/tests/misc/tests/idl_doc/idl_doc.ts b/tests/misc/tests/idl_doc/idl_doc.ts index 88c65e314..f018b8d55 100644 --- a/tests/misc/tests/idl_doc/idl_doc.ts +++ b/tests/misc/tests/idl_doc/idl_doc.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Program, Wallet } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Program, Wallet } from "@coral-xyz/anchor"; import { IdlDoc } from "../../target/types/idl_doc"; const { expect } = require("chai"); const idl_doc_idl = require("../../target/idl/idl_doc.json"); diff --git a/tests/misc/tests/init-if-needed/init-if-needed.ts b/tests/misc/tests/init-if-needed/init-if-needed.ts index febc09ff3..eea844532 100644 --- a/tests/misc/tests/init-if-needed/init-if-needed.ts +++ b/tests/misc/tests/init-if-needed/init-if-needed.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { AnchorError, Program } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { AnchorError, Program } from "@coral-xyz/anchor"; import { InitIfNeeded } from "../../target/types/init_if_needed"; import { SystemProgram, LAMPORTS_PER_SOL } from "@solana/web3.js"; import { expect } from "chai"; diff --git a/tests/misc/tests/misc/misc.ts b/tests/misc/tests/misc/misc.ts index 6c032917d..d897650d0 100644 --- a/tests/misc/tests/misc/misc.ts +++ b/tests/misc/tests/misc/misc.ts @@ -1,4 +1,4 @@ -import * as anchor from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; import { Program, BN, @@ -7,7 +7,7 @@ import { Wallet, IdlTypes, IdlEvents, -} from "@project-serum/anchor"; +} from "@coral-xyz/anchor"; import { PublicKey, Keypair, diff --git a/tests/multiple-suites-run-single/package.json b/tests/multiple-suites-run-single/package.json index 8841f8ab3..f11e4edbf 100644 --- a/tests/multiple-suites-run-single/package.json +++ b/tests/multiple-suites-run-single/package.json @@ -2,13 +2,13 @@ "name": "multiple-suites-run-single", "version": "0.24.2", "license": "(MIT OR Apache-2.0)", - "homepage": "https://github.com/project-serum/anchor#readme", + "homepage": "https://github.com/coral-xyz/anchor#readme", "bugs": { - "url": "https://github.com/project-serum/anchor/issues" + "url": "https://github.com/coral-xyz/anchor/issues" }, "repository": { "type": "git", - "url": "https://github.com/project-serum/anchor.git" + "url": "https://github.com/coral-xyz/anchor.git" }, "engines": { "node": ">=11" diff --git a/tests/multiple-suites-run-single/tests/should-run/shouldRun.ts b/tests/multiple-suites-run-single/tests/should-run/shouldRun.ts index 2924162a5..669785a21 100644 --- a/tests/multiple-suites-run-single/tests/should-run/shouldRun.ts +++ b/tests/multiple-suites-run-single/tests/should-run/shouldRun.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Program } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Program } from "@coral-xyz/anchor"; import { assert } from "chai"; import { MultipleSuitesRunSingle } from "../../target/types/multiple_suites_run_single"; diff --git a/tests/multiple-suites/migrations/deploy.ts b/tests/multiple-suites/migrations/deploy.ts index 5e3df0dc3..82fb175fa 100644 --- a/tests/multiple-suites/migrations/deploy.ts +++ b/tests/multiple-suites/migrations/deploy.ts @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/multiple-suites/tests/another-suite/another-suite.ts b/tests/multiple-suites/tests/another-suite/another-suite.ts index 0ab19987e..bcce7ce32 100644 --- a/tests/multiple-suites/tests/another-suite/another-suite.ts +++ b/tests/multiple-suites/tests/another-suite/another-suite.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Program } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Program } from "@coral-xyz/anchor"; import { PublicKey } from "@solana/web3.js"; import { assert } from "chai"; import { MultipleSuites } from "../../target/types/multiple_suites"; diff --git a/tests/multiple-suites/tests/fourth-and-fifth-suite/fifth-suite/fifthSuite.ts b/tests/multiple-suites/tests/fourth-and-fifth-suite/fifth-suite/fifthSuite.ts index 43e781a5e..ba05f1cb7 100644 --- a/tests/multiple-suites/tests/fourth-and-fifth-suite/fifth-suite/fifthSuite.ts +++ b/tests/multiple-suites/tests/fourth-and-fifth-suite/fifth-suite/fifthSuite.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Program } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Program } from "@coral-xyz/anchor"; import { PublicKey } from "@solana/web3.js"; import { assert } from "chai"; import { MultipleSuites } from "../../../target/types/multiple_suites"; diff --git a/tests/multiple-suites/tests/fourth-and-fifth-suite/forth-suite/forth-suite.ts b/tests/multiple-suites/tests/fourth-and-fifth-suite/forth-suite/forth-suite.ts index 5f14aebee..a17931fb2 100644 --- a/tests/multiple-suites/tests/fourth-and-fifth-suite/forth-suite/forth-suite.ts +++ b/tests/multiple-suites/tests/fourth-and-fifth-suite/forth-suite/forth-suite.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Program } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Program } from "@coral-xyz/anchor"; import { PublicKey } from "@solana/web3.js"; import { assert } from "chai"; import { MultipleSuites } from "../../../target/types/multiple_suites"; diff --git a/tests/multiple-suites/tests/multiple-suites/multiple-suites.ts b/tests/multiple-suites/tests/multiple-suites/multiple-suites.ts index 3cdf84ed4..98f554a18 100644 --- a/tests/multiple-suites/tests/multiple-suites/multiple-suites.ts +++ b/tests/multiple-suites/tests/multiple-suites/multiple-suites.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Program } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Program } from "@coral-xyz/anchor"; import { PublicKey } from "@solana/web3.js"; import { assert } from "chai"; import { MultipleSuites } from "../../target/types/multiple_suites"; diff --git a/tests/multiple-suites/tests/third-suite/sub-dir-one/subDirOne.ts b/tests/multiple-suites/tests/third-suite/sub-dir-one/subDirOne.ts index 93cf1c0ac..e35e1191f 100644 --- a/tests/multiple-suites/tests/third-suite/sub-dir-one/subDirOne.ts +++ b/tests/multiple-suites/tests/third-suite/sub-dir-one/subDirOne.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Program } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Program } from "@coral-xyz/anchor"; import { PublicKey } from "@solana/web3.js"; import { MultipleSuites } from "../../../target/types/multiple_suites"; import { assert } from "chai"; diff --git a/tests/multiple-suites/tests/third-suite/sub-dir-two/subDirTwo.ts b/tests/multiple-suites/tests/third-suite/sub-dir-two/subDirTwo.ts index 62be69fc6..e0409f10c 100644 --- a/tests/multiple-suites/tests/third-suite/sub-dir-two/subDirTwo.ts +++ b/tests/multiple-suites/tests/third-suite/sub-dir-two/subDirTwo.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Program } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Program } from "@coral-xyz/anchor"; import { PublicKey } from "@solana/web3.js"; import { assert } from "chai"; import { MultipleSuites } from "../../../target/types/multiple_suites"; diff --git a/tests/multisig/migrations/deploy.js b/tests/multisig/migrations/deploy.js index 5e3df0dc3..82fb175fa 100644 --- a/tests/multisig/migrations/deploy.js +++ b/tests/multisig/migrations/deploy.js @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/multisig/tests/multisig.js b/tests/multisig/tests/multisig.js index 1a700025a..f65e7d182 100644 --- a/tests/multisig/tests/multisig.js +++ b/tests/multisig/tests/multisig.js @@ -1,4 +1,4 @@ -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const { assert } = require("chai"); describe("multisig", () => { diff --git a/tests/optional/tests/optional.ts b/tests/optional/tests/optional.ts index 9c12bb4ba..19aeeb7f7 100644 --- a/tests/optional/tests/optional.ts +++ b/tests/optional/tests/optional.ts @@ -1,4 +1,4 @@ -import * as anchor from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; import { Program, web3, @@ -8,7 +8,7 @@ import { LangErrorMessage, translateError, parseIdlErrors, -} from "@project-serum/anchor"; +} from "@coral-xyz/anchor"; import { Optional } from "../target/types/optional"; import { AllowMissingOptionals } from "../target/types/allow_missing_optionals"; import { assert, expect } from "chai"; diff --git a/tests/package.json b/tests/package.json index 97e9756f7..0d58b9719 100644 --- a/tests/package.json +++ b/tests/package.json @@ -43,16 +43,16 @@ "bpf-upgradeable-state" ], "dependencies": { - "@project-serum/anchor": "file:../ts/packages/anchor", + "@coral-xyz/anchor": "file:../ts/packages/anchor", "@project-serum/common": "^0.0.1-beta.3", "@project-serum/serum": "^0.13.60", - "@project-serum/spl-associated-token-account": "file:../ts/packages/spl-associated-token-account", - "@project-serum/spl-token": "file:../ts/packages/spl-token", + "@coral-xyz/spl-associated-token-account": "file:../ts/packages/spl-associated-token-account", + "@coral-xyz/spl-token": "file:../ts/packages/spl-token", "@solana/spl-token": "^0.1.8", "@solana/web3.js": "^1.68.0" }, "resolutions": { - "@project-serum/anchor/@solana/web3.js": "^1.68.0" + "@coral-xyz/anchor/@solana/web3.js": "^1.68.0" }, "devDependencies": { "@types/chai": "^4.3.0", diff --git a/tests/pda-derivation/migrations/deploy.ts b/tests/pda-derivation/migrations/deploy.ts index 53e1252d6..1ba1b21c2 100644 --- a/tests/pda-derivation/migrations/deploy.ts +++ b/tests/pda-derivation/migrations/deploy.ts @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/pda-derivation/tests/typescript.spec.ts b/tests/pda-derivation/tests/typescript.spec.ts index cb7fab1de..f81166c77 100644 --- a/tests/pda-derivation/tests/typescript.spec.ts +++ b/tests/pda-derivation/tests/typescript.spec.ts @@ -1,8 +1,8 @@ -import * as anchor from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; import BN from "bn.js"; import { Keypair } from "@solana/web3.js"; -import { findProgramAddressSync } from "@project-serum/anchor/dist/cjs/utils/pubkey"; -import { Program } from "@project-serum/anchor"; +import { findProgramAddressSync } from "@coral-xyz/anchor/dist/cjs/utils/pubkey"; +import { Program } from "@coral-xyz/anchor"; import { PdaDerivation } from "../target/types/pda_derivation"; import { expect } from "chai"; const encode = anchor.utils.bytes.utf8.encode; diff --git a/tests/pyth/tests/oracleUtils.ts b/tests/pyth/tests/oracleUtils.ts index 9a39e409b..2802d1c9b 100644 --- a/tests/pyth/tests/oracleUtils.ts +++ b/tests/pyth/tests/oracleUtils.ts @@ -1,5 +1,5 @@ import { Buffer } from "buffer"; -import { AnchorProvider, BN, Program, web3 } from "@project-serum/anchor"; +import { AnchorProvider, BN, Program, web3 } from "@coral-xyz/anchor"; export const Magic = 0xa1b2c3d4; export const Version1 = 1; diff --git a/tests/pyth/tests/pyth.spec.ts b/tests/pyth/tests/pyth.spec.ts index f3a751ee8..a65a0bc52 100644 --- a/tests/pyth/tests/pyth.spec.ts +++ b/tests/pyth/tests/pyth.spec.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { BN, Program, web3 } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { BN, Program, web3 } from "@coral-xyz/anchor"; import { assert } from "chai"; import { createPriceFeed, setFeedPrice, getFeedData } from "./oracleUtils"; diff --git a/tests/realloc/package.json b/tests/realloc/package.json index 6fde8a6de..a48fb22e3 100644 --- a/tests/realloc/package.json +++ b/tests/realloc/package.json @@ -2,13 +2,13 @@ "name": "realloc", "version": "0.26.0", "license": "(MIT OR Apache-2.0)", - "homepage": "https://github.com/project-serum/anchor#readme", + "homepage": "https://github.com/coral-xyz/anchor#readme", "bugs": { - "url": "https://github.com/project-serum/anchor/issues" + "url": "https://github.com/coral-xyz/anchor/issues" }, "repository": { "type": "git", - "url": "https://github.com/project-serum/anchor.git" + "url": "https://github.com/coral-xyz/anchor.git" }, "engines": { "node": ">=11" diff --git a/tests/realloc/tests/realloc.ts b/tests/realloc/tests/realloc.ts index 7ae700bc8..34aa2daac 100644 --- a/tests/realloc/tests/realloc.ts +++ b/tests/realloc/tests/realloc.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { AnchorError, Program } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { AnchorError, Program } from "@coral-xyz/anchor"; import { assert } from "chai"; import { Realloc } from "../target/types/realloc"; diff --git a/tests/relations-derivation/migrations/deploy.ts b/tests/relations-derivation/migrations/deploy.ts index 53e1252d6..1ba1b21c2 100644 --- a/tests/relations-derivation/migrations/deploy.ts +++ b/tests/relations-derivation/migrations/deploy.ts @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/relations-derivation/tests/typescript.spec.ts b/tests/relations-derivation/tests/typescript.spec.ts index 07921da3b..786e27105 100644 --- a/tests/relations-derivation/tests/typescript.spec.ts +++ b/tests/relations-derivation/tests/typescript.spec.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { AnchorProvider, Program } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { AnchorProvider, Program } from "@coral-xyz/anchor"; import { PublicKey } from "@solana/web3.js"; import { expect } from "chai"; import { RelationsDerivation } from "../target/types/relations_derivation"; diff --git a/tests/spl/token-proxy/tests/token-proxy.js b/tests/spl/token-proxy/tests/token-proxy.js index 503c976f4..7fb746cf0 100644 --- a/tests/spl/token-proxy/tests/token-proxy.js +++ b/tests/spl/token-proxy/tests/token-proxy.js @@ -1,4 +1,4 @@ -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const { assert } = require("chai"); describe("token", () => { diff --git a/tests/swap/migrations/deploy.js b/tests/swap/migrations/deploy.js index 5e3df0dc3..82fb175fa 100644 --- a/tests/swap/migrations/deploy.js +++ b/tests/swap/migrations/deploy.js @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/swap/tests/swap.js b/tests/swap/tests/swap.js index 21dd0778d..1e32b1c78 100644 --- a/tests/swap/tests/swap.js +++ b/tests/swap/tests/swap.js @@ -1,5 +1,5 @@ const { assert } = require("chai"); -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const BN = anchor.BN; const OpenOrders = require("@project-serum/serum").OpenOrders; const TOKEN_PROGRAM_ID = require("@solana/spl-token").TOKEN_PROGRAM_ID; diff --git a/tests/swap/tests/utils/index.js b/tests/swap/tests/utils/index.js index d53f0a04a..33147f108 100644 --- a/tests/swap/tests/utils/index.js +++ b/tests/swap/tests/utils/index.js @@ -9,9 +9,9 @@ const TOKEN_PROGRAM_ID = require("@solana/spl-token").TOKEN_PROGRAM_ID; const TokenInstructions = require("@project-serum/serum").TokenInstructions; const Market = require("@project-serum/serum").Market; const DexInstructions = require("@project-serum/serum").DexInstructions; -const web3 = require("@project-serum/anchor").web3; +const web3 = require("@coral-xyz/anchor").web3; const Connection = web3.Connection; -const BN = require("@project-serum/anchor").BN; +const BN = require("@coral-xyz/anchor").BN; const serumCmn = require("@project-serum/common"); const Account = web3.Account; const Transaction = web3.Transaction; diff --git a/tests/system-accounts/tests/system-accounts.js b/tests/system-accounts/tests/system-accounts.js index 5cd2f60a9..3027176ba 100644 --- a/tests/system-accounts/tests/system-accounts.js +++ b/tests/system-accounts/tests/system-accounts.js @@ -1,4 +1,4 @@ -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const splToken = require("@solana/spl-token"); const { assert } = require("chai"); diff --git a/tests/sysvars/tests/sysvars.js b/tests/sysvars/tests/sysvars.js index c69afa978..e7fecfb88 100644 --- a/tests/sysvars/tests/sysvars.js +++ b/tests/sysvars/tests/sysvars.js @@ -1,4 +1,4 @@ -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const { assert } = require("chai"); describe("sysvars", () => { diff --git a/tests/tictactoe/migrations/deploy.js b/tests/tictactoe/migrations/deploy.js index 5e3df0dc3..82fb175fa 100644 --- a/tests/tictactoe/migrations/deploy.js +++ b/tests/tictactoe/migrations/deploy.js @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/tictactoe/tests/tictactoe.js b/tests/tictactoe/tests/tictactoe.js index 5c4147a35..c405166ed 100644 --- a/tests/tictactoe/tests/tictactoe.js +++ b/tests/tictactoe/tests/tictactoe.js @@ -1,4 +1,4 @@ -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); describe("tictactoe", () => { anchor.setProvider(anchor.AnchorProvider.env()); diff --git a/tests/typescript/migrations/deploy.ts b/tests/typescript/migrations/deploy.ts index 53e1252d6..1ba1b21c2 100644 --- a/tests/typescript/migrations/deploy.ts +++ b/tests/typescript/migrations/deploy.ts @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/typescript/tests/typescript.spec.ts b/tests/typescript/tests/typescript.spec.ts index d4c34f50a..8051b6fb0 100644 --- a/tests/typescript/tests/typescript.spec.ts +++ b/tests/typescript/tests/typescript.spec.ts @@ -1,4 +1,4 @@ -import * as anchor from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; describe("typescript", () => { // Configure the client to use the local cluster. diff --git a/tests/validator-clone/tests/validator-clone.ts b/tests/validator-clone/tests/validator-clone.ts index 92b2fc1fb..0a2cfc387 100644 --- a/tests/validator-clone/tests/validator-clone.ts +++ b/tests/validator-clone/tests/validator-clone.ts @@ -1,5 +1,5 @@ -import * as anchor from "@project-serum/anchor"; -import { Program } from "@project-serum/anchor"; +import * as anchor from "@coral-xyz/anchor"; +import { Program } from "@coral-xyz/anchor"; import { assert } from "chai"; import { ValidatorClone } from "../target/types/validator_clone"; diff --git a/tests/yarn.lock b/tests/yarn.lock index d5cb8d7aa..ee9dbd091 100644 --- a/tests/yarn.lock +++ b/tests/yarn.lock @@ -16,14 +16,45 @@ dependencies: regenerator-runtime "^0.13.4" -"@coral-xyz/borsh@^0.2.6": - version "0.2.6" - resolved "https://registry.yarnpkg.com/@coral-xyz/borsh/-/borsh-0.2.6.tgz#0f11b223bf2967574310705afd3c53ce26688ada" - integrity sha512-y6nmHw1bFcJib7sMHsQPpC8r47xhqDZVvhUdna7NUPzpSbOZG6f46N21+aXsQ2w/tG8Ggls488J/ZmwbgVmyjg== +"@coral-xyz/anchor@=0.26.0", "@coral-xyz/anchor@file:../ts/packages/anchor": + version "0.26.0" + dependencies: + "@coral-xyz/borsh" "^0.26.0" + "@solana/web3.js" "^1.68.0" + base64-js "^1.5.1" + bn.js "^5.1.2" + bs58 "^4.0.1" + buffer-layout "^1.2.2" + camelcase "^6.3.0" + cross-fetch "^3.1.5" + crypto-hash "^1.3.0" + eventemitter3 "^4.0.7" + js-sha256 "^0.9.0" + pako "^2.0.3" + snake-case "^3.0.4" + superstruct "^0.15.4" + toml "^3.0.0" + +"@coral-xyz/borsh@^0.26.0": + version "0.26.0" + resolved "https://registry.yarnpkg.com/@coral-xyz/borsh/-/borsh-0.26.0.tgz#d054f64536d824634969e74138f9f7c52bbbc0d5" + integrity sha512-uCZ0xus0CszQPHYfWAqKS5swS1UxvePu83oOF+TWpUkedsNlg6p2p4azxZNSSqwXb9uXMFgxhuMBX9r3Xoi0vQ== dependencies: bn.js "^5.1.2" buffer-layout "^1.2.0" +"@coral-xyz/spl-associated-token-account@file:../ts/packages/spl-associated-token-account": + version "1.1.1" + dependencies: + "@coral-xyz/anchor" "=0.26.0" + "@native-to-anchor/buffer-layout" "=0.1.0" + +"@coral-xyz/spl-token@file:../ts/packages/spl-token": + version "0.26.0" + dependencies: + "@coral-xyz/anchor" "=0.26.0" + "@native-to-anchor/buffer-layout" "=0.1.0" + "@native-to-anchor/buffer-layout@=0.1.0": version "0.1.0" resolved "https://registry.yarnpkg.com/@native-to-anchor/buffer-layout/-/buffer-layout-0.1.0.tgz#ff0cb66341bc820b8ee73bb1d1d43bae7e3554b0" @@ -47,25 +78,6 @@ resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.6.3.tgz#7eed12d9f4404b416999d0c87686836c4c5c9b94" integrity sha512-T04e4iTurVy7I8Sw4+c5OSN9/RkPlo1uKxAomtxQNLq8j1uPAqnsqG1bqvY3Jv7c13gyr6dui0zmh/I3+f/JaQ== -"@project-serum/anchor@=0.25.0", "@project-serum/anchor@file:../ts/packages/anchor": - version "0.25.0" - dependencies: - "@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" - buffer-layout "^1.2.2" - camelcase "^6.3.0" - cross-fetch "^3.1.5" - crypto-hash "^1.3.0" - eventemitter3 "^4.0.7" - js-sha256 "^0.9.0" - pako "^2.0.3" - snake-case "^3.0.4" - superstruct "^0.15.4" - toml "^3.0.0" - "@project-serum/anchor@^0.11.1": version "0.11.1" resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.11.1.tgz#155bff2c70652eafdcfd5559c81a83bb19cec9ff" @@ -114,18 +126,6 @@ bn.js "^5.1.2" buffer-layout "^1.2.0" -"@project-serum/spl-associated-token-account@file:../ts/packages/spl-associated-token-account": - version "1.1.1" - dependencies: - "@native-to-anchor/buffer-layout" "=0.1.0" - "@project-serum/anchor" "=0.25.0" - -"@project-serum/spl-token@file:../ts/packages/spl-token": - version "3.3.0" - dependencies: - "@native-to-anchor/buffer-layout" "=0.1.0" - "@project-serum/anchor" "=0.25.0" - "@solana/buffer-layout-utils@=0.2.0": version "0.2.0" resolved "https://registry.yarnpkg.com/@solana/buffer-layout-utils/-/buffer-layout-utils-0.2.0.tgz#b45a6cab3293a2eb7597cceb474f229889d875ca" @@ -1428,4 +1428,4 @@ yn@^2.0.0: yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== \ No newline at end of file + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/tests/zero-copy/migrations/deploy.js b/tests/zero-copy/migrations/deploy.js index 5e3df0dc3..82fb175fa 100644 --- a/tests/zero-copy/migrations/deploy.js +++ b/tests/zero-copy/migrations/deploy.js @@ -2,7 +2,7 @@ // single deploy script that's invoked from the CLI, injecting a provider // configured from the workspace's Anchor.toml. -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); module.exports = async function (provider) { // Configure client to use the provider. diff --git a/tests/zero-copy/tests/zero-copy.js b/tests/zero-copy/tests/zero-copy.js index f4e9f1213..805cd8c46 100644 --- a/tests/zero-copy/tests/zero-copy.js +++ b/tests/zero-copy/tests/zero-copy.js @@ -1,4 +1,4 @@ -const anchor = require("@project-serum/anchor"); +const anchor = require("@coral-xyz/anchor"); const { assert } = require("chai"); const nativeAssert = require("assert"); const PublicKey = anchor.web3.PublicKey; diff --git a/ts/package.json b/ts/package.json index 56d3cf15c..7dbbf9af1 100644 --- a/ts/package.json +++ b/ts/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/monorepo", + "name": "@coral-xyz/monorepo", "private": true, "workspaces": [ "packages/*", diff --git a/ts/packages/anchor/README.md b/ts/packages/anchor/README.md index 593c0a7ac..102f0917b 100644 --- a/ts/packages/anchor/README.md +++ b/ts/packages/anchor/README.md @@ -1,10 +1,10 @@ -# @project-serum/anchor +# @coral-xyz/anchor -[![npm](https://img.shields.io/npm/v/@project-serum/anchor.svg?color=blue)](https://www.npmjs.com/package/@project-serum/anchor) +[![npm](https://img.shields.io/npm/v/@coral-xyz/anchor.svg?color=blue)](https://www.npmjs.com/package/@coral-xyz/anchor) [![Docs](https://img.shields.io/badge/docs-typedoc-blue)](https://coral-xyz.github.io/anchor/ts/index.html) TypeScript client for Anchor programs. ## Note -* `@project-serum/anchor` depends on node.js native modules. Therefore, webpack 5 will not work with current version. You will either need to rollback to webpack 4, or use a polyfill for each missing dependency. \ No newline at end of file +- `@coral-xyz/anchor` depends on node.js native modules. Therefore, webpack 5 will not work with current version. You will either need to rollback to webpack 4, or use a polyfill for each missing dependency. diff --git a/ts/packages/anchor/package.json b/ts/packages/anchor/package.json index 47f5e7ecd..e67f35747 100644 --- a/ts/packages/anchor/package.json +++ b/ts/packages/anchor/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/anchor", + "name": "@coral-xyz/anchor", "version": "0.26.0", "description": "Anchor client", "module": "./dist/esm/index.js", diff --git a/ts/packages/spl-associated-token-account/package.json b/ts/packages/spl-associated-token-account/package.json index 303ab399d..6dd93dd6f 100644 --- a/ts/packages/spl-associated-token-account/package.json +++ b/ts/packages/spl-associated-token-account/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/spl-associated-token-account", + "name": "@coral-xyz/spl-associated-token-account", "description": "Anchor client for Solana Program Library Associated Token Account", "version": "1.1.1", "author": "acheron ", @@ -27,7 +27,7 @@ "watch": "tsc -p tsconfig.cjs.json --watch" }, "dependencies": { - "@project-serum/anchor": "=0.26.0", + "@coral-xyz/anchor": "=0.26.0", "@native-to-anchor/buffer-layout": "=0.1.0" }, "devDependencies": { diff --git a/ts/packages/spl-associated-token-account/src/coder/accounts.ts b/ts/packages/spl-associated-token-account/src/coder/accounts.ts index 2a2217b8b..40a0ea856 100644 --- a/ts/packages/spl-associated-token-account/src/coder/accounts.ts +++ b/ts/packages/spl-associated-token-account/src/coder/accounts.ts @@ -1,7 +1,7 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { AccountsCoder, Idl } from "@project-serum/anchor"; -import { IdlTypeDef } from "@project-serum/anchor/dist/cjs/idl"; +import { AccountsCoder, Idl } from "@coral-xyz/anchor"; +import { IdlTypeDef } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplAssociatedTokenAccountAccountsCoder implements AccountsCoder diff --git a/ts/packages/spl-associated-token-account/src/coder/events.ts b/ts/packages/spl-associated-token-account/src/coder/events.ts index 631646cf6..28b927101 100644 --- a/ts/packages/spl-associated-token-account/src/coder/events.ts +++ b/ts/packages/spl-associated-token-account/src/coder/events.ts @@ -1,5 +1,5 @@ -import { Idl, Event, EventCoder } from "@project-serum/anchor"; -import { IdlEvent } from "@project-serum/anchor/dist/cjs/idl"; +import { Idl, Event, EventCoder } from "@coral-xyz/anchor"; +import { IdlEvent } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplAssociatedTokenAccountEventsCoder implements EventCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-associated-token-account/src/coder/index.ts b/ts/packages/spl-associated-token-account/src/coder/index.ts index 25f898f46..5ef8a1cb6 100644 --- a/ts/packages/spl-associated-token-account/src/coder/index.ts +++ b/ts/packages/spl-associated-token-account/src/coder/index.ts @@ -1,4 +1,4 @@ -import { Idl, Coder } from "@project-serum/anchor"; +import { Idl, Coder } from "@coral-xyz/anchor"; import { SplAssociatedTokenAccountAccountsCoder } from "./accounts"; import { SplAssociatedTokenAccountEventsCoder } from "./events"; diff --git a/ts/packages/spl-associated-token-account/src/coder/instructions.ts b/ts/packages/spl-associated-token-account/src/coder/instructions.ts index 38cbc057b..78343994d 100644 --- a/ts/packages/spl-associated-token-account/src/coder/instructions.ts +++ b/ts/packages/spl-associated-token-account/src/coder/instructions.ts @@ -1,6 +1,6 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { Idl, InstructionCoder } from "@project-serum/anchor"; +import { Idl, InstructionCoder } from "@coral-xyz/anchor"; export class SplAssociatedTokenAccountInstructionCoder implements InstructionCoder diff --git a/ts/packages/spl-associated-token-account/src/coder/state.ts b/ts/packages/spl-associated-token-account/src/coder/state.ts index 081d43dca..0f57e79e1 100644 --- a/ts/packages/spl-associated-token-account/src/coder/state.ts +++ b/ts/packages/spl-associated-token-account/src/coder/state.ts @@ -1,4 +1,4 @@ -import { Idl, StateCoder } from "@project-serum/anchor"; +import { Idl, StateCoder } from "@coral-xyz/anchor"; export class SplAssociatedTokenAccountStateCoder implements StateCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-associated-token-account/src/coder/types.ts b/ts/packages/spl-associated-token-account/src/coder/types.ts index 084fc264f..349e56bf2 100644 --- a/ts/packages/spl-associated-token-account/src/coder/types.ts +++ b/ts/packages/spl-associated-token-account/src/coder/types.ts @@ -1,4 +1,4 @@ -import { Idl, TypesCoder } from "@project-serum/anchor"; +import { Idl, TypesCoder } from "@coral-xyz/anchor"; export class SplAssociatedTokenAccountTypesCoder implements TypesCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-associated-token-account/src/program.ts b/ts/packages/spl-associated-token-account/src/program.ts index 359d0a8cb..feaec79b1 100644 --- a/ts/packages/spl-associated-token-account/src/program.ts +++ b/ts/packages/spl-associated-token-account/src/program.ts @@ -1,5 +1,5 @@ import { PublicKey } from "@solana/web3.js"; -import { Program, AnchorProvider } from "@project-serum/anchor"; +import { Program, AnchorProvider } from "@coral-xyz/anchor"; import { SplAssociatedTokenAccountCoder } from "./coder"; diff --git a/ts/packages/spl-binary-option/package.json b/ts/packages/spl-binary-option/package.json index 3b350389a..953935461 100644 --- a/ts/packages/spl-binary-option/package.json +++ b/ts/packages/spl-binary-option/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/spl-binary-option", + "name": "@coral-xyz/spl-binary-option", "description": "Anchor client for Solana Program Library Binary Option", "version": "0.1.0", "author": "acheron ", @@ -27,7 +27,7 @@ "watch": "tsc -p tsconfig.cjs.json --watch" }, "dependencies": { - "@project-serum/anchor": "=0.26.0", + "@coral-xyz/anchor": "=0.26.0", "@native-to-anchor/buffer-layout": "=0.1.0" }, "devDependencies": { diff --git a/ts/packages/spl-binary-option/src/coder/accounts.ts b/ts/packages/spl-binary-option/src/coder/accounts.ts index 13c83d559..5f1fc5c79 100644 --- a/ts/packages/spl-binary-option/src/coder/accounts.ts +++ b/ts/packages/spl-binary-option/src/coder/accounts.ts @@ -1,7 +1,7 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { AccountsCoder, Idl } from "@project-serum/anchor"; -import { IdlTypeDef } from "@project-serum/anchor/dist/cjs/idl"; +import { AccountsCoder, Idl } from "@coral-xyz/anchor"; +import { IdlTypeDef } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplBinaryOptionAccountsCoder implements AccountsCoder diff --git a/ts/packages/spl-binary-option/src/coder/events.ts b/ts/packages/spl-binary-option/src/coder/events.ts index d2b5f7e2f..91261a59c 100644 --- a/ts/packages/spl-binary-option/src/coder/events.ts +++ b/ts/packages/spl-binary-option/src/coder/events.ts @@ -1,5 +1,5 @@ -import { Idl, Event, EventCoder } from "@project-serum/anchor"; -import { IdlEvent } from "@project-serum/anchor/dist/cjs/idl"; +import { Idl, Event, EventCoder } from "@coral-xyz/anchor"; +import { IdlEvent } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplBinaryOptionEventsCoder implements EventCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-binary-option/src/coder/index.ts b/ts/packages/spl-binary-option/src/coder/index.ts index 764d0abe4..6af8d8f47 100644 --- a/ts/packages/spl-binary-option/src/coder/index.ts +++ b/ts/packages/spl-binary-option/src/coder/index.ts @@ -1,4 +1,4 @@ -import { Idl, Coder } from "@project-serum/anchor"; +import { Idl, Coder } from "@coral-xyz/anchor"; import { SplBinaryOptionAccountsCoder } from "./accounts"; import { SplBinaryOptionEventsCoder } from "./events"; diff --git a/ts/packages/spl-binary-option/src/coder/instructions.ts b/ts/packages/spl-binary-option/src/coder/instructions.ts index 3b3a24e42..5b05e5431 100644 --- a/ts/packages/spl-binary-option/src/coder/instructions.ts +++ b/ts/packages/spl-binary-option/src/coder/instructions.ts @@ -1,6 +1,6 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { Idl, InstructionCoder } from "@project-serum/anchor"; +import { Idl, InstructionCoder } from "@coral-xyz/anchor"; export class SplBinaryOptionInstructionCoder implements InstructionCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-binary-option/src/coder/state.ts b/ts/packages/spl-binary-option/src/coder/state.ts index 274aa44eb..1b4d48e07 100644 --- a/ts/packages/spl-binary-option/src/coder/state.ts +++ b/ts/packages/spl-binary-option/src/coder/state.ts @@ -1,4 +1,4 @@ -import { Idl, StateCoder } from "@project-serum/anchor"; +import { Idl, StateCoder } from "@coral-xyz/anchor"; export class SplBinaryOptionStateCoder implements StateCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-binary-option/src/coder/types.ts b/ts/packages/spl-binary-option/src/coder/types.ts index e36c09217..ca9253036 100644 --- a/ts/packages/spl-binary-option/src/coder/types.ts +++ b/ts/packages/spl-binary-option/src/coder/types.ts @@ -1,4 +1,4 @@ -import { Idl, TypesCoder } from "@project-serum/anchor"; +import { Idl, TypesCoder } from "@coral-xyz/anchor"; export class SplBinaryOptionTypesCoder implements TypesCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-binary-option/src/program.ts b/ts/packages/spl-binary-option/src/program.ts index 388e3f119..6d4a5b5f9 100644 --- a/ts/packages/spl-binary-option/src/program.ts +++ b/ts/packages/spl-binary-option/src/program.ts @@ -1,5 +1,5 @@ import { PublicKey } from "@solana/web3.js"; -import { Program, AnchorProvider } from "@project-serum/anchor"; +import { Program, AnchorProvider } from "@coral-xyz/anchor"; import { SplBinaryOptionCoder } from "./coder"; diff --git a/ts/packages/spl-binary-oracle-pair/package.json b/ts/packages/spl-binary-oracle-pair/package.json index 4f8c1a4cc..1afb73087 100644 --- a/ts/packages/spl-binary-oracle-pair/package.json +++ b/ts/packages/spl-binary-oracle-pair/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/spl-binary-oracle-pair", + "name": "@coral-xyz/spl-binary-oracle-pair", "description": "Anchor client for Solana Program Library Binary Oracle Pair", "version": "0.1.0", "author": "acheron ", @@ -27,7 +27,7 @@ "watch": "tsc -p tsconfig.cjs.json --watch" }, "dependencies": { - "@project-serum/anchor": "=0.26.0", + "@coral-xyz/anchor": "=0.26.0", "@native-to-anchor/buffer-layout": "=0.1.0" }, "devDependencies": { diff --git a/ts/packages/spl-binary-oracle-pair/src/coder/accounts.ts b/ts/packages/spl-binary-oracle-pair/src/coder/accounts.ts index 75276e7fa..1dff5fe9e 100644 --- a/ts/packages/spl-binary-oracle-pair/src/coder/accounts.ts +++ b/ts/packages/spl-binary-oracle-pair/src/coder/accounts.ts @@ -1,7 +1,7 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { AccountsCoder, Idl } from "@project-serum/anchor"; -import { IdlTypeDef } from "@project-serum/anchor/dist/cjs/idl"; +import { AccountsCoder, Idl } from "@coral-xyz/anchor"; +import { IdlTypeDef } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplBinaryOraclePairAccountsCoder implements AccountsCoder diff --git a/ts/packages/spl-binary-oracle-pair/src/coder/events.ts b/ts/packages/spl-binary-oracle-pair/src/coder/events.ts index 87d9b6f3e..173360b9d 100644 --- a/ts/packages/spl-binary-oracle-pair/src/coder/events.ts +++ b/ts/packages/spl-binary-oracle-pair/src/coder/events.ts @@ -1,5 +1,5 @@ -import { Idl, Event, EventCoder } from "@project-serum/anchor"; -import { IdlEvent } from "@project-serum/anchor/dist/cjs/idl"; +import { Idl, Event, EventCoder } from "@coral-xyz/anchor"; +import { IdlEvent } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplBinaryOraclePairEventsCoder implements EventCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-binary-oracle-pair/src/coder/index.ts b/ts/packages/spl-binary-oracle-pair/src/coder/index.ts index 5ea9932c4..2ed372c35 100644 --- a/ts/packages/spl-binary-oracle-pair/src/coder/index.ts +++ b/ts/packages/spl-binary-oracle-pair/src/coder/index.ts @@ -1,4 +1,4 @@ -import { Idl, Coder } from "@project-serum/anchor"; +import { Idl, Coder } from "@coral-xyz/anchor"; import { SplBinaryOraclePairAccountsCoder } from "./accounts"; import { SplBinaryOraclePairEventsCoder } from "./events"; diff --git a/ts/packages/spl-binary-oracle-pair/src/coder/instructions.ts b/ts/packages/spl-binary-oracle-pair/src/coder/instructions.ts index aa1ca57fb..e735c7fc2 100644 --- a/ts/packages/spl-binary-oracle-pair/src/coder/instructions.ts +++ b/ts/packages/spl-binary-oracle-pair/src/coder/instructions.ts @@ -1,6 +1,6 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { Idl, InstructionCoder } from "@project-serum/anchor"; +import { Idl, InstructionCoder } from "@coral-xyz/anchor"; export class SplBinaryOraclePairInstructionCoder implements InstructionCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-binary-oracle-pair/src/coder/state.ts b/ts/packages/spl-binary-oracle-pair/src/coder/state.ts index 2ed9392f8..02deaea32 100644 --- a/ts/packages/spl-binary-oracle-pair/src/coder/state.ts +++ b/ts/packages/spl-binary-oracle-pair/src/coder/state.ts @@ -1,4 +1,4 @@ -import { Idl, StateCoder } from "@project-serum/anchor"; +import { Idl, StateCoder } from "@coral-xyz/anchor"; export class SplBinaryOraclePairStateCoder implements StateCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-binary-oracle-pair/src/coder/types.ts b/ts/packages/spl-binary-oracle-pair/src/coder/types.ts index afd3687d9..c4867e7eb 100644 --- a/ts/packages/spl-binary-oracle-pair/src/coder/types.ts +++ b/ts/packages/spl-binary-oracle-pair/src/coder/types.ts @@ -1,4 +1,4 @@ -import { Idl, TypesCoder } from "@project-serum/anchor"; +import { Idl, TypesCoder } from "@coral-xyz/anchor"; export class SplBinaryOraclePairTypesCoder implements TypesCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-binary-oracle-pair/src/program.ts b/ts/packages/spl-binary-oracle-pair/src/program.ts index 750b19c52..880faaf98 100644 --- a/ts/packages/spl-binary-oracle-pair/src/program.ts +++ b/ts/packages/spl-binary-oracle-pair/src/program.ts @@ -1,5 +1,5 @@ import { PublicKey } from "@solana/web3.js"; -import { Program, AnchorProvider } from "@project-serum/anchor"; +import { Program, AnchorProvider } from "@coral-xyz/anchor"; import { SplBinaryOraclePairCoder } from "./coder"; diff --git a/ts/packages/spl-feature-proposal/package.json b/ts/packages/spl-feature-proposal/package.json index 1a0ae1220..3d1f87b28 100644 --- a/ts/packages/spl-feature-proposal/package.json +++ b/ts/packages/spl-feature-proposal/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/spl-feature-proposal", + "name": "@coral-xyz/spl-feature-proposal", "description": "Anchor client for Solana Program Library Feature Proposal Program", "version": "1.0.0", "author": "acheron ", @@ -27,7 +27,7 @@ "watch": "tsc -p tsconfig.cjs.json --watch" }, "dependencies": { - "@project-serum/anchor": "=0.26.0", + "@coral-xyz/anchor": "=0.26.0", "@native-to-anchor/buffer-layout": "=0.1.0" }, "devDependencies": { diff --git a/ts/packages/spl-feature-proposal/src/coder/accounts.ts b/ts/packages/spl-feature-proposal/src/coder/accounts.ts index ea087b6eb..28e3971a5 100644 --- a/ts/packages/spl-feature-proposal/src/coder/accounts.ts +++ b/ts/packages/spl-feature-proposal/src/coder/accounts.ts @@ -1,7 +1,7 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { AccountsCoder, Idl } from "@project-serum/anchor"; -import { IdlTypeDef } from "@project-serum/anchor/dist/cjs/idl"; +import { AccountsCoder, Idl } from "@coral-xyz/anchor"; +import { IdlTypeDef } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplFeatureProposalAccountsCoder implements AccountsCoder diff --git a/ts/packages/spl-feature-proposal/src/coder/events.ts b/ts/packages/spl-feature-proposal/src/coder/events.ts index 0fe964597..b45acf4eb 100644 --- a/ts/packages/spl-feature-proposal/src/coder/events.ts +++ b/ts/packages/spl-feature-proposal/src/coder/events.ts @@ -1,5 +1,5 @@ -import { Idl, Event, EventCoder } from "@project-serum/anchor"; -import { IdlEvent } from "@project-serum/anchor/dist/cjs/idl"; +import { Idl, Event, EventCoder } from "@coral-xyz/anchor"; +import { IdlEvent } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplFeatureProposalEventsCoder implements EventCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-feature-proposal/src/coder/index.ts b/ts/packages/spl-feature-proposal/src/coder/index.ts index 445976e8e..f67f806dd 100644 --- a/ts/packages/spl-feature-proposal/src/coder/index.ts +++ b/ts/packages/spl-feature-proposal/src/coder/index.ts @@ -1,4 +1,4 @@ -import { Idl, Coder } from "@project-serum/anchor"; +import { Idl, Coder } from "@coral-xyz/anchor"; import { SplFeatureProposalAccountsCoder } from "./accounts"; import { SplFeatureProposalEventsCoder } from "./events"; diff --git a/ts/packages/spl-feature-proposal/src/coder/instructions.ts b/ts/packages/spl-feature-proposal/src/coder/instructions.ts index a5459bded..def7597c9 100644 --- a/ts/packages/spl-feature-proposal/src/coder/instructions.ts +++ b/ts/packages/spl-feature-proposal/src/coder/instructions.ts @@ -1,6 +1,6 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { Idl, InstructionCoder } from "@project-serum/anchor"; +import { Idl, InstructionCoder } from "@coral-xyz/anchor"; export class SplFeatureProposalInstructionCoder implements InstructionCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-feature-proposal/src/coder/state.ts b/ts/packages/spl-feature-proposal/src/coder/state.ts index 17dd9e0d4..48dbe9b7d 100644 --- a/ts/packages/spl-feature-proposal/src/coder/state.ts +++ b/ts/packages/spl-feature-proposal/src/coder/state.ts @@ -1,4 +1,4 @@ -import { Idl, StateCoder } from "@project-serum/anchor"; +import { Idl, StateCoder } from "@coral-xyz/anchor"; export class SplFeatureProposalStateCoder implements StateCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-feature-proposal/src/coder/types.ts b/ts/packages/spl-feature-proposal/src/coder/types.ts index ee91a7a3e..98c5a661e 100644 --- a/ts/packages/spl-feature-proposal/src/coder/types.ts +++ b/ts/packages/spl-feature-proposal/src/coder/types.ts @@ -1,4 +1,4 @@ -import { Idl, TypesCoder } from "@project-serum/anchor"; +import { Idl, TypesCoder } from "@coral-xyz/anchor"; export class SplFeatureProposalTypesCoder implements TypesCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-feature-proposal/src/program.ts b/ts/packages/spl-feature-proposal/src/program.ts index ed85cc456..d691967dd 100644 --- a/ts/packages/spl-feature-proposal/src/program.ts +++ b/ts/packages/spl-feature-proposal/src/program.ts @@ -1,6 +1,6 @@ // @ts-nocheck import { PublicKey } from "@solana/web3.js"; -import { Program, AnchorProvider } from "@project-serum/anchor"; +import { Program, AnchorProvider } from "@coral-xyz/anchor"; import { SplFeatureProposalCoder } from "./coder"; diff --git a/ts/packages/spl-governance/package.json b/ts/packages/spl-governance/package.json index d770d30d1..3064ca13c 100644 --- a/ts/packages/spl-governance/package.json +++ b/ts/packages/spl-governance/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/spl-governance", + "name": "@coral-xyz/spl-governance", "description": "Anchor client for Solana Program Library Governance Program", "version": "3.0.0", "author": "acheron ", @@ -27,7 +27,7 @@ "watch": "tsc -p tsconfig.cjs.json --watch" }, "dependencies": { - "@project-serum/anchor": "=0.26.0", + "@coral-xyz/anchor": "=0.26.0", "@native-to-anchor/buffer-layout": "=0.1.0" }, "devDependencies": { diff --git a/ts/packages/spl-governance/src/coder/accounts.ts b/ts/packages/spl-governance/src/coder/accounts.ts index 99b2cfabb..3384de944 100644 --- a/ts/packages/spl-governance/src/coder/accounts.ts +++ b/ts/packages/spl-governance/src/coder/accounts.ts @@ -1,7 +1,7 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { AccountsCoder, Idl } from "@project-serum/anchor"; -import { IdlTypeDef } from "@project-serum/anchor/dist/cjs/idl"; +import { AccountsCoder, Idl } from "@coral-xyz/anchor"; +import { IdlTypeDef } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplGovernanceAccountsCoder implements AccountsCoder diff --git a/ts/packages/spl-governance/src/coder/events.ts b/ts/packages/spl-governance/src/coder/events.ts index fab36d83d..b31ea4c44 100644 --- a/ts/packages/spl-governance/src/coder/events.ts +++ b/ts/packages/spl-governance/src/coder/events.ts @@ -1,5 +1,5 @@ -import { Idl, Event, EventCoder } from "@project-serum/anchor"; -import { IdlEvent } from "@project-serum/anchor/dist/cjs/idl"; +import { Idl, Event, EventCoder } from "@coral-xyz/anchor"; +import { IdlEvent } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplGovernanceEventsCoder implements EventCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-governance/src/coder/index.ts b/ts/packages/spl-governance/src/coder/index.ts index b132e7737..ebde8e204 100644 --- a/ts/packages/spl-governance/src/coder/index.ts +++ b/ts/packages/spl-governance/src/coder/index.ts @@ -1,4 +1,4 @@ -import { Idl, Coder } from "@project-serum/anchor"; +import { Idl, Coder } from "@coral-xyz/anchor"; import { SplGovernanceAccountsCoder } from "./accounts"; import { SplGovernanceEventsCoder } from "./events"; diff --git a/ts/packages/spl-governance/src/coder/instructions.ts b/ts/packages/spl-governance/src/coder/instructions.ts index 5ee2958fd..a335fad20 100644 --- a/ts/packages/spl-governance/src/coder/instructions.ts +++ b/ts/packages/spl-governance/src/coder/instructions.ts @@ -1,6 +1,6 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { Idl, InstructionCoder } from "@project-serum/anchor"; +import { Idl, InstructionCoder } from "@coral-xyz/anchor"; export class SplGovernanceInstructionCoder implements InstructionCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-governance/src/coder/state.ts b/ts/packages/spl-governance/src/coder/state.ts index 30ce6a80e..042f3bd76 100644 --- a/ts/packages/spl-governance/src/coder/state.ts +++ b/ts/packages/spl-governance/src/coder/state.ts @@ -1,4 +1,4 @@ -import { Idl, StateCoder } from "@project-serum/anchor"; +import { Idl, StateCoder } from "@coral-xyz/anchor"; export class SplGovernanceStateCoder implements StateCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-governance/src/coder/types.ts b/ts/packages/spl-governance/src/coder/types.ts index 98ee006e8..cee12ad2f 100644 --- a/ts/packages/spl-governance/src/coder/types.ts +++ b/ts/packages/spl-governance/src/coder/types.ts @@ -1,4 +1,4 @@ -import { Idl, TypesCoder } from "@project-serum/anchor"; +import { Idl, TypesCoder } from "@coral-xyz/anchor"; export class SplGovernanceTypesCoder implements TypesCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-governance/src/program.ts b/ts/packages/spl-governance/src/program.ts index 309f16838..058930f3e 100644 --- a/ts/packages/spl-governance/src/program.ts +++ b/ts/packages/spl-governance/src/program.ts @@ -1,5 +1,5 @@ import { PublicKey } from "@solana/web3.js"; -import { Program, AnchorProvider } from "@project-serum/anchor"; +import { Program, AnchorProvider } from "@coral-xyz/anchor"; import { SplGovernanceCoder } from "./coder"; diff --git a/ts/packages/spl-memo/package.json b/ts/packages/spl-memo/package.json index 30052c6be..9d01b8260 100644 --- a/ts/packages/spl-memo/package.json +++ b/ts/packages/spl-memo/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/spl-memo", + "name": "@coral-xyz/spl-memo", "description": "Anchor client for Solana Program Library Memo", "version": "3.0.1", "author": "acheron ", @@ -27,7 +27,7 @@ "watch": "tsc -p tsconfig.cjs.json --watch" }, "dependencies": { - "@project-serum/anchor": "=0.26.0" + "@coral-xyz/anchor": "=0.26.0" }, "devDependencies": { "@rollup/plugin-commonjs": "=21.0.2", diff --git a/ts/packages/spl-memo/src/coder/accounts.ts b/ts/packages/spl-memo/src/coder/accounts.ts index 4aec0cfc7..8e4ca2882 100644 --- a/ts/packages/spl-memo/src/coder/accounts.ts +++ b/ts/packages/spl-memo/src/coder/accounts.ts @@ -1,6 +1,6 @@ // @ts-nocheck -import { AccountsCoder, Idl } from "@project-serum/anchor"; -import { IdlTypeDef } from "@project-serum/anchor/dist/cjs/idl"; +import { AccountsCoder, Idl } from "@coral-xyz/anchor"; +import { IdlTypeDef } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplMemoAccountsCoder implements AccountsCoder diff --git a/ts/packages/spl-memo/src/coder/events.ts b/ts/packages/spl-memo/src/coder/events.ts index 73dad8d08..061a6ad01 100644 --- a/ts/packages/spl-memo/src/coder/events.ts +++ b/ts/packages/spl-memo/src/coder/events.ts @@ -1,5 +1,5 @@ -import { Idl, Event, EventCoder } from "@project-serum/anchor"; -import { IdlEvent } from "@project-serum/anchor/dist/cjs/idl"; +import { Idl, Event, EventCoder } from "@coral-xyz/anchor"; +import { IdlEvent } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplMemoEventsCoder implements EventCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-memo/src/coder/index.ts b/ts/packages/spl-memo/src/coder/index.ts index 042348954..28ccc5817 100644 --- a/ts/packages/spl-memo/src/coder/index.ts +++ b/ts/packages/spl-memo/src/coder/index.ts @@ -1,4 +1,4 @@ -import { Idl, Coder } from "@project-serum/anchor"; +import { Idl, Coder } from "@coral-xyz/anchor"; import { SplMemoAccountsCoder } from "./accounts"; import { SplMemoEventsCoder } from "./events"; diff --git a/ts/packages/spl-memo/src/coder/instructions.ts b/ts/packages/spl-memo/src/coder/instructions.ts index 310b6c872..bce88d6d9 100644 --- a/ts/packages/spl-memo/src/coder/instructions.ts +++ b/ts/packages/spl-memo/src/coder/instructions.ts @@ -1,5 +1,5 @@ // @ts-nocheck -import { Idl, InstructionCoder } from "@project-serum/anchor"; +import { Idl, InstructionCoder } from "@coral-xyz/anchor"; export class SplMemoInstructionCoder implements InstructionCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-memo/src/coder/state.ts b/ts/packages/spl-memo/src/coder/state.ts index adedce76d..1b2147e88 100644 --- a/ts/packages/spl-memo/src/coder/state.ts +++ b/ts/packages/spl-memo/src/coder/state.ts @@ -1,4 +1,4 @@ -import { Idl, StateCoder } from "@project-serum/anchor"; +import { Idl, StateCoder } from "@coral-xyz/anchor"; export class SplMemoStateCoder implements StateCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-memo/src/coder/types.ts b/ts/packages/spl-memo/src/coder/types.ts index 128352f76..683ae77fb 100644 --- a/ts/packages/spl-memo/src/coder/types.ts +++ b/ts/packages/spl-memo/src/coder/types.ts @@ -1,4 +1,4 @@ -import { Idl, TypesCoder } from "@project-serum/anchor"; +import { Idl, TypesCoder } from "@coral-xyz/anchor"; export class SplMemoTypesCoder implements TypesCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-memo/src/program.ts b/ts/packages/spl-memo/src/program.ts index dc02fa2e2..ec563265a 100644 --- a/ts/packages/spl-memo/src/program.ts +++ b/ts/packages/spl-memo/src/program.ts @@ -1,5 +1,5 @@ import { PublicKey } from "@solana/web3.js"; -import { Program, AnchorProvider } from "@project-serum/anchor"; +import { Program, AnchorProvider } from "@coral-xyz/anchor"; import { SplMemoCoder } from "./coder"; diff --git a/ts/packages/spl-name-service/package.json b/ts/packages/spl-name-service/package.json index c8974bf60..ebbdd5526 100644 --- a/ts/packages/spl-name-service/package.json +++ b/ts/packages/spl-name-service/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/spl-name-service", + "name": "@coral-xyz/spl-name-service", "description": "Anchor client for Solana Program Library Name Service", "version": "0.2.0", "author": "acheron ", @@ -27,7 +27,7 @@ "watch": "tsc -p tsconfig.cjs.json --watch" }, "dependencies": { - "@project-serum/anchor": "=0.26.0", + "@coral-xyz/anchor": "=0.26.0", "@native-to-anchor/buffer-layout": "=0.1.0" }, "devDependencies": { diff --git a/ts/packages/spl-name-service/src/coder/accounts.ts b/ts/packages/spl-name-service/src/coder/accounts.ts index 0565cd88c..78b0b4b02 100644 --- a/ts/packages/spl-name-service/src/coder/accounts.ts +++ b/ts/packages/spl-name-service/src/coder/accounts.ts @@ -1,7 +1,7 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { AccountsCoder, Idl } from "@project-serum/anchor"; -import { IdlTypeDef } from "@project-serum/anchor/dist/cjs/idl"; +import { AccountsCoder, Idl } from "@coral-xyz/anchor"; +import { IdlTypeDef } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplNameServiceAccountsCoder implements AccountsCoder diff --git a/ts/packages/spl-name-service/src/coder/events.ts b/ts/packages/spl-name-service/src/coder/events.ts index 4ce6a7cb6..d130ba977 100644 --- a/ts/packages/spl-name-service/src/coder/events.ts +++ b/ts/packages/spl-name-service/src/coder/events.ts @@ -1,5 +1,5 @@ -import { Idl, Event, EventCoder } from "@project-serum/anchor"; -import { IdlEvent } from "@project-serum/anchor/dist/cjs/idl"; +import { Idl, Event, EventCoder } from "@coral-xyz/anchor"; +import { IdlEvent } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplNameServiceEventsCoder implements EventCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-name-service/src/coder/index.ts b/ts/packages/spl-name-service/src/coder/index.ts index 992d2bfe7..60195722b 100644 --- a/ts/packages/spl-name-service/src/coder/index.ts +++ b/ts/packages/spl-name-service/src/coder/index.ts @@ -1,4 +1,4 @@ -import { Idl, Coder } from "@project-serum/anchor"; +import { Idl, Coder } from "@coral-xyz/anchor"; import { SplNameServiceAccountsCoder } from "./accounts"; import { SplNameServiceEventsCoder } from "./events"; diff --git a/ts/packages/spl-name-service/src/coder/instructions.ts b/ts/packages/spl-name-service/src/coder/instructions.ts index e117f9307..44503e816 100644 --- a/ts/packages/spl-name-service/src/coder/instructions.ts +++ b/ts/packages/spl-name-service/src/coder/instructions.ts @@ -1,6 +1,6 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { Idl, InstructionCoder } from "@project-serum/anchor"; +import { Idl, InstructionCoder } from "@coral-xyz/anchor"; export class SplNameServiceInstructionCoder implements InstructionCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-name-service/src/coder/state.ts b/ts/packages/spl-name-service/src/coder/state.ts index 6edeeece2..8c6514428 100644 --- a/ts/packages/spl-name-service/src/coder/state.ts +++ b/ts/packages/spl-name-service/src/coder/state.ts @@ -1,4 +1,4 @@ -import { Idl, StateCoder } from "@project-serum/anchor"; +import { Idl, StateCoder } from "@coral-xyz/anchor"; export class SplNameServiceStateCoder implements StateCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-name-service/src/coder/types.ts b/ts/packages/spl-name-service/src/coder/types.ts index e3b36281e..89c6084ac 100644 --- a/ts/packages/spl-name-service/src/coder/types.ts +++ b/ts/packages/spl-name-service/src/coder/types.ts @@ -1,4 +1,4 @@ -import { Idl, TypesCoder } from "@project-serum/anchor"; +import { Idl, TypesCoder } from "@coral-xyz/anchor"; export class SplNameServiceTypesCoder implements TypesCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-name-service/src/program.ts b/ts/packages/spl-name-service/src/program.ts index a23b7cfe7..9eb60eff9 100644 --- a/ts/packages/spl-name-service/src/program.ts +++ b/ts/packages/spl-name-service/src/program.ts @@ -1,5 +1,5 @@ import { PublicKey } from "@solana/web3.js"; -import { Program, AnchorProvider } from "@project-serum/anchor"; +import { Program, AnchorProvider } from "@coral-xyz/anchor"; import { SplNameServiceCoder } from "./coder"; diff --git a/ts/packages/spl-record/package.json b/ts/packages/spl-record/package.json index ce83c02fa..d5b27b37a 100644 --- a/ts/packages/spl-record/package.json +++ b/ts/packages/spl-record/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/spl-record", + "name": "@coral-xyz/spl-record", "description": "Anchor client for Solana Program Library Record Program", "version": "0.1.0", "author": "acheron ", @@ -27,7 +27,7 @@ "watch": "tsc -p tsconfig.cjs.json --watch" }, "dependencies": { - "@project-serum/anchor": "=0.26.0", + "@coral-xyz/anchor": "=0.26.0", "@native-to-anchor/buffer-layout": "=0.1.0" }, "devDependencies": { diff --git a/ts/packages/spl-record/src/coder/accounts.ts b/ts/packages/spl-record/src/coder/accounts.ts index b2b4f3adb..24179e486 100644 --- a/ts/packages/spl-record/src/coder/accounts.ts +++ b/ts/packages/spl-record/src/coder/accounts.ts @@ -1,7 +1,7 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { AccountsCoder, Idl } from "@project-serum/anchor"; -import { IdlTypeDef } from "@project-serum/anchor/dist/cjs/idl"; +import { AccountsCoder, Idl } from "@coral-xyz/anchor"; +import { IdlTypeDef } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplRecordAccountsCoder implements AccountsCoder diff --git a/ts/packages/spl-record/src/coder/events.ts b/ts/packages/spl-record/src/coder/events.ts index 9b85920f5..88004d32d 100644 --- a/ts/packages/spl-record/src/coder/events.ts +++ b/ts/packages/spl-record/src/coder/events.ts @@ -1,5 +1,5 @@ -import { Idl, Event, EventCoder } from "@project-serum/anchor"; -import { IdlEvent } from "@project-serum/anchor/dist/cjs/idl"; +import { Idl, Event, EventCoder } from "@coral-xyz/anchor"; +import { IdlEvent } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplRecordEventsCoder implements EventCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-record/src/coder/index.ts b/ts/packages/spl-record/src/coder/index.ts index 9ba1c3bbf..489b6549d 100644 --- a/ts/packages/spl-record/src/coder/index.ts +++ b/ts/packages/spl-record/src/coder/index.ts @@ -1,4 +1,4 @@ -import { Idl, Coder } from "@project-serum/anchor"; +import { Idl, Coder } from "@coral-xyz/anchor"; import { SplRecordAccountsCoder } from "./accounts"; import { SplRecordEventsCoder } from "./events"; diff --git a/ts/packages/spl-record/src/coder/instructions.ts b/ts/packages/spl-record/src/coder/instructions.ts index df97d95ee..2f47a2f22 100644 --- a/ts/packages/spl-record/src/coder/instructions.ts +++ b/ts/packages/spl-record/src/coder/instructions.ts @@ -1,6 +1,6 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { Idl, InstructionCoder } from "@project-serum/anchor"; +import { Idl, InstructionCoder } from "@coral-xyz/anchor"; export class SplRecordInstructionCoder implements InstructionCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-record/src/coder/state.ts b/ts/packages/spl-record/src/coder/state.ts index 1171b42a8..04045585b 100644 --- a/ts/packages/spl-record/src/coder/state.ts +++ b/ts/packages/spl-record/src/coder/state.ts @@ -1,4 +1,4 @@ -import { Idl, StateCoder } from "@project-serum/anchor"; +import { Idl, StateCoder } from "@coral-xyz/anchor"; export class SplRecordStateCoder implements StateCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-record/src/coder/types.ts b/ts/packages/spl-record/src/coder/types.ts index f8e05c5c9..d56acea56 100644 --- a/ts/packages/spl-record/src/coder/types.ts +++ b/ts/packages/spl-record/src/coder/types.ts @@ -1,4 +1,4 @@ -import { Idl, TypesCoder } from "@project-serum/anchor"; +import { Idl, TypesCoder } from "@coral-xyz/anchor"; export class SplRecordTypesCoder implements TypesCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-record/src/program.ts b/ts/packages/spl-record/src/program.ts index 77cb7d99e..214fce04b 100644 --- a/ts/packages/spl-record/src/program.ts +++ b/ts/packages/spl-record/src/program.ts @@ -1,5 +1,5 @@ import { PublicKey } from "@solana/web3.js"; -import { Program, AnchorProvider } from "@project-serum/anchor"; +import { Program, AnchorProvider } from "@coral-xyz/anchor"; import { SplRecordCoder } from "./coder"; diff --git a/ts/packages/spl-stake-pool/package.json b/ts/packages/spl-stake-pool/package.json index 0c08bd632..a8ce5e3e8 100644 --- a/ts/packages/spl-stake-pool/package.json +++ b/ts/packages/spl-stake-pool/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/spl-stake-pool", + "name": "@coral-xyz/spl-stake-pool", "description": "Anchor client for Solana Program Library Stake Pool", "version": "0.7.0", "author": "acheron ", @@ -27,7 +27,7 @@ "watch": "tsc -p tsconfig.cjs.json --watch" }, "dependencies": { - "@project-serum/anchor": "=0.26.0", + "@coral-xyz/anchor": "=0.26.0", "@native-to-anchor/buffer-layout": "=0.1.0" }, "devDependencies": { diff --git a/ts/packages/spl-stake-pool/src/coder/accounts.ts b/ts/packages/spl-stake-pool/src/coder/accounts.ts index f42e1ec07..c0b607b2d 100644 --- a/ts/packages/spl-stake-pool/src/coder/accounts.ts +++ b/ts/packages/spl-stake-pool/src/coder/accounts.ts @@ -1,7 +1,7 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { AccountsCoder, Idl } from "@project-serum/anchor"; -import { IdlTypeDef } from "@project-serum/anchor/dist/cjs/idl"; +import { AccountsCoder, Idl } from "@coral-xyz/anchor"; +import { IdlTypeDef } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplStakePoolAccountsCoder implements AccountsCoder diff --git a/ts/packages/spl-stake-pool/src/coder/events.ts b/ts/packages/spl-stake-pool/src/coder/events.ts index 4320f2545..e7287f5b4 100644 --- a/ts/packages/spl-stake-pool/src/coder/events.ts +++ b/ts/packages/spl-stake-pool/src/coder/events.ts @@ -1,5 +1,5 @@ -import { Idl, Event, EventCoder } from "@project-serum/anchor"; -import { IdlEvent } from "@project-serum/anchor/dist/cjs/idl"; +import { Idl, Event, EventCoder } from "@coral-xyz/anchor"; +import { IdlEvent } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplStakePoolEventsCoder implements EventCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-stake-pool/src/coder/index.ts b/ts/packages/spl-stake-pool/src/coder/index.ts index 3836cad31..0ae8b433b 100644 --- a/ts/packages/spl-stake-pool/src/coder/index.ts +++ b/ts/packages/spl-stake-pool/src/coder/index.ts @@ -1,4 +1,4 @@ -import { Idl, Coder } from "@project-serum/anchor"; +import { Idl, Coder } from "@coral-xyz/anchor"; import { SplStakePoolAccountsCoder } from "./accounts"; import { SplStakePoolEventsCoder } from "./events"; diff --git a/ts/packages/spl-stake-pool/src/coder/instructions.ts b/ts/packages/spl-stake-pool/src/coder/instructions.ts index f6167c58f..d2febab48 100644 --- a/ts/packages/spl-stake-pool/src/coder/instructions.ts +++ b/ts/packages/spl-stake-pool/src/coder/instructions.ts @@ -1,6 +1,6 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { Idl, InstructionCoder } from "@project-serum/anchor"; +import { Idl, InstructionCoder } from "@coral-xyz/anchor"; export class SplStakePoolInstructionCoder implements InstructionCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-stake-pool/src/coder/state.ts b/ts/packages/spl-stake-pool/src/coder/state.ts index a6180dca3..a40e28ec6 100644 --- a/ts/packages/spl-stake-pool/src/coder/state.ts +++ b/ts/packages/spl-stake-pool/src/coder/state.ts @@ -1,4 +1,4 @@ -import { Idl, StateCoder } from "@project-serum/anchor"; +import { Idl, StateCoder } from "@coral-xyz/anchor"; export class SplStakePoolStateCoder implements StateCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-stake-pool/src/coder/types.ts b/ts/packages/spl-stake-pool/src/coder/types.ts index dc9b4eed2..c8c6f1fe5 100644 --- a/ts/packages/spl-stake-pool/src/coder/types.ts +++ b/ts/packages/spl-stake-pool/src/coder/types.ts @@ -1,4 +1,4 @@ -import { Idl, TypesCoder } from "@project-serum/anchor"; +import { Idl, TypesCoder } from "@coral-xyz/anchor"; export class SplStakePoolTypesCoder implements TypesCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-stake-pool/src/program.ts b/ts/packages/spl-stake-pool/src/program.ts index 593b1174e..ba7e7e033 100644 --- a/ts/packages/spl-stake-pool/src/program.ts +++ b/ts/packages/spl-stake-pool/src/program.ts @@ -1,5 +1,5 @@ import { PublicKey } from "@solana/web3.js"; -import { Program, AnchorProvider } from "@project-serum/anchor"; +import { Program, AnchorProvider } from "@coral-xyz/anchor"; import { SplStakePoolCoder } from "./coder"; diff --git a/ts/packages/spl-stateless-asks/package.json b/ts/packages/spl-stateless-asks/package.json index 0e995a901..7618fabb8 100644 --- a/ts/packages/spl-stateless-asks/package.json +++ b/ts/packages/spl-stateless-asks/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/spl-stateless-asks", + "name": "@coral-xyz/spl-stateless-asks", "description": "Anchor client for Solana Program Library Stateless Asks", "version": "0.1.0", "author": "acheron ", @@ -27,7 +27,7 @@ "watch": "tsc -p tsconfig.cjs.json --watch" }, "dependencies": { - "@project-serum/anchor": "=0.26.0", + "@coral-xyz/anchor": "=0.26.0", "@native-to-anchor/buffer-layout": "=0.1.0" }, "devDependencies": { diff --git a/ts/packages/spl-stateless-asks/src/coder/accounts.ts b/ts/packages/spl-stateless-asks/src/coder/accounts.ts index db9682e66..59d1e0b8a 100644 --- a/ts/packages/spl-stateless-asks/src/coder/accounts.ts +++ b/ts/packages/spl-stateless-asks/src/coder/accounts.ts @@ -1,7 +1,7 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { AccountsCoder, Idl } from "@project-serum/anchor"; -import { IdlTypeDef } from "@project-serum/anchor/dist/cjs/idl"; +import { AccountsCoder, Idl } from "@coral-xyz/anchor"; +import { IdlTypeDef } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplStatelessAsksAccountsCoder implements AccountsCoder diff --git a/ts/packages/spl-stateless-asks/src/coder/events.ts b/ts/packages/spl-stateless-asks/src/coder/events.ts index a94f1f3ce..753f540a9 100644 --- a/ts/packages/spl-stateless-asks/src/coder/events.ts +++ b/ts/packages/spl-stateless-asks/src/coder/events.ts @@ -1,5 +1,5 @@ -import { Idl, Event, EventCoder } from "@project-serum/anchor"; -import { IdlEvent } from "@project-serum/anchor/dist/cjs/idl"; +import { Idl, Event, EventCoder } from "@coral-xyz/anchor"; +import { IdlEvent } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplStatelessAsksEventsCoder implements EventCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-stateless-asks/src/coder/index.ts b/ts/packages/spl-stateless-asks/src/coder/index.ts index 9c34ac256..9203d8905 100644 --- a/ts/packages/spl-stateless-asks/src/coder/index.ts +++ b/ts/packages/spl-stateless-asks/src/coder/index.ts @@ -1,4 +1,4 @@ -import { Idl, Coder } from "@project-serum/anchor"; +import { Idl, Coder } from "@coral-xyz/anchor"; import { SplStatelessAsksAccountsCoder } from "./accounts"; import { SplStatelessAsksEventsCoder } from "./events"; diff --git a/ts/packages/spl-stateless-asks/src/coder/instructions.ts b/ts/packages/spl-stateless-asks/src/coder/instructions.ts index 215dfb35c..46dd8e81e 100644 --- a/ts/packages/spl-stateless-asks/src/coder/instructions.ts +++ b/ts/packages/spl-stateless-asks/src/coder/instructions.ts @@ -1,6 +1,6 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { Idl, InstructionCoder } from "@project-serum/anchor"; +import { Idl, InstructionCoder } from "@coral-xyz/anchor"; export class SplStatelessAsksInstructionCoder implements InstructionCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-stateless-asks/src/coder/state.ts b/ts/packages/spl-stateless-asks/src/coder/state.ts index 59abdb78b..b7020fef6 100644 --- a/ts/packages/spl-stateless-asks/src/coder/state.ts +++ b/ts/packages/spl-stateless-asks/src/coder/state.ts @@ -1,4 +1,4 @@ -import { Idl, StateCoder } from "@project-serum/anchor"; +import { Idl, StateCoder } from "@coral-xyz/anchor"; export class SplStatelessAsksStateCoder implements StateCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-stateless-asks/src/coder/types.ts b/ts/packages/spl-stateless-asks/src/coder/types.ts index 41f0b22a2..70c9131dd 100644 --- a/ts/packages/spl-stateless-asks/src/coder/types.ts +++ b/ts/packages/spl-stateless-asks/src/coder/types.ts @@ -1,4 +1,4 @@ -import { Idl, TypesCoder } from "@project-serum/anchor"; +import { Idl, TypesCoder } from "@coral-xyz/anchor"; export class SplStatelessAsksTypesCoder implements TypesCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-stateless-asks/src/program.ts b/ts/packages/spl-stateless-asks/src/program.ts index 6ae98d1fe..b99547e70 100644 --- a/ts/packages/spl-stateless-asks/src/program.ts +++ b/ts/packages/spl-stateless-asks/src/program.ts @@ -1,5 +1,5 @@ import { PublicKey } from "@solana/web3.js"; -import { Program, AnchorProvider } from "@project-serum/anchor"; +import { Program, AnchorProvider } from "@coral-xyz/anchor"; import { SplStatelessAsksCoder } from "./coder"; diff --git a/ts/packages/spl-token-lending/package.json b/ts/packages/spl-token-lending/package.json index b3a569476..20160d472 100644 --- a/ts/packages/spl-token-lending/package.json +++ b/ts/packages/spl-token-lending/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/spl-token-lending", + "name": "@coral-xyz/spl-token-lending", "description": "Anchor client for Solana Program Library Token Lending", "version": "0.2.0", "author": "acheron ", @@ -27,7 +27,7 @@ "watch": "tsc -p tsconfig.cjs.json --watch" }, "dependencies": { - "@project-serum/anchor": "=0.26.0", + "@coral-xyz/anchor": "=0.26.0", "@native-to-anchor/buffer-layout": "=0.1.0" }, "devDependencies": { diff --git a/ts/packages/spl-token-lending/src/coder/accounts.ts b/ts/packages/spl-token-lending/src/coder/accounts.ts index f06f69bf2..ad2ee874a 100644 --- a/ts/packages/spl-token-lending/src/coder/accounts.ts +++ b/ts/packages/spl-token-lending/src/coder/accounts.ts @@ -1,7 +1,7 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { AccountsCoder, Idl } from "@project-serum/anchor"; -import { IdlTypeDef } from "@project-serum/anchor/dist/cjs/idl"; +import { AccountsCoder, Idl } from "@coral-xyz/anchor"; +import { IdlTypeDef } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplTokenLendingAccountsCoder implements AccountsCoder diff --git a/ts/packages/spl-token-lending/src/coder/events.ts b/ts/packages/spl-token-lending/src/coder/events.ts index d0d7e9cfd..5a7b45f48 100644 --- a/ts/packages/spl-token-lending/src/coder/events.ts +++ b/ts/packages/spl-token-lending/src/coder/events.ts @@ -1,5 +1,5 @@ -import { Idl, Event, EventCoder } from "@project-serum/anchor"; -import { IdlEvent } from "@project-serum/anchor/dist/cjs/idl"; +import { Idl, Event, EventCoder } from "@coral-xyz/anchor"; +import { IdlEvent } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplTokenLendingEventsCoder implements EventCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-token-lending/src/coder/index.ts b/ts/packages/spl-token-lending/src/coder/index.ts index 7ac6ddb04..8bec955c5 100644 --- a/ts/packages/spl-token-lending/src/coder/index.ts +++ b/ts/packages/spl-token-lending/src/coder/index.ts @@ -1,4 +1,4 @@ -import { Idl, Coder } from "@project-serum/anchor"; +import { Idl, Coder } from "@coral-xyz/anchor"; import { SplTokenLendingAccountsCoder } from "./accounts"; import { SplTokenLendingEventsCoder } from "./events"; diff --git a/ts/packages/spl-token-lending/src/coder/instructions.ts b/ts/packages/spl-token-lending/src/coder/instructions.ts index 9e267ce7b..b0c033829 100644 --- a/ts/packages/spl-token-lending/src/coder/instructions.ts +++ b/ts/packages/spl-token-lending/src/coder/instructions.ts @@ -1,6 +1,6 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { Idl, InstructionCoder } from "@project-serum/anchor"; +import { Idl, InstructionCoder } from "@coral-xyz/anchor"; export class SplTokenLendingInstructionCoder implements InstructionCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-token-lending/src/coder/state.ts b/ts/packages/spl-token-lending/src/coder/state.ts index f3528cc18..abe8da940 100644 --- a/ts/packages/spl-token-lending/src/coder/state.ts +++ b/ts/packages/spl-token-lending/src/coder/state.ts @@ -1,4 +1,4 @@ -import { Idl, StateCoder } from "@project-serum/anchor"; +import { Idl, StateCoder } from "@coral-xyz/anchor"; export class SplTokenLendingStateCoder implements StateCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-token-lending/src/coder/types.ts b/ts/packages/spl-token-lending/src/coder/types.ts index c4d2d6484..c1ec355fd 100644 --- a/ts/packages/spl-token-lending/src/coder/types.ts +++ b/ts/packages/spl-token-lending/src/coder/types.ts @@ -1,4 +1,4 @@ -import { Idl, TypesCoder } from "@project-serum/anchor"; +import { Idl, TypesCoder } from "@coral-xyz/anchor"; export class SplTokenLendingTypesCoder implements TypesCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-token-lending/src/program.ts b/ts/packages/spl-token-lending/src/program.ts index 0f6340a5d..2dc357c74 100644 --- a/ts/packages/spl-token-lending/src/program.ts +++ b/ts/packages/spl-token-lending/src/program.ts @@ -1,5 +1,5 @@ import { PublicKey } from "@solana/web3.js"; -import { Program, AnchorProvider } from "@project-serum/anchor"; +import { Program, AnchorProvider } from "@coral-xyz/anchor"; import { SplTokenLendingCoder } from "./coder"; diff --git a/ts/packages/spl-token-swap/package.json b/ts/packages/spl-token-swap/package.json index 2d800ecc6..9f0bf5814 100644 --- a/ts/packages/spl-token-swap/package.json +++ b/ts/packages/spl-token-swap/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/spl-token-swap", + "name": "@coral-xyz/spl-token-swap", "description": "Anchor client for Solana Program Library Token Swap", "version": "3.0.0", "author": "acheron ", @@ -27,7 +27,7 @@ "watch": "tsc -p tsconfig.cjs.json --watch" }, "dependencies": { - "@project-serum/anchor": "=0.26.0", + "@coral-xyz/anchor": "=0.26.0", "@native-to-anchor/buffer-layout": "=0.1.0" }, "devDependencies": { diff --git a/ts/packages/spl-token-swap/src/coder/accounts.ts b/ts/packages/spl-token-swap/src/coder/accounts.ts index f1c139f85..c34acee02 100644 --- a/ts/packages/spl-token-swap/src/coder/accounts.ts +++ b/ts/packages/spl-token-swap/src/coder/accounts.ts @@ -1,7 +1,7 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { AccountsCoder, Idl } from "@project-serum/anchor"; -import { IdlTypeDef } from "@project-serum/anchor/dist/cjs/idl"; +import { AccountsCoder, Idl } from "@coral-xyz/anchor"; +import { IdlTypeDef } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplTokenSwapAccountsCoder implements AccountsCoder diff --git a/ts/packages/spl-token-swap/src/coder/events.ts b/ts/packages/spl-token-swap/src/coder/events.ts index 026cf37ff..8e0885512 100644 --- a/ts/packages/spl-token-swap/src/coder/events.ts +++ b/ts/packages/spl-token-swap/src/coder/events.ts @@ -1,5 +1,5 @@ -import { Idl, Event, EventCoder } from "@project-serum/anchor"; -import { IdlEvent } from "@project-serum/anchor/dist/cjs/idl"; +import { Idl, Event, EventCoder } from "@coral-xyz/anchor"; +import { IdlEvent } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplTokenSwapEventsCoder implements EventCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-token-swap/src/coder/index.ts b/ts/packages/spl-token-swap/src/coder/index.ts index a29d61eed..504b84b6c 100644 --- a/ts/packages/spl-token-swap/src/coder/index.ts +++ b/ts/packages/spl-token-swap/src/coder/index.ts @@ -1,4 +1,4 @@ -import { Idl, Coder } from "@project-serum/anchor"; +import { Idl, Coder } from "@coral-xyz/anchor"; import { SplTokenSwapAccountsCoder } from "./accounts"; import { SplTokenSwapEventsCoder } from "./events"; diff --git a/ts/packages/spl-token-swap/src/coder/instructions.ts b/ts/packages/spl-token-swap/src/coder/instructions.ts index b534db8ca..a66176e3d 100644 --- a/ts/packages/spl-token-swap/src/coder/instructions.ts +++ b/ts/packages/spl-token-swap/src/coder/instructions.ts @@ -1,6 +1,6 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { Idl, InstructionCoder } from "@project-serum/anchor"; +import { Idl, InstructionCoder } from "@coral-xyz/anchor"; export class SplTokenSwapInstructionCoder implements InstructionCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-token-swap/src/coder/state.ts b/ts/packages/spl-token-swap/src/coder/state.ts index 1cad1b48b..8f1cc508f 100644 --- a/ts/packages/spl-token-swap/src/coder/state.ts +++ b/ts/packages/spl-token-swap/src/coder/state.ts @@ -1,4 +1,4 @@ -import { Idl, StateCoder } from "@project-serum/anchor"; +import { Idl, StateCoder } from "@coral-xyz/anchor"; export class SplTokenSwapStateCoder implements StateCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-token-swap/src/coder/types.ts b/ts/packages/spl-token-swap/src/coder/types.ts index 46beb7ad8..6f2216a0f 100644 --- a/ts/packages/spl-token-swap/src/coder/types.ts +++ b/ts/packages/spl-token-swap/src/coder/types.ts @@ -1,4 +1,4 @@ -import { Idl, TypesCoder } from "@project-serum/anchor"; +import { Idl, TypesCoder } from "@coral-xyz/anchor"; export class SplTokenSwapTypesCoder implements TypesCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-token-swap/src/program.ts b/ts/packages/spl-token-swap/src/program.ts index 8a4982ded..af3f5811b 100644 --- a/ts/packages/spl-token-swap/src/program.ts +++ b/ts/packages/spl-token-swap/src/program.ts @@ -1,5 +1,5 @@ import { PublicKey } from "@solana/web3.js"; -import { Program, AnchorProvider } from "@project-serum/anchor"; +import { Program, AnchorProvider } from "@coral-xyz/anchor"; import { SplTokenSwapCoder } from "./coder"; diff --git a/ts/packages/spl-token/package.json b/ts/packages/spl-token/package.json index 702cdf745..bfa53a57d 100644 --- a/ts/packages/spl-token/package.json +++ b/ts/packages/spl-token/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/spl-token", + "name": "@coral-xyz/spl-token", "description": "Anchor client for Solana Program Library Token", "version": "0.26.0", "author": "acheron ", @@ -27,7 +27,7 @@ "watch": "tsc -p tsconfig.cjs.json --watch" }, "dependencies": { - "@project-serum/anchor": "=0.26.0", + "@coral-xyz/anchor": "=0.26.0", "@native-to-anchor/buffer-layout": "=0.1.0" }, "devDependencies": { diff --git a/ts/packages/spl-token/src/coder/accounts.ts b/ts/packages/spl-token/src/coder/accounts.ts index 8854822bd..176879c77 100644 --- a/ts/packages/spl-token/src/coder/accounts.ts +++ b/ts/packages/spl-token/src/coder/accounts.ts @@ -1,7 +1,7 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { AccountsCoder, Idl } from "@project-serum/anchor"; -import { IdlTypeDef } from "@project-serum/anchor/dist/cjs/idl"; +import { AccountsCoder, Idl } from "@coral-xyz/anchor"; +import { IdlTypeDef } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplTokenAccountsCoder implements AccountsCoder diff --git a/ts/packages/spl-token/src/coder/events.ts b/ts/packages/spl-token/src/coder/events.ts index 7bde6e665..b33d23bb7 100644 --- a/ts/packages/spl-token/src/coder/events.ts +++ b/ts/packages/spl-token/src/coder/events.ts @@ -1,5 +1,5 @@ -import { Idl, Event, EventCoder } from "@project-serum/anchor"; -import { IdlEvent } from "@project-serum/anchor/dist/cjs/idl"; +import { Idl, Event, EventCoder } from "@coral-xyz/anchor"; +import { IdlEvent } from "@coral-xyz/anchor/dist/cjs/idl"; export class SplTokenEventsCoder implements EventCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-token/src/coder/index.ts b/ts/packages/spl-token/src/coder/index.ts index 667adf889..cefa316a5 100644 --- a/ts/packages/spl-token/src/coder/index.ts +++ b/ts/packages/spl-token/src/coder/index.ts @@ -1,4 +1,4 @@ -import { Idl, Coder } from "@project-serum/anchor"; +import { Idl, Coder } from "@coral-xyz/anchor"; import { SplTokenAccountsCoder } from "./accounts"; import { SplTokenEventsCoder } from "./events"; diff --git a/ts/packages/spl-token/src/coder/instructions.ts b/ts/packages/spl-token/src/coder/instructions.ts index 44449b8ec..130cc25a6 100644 --- a/ts/packages/spl-token/src/coder/instructions.ts +++ b/ts/packages/spl-token/src/coder/instructions.ts @@ -1,6 +1,6 @@ // @ts-nocheck import * as B from "@native-to-anchor/buffer-layout"; -import { Idl, InstructionCoder } from "@project-serum/anchor"; +import { Idl, InstructionCoder } from "@coral-xyz/anchor"; export class SplTokenInstructionCoder implements InstructionCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-token/src/coder/state.ts b/ts/packages/spl-token/src/coder/state.ts index ade906066..9a3b60573 100644 --- a/ts/packages/spl-token/src/coder/state.ts +++ b/ts/packages/spl-token/src/coder/state.ts @@ -1,4 +1,4 @@ -import { Idl, StateCoder } from "@project-serum/anchor"; +import { Idl, StateCoder } from "@coral-xyz/anchor"; export class SplTokenStateCoder implements StateCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-token/src/coder/types.ts b/ts/packages/spl-token/src/coder/types.ts index 49ce4ddc6..96e0a08fc 100644 --- a/ts/packages/spl-token/src/coder/types.ts +++ b/ts/packages/spl-token/src/coder/types.ts @@ -1,4 +1,4 @@ -import { Idl, TypesCoder } from "@project-serum/anchor"; +import { Idl, TypesCoder } from "@coral-xyz/anchor"; export class SplTokenTypesCoder implements TypesCoder { constructor(_idl: Idl) {} diff --git a/ts/packages/spl-token/src/program.ts b/ts/packages/spl-token/src/program.ts index 9195e02f3..18fdf1699 100644 --- a/ts/packages/spl-token/src/program.ts +++ b/ts/packages/spl-token/src/program.ts @@ -1,5 +1,5 @@ import { PublicKey } from "@solana/web3.js"; -import { Program, AnchorProvider } from "@project-serum/anchor"; +import { Program, AnchorProvider } from "@coral-xyz/anchor"; import { SplTokenCoder } from "./coder"; diff --git a/ts/tests/package.json b/ts/tests/package.json index 0ed2c2d5d..1717e33d7 100644 --- a/ts/tests/package.json +++ b/ts/tests/package.json @@ -1,5 +1,5 @@ { - "name": "@project-serum/tests", + "name": "@coral-xyz/tests", "version": "0.1.0", "private": true, "main": "index.js", @@ -13,7 +13,7 @@ "typescript": "*" }, "dependencies": { - "@project-serum/anchor": "*", + "@coral-xyz/anchor": "*", "@solana/web3.js": "*" } } diff --git a/ts/tests/src/spl/associated-token-account.ts b/ts/tests/src/spl/associated-token-account.ts index 03c9f208c..55dd288fa 100644 --- a/ts/tests/src/spl/associated-token-account.ts +++ b/ts/tests/src/spl/associated-token-account.ts @@ -1,5 +1,5 @@ -import { splAssociatedTokenAccountProgram } from "@project-serum/spl-associated-token-account"; -import { splTokenProgram } from "@project-serum/spl-token"; +import { splAssociatedTokenAccountProgram } from "@coral-xyz/spl-associated-token-account"; +import { splTokenProgram } from "@coral-xyz/spl-token"; import { Keypair, PublicKey, SystemProgram } from "@solana/web3.js"; import { SPL_ATA_PROGRAM_ID, SPL_TOKEN_PROGRAM_ID } from "../constants"; diff --git a/ts/tests/src/spl/binary-option.ts b/ts/tests/src/spl/binary-option.ts index 3002d4328..65ba1c8ae 100644 --- a/ts/tests/src/spl/binary-option.ts +++ b/ts/tests/src/spl/binary-option.ts @@ -1,13 +1,13 @@ import assert from "assert"; -import { splBinaryOptionProgram } from "@project-serum/spl-binary-option"; +import { splBinaryOptionProgram } from "@coral-xyz/spl-binary-option"; import { Keypair, PublicKey, SystemProgram, SYSVAR_RENT_PUBKEY, } from "@solana/web3.js"; -import { splTokenProgram } from "@project-serum/spl-token"; -import { BN } from "@project-serum/anchor"; +import { splTokenProgram } from "@coral-xyz/spl-token"; +import { BN } from "@coral-xyz/anchor"; import { SPL_BINARY_OPTION_PROGRAM_ID, diff --git a/ts/tests/src/spl/binary-oracle-pair.ts b/ts/tests/src/spl/binary-oracle-pair.ts index 9ecea3fb2..12abf4b9a 100644 --- a/ts/tests/src/spl/binary-oracle-pair.ts +++ b/ts/tests/src/spl/binary-oracle-pair.ts @@ -1,7 +1,7 @@ import assert from "assert"; -import { splBinaryOraclePairProgram } from "@project-serum/spl-binary-oracle-pair"; -import { splTokenProgram } from "@project-serum/spl-token"; -import { BN } from "@project-serum/anchor"; +import { splBinaryOraclePairProgram } from "@coral-xyz/spl-binary-oracle-pair"; +import { splTokenProgram } from "@coral-xyz/spl-token"; +import { BN } from "@coral-xyz/anchor"; import { Keypair, PublicKey, diff --git a/ts/tests/src/spl/feature-proposal.ts b/ts/tests/src/spl/feature-proposal.ts index 518cc6972..0f264b309 100644 --- a/ts/tests/src/spl/feature-proposal.ts +++ b/ts/tests/src/spl/feature-proposal.ts @@ -1,6 +1,6 @@ -import { splFeatureProposalProgram } from "@project-serum/spl-feature-proposal"; -import { splTokenProgram } from "@project-serum/spl-token"; -import { BN } from "@project-serum/anchor"; +import { splFeatureProposalProgram } from "@coral-xyz/spl-feature-proposal"; +import { splTokenProgram } from "@coral-xyz/spl-token"; +import { BN } from "@coral-xyz/anchor"; import { Keypair, PublicKey, diff --git a/ts/tests/src/spl/memo.ts b/ts/tests/src/spl/memo.ts index e5dad7074..b92b2d41d 100644 --- a/ts/tests/src/spl/memo.ts +++ b/ts/tests/src/spl/memo.ts @@ -1,5 +1,5 @@ import assert from "assert"; -import { splMemoProgram } from "@project-serum/spl-memo"; +import { splMemoProgram } from "@coral-xyz/spl-memo"; import { Keypair } from "@solana/web3.js"; import { SPL_MEMO_PROGRAM_ID } from "../constants"; diff --git a/ts/tests/src/spl/name-service.ts b/ts/tests/src/spl/name-service.ts index bac7e3304..9a1763e70 100644 --- a/ts/tests/src/spl/name-service.ts +++ b/ts/tests/src/spl/name-service.ts @@ -1,6 +1,6 @@ import { createHash } from "crypto"; -import { splNameServiceProgram } from "@project-serum/spl-name-service"; -import { BN } from "@project-serum/anchor"; +import { splNameServiceProgram } from "@coral-xyz/spl-name-service"; +import { BN } from "@coral-xyz/anchor"; import { SPL_NAME_SERVICE_PROGRAM_ID } from "../constants"; import { confirmTx, getProvider, loadKp, test } from "../utils"; diff --git a/ts/tests/src/spl/record.ts b/ts/tests/src/spl/record.ts index 84fb810b4..c8134740b 100644 --- a/ts/tests/src/spl/record.ts +++ b/ts/tests/src/spl/record.ts @@ -1,7 +1,7 @@ import assert from "assert"; -import { splRecordProgram } from "@project-serum/spl-record"; +import { splRecordProgram } from "@coral-xyz/spl-record"; import { Keypair, PublicKey } from "@solana/web3.js"; -import { BN } from "@project-serum/anchor"; +import { BN } from "@coral-xyz/anchor"; import { SPL_RECORD_PROGRAM_ID } from "../constants"; import { diff --git a/ts/tests/src/spl/stake-pool.ts b/ts/tests/src/spl/stake-pool.ts index 39ee6f827..8eb99cb41 100644 --- a/ts/tests/src/spl/stake-pool.ts +++ b/ts/tests/src/spl/stake-pool.ts @@ -1,7 +1,7 @@ import assert from "assert"; -import { splStakePoolProgram } from "@project-serum/spl-stake-pool"; -import { splTokenProgram } from "@project-serum/spl-token"; -import { BN } from "@project-serum/anchor"; +import { splStakePoolProgram } from "@coral-xyz/spl-stake-pool"; +import { splTokenProgram } from "@coral-xyz/spl-token"; +import { BN } from "@coral-xyz/anchor"; import { Keypair, LAMPORTS_PER_SOL, diff --git a/ts/tests/src/spl/stateless-asks.ts b/ts/tests/src/spl/stateless-asks.ts index 7377c91f7..3e6897fb0 100644 --- a/ts/tests/src/spl/stateless-asks.ts +++ b/ts/tests/src/spl/stateless-asks.ts @@ -1,6 +1,6 @@ -import { splStatelessAsksProgram } from "@project-serum/spl-stateless-asks"; -import { splTokenProgram } from "@project-serum/spl-token"; -import { BN } from "@project-serum/anchor"; +import { splStatelessAsksProgram } from "@coral-xyz/spl-stateless-asks"; +import { splTokenProgram } from "@coral-xyz/spl-token"; +import { BN } from "@coral-xyz/anchor"; import { Keypair, PublicKey } from "@solana/web3.js"; import { diff --git a/ts/tests/src/spl/token-lending.ts b/ts/tests/src/spl/token-lending.ts index f8f181542..b891296e0 100644 --- a/ts/tests/src/spl/token-lending.ts +++ b/ts/tests/src/spl/token-lending.ts @@ -3,9 +3,9 @@ // deserialized correctly but the tests are incomplete. import assert from "assert"; -import { splTokenLendingProgram } from "@project-serum/spl-token-lending"; -import { splTokenProgram } from "@project-serum/spl-token"; -import { BN } from "@project-serum/anchor"; +import { splTokenLendingProgram } from "@coral-xyz/spl-token-lending"; +import { splTokenProgram } from "@coral-xyz/spl-token"; +import { BN } from "@coral-xyz/anchor"; import { Keypair, PublicKey, diff --git a/ts/tests/src/spl/token-swap.ts b/ts/tests/src/spl/token-swap.ts index 255fb89a8..713fbeb01 100644 --- a/ts/tests/src/spl/token-swap.ts +++ b/ts/tests/src/spl/token-swap.ts @@ -1,8 +1,8 @@ import assert from "assert"; -import { splTokenProgram } from "@project-serum/spl-token"; -import { splTokenSwapProgram } from "@project-serum/spl-token-swap"; +import { splTokenProgram } from "@coral-xyz/spl-token"; +import { splTokenSwapProgram } from "@coral-xyz/spl-token-swap"; import { Keypair, PublicKey, SYSVAR_RENT_PUBKEY } from "@solana/web3.js"; -import { BN } from "@project-serum/anchor"; +import { BN } from "@coral-xyz/anchor"; import { SPL_TOKEN_PROGRAM_ID, SPL_TOKEN_SWAP_PROGRAM_ID } from "../constants"; import { diff --git a/ts/tests/src/spl/token.ts b/ts/tests/src/spl/token.ts index 9b2ea383a..8156eeb8a 100644 --- a/ts/tests/src/spl/token.ts +++ b/ts/tests/src/spl/token.ts @@ -1,7 +1,7 @@ import assert from "assert"; -import { splTokenProgram } from "@project-serum/spl-token"; +import { splTokenProgram } from "@coral-xyz/spl-token"; import { Keypair, PublicKey, SYSVAR_RENT_PUBKEY } from "@solana/web3.js"; -import { BN } from "@project-serum/anchor"; +import { BN } from "@coral-xyz/anchor"; import { NATIVE_MINT_PK, SPL_TOKEN_PROGRAM_ID } from "../constants"; import { diff --git a/ts/tests/src/utils.ts b/ts/tests/src/utils.ts index 947ea4c35..3ce45afce 100644 --- a/ts/tests/src/utils.ts +++ b/ts/tests/src/utils.ts @@ -1,6 +1,6 @@ import * as fs from "fs/promises"; -import { splTokenProgram } from "@project-serum/spl-token"; -import { splAssociatedTokenAccountProgram } from "@project-serum/spl-associated-token-account"; +import { splTokenProgram } from "@coral-xyz/spl-token"; +import { splAssociatedTokenAccountProgram } from "@coral-xyz/spl-associated-token-account"; import { Connection, Keypair, @@ -12,7 +12,7 @@ import { Transaction, TransactionInstruction, } from "@solana/web3.js"; -import { AnchorProvider, Wallet } from "@project-serum/anchor"; +import { AnchorProvider, Wallet } from "@coral-xyz/anchor"; import { SPL_ATA_PROGRAM_ID, SPL_TOKEN_PROGRAM_ID } from "./constants"; diff --git a/version-bump.sh b/version-bump.sh index d5592ef9a..4ad0df5da 100755 --- a/version-bump.sh +++ b/version-bump.sh @@ -21,10 +21,10 @@ git grep -l $(cat VERSION) -- ':!**/yarn.lock' ':!CHANGELOG.md' ':!Cargo.lock' ' -e "s/$(cat VERSION)/$1/g" # Potential for collisions in package.json files, handle those separately -# Replace only matching "version": "x.xx.x" and "@project-serum/anchor": "x.xx.x" +# Replace only matching "version": "x.xx.x" and "@coral-xyz/anchor": "x.xx.x" git grep -l $(cat VERSION) -- '**/package.json' | \ xargs sed "${sedi[@]}" \ - -e "s/@project-serum\/anchor\": \"$(cat VERSION)\"/@project-serum\/anchor\": \"$1\"/g" \ + -e "s/@coral-xyz\/anchor\": \"$(cat VERSION)\"/@coral-xyz\/anchor\": \"$1\"/g" \ -e "s/\"version\": \"$(cat VERSION)\"/\"version\": \"$1\"/g" # Potential for collisions in Cargo.lock, use cargo update to update it