chore: system program (#707)

* system program * test-utils fix imports * fix imports * rm old idl --------- Co-authored-by: Swen <[email protected]>
Lightprotocol · May 14, 2024 · 2e7409e · 2e7409e
1 parent f85dc3b
commit 2e7409e
Show file tree

Hide file tree

Showing 88 changed files with 280 additions and 660 deletions.
diff --git a/.github/actions/setup-and-build/action.yml b/.github/actions/setup-and-build/action.yml
@@ -58,7 +58,7 @@ runs:
         solana-keygen new --no-bip39-passphrase -o /home/runner/.config/solana/id.json
         npx nx build @lightprotocol/hasher.rs
         npx nx build @lightprotocol/programs
-        npx nx build @lightprotocol/cli
+        npx nx build @lightprotocol/zk-compression-cli
 
     - name: Check for git changes
       shell: bash

diff --git a/.github/workflows/light-sdk-tests.yml b/.github/workflows/light-sdk-tests.yml
@@ -29,7 +29,7 @@ jobs:
             sub-tests: '[
                 "@lightprotocol/circuit-lib.js:test",
                 "@lightprotocol/prover.js:test",
-                "@lightprotocol/cli:test",
+                "@lightprotocol/zk-compression-cli:test",
             ]'
     steps:
       - name: Log in to Docker Hub

diff --git a/.github/workflows/light-system-programs-tests.yml b/.github/workflows/light-system-programs-tests.yml
@@ -41,9 +41,9 @@ jobs:
             sub-tests: '[
               "cargo-test-sbf -p account-compression-test -- --test-threads=1"
             ]'
-          - program: light-compressed-pda
+          - program: light-system-program
             sub-tests: '[
-              "cargo-test-sbf -p compressed-pda-test -- --test-threads=1"
+              "cargo-test-sbf -p system-test -- --test-threads=1"
             ]'
           - program: light-registry
             sub-tests: '[

diff --git a/.github/workflows/release-pr-rust.yml b/.github/workflows/release-pr-rust.yml
@@ -23,7 +23,7 @@ on:
           - light-utils
           - light-wasm-hasher
           - account-compression
-          - light-compressed-pda
+          - light-system-program
           - light-compressed-token
       version:
         description: Version to release

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Build CLI
         run: |
           source ./scripts/devenv.sh
-          npx nx build @lightprotocol/cli
+          npx nx build @lightprotocol/zk-compression-cli
 
       - name: Test workspace
         run:  |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,7 @@ members = [
     "macros/light",
     "merkle-tree/*",
     "programs/account-compression",
-    "programs/compressed-pda",
+    "programs/system",
     "programs/compressed-token",
     "programs/registry",
     "test-utils",

diff --git a/cli/README.md b/cli/README.md
@@ -1,6 +1,6 @@
 # ZK Compression CLI
 
-CLI to interact with Light Protocol and ZK compression.
+CLI to interact with ZK compression.
 
 ## Requirements
 
@@ -15,7 +15,7 @@ CLI to interact with Light Protocol and ZK compression.
 ### Using npm
 
 ```bash
-npm install -g @lightprotocol/cli
+npm install -g @lightprotocol/zk-compression-cli
 ```
 
 ### Building from source

diff --git a/cli/package.json b/cli/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "@lightprotocol/cli",
+  "name": "@lightprotocol/zk-compression-cli",
   "version": "0.2.8",
-  "description": "ZK Compression: Secure Scaling of State on Solana",
+  "description": "ZK Compression: Secure Scaling on Solana",
   "maintainers": [
     {
       "name": "Light Protocol maintainers",
@@ -111,7 +111,7 @@
     "kill": "killall solana-test-validator || true && killall solana-test-val || true && sleep 1",
     "test-cli": "pnpm test-config && pnpm kill",
     "test": "pnpm kill && pnpm test-cli && pnpm test-utils && pnpm test-create-mint && pnpm test-mint-to && pnpm test-transfer && pnpm test-compress-spl && pnpm test-decompress-spl && pnpm test-balance && pnpm test-compress-sol && pnpm test-decompress-sol && pnpm test-register-mint && pnpm test-approve-and-mint-to",
-    "install-local": "pnpm build && pnpm global remove @lightprotocol/cli || true && pnpm global add $PWD",
+    "install-local": "pnpm build && pnpm global remove @lightprotocol/zk-compression-cli || true && pnpm global add $PWD",
     "version": "oclif readme && git add README.md"
   },
   "engines": {

diff --git a/cli/scripts/copyLocalProgramBinaries.sh b/cli/scripts/copyLocalProgramBinaries.sh
@@ -2,7 +2,7 @@
 
 set -eux
 
-keys="account_compression light_compressed_pda light_compressed_token light_registry"
+keys="account_compression light_system_program light_compressed_token light_registry"
 
 out_dir="`git rev-parse --show-toplevel`/cli/bin"
 if [ ! -e $out_dir ]; then

diff --git a/cli/src/utils/initTestEnv.ts b/cli/src/utils/initTestEnv.ts
@@ -146,7 +146,7 @@ export async function getSolanaArgs({
     },
     {
       id: "6UqiSPd2mRCTTwkzhcs1M6DGYsqHWd5jiPueX3LwDMXQ",
-      name: "light_compressed_pda.so",
+      name: "light_system_program.so",
       tag: LIGHT_MERKLE_TREE_PROGRAM_TAG,
     },
     {

diff --git a/examples/token-escrow/programs/token-escrow/Cargo.toml b/examples/token-escrow/programs/token-escrow/Cargo.toml
@@ -22,7 +22,7 @@ test-sbf = []
 [dependencies]
 anchor-lang = { version="0.29.0", features = ["init-if-needed"] }
 light-compressed-token = { path = "../../../../programs/compressed-token", version = "0.3.1", features = ["cpi"]}
-light-compressed-pda = { path = "../../../../programs/compressed-pda", version = "0.3.1", features = ["cpi"]}
+light-system-program = { path = "../../../../programs/system", version = "0.3.1", features = ["cpi"]}
 account-compression = { path = "../../../../programs/account-compression", version = "0.3.2",  features = ["cpi"] }
 light-hasher = { path = "../../../../merkle-tree/hasher", version = "0.1.1" }
 light-verifier = { path = "../../../../circuit-lib/verifier", version = "0.1.1" }