Auto Back Merge from Master

.env-example

@@ -1,13 +1,28 @@
+# - Core bundler environment variables -
+
 BUNDLER_CONFIG_PASSPHRASE=
-BUNDLER_NODE_PATH_INDEX=0
-BUNDLER_CHAIN_ID=80001
-BUNDLER_MIN_RELAYER_COUNT=5
-BUNDLER_MAX_RELAYER_COUNT=10
-BUNDLER_FUNDING_BALANCE_THRESHOLD=0.1
-BUNDLER_FUNDING_RELAYER_AMOUNT=0.2
-BUNDLER_SLACK_JSON='{"token": "","channel": ""}'
-BUNDLER_PROVIDER_JSON='{"137": "", "42161": "", "56": "", "10": "", "43114": "", "8453": "", "80001": ""}'
-BUNDLER_DATASOURCES_JSON= '{"mongoUrl": "", "redisUrl": ""}'
-BUNDLER_QUEUE_URL=""
-BUNDLER_IS_TRUSTWALLET_SETUP=true
-BUNDLER_FALLBACK_PROVIDER_JSON='{"137": ["", ""], "42161": ["", ""], "56": ["", ""], "10": ["", ""], "43114": ["", ""], "8453": ["", ""], "80001": ["", ""]}'
+NODE_PATH_INDEX=0
+# 🔥 make sure this is never development when deploying to production 🔥
+NODE_ENV=development
+
+# - Smoke tests environment variables -
+
+# You can set the folloowing to a production deployment if you want to run smoke tests against the production environment
+SMOKE_TEST_BUNDLER_HOSTNAME=https://bundler.biconomy.io
+
+# - E2E tests environment variables -
+
+# Following are the environment variables required for e2e tests, see the docstrings inside src/test/e2e/nativeTransfer.test.ts for more information
+# Set this to the private key of the EOA account that will be used to derive the smart account
+PRIVATE_KEY=
+
+# Set this to https://bundler.biconomy.io if you want to test against the production environment
+BUNDLER_HOSTNAME=http://localhost:3000
+
+# You don't have to set all of the paymasters, just the ones you want to test e2e
+BASE_MAINNET_PAYMASTER_URL=
+AVALANCHE_MAINNET_PAYMASTER_URL=
+OPTIMISM_MAINNET_PAYMASTER_URL=
+POLYGON_MAINNET_PAYMASTER_URL=
+BSC_MAINNET_PAYMASTER_URL=
+ARBITRUM_MAINNET_PAYMASTER_URL=

.github/workflows/container_img_build_push_gar.yaml

@@ -0,0 +1,111 @@
+#  This is a reusable workflow
+#  https://docs.github.com/en/actions/using-workflows/reusing-workflows
+#
+---
+# yamllint disable rule:line-length
+name: Container_Img_Build_Push_GAR
+# yamllint disable-line rule:truthy
+on:
+  workflow_call:
+    inputs:
+
+      image:
+        required: true
+        type: string
+
+      dockerfile:
+        required: true
+        type: string
+      push:
+        required: true
+        type: boolean
+
+      docker_context:
+        required: false
+        type: string
+
+      gcp_project_number:
+        required: true
+        type: string
+
+      gcp_pool_id:
+        required: true
+        type: string
+
+      gcp_provider_id:
+        required: true
+        type: string
+
+      gcp_service_account:
+        required: true
+        type: string
+
+      gcp_registry:
+        required: true
+        type: string
+
+jobs:
+  # To avoid packing and passing artifacts from one job to another, we will
+  # build and test in the same github job.
+  container_image_build_push:
+    runs-on: ubuntu-latest
+    # Allow the job to fetch a GitHub ID token
+    # !!! IMPORTANT set "permissions:" section in the calling workflow job
+    # same like lines below
+    # permissions:
+    #   id-token: write
+    #   contents: read
+    # https://github.com/marketplace/actions/build-and-push-docker-images
+    # Checks out the repository source code with ref/SHA commit that trigger the workflow as HEAD.
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # https://cloud.google.com/iam/docs/workload-identity-federation-with-deployment-pipelines#authenticate
+      - id: 'auth'
+        name: 'Authenticate to Google Cloud'
+        uses: 'google-github-actions/auth@v2'
+        with:
+          token_format: access_token
+          workload_identity_provider: "projects/${{inputs.gcp_project_number}}/locations/global/workloadIdentityPools/${{inputs.gcp_pool_id}}/providers/${{inputs.gcp_provider_id}}"
+          service_account: ${{ inputs.gcp_service_account }}
+
+      - name: 'Login to Google Artifact Registry'
+        uses: docker/login-action@v3
+        with:
+          # registry: <location>-docker.pkg.dev
+          registry: ${{ inputs.gcp_registry }}
+          username: oauth2accesstoken
+          password: ${{ steps.auth.outputs.access_token }}
+      # Allow to extract the metadata information of the events and reference.
+      # In this step we configure the tags and labels for Docker image build and push 
+      - name: 'Docker metadata'
+        id: 'metadata'
+        uses: docker/metadata-action@v5.0.0
+        with:
+          images: ${{ inputs.image }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern=v{{version}}
+            type=raw,value=latest,enable=${{ github.ref_type != 'tag' }}
+            type=raw,value={{sha}},enable=${{ github.ref_type != 'tag' }}
+            # type=raw,value=foo
+
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v5.0.0
+        with:
+          # context: .
+          context: ${{ inputs.docker_context == ''  && '.' || inputs.docker_context }}
+          # push: ${{ github.event.base_ref == 'refs/heads/main' && github.ref_type == 'tag' && !startsWith(github.ref, 'refs/tags/v0.')}}
+          file: ${{ inputs.dockerfile }}
+          push: ${{ inputs.push }}
+          tags: ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}
+
+  all:
+    # This job ensures that all jobs above are successful.
+    needs: [container_image_build_push]
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo Success

.github/workflows/deploy_to_gke.yaml

@@ -0,0 +1,114 @@
+---
+# yamllint disable rule:line-length
+name: Setup_Connection_GKE_Cluster
+# yamllint disable-line rule:truthy
+on:
+  workflow_call:
+    inputs:
+      environment:
+        required: false
+        type: string
+      gcp_project_number:
+        required: true
+        type: string
+      gcp_project_id:
+        required: true
+        type: string
+      gcp_bastion:
+        required: false
+        type: string
+      gcp_bastion_zone:
+        required: true
+        type: string
+      gcp_pool_id:
+        required: true
+        type: string
+      gcp_provider_id:
+        required: true
+        type: string
+      gcp_service_account:
+        required: true
+        type: string
+      gcp_cluster_name:
+        required: true
+        type: string
+      gcp_cluster_location:
+        required: true
+        type: string
+      use_internal_ip:
+        required: true
+        type: boolean
+      deploy_command:
+        required: true
+        type: string
+
+jobs:
+  # To avoid packing and passing artifacts from one job to another, we will
+  # build and test in the same github job.
+  auth_gke:
+    environment: ${{ inputs.environment }}
+    runs-on: ubuntu-latest
+    # Allow the job to fetch a GitHub ID token
+    # !!! IMPORTANT set "permissions:" section in the calling workflow job
+    # same like lines below
+    # permissions:
+    #   id-token: write
+    #   contents: read
+
+    # https://github.com/marketplace/actions/build-and-push-docker-images
+    # Checks out the repository source code with ref/SHA commit that trigger the workflow as HEAD.
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # https://cloud.google.com/iam/docs/workload-identity-federation-with-deployment-pipelines#authenticate
+      - id: 'auth'
+        name: 'Authenticate to Google Cloud'
+        uses: 'google-github-actions/auth@v2'
+        with:
+          token_format: access_token
+          workload_identity_provider: "projects/${{inputs.gcp_project_number}}/locations/global/workloadIdentityPools/${{inputs.gcp_pool_id}}/providers/${{inputs.gcp_provider_id}}"
+          service_account: ${{ inputs.gcp_service_account }}
+
+      - name: 'Set up Cloud SDK'
+        uses: 'google-github-actions/setup-gcloud@v2'
+        with:
+          version: '>= 363.0.0'
+
+      - name: 'Use gcloud CLI to open ssh tunnel'
+        run: |
+          gcloud info
+          # TODO: look into https://github.com/google-github-actions/ssh-compute
+          if [[ -n "${{ inputs.gcp_bastion }}" ]] ; then
+            gcloud compute ssh ${{ inputs.gcp_bastion }} \
+                  --project ${{ inputs.gcp_project_id }} \
+                  --zone  ${{ inputs.gcp_bastion_zone }}\
+                  -- -L8888:127.0.0.1:8888 -f tail -f /dev/null
+          else
+            echo "INFO: no need for a bastion tunnel"
+          fi
+
+      - id: 'get-gke-cluster-credentilas'
+        uses: 'google-github-actions/get-gke-credentials@v2'
+        with:
+          cluster_name: ${{ inputs.gcp_cluster_name }}
+          location: ${{ inputs.gcp_cluster_location }}
+          project_id: ${{ inputs.gcp_project_id }}
+          use_internal_ip: ${{ inputs.use_internal_ip }}
+      # The KUBECONFIG env var is automatically exported and picked up by kubectl.
+      - id: 'set-proxy'
+        run: |
+          if [[ -n "${{ inputs.gcp_bastion }}" ]] ; then
+            echo kubectl config set "clusters.${{inputs.gcp_cluster_name}}.proxy-url" "http://localhost:8888"
+            kubectl config set "clusters.${{inputs.gcp_cluster_name}}.proxy-url" "http://localhost:8888"
+            kubectl get nodes
+          else
+            echo "INFO: No proxy-url is needed"
+            kubectl get nodes
+          fi
+      - id: 'setup-helm'
+        uses: azure/setup-helm@v4
+      - name: deploy with helm
+        run: |
+          echo ${{ inputs.deploy_command }}
+          eval '${{ inputs.deploy_command }}'

.github/workflows/merge_on_master_tw.yaml

@@ -49,7 +49,7 @@ jobs:
           - us-docker.pkg.dev/prj-biconomy-prod-001/bundler/bundler
           # LOCATION-docker.pkg.dev/PROJECT-ID/REPOSITORY/IMAGE
           # {owner}/{repo}/.github/workflows/{filename}@{ref}
-    uses: bcnmy/devops/.github/workflows/container_img_build_push_gar.yaml@master
+    uses: bcnmy/bundler/.github/workflows/container_img_build_push_gar.yaml@master
     with:
       image: ${{ matrix.image }}
       dockerfile: Dockerfile.helm

.github/workflows/pr.yaml

@@ -44,21 +44,18 @@ jobs:
     strategy:
       matrix:
         image:
-          - us-docker.pkg.dev/biconomy-prod/bundler/trustwallet
-          - us-docker.pkg.dev/prj-biconomy-prod-001/bundler/bundler
+          - us-west1-docker.pkg.dev/artifact-registry-1191/bundler/bundler
           # LOCATION-docker.pkg.dev/PROJECT-ID/REPOSITORY/IMAGE
           # {owner}/{repo}/.github/workflows/{filename}@{ref}
-    uses: bcnmy/devops/.github/workflows/container_img_build_push_gar.yaml@master
+    uses: bcnmy/bundler/.github/workflows/container_img_build_push_gar.yaml@master
     with:
       image: ${{ matrix.image }}
-      dockerfile: Dockerfile.helm
+      dockerfile: Dockerfile
+      push: false
       # GCP project where the identity provider is
-      # gcloud projects describe prj-workload-identity-001
-      gcp_project_number: '766873424314'
-      gcp_pool_id: 'pool-id-github-actions'
-      # gcp_provider_id: 'ga-GITHUB_REPO_NAME'
-      gcp_provider_id: 'ga-bundler'
+      gcp_project_number: '334188102066'
+      gcp_pool_id: 'github-pool'
+      gcp_provider_id: 'github-actions-wif-provider'
       # LOCATION-docker.pkg.dev/PROJECT-ID/REPOSITORY/IMAGE
-      gcp_registry: 'us-docker.pkg.dev/biconomy-prod/bundler/trustwallet'
-      gcp_service_account: 'sa-bundler@prj-workload-identity-001.iam.gserviceaccount.com'
-      #
+      gcp_registry: 'us-west1-docker.pkg.dev/artifact-registry-1191/bundler/bundler'
+      gcp_service_account: 'sa-bundler@workload-identity-e697.iam.gserviceaccount.com'