Merge branch 'master' into soloseng/double-signing-slash-foundry

celo-org · Jan 16, 2024 · 4e02716 · 4e02716
2 parents 7e5b094 + f05448f
commit 4e02716
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/celo-monorepo.yml b/.github/workflows/celo-monorepo.yml
@@ -173,7 +173,7 @@ jobs:
             --ignore @celo/env-tests \
             run test
       - name: Upload Jest Test Results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Jest Test Results
           path: test-results/jest

diff --git a/.github/workflows/container-circleci.yml b/.github/workflows/container-circleci.yml
@@ -20,7 +20,7 @@ jobs:
       node12: ${{ steps.changes.outputs.node12 }}
       gcloud: ${{ steps.changes.outputs.gcloud }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Check for changes
         uses: dorny/paths-filter@v2
         id: changes

diff --git a/.github/workflows/cron-protocol-test-with-coverage.yml b/.github/workflows/cron-protocol-test-with-coverage.yml
@@ -14,15 +14,15 @@ jobs:
   protocol-test-with-code-coverage:
     runs-on: ["self-hosted", "monorepo-node18"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install yarn dependencies
         run: yarn install
       - name: Build packages
         run: yarn build --ignore docs --include-dependencies
       - name: Run protocol tests with coverage
         run: yarn --cwd packages/protocol test:coverage
       - name: Store results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: protocol-coverage
           path: packages/protocol/coverage

diff --git a/.github/workflows/protocol-devchain.yml b/.github/workflows/protocol-devchain.yml
@@ -45,7 +45,7 @@ jobs:
           yarn --cwd packages/protocol devchain generate-tar devchain/devchain.tar.gz --release_gold_contracts $GRANTS_FILE
           mv packages/protocol/build/contracts* devchain/
       - name: Upload devchain as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: devchain-${{ matrix.tag }}
           path: devchain

diff --git a/.github/workflows/publish-contracts-abi-release.yml b/.github/workflows/publish-contracts-abi-release.yml
@@ -37,7 +37,7 @@ jobs:
           static-secrets: '{"/static-secrets/NPM/npm-publish-token":"NPM_TOKEN"}'
 
       # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: '18.x'
           registry-url: 'https://registry.npmjs.org'

diff --git a/packages/celotool/package.json b/packages/celotool/package.json
@@ -19,7 +19,7 @@
     "@ethereumjs/rlp": "4.0.1",
     "@google-cloud/monitoring": "0.7.1",
     "@google-cloud/pubsub": "^0.28.1",
-    "@google-cloud/secret-manager": "3.0.0",
+    "@google-cloud/secret-manager": "3.12.0",
     "@google-cloud/storage": "^2.4.3",
     "bignumber.js": "^9.0.0",
     "bip32": "3.1.0",

diff --git a/yarn.lock b/yarn.lock
@@ -1790,12 +1790,12 @@
     p-defer "^1.0.0"
     protobufjs "^6.8.1"
 
-"@google-cloud/secret-manager@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/secret-manager/-/secret-manager-3.0.0.tgz#31842287bd0eee380210488ae40cae3732b2b32f"
-  integrity sha512-ZAWoqiMbWv2Osx6Enq6TLPw/LR8kuSUWKhAsaJVy+q1GCR7clVNVuaPhizWIc4p88QYjW0h2j/wUBJ6OKFUmAw==
+"@google-cloud/secret-manager@3.12.0":
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/secret-manager/-/secret-manager-3.12.0.tgz#ff975190e45da3aaa762905f2b7c679c06a0f4a3"
+  integrity sha512-nFNm5lYgH2RRAn1x8vPKt1c+MBMJtBXqkYB5Jpi68PjN7Emjcu7/kl+0/+FamFLp3qJUU7RKRCwETFNNZAOkuw==
   dependencies:
-    google-gax "^2.0.1"
+    google-gax "^2.30.0"
 
 "@google-cloud/storage@^2.4.3":
   version "2.5.0"
@@ -11069,7 +11069,7 @@ google-gax@^0.25.0:
     semver "^6.0.0"
     walkdir "^0.3.2"
 
-google-gax@^2.0.1:
+google-gax@^2.30.0:
   version "2.30.5"
   resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-2.30.5.tgz#e836f984f3228900a8336f608c83d75f9cb73eff"
   integrity sha512-Jey13YrAN2hfpozHzbtrwEfEHdStJh1GwaQ2+Akh1k0Tv/EuNVSuBtHZoKSBm5wBMvNsxTsEIZ/152NrYyZgxQ==