Mohammed changes

.cargo/config.toml

@@ -1,6 +1,6 @@
 # placeholders for clippy and other tools
 # Program IDs may not be correct
 [env]
-TIP_ROUTER_PROGRAM_ID = "RouterBmuRBkPUbgEDMtdvTZ75GBdSREZR5uGUxxxpb"
+NCN_PROGRAM_ID = "7rNw1g2ZUCdTrCyVGZwCJLnbp3ssTRK5mdkH8gm9AKE8"
 RESTAKING_PROGRAM_ID = "RestkWeAVL8fRGgzhfeoqFhsqKRchg6aa1XrcH96z4Q"
 VAULT_PROGRAM_ID = "Vau1t6sLNxnzB7ZDsef8TLbPLfyZMYXH8WTNqUdm9g8"

.cargo/programs.env

@@ -1,3 +1,3 @@
-TIP_ROUTER_PROGRAM_ID=RouterBmuRBkPUbgEDMtdvTZ75GBdSREZR5uGUxxxpb
+NCN_PROGRAM_ID=7rNw1g2ZUCdTrCyVGZwCJLnbp3ssTRK5mdkH8gm9AKE8
 RESTAKING_PROGRAM_ID=RestkWeAVL8fRGgzhfeoqFhsqKRchg6aa1XrcH96z4Q
 VAULT_PROGRAM_ID=Vau1t6sLNxnzB7ZDsef8TLbPLfyZMYXH8WTNqUdm9g8

.github/workflows/ci.yaml

@@ -39,12 +39,12 @@ jobs:
           components: rustfmt, clippy
           toolchain: nightly-2024-07-25
       - name: Regenerate Shank IDL files
-        run: cargo b --release -p jito-tip-router-shank-cli && ./target/release/jito-tip-router-shank-cli
+        run: cargo b --release -p ncn-program-shank-cli && ./target/release/ncn-program-shank-cli
       - name: Verify no changed files
         uses: tj-actions/verify-changed-files@v20
         with:
           fail-if-changed: true
-          fail-message: 'Unexpected changes in the shank IDL files. Please run `./target/release/jito-tip-router-shank-cli` to regenerate the files.'
+          fail-message: 'Unexpected changes in the shank IDL files. Please run `./target/release/ncn-program-shank-cli` to regenerate the files.'
       - name: Set Node.js 22.x
         uses: actions/setup-node@v3
         with:
@@ -120,12 +120,12 @@ jobs:
       - name: Building programs
         run: cargo-build-sbf
         env:
-          TIP_ROUTER_PROGRAM_ID: ${{ env.TIP_ROUTER_PROGRAM_ID }}
+          NCN_PROGRAM_ID: ${{ env.NCN_PROGRAM_ID }}
           SBF_OUT_DIR: ${{ github.workspace }}/target/sbf-solana-solana/release
       - name: Upload MEV Tip Distribution NCN program
         uses: actions/upload-artifact@v4
         with:
-          name: jito_tip_router_program.so
+          name: ncn_program.so
           path: target/sbf-solana-solana/release/
           if-no-files-found: error
 
@@ -142,12 +142,12 @@ jobs:
         uses: baptiste0928/cargo-install@v3
         with:
           crate: solana-verify
-      - run: solana-verify build --library-name jito_tip_router_program --base-image solanafoundation/solana-verifiable-build:2.1.11
-      - name: Upload jito_tip_router_program.so
+      - run: solana-verify build --library-name ncn_program --base-image solanafoundation/solana-verifiable-build:2.1.11
+      - name: Upload ncn_program.so
         uses: actions/upload-artifact@v4
         with:
           name: jito_restaking_program.so
-          path: target/deploy/jito_tip_router_program.so
+          path: target/deploy/ncn_program.so
 
   # coverage:
   #   name: coverage
@@ -163,12 +163,12 @@ jobs:
   #     - name: Generate code coverage
   #       run: cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info
   #       env:
-  #         TIP_ROUTER_PROGRAM_ID: RouterBmuRBkPUbgEDMtdvTZ75GBdSREZR5uGUxxxpb
+  #         NCN_PROGRAM_ID: 7rNw1g2ZUCdTrCyVGZwCJLnbp3ssTRK5mdkH8gm9AKE8
   #     - name: Upload coverage to Codecov
   #       uses: codecov/codecov-action@v4.5.0
   #       with:
   #         token: ${{ secrets.CODECOV_TOKEN }}
-  #         slug: jito-foundation/jito-tip-router
+  #         slug: jito-foundation/ncn-program
   #         fail_ci_if_error: true
 
   test_sbf:
@@ -191,7 +191,7 @@ jobs:
       - name: Download MEV Tip Distribution NCN program
         uses: actions/download-artifact@v4
         with:
-          name: jito_tip_router_program.so
+          name: ncn_program.so
           path: integration_tests/tests/fixtures/
       - uses: taiki-e/install-action@nextest
       - run: cargo nextest run --all-features -E 'not test(ledger_utils::tests)'

.gitignore

@@ -6,22 +6,27 @@
 .cursorrules
 node_modules
 test-ledger
-tip-router-operator-cli/scripts/test-validator-keys
-tip-router-operator-cli/scripts/validators.txt
-tip-router-operator-cli/tests/fixtures/local_validators.txt
-tip-router-operator-cli/tests/fixtures/keys/
-tip-router-operator-cli/tests/fixtures/tda-accounts/
 
 # Debugging
 program_errors.json
 test_errors.output
 tests.output
-integration_tests/tests/fixtures/jito_tip_router_program.so
+integration_tests/tests/fixtures/ncn_program.so
 notes.md
 
-integration_tests/tests/fixtures/jito_tip_router_program-keypair.json
+integration_tests/tests/fixtures/ncn_program-keypair.json
+
 lcov.info
 
 credentials/
 
-.DS_Store
+.DS_Store
+
+integration_tests/tests/fixtures/local_validators.txt
+integration_tests/tests/fixtures/keys/
+integration_tests/tests/fixtures/tda-accounts/
+
+# Debugging
+integration_tests/tests/fixtures/ncn_program.so
+
+integration_tests/tests/fixtures/ncn_program-keypair.json