merge: resolve interest rate and lending contract conflicts

Author: Smartdevs17

.devcontainer/devcontainer.json

@@ -0,0 +1,71 @@
+{
+  "name": "StellarLend Devnet",
+  "dockerComposeFile": "../docker/devnet/docker-compose.yml",
+  "service": "api",
+  "workspaceFolder": "/workspace",
+  "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=cached",
+  "shutdownAction": "stopCompose",
+
+  "features": {
+    "ghcr.io/devcontainers/features/rust:1": {
+      "version": "latest",
+      "targets": "wasm32-unknown-unknown"
+    },
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "20"
+    },
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+    "ghcr.io/devcontainers/features/git:1": {}
+  },
+
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "rust-lang.rust-analyzer",
+        "ms-azuretools.vscode-docker",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
+        "bradlc.vscode-tailwindcss",
+        "ms-vscode.vscode-typescript-next"
+      ],
+      "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash",
+        "rust-analyzer.cargo.target": "wasm32-unknown-unknown",
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "[rust]": {
+          "editor.defaultFormatter": "rust-lang.rust-analyzer"
+        }
+      }
+    }
+  },
+
+  "forwardPorts": [
+    3000,
+    4000,
+    5432,
+    6379,
+    8000
+  ],
+  "portsAttributes": {
+    "3000": { "label": "API", "onAutoForward": "notify" },
+    "4000": { "label": "Oracle", "onAutoForward": "notify" },
+    "5432": { "label": "PostgreSQL", "onAutoForward": "silent" },
+    "6379": { "label": "Redis", "onAutoForward": "silent" },
+    "8000": { "label": "Soroban RPC / Horizon", "onAutoForward": "notify" }
+  },
+
+  "postCreateCommand": "bash -c 'echo \"StellarLend Devnet ready. Run: cd docker/devnet && ./healthcheck.sh\" && which stellar > /dev/null 2>&1 || (curl -sf https://raw.githubusercontent.com/nicholasgasior/stellar-cli-install/main/install.sh | bash || echo \"Stellar CLI install skipped\")'",
+
+  "remoteUser": "node",
+
+  "remoteEnv": {
+    "STELLAR_NETWORK": "local",
+    "SOROBAN_RPC_URL": "http://soroban-devnet:8000/soroban/rpc",
+    "HORIZON_URL": "http://soroban-devnet:8000",
+    "FRIENDBOT_URL": "http://soroban-devnet:8000/friendbot",
+    "NETWORK_PASSPHRASE": "Standalone Network ; February 2017",
+    "DATABASE_URL": "postgres://stellarlend:stellarlend@postgres:5432/stellarlend",
+    "REDIS_URL": "redis://redis:6379"
+  }
+}

.github/ISSUE_TEMPLATE/bug-bounty.md

@@ -0,0 +1,33 @@
+---
+name: Bug Bounty Report
+about: Report a security vulnerability for the StellarLend bug bounty program
+title: '[BUG BOUNTY] '
+labels: 'security, bug-bounty'
+assignees: ''
+
+---
+
+## Vulnerability Description
+Please provide a clear and concise description of the vulnerability.
+
+## Impact
+What is the potential impact of this vulnerability? (e.g., loss of funds, denial of service).
+
+## Severity Self-Assessment
+(Critical, High, Medium, Low)
+
+## Steps to Reproduce
+1. 
+2. 
+3. 
+
+## Proof of Concept
+(Code snippets, scripts, or transaction hashes)
+
+## Proposed Remediation (Optional)
+How would you fix this issue?
+
+## Researcher Information
+- Name/Handle:
+- Email/Contact:
+- ETH Wallet Address (for reward payout):

.github/dependabot.yml

@@ -0,0 +1,31 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/api"
+    schedule:
+      interval: "weekly"
+    groups:
+      minor-and-patch:
+        update-types:
+          - "minor"
+          - "patch"
+
+  - package-ecosystem: "npm"
+    directory: "/oracle"
+    schedule:
+      interval: "weekly"
+    groups:
+      minor-and-patch:
+        update-types:
+          - "minor"
+          - "patch"
+
+  - package-ecosystem: "cargo"
+    directory: "/stellar-lend"
+    schedule:
+      interval: "weekly"
+    groups:
+      minor-and-patch:
+        update-types:
+          - "minor"
+          - "patch"

.github/workflows/ci-cd.yml

@@ -1,10 +1,6 @@
 name: CI/CD Pipeline
 
-on:
-  push:
-    branches: ["main", "dev"]
-  pull_request:
-    branches: ["main", "dev"]
+on: workflow_dispatch
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -29,13 +25,20 @@ jobs:
           toolchain: stable
           components: rustfmt, clippy
 
+      - name: Install sccache
+        uses: mozilla-actions/sccache-action@v0.0.4
+
+      - name: Configure sccache
+        run: |
+          echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
+          echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV
+
       - name: Cache cargo registry & build
         uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-            stellar-lend/target
           key: ${{ runner.os }}-cargo-${{ hashFiles('stellar-lend/Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-cargo-
@@ -97,7 +100,9 @@ jobs:
         run: |
           cd stellar-lend
           cargo test --package hello-world --lib tests::differential_test -- --nocapture 2>&1 | tee differential-test-report.txt
+          cargo test --package hello-world --lib tests::hello_world_vs_lending_test -- --nocapture 2>&1 | tee -a differential-test-report.txt
           cargo test --package hello-world --lib tests::migration_verification_test -- --nocapture 2>&1 | tee -a differential-test-report.txt
+          cargo test --package stellarlend-lending --lib migration_verification_test -- --nocapture 2>&1 | tee -a differential-test-report.txt
           grep "test result:" differential-test-report.txt
 
       - name: Upload differential test report
@@ -107,10 +112,18 @@ jobs:
           name: differential-test-report
           path: stellar-lend/differential-test-report.txt
 
+      - name: Cache cargo-audit binary
+        uses: actions/cache@v4
+        with:
+          path: ~/.cargo/bin/cargo-audit
+          key: ${{ runner.os }}-cargo-audit-${{ hashFiles('stellar-lend/.cargo/audit.toml') }}
+
+      - name: Install cargo-audit
+        run: cargo install cargo-audit --locked
+
       - name: Run security audit
         run: |
           cd stellar-lend
-          cargo install cargo-audit --locked
           cargo audit
 
   fuzzing:
@@ -143,6 +156,14 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-cargo-fuzz-
 
+      - name: Cache cargo-fuzz binary
+        uses: actions/cache@v4
+        with:
+          path: ~/.cargo/bin/cargo-fuzz
+          key: ${{ runner.os }}-cargo-fuzz-nightly-${{ hashFiles('stellar-lend/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-fuzz-nightly-
+
       - name: Install cargo-fuzz
         run: cargo +nightly install cargo-fuzz --locked
 
@@ -186,6 +207,14 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-cargo-invariant-
 
+      - name: Cache cargo-fuzz binary
+        uses: actions/cache@v4
+        with:
+          path: ~/.cargo/bin/cargo-fuzz
+          key: ${{ runner.os }}-cargo-fuzz-nightly-${{ hashFiles('stellar-lend/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-fuzz-nightly-
+
       - name: Install cargo-fuzz
         run: cargo +nightly install cargo-fuzz --locked
 

.github/workflows/ci.yml

@@ -0,0 +1,83 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+env:
+  NODE_VERSION: '20'
+
+jobs:
+  lint:
+    name: Lint & Format
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      - uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-${{ hashFiles('package-lock.json') }}
+      - run: npm ci --workspaces
+      - run: npm run format --workspace=api && npm run format --workspace=oracle
+      - run: npm run lint --workspace=api && npm run lint --workspace=oracle
+
+  typecheck:
+    name: Type Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      - uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-${{ hashFiles('package-lock.json') }}
+      - run: npm ci --workspaces
+      - run: npm run typecheck --workspace=api && npm run typecheck --workspace=oracle
+
+  test:
+    name: Tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      - uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-${{ hashFiles('package-lock.json') }}
+      - run: npm ci --workspaces
+      - run: npm run test --workspace=api && npm run test --workspace=oracle
+
+  e2e:
+    name: E2E Tests
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: tests/e2e
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      - uses: actions/cache@v4
+        with:
+          path: tests/e2e/node_modules
+          key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-e2e-${{ hashFiles('tests/e2e/package-lock.json') }}
+      - run: npm ci
+      - run: npm run test:report
+      - name: Upload E2E test report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: e2e-test-report
+          path: tests/e2e/e2e-report.json
+          retention-days: 30
+