diff --git a/.changeset/pre.json b/.changeset/pre.json
index 2a52ab038..2ef010c92 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -16,15 +16,22 @@
     "@ethereum-waffle/ens": "4.0.0-alpha.19",
     "@ethereum-waffle/hardhat": "4.0.0-alpha.19",
     "@ethereum-waffle/mock-contract": "4.0.0-alpha.19",
-    "@ethereum-waffle/provider": "4.0.0-alpha.19"
+    "@ethereum-waffle/provider": "4.0.0-alpha.19",
+    "@ethereum-waffle/optimism": "4.0.0-alpha.20"
   },
   "changesets": [
     "add-src-to-npm",
     "big-goats-guess",
     "big-shrimps-rule",
+    "blue-frogs-reply",
     "dirty-badgers-sin",
+    "dirty-walls-repeat",
+    "eighty-squids-knock",
     "fluffy-queens-cross",
+    "smooth-yaks-hammer",
+    "strange-hairs-boil",
     "tame-walls-speak",
+    "thin-items-hide",
     "tricky-spiders-invite",
     "update-ethers"
   ]
diff --git a/waffle-chai/CHANGELOG.md b/waffle-chai/CHANGELOG.md
index 649d8d853..18c520972 100644
--- a/waffle-chai/CHANGELOG.md
+++ b/waffle-chai/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @ethereum-waffle/chai
 
+## 4.0.0-alpha.25
+
+### Patch Changes
+
+- e69f739: Support testing on optimism
+- 1e598c5: BN closeTo actual may be a js number
+- 2ccc395: Fix emit.withArgs not enough elements in list
+- 79a421f: Test args of custom errors with .withArgs matcher
+- Updated dependencies [1e479c3]
+  - @ethereum-waffle/provider@4.0.0-alpha.24
+
 ## 4.0.0-alpha.24
 
 ### Patch Changes
diff --git a/waffle-chai/package.json b/waffle-chai/package.json
index ad6b9ab1e..2517911b0 100644
--- a/waffle-chai/package.json
+++ b/waffle-chai/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ethereum-waffle/chai",
   "description": "A sweet set of chai matchers for your blockchain testing needs.",
-  "version": "4.0.0-alpha.24",
+  "version": "4.0.0-alpha.25",
   "author": "Marek Kirejczyk <account@ethworks.io> (http://ethworks.io)",
   "repository": "git@github.com:EthWorks/Waffle.git",
   "private": false,
diff --git a/waffle-cli/CHANGELOG.md b/waffle-cli/CHANGELOG.md
index 9e019d36d..b460111b7 100644
--- a/waffle-cli/CHANGELOG.md
+++ b/waffle-cli/CHANGELOG.md
@@ -1,5 +1,19 @@
 # ethereum-waffle
 
+## 4.0.0-alpha.25
+
+### Patch Changes
+
+- Updated dependencies [e69f739]
+- Updated dependencies [1e598c5]
+- Updated dependencies [1e479c3]
+- Updated dependencies [2ccc395]
+- Updated dependencies [79a421f]
+  - @ethereum-waffle/chai@4.0.0-alpha.25
+  - @ethereum-waffle/provider@4.0.0-alpha.24
+  - @ethereum-waffle/compiler@4.0.0-alpha.21
+  - @ethereum-waffle/mock-contract@4.0.0-alpha.21
+
 ## 4.0.0-alpha.24
 
 ### Patch Changes
diff --git a/waffle-cli/package.json b/waffle-cli/package.json
index d8bd6bf62..77acecc03 100644
--- a/waffle-cli/package.json
+++ b/waffle-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ethereum-waffle",
   "description": "Sweeter, faster and simpler than truffle.",
-  "version": "4.0.0-alpha.24",
+  "version": "4.0.0-alpha.25",
   "author": "Marek Kirejczyk <account@ethworks.io> (http://ethworks.io)",
   "repository": "git@github.com:EthWorks/Waffle.git",
   "private": false,
diff --git a/waffle-optimism/CHANGELOG.md b/waffle-optimism/CHANGELOG.md
new file mode 100644
index 000000000..f7aae4aa8
--- /dev/null
+++ b/waffle-optimism/CHANGELOG.md
@@ -0,0 +1,8 @@
+# @ethereum-waffle/optimism
+
+## 4.0.0-alpha.21
+
+### Patch Changes
+
+- a26257e: Add build step for waffle-optimism
+- e69f739: Support testing on optimism
diff --git a/waffle-optimism/package.json b/waffle-optimism/package.json
index d675bd382..e0f313a3e 100644
--- a/waffle-optimism/package.json
+++ b/waffle-optimism/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ethereum-waffle/optimism",
   "description": "Testing waffle with optimism",
-  "version": "4.0.0-alpha.20",
+  "version": "4.0.0-alpha.21",
   "author": "Marek Kirejczyk <account@ethworks.io> (http://ethworks.io)",
   "repository": "git@github.com:EthWorks/Waffle.git",
   "private": false,
diff --git a/waffle-provider/CHANGELOG.md b/waffle-provider/CHANGELOG.md
index 316ef0729..e3a3d9b18 100644
--- a/waffle-provider/CHANGELOG.md
+++ b/waffle-provider/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @ethereum-waffle/provider
 
+## 4.0.0-alpha.24
+
+### Patch Changes
+
+- 1e479c3: Introduce TestProvider type
+
 ## 4.0.0-alpha.23
 
 ### Patch Changes
diff --git a/waffle-provider/package.json b/waffle-provider/package.json
index b4d1212da..6b8b8d701 100644
--- a/waffle-provider/package.json
+++ b/waffle-provider/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ethereum-waffle/provider",
   "description": "A mock provider for your blockchain testing needs.",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.24",
   "author": "Marek Kirejczyk <account@ethworks.io> (http://ethworks.io)",
   "repository": "git@github.com:EthWorks/Waffle.git",
   "private": false,