Merge pull request #4 from jito-foundation/lb/increase_rate_limits

Increase rate limits, update CI, and add updated osec report with new commit

.github/workflows/build.yaml

@@ -11,7 +11,7 @@ env:
 jobs:
   build-and-test:
     name: Build and test programs
-    runs-on: ubuntu-20.04-32c-128g
+    runs-on: big-runner-1
 
     steps:
       # Setup
@@ -75,7 +75,7 @@ jobs:
 
   verified-build:
     name: Build Verifiable Artifact
-    runs-on: ubuntu-20.04-32c-128g
+    runs-on: big-runner-1
     steps:
       - uses: actions/checkout@v3
         with:
@@ -98,26 +98,26 @@ jobs:
           path: |
             target/deploy/merkle_distributor.so
 
-  docker:
-    name: Build and push docker container
-    runs-on: ubuntu-20.04-32c-128g
-    steps:
-      # Required for docker cache export
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USER }}
-          password: ${{ secrets.DOCKERHUB_PWD }}
-
-      - name: Build and push jito-airdrop-api
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          target: jito-airdrop-api
-          tags: jitolabs/jito-airdrop-api:${{ github.sha }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          platforms: linux/arm64,linux/x86_64
+#  docker:
+#    name: Build and push docker container
+#    runs-on: big-runner-1
+#    steps:
+#      # Required for docker cache export
+#      - name: Set up Docker Buildx
+#        uses: docker/setup-buildx-action@v2
+#
+#      - name: Login to Docker Hub
+#        uses: docker/login-action@v2
+#        with:
+#          username: ${{ secrets.DOCKERHUB_USER }}
+#          password: ${{ secrets.DOCKERHUB_PWD }}
+#
+#      - name: Build and push jito-airdrop-api
+#        uses: docker/build-push-action@v4
+#        with:
+#          push: true
+#          target: jito-airdrop-api
+#          tags: jitolabs/jito-airdrop-api:${{ github.sha }}
+#          cache-from: type=gha
+#          cache-to: type=gha,mode=max
+#          platforms: linux/arm64,linux/x86_64

.github/workflows/release.yaml

@@ -9,7 +9,7 @@ env:
 jobs:
   release:
     name: Create the jito programs release
-    runs-on: ubuntu-20.04-32c-128g
+    runs-on: big-runner-1
 
     steps:
       # Setup

api/src/router.rs

@@ -56,9 +56,9 @@ impl Debug for RouterState {
 #[instrument]
 pub fn get_routes(state: Arc<RouterState>, enable_proof_endpoint: bool) -> Router {
     let middleware = ServiceBuilder::new()
-        .layer(HandleErrorLayer::new(error::handle_error)) // handle middleware errors explicitly!
-        .layer(BufferLayer::new(100)) // buffer up to 100 requests in queue
-        .layer(RateLimitLayer::new(1000, Duration::from_secs(10)))
+        .layer(HandleErrorLayer::new(error::handle_error))
+        .layer(BufferLayer::new(1000))
+        .layer(RateLimitLayer::new(10000, Duration::from_secs(1)))
         .layer(TimeoutLayer::new(Duration::from_secs(20)))
         .layer(LoadShedLayer::new())
         .layer(

b

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Pushes docker images to container registry
+set -eux -o pipefail
+
+export BUILD_TAG="$(git describe --always --dirty)"
+
+COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build --progress=plain

docker-compose.yaml

@@ -3,7 +3,7 @@ version: "3.9"
 services:
   # API service to serve points requests
   jito-airdrop-api:
-    image: jito-airdrop-api
+    image: jitolabs/jito-airdrop-api:${BUILD_TAG}
     build:
       context: .
       dockerfile: Dockerfile

p

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Pushes docker images to container registry
+set -eux -o pipefail
+
+export BUILD_TAG="$(git describe --always --dirty)"
+
+COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose push
+
+echo "pushed build_tag: ${BUILD_TAG}"