diff --git a/poetry.lock b/poetry.lock
index 4b82f300..5f62ffc5 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -4136,8 +4136,8 @@ forking-recommended = ["ujson"]
 [package.source]
 type = "git"
 url = "https://github.com/vyperlang/titanoboa.git"
-reference = "7171aee25c4d25fc1626a361a8c972e9316fd383"
-resolved_reference = "7171aee25c4d25fc1626a361a8c972e9316fd383"
+reference = "b4e66665612ea0b27c1a286dd598bb02a6a973ff"
+resolved_reference = "b4e66665612ea0b27c1a286dd598bb02a6a973ff"
 
 [[package]]
 name = "tomli"
@@ -4805,4 +4805,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "40670953f2e928ef535bfedc35d1c0ea4fafd22fff5e96d6123780ba2b92b3cb"
+content-hash = "790076c1b81fd47dcd25d479baeaeda746bd494c430712367a17105c3205d4a6"
diff --git a/pyproject.toml b/pyproject.toml
index 24b897d9..6fb65c00 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ packages = []
 [tool.poetry.dependencies]
 python = "^3.10"
 poetry = "1.5.1"
-titanoboa = {git = "https://github.com/vyperlang/titanoboa.git", rev = "7171aee25c4d25fc1626a361a8c972e9316fd383"}
+titanoboa = {git = "https://github.com/vyperlang/titanoboa.git", rev = "b4e66665612ea0b27c1a286dd598bb02a6a973ff"}
 vyper = "0.3.10"
 pycryptodome = "^3.18.0"
 pre-commit = "^3.3.3"
diff --git a/scripts/deploy_infra.py b/scripts/deploy_infra.py
index bfd393cc..ab06045e 100644
--- a/scripts/deploy_infra.py
+++ b/scripts/deploy_infra.py
@@ -32,36 +32,36 @@
     "arbitrum:mainnet": {
         "math": "0x3d6cB2F6DcF47CDd9C13E4e3beAe9af041d8796a",
         "views": "0xC1b393EfEF38140662b91441C6710Aa704973228",
-        "plain_amm": "",
-        "meta_amm": "",
+        "plain_amm": "0x0458ea5f4cd00e873264be2031ceb8f9d9b3116c",
+        "meta_amm": "0xc6c09471ee39c7e30a067952fcc89c8922f9ab53",
         "factory": "0x9AF14D26075f142eb3F292D5065EB3faa646167b",
     },
     "optimism:mainnet": {
         "math": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6",
         "views": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f",
-        "plain_amm": "",
-        "meta_amm": "",
+        "plain_amm": "0x06452f9c013fc37169B57Eab8F50A7A48c9198A3",
+        "meta_amm": "0xd7E72f3615aa65b92A4DBdC211E296a35512988B",
         "factory": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E",
     },
     "base:mainnet": {
         "math": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f",
         "views": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617",
-        "plain_amm": "",
-        "meta_amm": "",
+        "plain_amm": "0x604388Bb1159AFd21eB5191cE22b4DeCdEE2Ae22",
+        "meta_amm": "0x06452f9c013fc37169B57Eab8F50A7A48c9198A3",
         "factory": "0xd2002373543Ce3527023C75e7518C274A51ce712",
     },
     "linea:mainnet": {
         "math": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6",
         "views": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f",
-        "plain_amm": "",
-        "meta_amm": "",
+        "plain_amm": "0x7C2085419BE6a04f4ad88ea91bC9F5C6E6C463D8",
+        "meta_amm": "0x604388bb1159afd21eb5191ce22b4decdee2ae22",
         "factory": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E",
     },
     "scroll:mainnet": {
         "math": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6",
         "views": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f",
-        "plain_amm": "",
-        "meta_amm": "",
+        "plain_amm": "0x7C2085419BE6a04f4ad88ea91bC9F5C6E6C463D8",
+        "meta_amm": "0x604388Bb1159AFd21eB5191cE22b4DeCdEE2Ae22",
         "factory": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E",
     },
     "zksync:mainnet": {
@@ -74,65 +74,65 @@
     "pzkevm:mainnet": {
         "math": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f",
         "views": "0x87fe17697d0f14a222e8bef386a0860ecffdd617",
-        "plain_amm": "",
-        "meta_amm": "",
+        "plain_amm": "0x604388Bb1159AFd21eB5191cE22b4DeCdEE2Ae22",
+        "meta_amm": "0x06452f9c013fc37169B57Eab8F50A7A48c9198A3",
         "factory": "0xd2002373543Ce3527023C75e7518C274A51ce712",
     },
     # Layer 1
     "gnosis:mainnet": {
         "math": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617",
         "views": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E",
-        "plain_amm": "",
-        "meta_amm": "",
+        "plain_amm": "0xc9Fe0C63Af9A39402e8a5514f9c43Af0322b665F",
+        "meta_amm": "0x166c4084Ad2434E8F2425C64dabFE6875A0D45c5",
         "factory": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8",
     },
     "polygon:mainnet": {
         "math": "0xf3A431008396df8A8b2DF492C913706BDB0874ef",
         "views": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6",
-        "plain_amm": "",
-        "meta_amm": "",
+        "plain_amm": "0xa7Ba18EeFcD9513230987eC2faB6711AF5AbD9c2",
+        "meta_amm": "0x7C2085419BE6a04f4ad88ea91bC9F5C6E6C463D8",
         "factory": "0x1764ee18e8B3ccA4787249Ceb249356192594585",
     },
     "avax:mainnet": {
         "math": "0xf3A431008396df8A8b2DF492C913706BDB0874ef",
         "views": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6",
-        "plain_amm": "",
-        "meta_amm": "",
+        "plain_amm": "0xa7Ba18EeFcD9513230987eC2faB6711AF5AbD9c2",
+        "meta_amm": "0x7C2085419BE6a04f4ad88ea91bC9F5C6E6C463D8",
         "factory": "0x1764ee18e8B3ccA4787249Ceb249356192594585",
     },
     "ftm:mainnet": {
         "math": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6",
         "views": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E",
-        "plain_amm": "",
-        "meta_amm": "",
+        "plain_amm": "0xd7E72f3615aa65b92A4DBdC211E296a35512988B",
+        "meta_amm": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8",
         "factory": "0xe61Fb97Ef6eBFBa12B36Ffd7be785c1F5A2DE66b",
     },
     "bsc:mainnet": {
         "math": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f",
         "views": "0x1764ee18e8B3ccA4787249Ceb249356192594585",
-        "plain_amm": "",
-        "meta_amm": "",
+        "plain_amm": "0x64379C265Fc6595065D7d835AAaa731c0584dB80",
+        "meta_amm": "0xd3B17f862956464ae4403cCF829CE69199856e1e",
         "factory": "0xd7E72f3615aa65b92A4DBdC211E296a35512988B",
     },
     "celo:mainnet": {
         "math": "0xf3A431008396df8A8b2DF492C913706BDB0874ef",
         "views": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6",
-        "plain_amm": "",
-        "meta_amm": "",
+        "plain_amm": "0xa7Ba18EeFcD9513230987eC2faB6711AF5AbD9c2",
+        "meta_amm": "0x7C2085419BE6a04f4ad88ea91bC9F5C6E6C463D8",
         "factory": "0x1764ee18e8B3ccA4787249Ceb249356192594585",
     },
     "kava:mainnet": {
         "math": "0xf3A431008396df8A8b2DF492C913706BDB0874ef",
         "views": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6",
-        "plain_amm": "",
-        "meta_amm": "",
+        "plain_amm": "0xa7Ba18EeFcD9513230987eC2faB6711AF5AbD9c2",
+        "meta_amm": "0x7C2085419BE6a04f4ad88ea91bC9F5C6E6C463D8",
         "factory": "0x1764ee18e8B3ccA4787249Ceb249356192594585",
     },
     "aurora:mainnet": {
         "math": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6",
         "views": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f",
-        "plain_amm": "",
-        "meta_amm": "",
+        "plain_amm": "0x7C2085419BE6a04f4ad88ea91bC9F5C6E6C463D8",
+        "meta_amm": "0x604388Bb1159AFd21eB5191cE22b4DeCdEE2Ae22",
         "factory": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E",
     },
     "tron:mainnet": {
@@ -261,9 +261,9 @@ def deploy_infra(network, url, account, fork=False):
 def main():
 
     deploy_infra(
-        "ethereum:mainnet",
-        "http://localhost:9090/",
-        "FIDDYDEPLOYER",
+        ":mainnet",
+        os.environ["RPC_"],
+        "",
         fork=False,
     )