Merge branch 'geth-upgrade' of github.com:crypto-facs/ethermint into …

…geth-upgrade
evmos · Feb 14, 2022 · 642fb42 · 642fb42
2 parents f70c36b + 7a2d2c0
commit 642fb42
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/tests/solidity/yarn.lock b/tests/solidity/yarn.lock
@@ -7636,9 +7636,9 @@ flow-stoplight@^1.0.0:
   integrity sha1-SiksW8/4s5+mzAyxqFPYbyfu/3s=
 
 follow-redirects@^1.10.0:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
-  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
+  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
 
 for-each@^0.3.3, for-each@~0.3.3:
   version "0.3.3"

diff --git a/x/evm/spec/08_params.md b/x/evm/spec/08_params.md
@@ -76,6 +76,5 @@ By default, all block configuration fields but `ConstantinopleBlock`, are enable
 | IstanbulBlock       | 0                                                                    |
 | MuirGlacierBlock    | 0                                                                    |
 | BerlinBlock         | 0                                                                    |
-| CatalystBlock       | `nil`                                                                |
 | LondonBlock         | 0                                                                    |