feat/add common protocol fee

.github/actions/setup-anchor/action.yml

@@ -3,7 +3,7 @@ description: "Setup node js and anchor cli"
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-node@v2
+    - uses: actions/setup-node@v6
       with:
         node-version: ${{ env.NODE_VERSION }}
     - run: cargo install --git https://github.com/coral-xyz/anchor --tag v${{ env.ANCHOR_CLI_VERSION }} anchor-cli --locked

.github/workflows/ci.yml

@@ -9,8 +9,8 @@ on:
 env:
   SOLANA_CLI_VERSION: 2.1.0
   NODE_VERSION: 22.15.0
-  ANCHOR_CLI_VERSION: 0.31.0
-  TOOLCHAIN: 1.76.0
+  ANCHOR_CLI_VERSION: 0.31.1
+  TOOLCHAIN: 1.85.0
 
 jobs:
   program_changed_files:
@@ -27,6 +27,8 @@ jobs:
         with:
           files: |
             programs/zap
+            protocol-zap
+            zap-sdk
 
   anchor_build:
     runs-on: ubuntu-latest
@@ -51,26 +53,44 @@ jobs:
       - run: anchor build
         shell: bash
 
-  program_test:
+  unit_test:
     runs-on: ubuntu-latest
     needs: program_changed_files
     if: needs.program_changed_files.outputs.program == 'true'
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: ${{ env.TOOLCHAIN }}
+          components: clippy
+      - uses: Swatinem/rust-cache@v2
+      - run: cargo test --package zap
+        shell: bash
+      - run: cargo test --package protocol-zap
+        shell: bash
+
+  integration_test:
+    runs-on: ubuntu-latest
+    needs: program_changed_files
+    if: needs.program_changed_files.outputs.program == 'true'
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
       - uses: ./.github/actions/setup-solana
       - uses: ./.github/actions/setup-dep
       - uses: ./.github/actions/setup-anchor
       # Install pnpm
-      - uses: pnpm/action-setup@v3 # docs https://pnpm.io/continuous-integration#github-actions
-        with:
-          version: 9.5.0 # Optional: specify a pnpm version
+      - uses: pnpm/action-setup@v4 # docs https://pnpm.io/continuous-integration#github-actions
       # Install rust + toolchain
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: ${{ env.TOOLCHAIN }}
           components: clippy
       # Cache rust, cargo
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
       # Cache node_modules
       - uses: actions/cache@v4
         id: cache-node-modules

Anchor.toml

@@ -1,5 +1,7 @@
 [toolchain]
-package_manager = "yarn"
+anchor_version = "0.31.1"
+solana_version = "2.1.0"
+package_manager = "pnpm"
 
 [features]
 resolution = true
@@ -16,4 +18,4 @@ cluster = "localnet"
 wallet = "~/.config/solana/id.json"
 
 [scripts]
-test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
+test = "pnpm ts-mocha --no-experimental-strip-types -p ./tsconfig.json -t 1000000 tests/**/*.ts"

Cargo.toml

@@ -1,7 +1,5 @@
 [workspace]
-members = [
-    "programs/*"
-]
+members = ["programs/*", "libs/*", "zap-sdk", "protocol-zap"]
 resolver = "2"
 
 [profile.release]
@@ -16,4 +14,5 @@ codegen-units = 1
 [workspace.dependencies]
 anchor-lang = "0.31.1"
 anchor-spl = "0.31.1"
-bytemuck = "1.20.0"
+bytemuck = "1.20.0"
+ruint = "1.3.0"