Merge branch 'develop' into zksync-tx-known-error

smartcontractkit · Mar 26, 2024 · a9aa167 · a9aa167
2 parents 8005aac + 50724c3
commit a9aa167
Show file tree

Hide file tree

Showing 18 changed files with 757 additions and 65 deletions.
diff --git a/.changeset/thick-apes-reply.md b/.changeset/thick-apes-reply.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+bug fixes in s_reserveAmount accounting
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -517,7 +517,7 @@ jobs:
             os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2-evm-simulated
           - name: vrfv2plus
-            nodes: 6
+            nodes: 7
             os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2plus-evm-simulated
           - name: forwarder_ocr

diff --git a/contracts/.changeset/tricky-pigs-shout.md b/contracts/.changeset/tricky-pigs-shout.md
@@ -0,0 +1,5 @@
+---
+"@chainlink/contracts": minor
+---
+
+bug fixes in s_reserveAmount accounting