bobanetwork
diff --git a/‎.circleci/config.yml‎
Lines changed: 29 additions & 13 deletions b/‎.circleci/config.yml‎
Lines changed: 29 additions & 13 deletions
diff --git a/‎.eslintrc.js‎
Lines changed: 0 additions & 1 deletion b/‎.eslintrc.js‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎.github/workflows/aa-bundler-sdk-pr.yml‎
Lines changed: 2 additions & 50 deletions b/‎.github/workflows/aa-bundler-sdk-pr.yml‎
Lines changed: 2 additions & 50 deletions
diff --git a/‎.github/workflows/aa-bundler-sdk-version.yml‎
Lines changed: 124 additions & 0 deletions b/‎.github/workflows/aa-bundler-sdk-version.yml‎
Lines changed: 124 additions & 0 deletions
diff --git a/‎.github/workflows/aa-bundler-sdk.yml‎
Lines changed: 13 additions & 1 deletion b/‎.github/workflows/aa-bundler-sdk.yml‎
Lines changed: 13 additions & 1 deletion
diff --git a/‎.github/workflows/account-abstraction.yml‎
Lines changed: 13 additions & 13 deletions b/‎.github/workflows/account-abstraction.yml‎
Lines changed: 13 additions & 13 deletions
@@ -1,23 +1,37 @@
-#adapted from https://raw.githubusercontent.com/ethereum-optimism/optimism/develop/.circleci/config.yml
 version: 2.1
 
 executors:
   intergration-tests-executor:
     resource_class: xlarge
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2204:2022.10.1
       docker_layer_caching: true
     environment:
       DOCKER_BUILDKIT: 1
 
 commands:
+  check-changed:
+    description: "Conditionally halts a step if certain modules change"
+    parameters:
+      patterns:
+        type: string
+        description: "Comma-separated list of dependencies"
+    steps:
+      - run:
+          name: "Check for changes"
+          command: |
+            cd ops/check-changed
+            pip3 install -r requirements.txt
+            python3 main.py "<<parameters.patterns>>"
   download-solidity-compilers:
     steps:
       - checkout
+
       - run:
           name: Generate cache key from all hardhat.config.ts files
           working_directory: ops
           command: ./scripts/checksum.sh /tmp/checksum.txt
+
       - restore_cache:
           keys:
             - solc-compilers-{{ checksum "/tmp/checksum.txt" }}-{{ .Environment.CACHE_VERSION }}
@@ -53,6 +67,8 @@ commands:
         description: Folder to run tests in
         type: string
     steps:
+      - check-changed:
+          patterns: common-ts,contracts,core-utils,data-transport-layer,message-relayer,regenesis-surgery,sdk,integration-tests,l2geth,packages/boba/account-abstraction,packages/boba/bobalink,packages/boba/bundler,packages/boba/bundler_sdk,packages/boba/bundler_utils,packages/boba/contracts,packages/boba/gas-price-oracle,packages/boba/register,packages/boba/teleportation,ops,ops_boba
       - run:
           name: Build the project
           command: yarn && yarn build
@@ -65,7 +81,13 @@ commands:
 
       - run:
           name: Build the side services
-          command: docker-compose -f <<parameters.docker_compose_file>> -f docker-compose-side.yml build -- $(yq '(.services | keys)[]' <<parameters.docker_compose_file>>  | tr '\n' ' ') $(yq '(.services | keys)[]' docker-compose-side.yml  | tr '\n' ' ')
+          command: |
+            yq() {
+              docker run --rm -i -v ${PWD}:/workdir mikefarah/yq "$@"
+            }
+            echo $(yq '(.services | keys)[]' <<parameters.docker_compose_file>>  | tr '\n' ' ')
+            echo $(yq '(.services | keys)[]' docker-compose-side.yml  | tr '\n' ' ')
+            docker-compose -f <<parameters.docker_compose_file>> -f docker-compose-side.yml build -- $(yq '(.services | keys)[]' <<parameters.docker_compose_file>>  | tr '\n' ' ') $(yq '(.services | keys)[]' docker-compose-side.yml  | tr '\n' ' ')
           working_directory: ops
 
       - run:
@@ -82,7 +104,7 @@ commands:
       - run:
           name: Bring up services
           command: |
-            docker-compose -f <<parameters.docker_compose_file>> -f <<parameters.docker_compose_side_file>> up -d bobalink aa_deployer bundler
+            docker-compose -f <<parameters.docker_compose_file>> -f <<parameters.docker_compose_side_file>> up -d bobalink aa_deployer bundler teleportation_db
           working_directory: ops
       - run:
           name: Start background logging
@@ -119,6 +141,7 @@ commands:
           path: /home/circleci/project/ops/result
 
 jobs:
+
   go-lint-test-build:
     parameters:
       binary_name:
@@ -140,15 +163,8 @@ jobs:
       - image: cimg/postgres:14.1
     steps:
       - checkout
-      - run:
-          name: Check if we should run
-          command: |
-            shopt -s inherit_errexit
-            CHANGED=$(check-changed "(<<parameters.working_directory>>|<<parameters.dependencies>>)" || echo "TRUE")
-            echo $CHANGED
-            if [[ "$CHANGED" = "FALSE" ]]; then
-              circleci step halt
-            fi
+      - check-changed:
+          patterns: go/proxyd
       - run:
           name: Lint
           command: golangci-lint run -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint -e "errors.As" -e "errors.Is" ./...
 
@@ -106,7 +106,6 @@ module.exports = {
     indent: 'off',
     'jsdoc/check-alignment': 'error',
     'jsdoc/check-indentation': 'error',
-    'jsdoc/newline-after-description': 'error',
     'linebreak-style': 'off',
     'max-classes-per-file': 'off',
     'max-len': 'off',
 
@@ -1,7 +1,7 @@
 name: Will trigger version bump of AA-Bundler for NPM
 
 on:
-  push:
+  pull_request:
     branches:
       - develop
     paths:
@@ -12,6 +12,7 @@ on:
 
 permissions:
   contents: write
+  pull-requests: write
 
 jobs:
   build:
@@ -39,53 +40,4 @@ jobs:
 
               The package that is going to be updated is `@bobanetwork/bundler_sdk`.
 
-      - uses: MontyD/[email protected]
-        id: version-updated
-        with:
-            path: packages/boba/bundler_sdk/package.json
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - id: get-latest-tag
-        working-directory: ./packages/boba/bundler_sdk
-        run: echo "sdk_current_version=$(cat package.json | jq -r '.version')" >> $GITHUB_OUTPUT
-
-      - uses: actions-ecosystem/action-bump-semver@v1
-        id: bump-semver
-        with:
-          current_version: ${{ steps.get-latest-tag.outputs.sdk_current_version }}
-          level: patch
-
-      - name: Increment patch version
-        if: steps.version-updated.outputs.has-updated == 'true'
-        working-directory: ./packages/boba/bundler_sdk
-        run: yarn version patch --no-commit-hooks --no-git-tag-version --new-version ${{ steps.bump-semver.outputs.new_version }}
-
-      - name: Create Pull Request
-        if: steps.version-updated.outputs.has-updated == 'true'
-        id: cpr
-        uses: peter-evans/create-pull-request@v5
-        with:
-          base: develop
-          token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
-          commit-message: Update SDK version
-          committer: GitHub <[email protected]>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          signoff: false
-          branch: automated/bump_bundler_sdk_version
-          delete-branch: true
-          title: 'Bump Bundler SDK version'
-          body: |
-            Bump Bundler SDK version
-          labels: |
-            automated pr
-            bundler
-            bundler sdk
-            account-abstraction
-          reviewers: |
-            souradeep-das
-            wsdt
-            Boyuan-Chen
-            inomurko
-          draft: false
 
@@ -0,0 +1,124 @@
+name: Bump of AA-Bundler for NPM
+
+on:
+  push:
+    branches:
+      - develop
+    paths:
+     # only on change
+     - 'packages/boba/bundler_sdk/**/*'
+     - 'packages/boba/bundler_utils/**/*'
+     - 'packages/boba/account-abstraction/**/*'
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: dorny/paths-filter@v2
+        id: filter
+        with:
+          filters: |
+            bundler_sdk:
+              - 'packages/boba/account-abstraction/**/*'
+              - 'packages/boba/bundler_sdk/**/*'
+              - 'packages/boba/bundler_utils/**/*'
+
+      - uses: MontyD/[email protected]
+        id: version-updated-aa
+        with:
+          path: packages/boba/account-abstraction/package.json
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: MontyD/[email protected]
+        id: version-updated-utils
+        with:
+          path: packages/boba/bundler_utils/package.json
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: MontyD/[email protected]
+        id: version-updated
+        with:
+            path: packages/boba/bundler_sdk/package.json
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - id: get-latest-tag-aa
+        working-directory: ./packages/boba/account-abstraction
+        run: echo "aa_current_version=$(cat package.json | jq -r '.version')" >> $GITHUB_OUTPUT
+
+      - id: get-latest-tag-utils
+        working-directory: ./packages/boba/bundler_utils
+        run: echo "utils_current_version=$(cat package.json | jq -r '.version')" >> $GITHUB_OUTPUT
+
+      - id: get-latest-tag
+        working-directory: ./packages/boba/bundler_sdk
+        run: echo "sdk_current_version=$(cat package.json | jq -r '.version')" >> $GITHUB_OUTPUT
+
+      - uses: actions-ecosystem/action-bump-semver@v1
+        id: bump-semver-aa
+        with:
+          current_version: ${{ steps.get-latest-tag-aa.outputs.aa_current_version }}
+          level: patch
+
+      - uses: actions-ecosystem/action-bump-semver@v1
+        id: bump-semver-utils
+        with:
+          current_version: ${{ steps.get-latest-tag-utils.outputs.utils_current_version }}
+          level: patch
+
+      - uses: actions-ecosystem/action-bump-semver@v1
+        id: bump-semver
+        with:
+          current_version: ${{ steps.get-latest-tag.outputs.sdk_current_version }}
+          level: patch
+
+      - name: Increment patch version - AA
+        if: steps.version-updated-aa.outputs.has-updated == 'true'
+        working-directory: ./packages/boba/account-abstraction
+        run: yarn version patch --no-commit-hooks --no-git-tag-version --new-version ${{ steps.bump-semver-aa.outputs.new_version }}
+
+      - name: Increment patch version - BundlerUtils
+        if: steps.version-updated-utils.outputs.has-updated == 'true'
+        working-directory: ./packages/boba/bundler_utils
+        run: yarn version patch --no-commit-hooks --no-git-tag-version --new-version ${{ steps.bump-semver-utils.outputs.new_version }}
+
+      - name: Increment patch version - BundlerSDK
+        if: steps.version-updated.outputs.has-updated == 'true'
+        working-directory: ./packages/boba/bundler_sdk
+        run: yarn version patch --no-commit-hooks --no-git-tag-version --new-version ${{ steps.bump-semver.outputs.new_version }}
+
+      - name: Create Pull Request
+        if: steps.version-updated.outputs.has-updated == 'true'
+        id: cpr
+        uses: peter-evans/create-pull-request@v5
+        with:
+          base: develop
+          token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
+          commit-message: Update NPM versions
+          committer: GitHub <[email protected]>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          signoff: false
+          branch: automated/bump_bundler_sdk_version
+          delete-branch: true
+          title: 'Bump Bundler SDK version'
+          body: |
+            Bump Bundler SDK version
+          labels: |
+            automated pr
+            bundler
+            bundler sdk
+            account-abstraction
+          reviewers: |
+            souradeep-das
+            wsdt
+            Boyuan-Chen
+            inomurko
+          draft: false
+
@@ -19,7 +19,19 @@ jobs:
       - name: Install dependencies and build 🔧
         run: yarn install --frozen-lockfile --legacy-peer-deps && yarn run build
 
-      - name: Publish package on NPM 📦
+      - name: Publish AA package on NPM 📦
+        working-directory: ./packages/boba/account-abstraction
+        run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_BOBA_FOUNDATION }}
+
+      - name: Publish BundlerUtils package on NPM 📦
+        working-directory: ./packages/boba/bundler_utils
+        run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_BOBA_FOUNDATION }}
+
+      - name: Publish BundlerSDK package on NPM 📦
         working-directory: ./packages/boba/bundler_sdk
         run: npm publish --access public
         env:
 
@@ -24,11 +24,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v3
         with:
           node-version: '14'
-      - uses: actions/checkout@v1
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
         with:
           path: node_modules
           key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }}
@@ -44,11 +44,11 @@ jobs:
         image: dtr22/geth-dev
 
     steps:
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v3
         with:
           node-version: '14'
-      - uses: actions/checkout@v1
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
         with:
           path: node_modules
           key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }}
@@ -59,11 +59,11 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v3
         with:
           node-version: '14'
-      - uses: actions/checkout@v1
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
         with:
           path: node_modules
           key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }}
@@ -73,11 +73,11 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v3
         with:
           node-version: '14'
-      - uses: actions/checkout@v1
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
         with:
           path: node_modules
           key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }}
@@ -86,7 +86,7 @@ jobs:
       - run: yarn compile
 
       - run: FORCE_COLOR=1 yarn coverage
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: solidity-coverage
           path: |