0.1.2 refactors

.github/actions/setup-common/action.yaml

@@ -0,0 +1,25 @@
+name: "Setup common"
+description: "Setup common"
+runs:
+  using: "composite"
+  steps:
+    - run: sudo apt-get update
+      shell: bash
+
+    - run: sudo apt-get install -y pkg-config build-essential libudev-dev
+      shell: bash
+
+    - uses: actions-rs/toolchain@v1
+      name: Install minimal rust toolchain with clippy and rustfmt
+      with:
+        profile: minimal
+        toolchain: ${{ env.RUST_TOOLCHAIN }}
+        target: x86_64-unknown-linux-gnu
+        components: rustfmt, clippy
+        default: true
+
+    - run: cargo install cargo-nextest --version "0.9.81" --locked
+      shell: bash
+
+    - run: cargo nextest --version
+      shell: bash

.github/workflows/release-program.yaml

@@ -0,0 +1,109 @@
+name: Program+IDL Upgrade MS Proposal
+
+on:
+  push:
+    tags:
+      - "testest-program-*"
+
+env:
+  RUST_TOOLCHAIN: 1.75.0
+  SOLANA_CLI_VERSION: 1.18.17
+  ANCHOR_CLI_VERSION: 0.30.1
+  ANCHOR_SHA: e6d7dafe12da661a36ad1b4f3b5970e8986e5321
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build-verifiable:
+    name: Generate verifiable build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install common dependencies
+        uses: ./.github/actions/setup-common/
+
+      - name: Install Anchor CLI
+        uses: ./.github/actions/setup-anchor-cli/
+
+      - name: Extract tag information
+        run: |
+          TAG=${GITHUB_REF#refs/tags/}  # Extract tag name from ref
+          echo "Tag name: $TAG"
+          PROGRAM=$(echo $TAG | sed 's/testest-program-\(.*\)-[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/\1/')
+          VERSION=$(echo $TAG | sed 's/.*-\([0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\)$/\1/')
+          PROGRAM_LIB_NAME=${PROGRAM//-/_}  # Substitute dashes with underscores
+          PROGRAM_ID=$(~/.cargo/bin/toml get Anchor.toml programs.mainnet.${PROGRAM_LIB_NAME} | tr -d '"')
+
+          echo "Program: $PROGRAM"
+          echo "Program ID: $PROGRAM_ID"
+          echo "Version: $VERSION"
+          echo "PROGRAM_ID=${PROGRAM_ID}" >> $GITHUB_ENV
+          echo "PROGRAM_LIB_NAME=${PROGRAM_LIB_NAME}" >> $GITHUB_ENV
+
+      # Solely to generate the IDL
+      - name: Build program using Anchor
+        uses: ./.github/actions/build-program/
+        with:
+          program_lib_name: ${{ env.PROGRAM_LIB_NAME }}
+
+      # Build verifiable program - store it in target/deploy/${PROGRAM_LIB_NAME}.so
+      - name: Build verifiable program
+        uses: ./.github/actions/build-verifiable-program/
+        with:
+          program_lib_name: ${{ env.PROGRAM_LIB_NAME }}
+
+      - name: Patch IDL and TS files
+        run: |
+          cargo run \
+            --release \
+            --package marginfi-v2-cli \
+            --features dev \
+            -- patch-idl target/idl/${{ env.PROGRAM_LIB_NAME }}.json
+          rm target/idl/${{ env.PROGRAM_LIB_NAME }}.json
+          mv target/idl/${{ env.PROGRAM_LIB_NAME }}_patched.json target/idl/${{ env.PROGRAM_LIB_NAME }}.json
+
+      # Display contents of /target/deploy and /target/idl
+      - run: ls -l target/deploy
+      - run: ls -l target/idl
+
+      - name: Upload program and IDL to buffers
+        uses: ./.github/actions/deploy-buffers/
+        id: deploy-buffers
+        with:
+          program-lib-name: ${{ env.PROGRAM_LIB_NAME }}
+          program-id: ${{ env.PROGRAM_ID }}
+          deployer-keypair: ${{ secrets.DEPLOYER_KEYPAIR }}
+          buffer-authority: ${{ secrets.MULTISIG_VAULT }}
+          rpc-endpoint: ${{ secrets.RPC_ENDPOINT }}
+
+      # # Create MS proposal for program upgrade
+      # - name: Squads program upgrade
+      #   uses: mrgnlabs/squads-program-upgrade@v0.3.1
+      #   with:
+      #     network-url: "https://api.mainnet-beta.solana.com"
+      #     program-multisig: ${{ secrets.MULTISIG }}
+      #     program-id: ${{ env.PROGRAM_ID }}
+      #     buffer: ${{ steps.deploy-buffers.outputs.program-buffer }}
+      #     idl-buffer: ${{ steps.deploy-buffers.outputs.idl-buffer }}
+      #     spill-address: ${{ secrets.DEPLOYER_ADDRESS }}
+      #     authority: ${{ secrets.MULTISIG_VAULT }}
+      #     name: "Deploy ${{env.PROGRAM_LIB_NAME}} ${{env.VERSION}}"
+      #     keypair: ${{ secrets.DEPLOYER_KEYPAIR }}
+
+      # - name: Upload program
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: ${{ env.PROGRAM_LIB_NAME }}-verifiable_build-${{ github.run_id }}-${{ github.run_attempt }}
+      #     path: ./target/deploy/${{ env.PROGRAM_LIB_NAME }}.so
+
+      # - name: Upload IDL (json)
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: ${{ env.PROGRAM_LIB_NAME }}-idl-${{ github.run_id }}-${{ github.run_attempt }}
+      #     path: ./target/idl/${{ env.PROGRAM_LIB_NAME }}_patched.json
+
+      # - name: Upload IDL (types)
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: ${{ env.PROGRAM_LIB_NAME }}-types-${{ github.run_id }}-${{ github.run_attempt }}
+      #     path: ./target/idl/${{ env.PROGRAM_LIB_NAME }}_patched.ts

.github/workflows/test.yaml

@@ -0,0 +1,185 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - "*"
+
+defaults:
+  run:
+    shell: bash
+    working-directory: .
+
+env:
+  RUST_TOOLCHAIN: 1.75.0
+  SOLANA_CLI_VERSION: 1.18.11
+  ANCHOR_CLI_VERSION: 0.30.1
+  ANCHOR_SHA: e6d7dafe12da661a36ad1b4f3b5970e8986e5321
+  CARGO_TERM_COLOR: always
+
+concurrency:
+  group: build-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    name: Rust Lint
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: ./.github/actions/setup-common/
+      - uses: ./.github/actions/setup-anchor-cli/
+
+      # - uses: actions/cache@v2
+      #   name: Cache Cargo registry + index
+      #   id: cache-cargo-build
+      #   with:
+      #     path: |
+      #       ~/.cargo/bin/
+      #       ~/.cargo/registry/index/
+      #       ~/.cargo/registry/cache/
+      #       ~/.cargo/git/db/
+      #     key: cargo-${{ runner.os }}-cargo-build-${{ hashFiles('**/Cargo.lock') }}
+
+      - run: cargo fmt -- --check
+
+      - run: ./scripts/lint.sh
+
+  test-unit:
+    name: Rust Unit Tests
+    runs-on: ubuntu-latest
+    # env:
+    #   RUSTUP_TOOLCHAIN: stable
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: ./.github/actions/setup-common/
+      - uses: ./.github/actions/setup-anchor-cli/
+
+      # - uses: actions/cache@v2
+      #   name: Cache Cargo registry + index
+      #   id: cache-cargo-build
+      #   with:
+      #     path: |
+      #       ~/.cargo/bin/
+      #       ~/.cargo/registry/index/
+      #       ~/.cargo/registry/cache/
+      #       ~/.cargo/git/db/
+      #     key: cargo-${{ runner.os }}-cargo-build-${{ hashFiles('**/Cargo.lock') }}
+
+      - run: cargo test --lib
+
+  build-and-test-workspace:
+    name: Build And Test Anchor Programs
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ./.github/actions/setup-common/
+      - uses: ./.github/actions/setup-anchor-cli/
+
+      - uses: ./.github/actions/build-workspace/
+
+      - run: ./scripts/test-program.sh all --sane
+        shell: bash
+
+  fuzz:
+    name: Fuzz The marginfi Program
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+        working-directory: ./programs/marginfi/fuzz
+
+    steps:
+      - uses: actions/checkout@v3
+      # - name: cache dependencies
+      #   uses: Swatinem/rust-cache@v2
+      - name: Install full rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly-2024-06-05
+          components: rust-src
+      - name: Run fuzz tests in fuzz dir
+        run: |
+          python ./generate_corpus.py
+          cargo install cargo-fuzz --locked
+          cargo +nightly-2024-06-05 fuzz run lend -Zbuild-std --strip-dead-code --no-cfg-fuzzing -- -max_total_time=300
+      - name: Pass after fuzzing
+        run: echo "Fuzzing completed"
+
+  localnet-test-marginfi:
+    name: Anchor localnet tests marginfi
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "20.10.0"
+
+      - uses: ./.github/actions/setup-common/
+      - uses: ./.github/actions/setup-anchor-cli/
+
+      - uses: ./.github/actions/build-workspace/
+
+      - name: Install Node.js dependencies
+        run: yarn install
+
+      - name: Build marginfi program
+        run: anchor build -p marginfi -- --no-default-features
+
+      - name: Build mocks program
+        run: anchor build -p mocks
+
+      # Handles extraneous (os error 2) that appears during testing in some versions of solana. See:
+      # https://solana.stackexchange.com/questions/1648/error-no-such-file-or-directory-os-error-2-error-from-anchor-test
+      - name: Run Anchor tests
+        run: |
+          set +e
+          anchor test --skip-build 2>&1 | tee test_output.log
+          ANCHOR_EXIT_CODE=$?
+          set -e
+
+          if grep -q "failing" test_output.log; then
+            echo "Real test failure detected."
+            exit 1
+          fi
+
+          if grep -q "No such file or directory (os error 2)" test_output.log; then
+            echo "Extraneous error detected, ignoring it..."
+            exit 0
+          fi
+
+          if [ $ANCHOR_EXIT_CODE -ne 0 ]; then
+            echo "Anchor test exited with code $ANCHOR_EXIT_CODE due to an unexpected error."
+            exit 1
+          else
+            echo "Test run completed successfully without extraneous errors."
+            exit 0
+          fi
+
+      # - name: Start Solana Test Validator
+      #   run: |
+      #     solana-test-validator --reset --limit-ledger-size 1000 \
+
+      # - name: Wait for Validator to Start
+      #   run: sleep 60
+
+      # - name: Deploy Liquidity Incentive Program
+      #   run: solana program deploy --program-id Lip1111111111111111111111111111111111111111 target/deploy/liquidity_incentive_program.so
+
+      # - name: Deploy Marginfi Program
+      #   run: solana program deploy --program-id 2jGhuVUuy3umdzByFx8sNWUAaf5vaeuDm78RDPEnhrMr target/deploy/marginfi.so
+
+      # - name: Deploy Mocks Program
+      #   run: solana program deploy --program-id 5XaaR94jBubdbrRrNW7DtRvZeWvLhSHkEGU3jHTEXV3C target/deploy/mocks.so

.gitignore

@@ -16,7 +16,6 @@ target
 # IDEs
 .idea
 *.iml
-**/.vscode
 
 # other
 .env
@@ -32,3 +31,4 @@ test-ledger/
 # Allow specific json files
 !tests/fixtures/**/*.json
 !programs/marginfi/tests/fixtures/**/*.json
+!.vscode/tasks.json