diff --git a/src/addresses/Moonbeam.sol b/src/addresses/Moonbeam.sol
new file mode 100644
index 0000000..7d9d90b
--- /dev/null
+++ b/src/addresses/Moonbeam.sol
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: ISC
+pragma solidity >=0.8.0;
+
+// **NOTE** Generated code, do not modify.  Run 'npm run generate:constants'.
+
+import { TestBase } from "forge-std/Test.sol";
+
+library Canonicals {
+    address internal constant FRAX = 0x322E86852e492a7Ee17f28a78c663da38FB33bfb;
+    address internal constant FXS = 0x2CC0A9D8047A5011dEfe85328a6f26968C8aaA1C;
+    address internal constant FRXETH = 0x82bbd1b6f6De2B7bb63D3e1546e6b1553508BE99;
+    address internal constant SFRXETH = 0xecf91116348aF1cfFe335e9807f0051332BE128D;
+}
+
+library Farms {}
+
+library FraxBonds {}
+
+library FraxFerry {
+    address internal constant FRAXFERRY_V1__ETHEREUM_MOONBEAM__FRAX__MNBM_SIDE =
+        0xd545Fd6080db07eDdcC1F57dC28a53D930837A8d;
+    address internal constant FRAXFERRY_V2__ETHEREUM_MOONBEAM__FXS__MNBM_SIDE =
+        0x1E87990678f640BFfe5A118c331fEc296DDC8d89;
+    address internal constant FRAXFERRY_V2__ETHEREUM_MOONBEAM__FRXETH__MNBM_SIDE =
+        0x7c7Fd7412F5E79f4917163F78d5Ece5E2e923504;
+    address internal constant FRAXFERRY_V2__ETHEREUM_MOONBEAM__SFRXETH__MNBM_SIDE =
+        0x78348E58582d0D1789da1621B79Fc62012485CAe;
+    address internal constant CAPTAIN = 0xBB437059584e30598b3AF0154472E47E6e2a45B9;
+    address internal constant FIRST_OFFICER = 0xBB437059584e30598b3AF0154472E47E6e2a45B9;
+    address internal constant CREWMEMBER = 0xBB437059584e30598b3AF0154472E47E6e2a45B9;
+}
+
+library FraxlendAndOracles {
+    address internal constant COMBO_ORACLE = 0x247A323DAA63cC97c2BAD61b4D6f1E0120B5c9e2;
+    address internal constant COMBO_ORACLE_UNIV2_UNIV3 = 0x4A40198373dE481741bdf629B44Dc98f12f18161;
+}
+
+library Fraxswap {
+    address internal constant FRAXSWAP_FACTORY_V1 = 0x5Ca135cB8527d76e932f34B5145575F9d8cbE08E;
+    address internal constant FRAXSWAP_FACTORY_V2 = 0x51f9DBEd76f5Dcf209817f641b549aa82F35D23F;
+    address internal constant FRAXSWAP_ROUTER_V1 = 0xc2544A32872A91F4A553b404C6950e89De901fdb;
+    address internal constant FRAXSWAP_ROUTER_V2 = 0xd95fe880d7717f7f20981FE6e41A2315f3EFeAb5;
+    address internal constant FRAXSWAP_ROUTER_MULTI_HOP = 0x0000000000000000000000000000000000000000;
+    address internal constant FRAXSWAP_V1_FRAX_FXS = 0x44E11b99ff8F6164FD54393a17b3CD4c57732dB7;
+    address internal constant FRAXSWAP_V2_FRAX_FXS = 0x2974A0D3e70FDe22d44c188F770beE964205aCad;
+    address internal constant FRAXSWAP_V1_FRAX_WGLMR = 0xAE0b5be7d467C8c0898CaE4c96B2f40A6810DEBC;
+    address internal constant FRAXSWAP_V2_FRAX_WGLMR = 0xd3bE0E32147ae91378F035fF96f3e2cAb96aC48b;
+}
+
+library Misc {}
+
+library Multisigs {
+    address internal constant COMPTROLLER = 0x343e4f06BF240d22FbdFd4a2Fe5858BC66e79F12;
+    address internal constant FPI_COMPTROLLER = 0xc4d89dcE72cde17DC3BEF317E62530b6A0733971;
+}
+
+library PoolRelatedTokens {
+    address internal constant ZENLINK_CANFRAX_CANFXS = 0x8ca030649720b94b16e8C3B551cc2ab88c681C0F;
+    address internal constant ZENLINK_CANFRAX_WGLMR = 0xd341D2191bb0F84E5c29cB301deF5753Dab1ac04;
+}
diff --git a/src/addresses/Moonriver.sol b/src/addresses/Moonriver.sol
new file mode 100644
index 0000000..a5c5417
--- /dev/null
+++ b/src/addresses/Moonriver.sol
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: ISC
+pragma solidity >=0.8.0;
+
+// **NOTE** Generated code, do not modify.  Run 'npm run generate:constants'.
+
+import { TestBase } from "forge-std/Test.sol";
+
+library Canonicals {
+    address internal constant FRAX = 0x1A93B23281CC1CDE4C4741353F3064709A16197d;
+    address internal constant FXS = 0x6f1D1Ee50846Fcbc3de91723E61cb68CFa6D0E98;
+}
+
+library Farms {}
+
+library FraxBonds {}
+
+library FraxFerry {
+    address internal constant FRAXFERRY_V1__ETHEREUM_MOONRIVER__FRAX__MOVR_SIDE =
+        0x81dbcc69937DAd14e358B1a16Ba7ea047703c404;
+    address internal constant FRAXFERRY_V2__ETHEREUM_MOONRIVER__FXS__MOVR_SIDE =
+        0x2d3146aD02f64cb21C23b54f3fD5B0ddc927ba20;
+    address internal constant CAPTAIN = 0xBB437059584e30598b3AF0154472E47E6e2a45B9;
+    address internal constant FIRST_OFFICER = 0xBB437059584e30598b3AF0154472E47E6e2a45B9;
+    address internal constant CREWMEMBER = 0xBB437059584e30598b3AF0154472E47E6e2a45B9;
+    address internal constant ZENLINK_CANFRAX_WGLMR = 0xd341D2191bb0F84E5c29cB301deF5753Dab1ac04;
+}
+
+library FraxlendAndOracles {
+    address internal constant COMBO_ORACLE = 0x3B56E2DD29e4976B639BAd95044A0852BeeEBF02;
+    address internal constant COMBO_ORACLE_UNIV2_UNIV3 = 0x212ae4B6e93a735840A431845833261CA9cA76ED;
+}
+
+library Fraxswap {
+    address internal constant FRAXSWAP_FACTORY_V1 = 0x5Ca135cB8527d76e932f34B5145575F9d8cbE08E;
+    address internal constant FRAXSWAP_FACTORY_V2 = 0x7FB05Ca29DAc7F5690E9b5AE0aF0415D579D7CD3;
+    address internal constant FRAXSWAP_ROUTER_V1 = 0xc2544A32872A91F4A553b404C6950e89De901fdb;
+    address internal constant FRAXSWAP_ROUTER_V2 = 0xD8FC27ec222E8d5172CD63aC453C6Dfb7467a3C7;
+    address internal constant FRAXSWAP_ROUTER_MULTI_HOP = 0x0000000000000000000000000000000000000000;
+    address internal constant FRAXSWAP_V1_FRAX_FXS = 0x2C803cd6E9a7AdAD813718a4767ECec4F6e0ca90;
+    address internal constant FRAXSWAP_V2_FRAX_FXS = 0x08C81e49D695Ae8F50574144560a301542b05C60;
+    address internal constant FRAXSWAP_V1_FRAX_WMOVR = 0x3Dbb1Fd5E0b50a5905fc24Fc38D8e741C52F782b;
+    address internal constant FRAXSWAP_V2_FRAX_WMOVR = 0x72B7D2Bb0082cC9cDa8db55eca6Ce4dfcc954191;
+}
+
+library Misc {}
+
+library Multisigs {
+    address internal constant COMPTROLLER = 0x2bBbE751E8C36CD6c92767776067f8Dd3A21941f;
+}
+
+library PoolRelatedTokens {
+    address internal constant SOLARBEAM_FRAX_ROME = 0x069C2065100b4D3D982383f7Ef3EcD1b95C05894;
+    address internal constant SOLARBEAM_FRAX_MOVR = 0x2cc54b4A3878e36E1C754871438113C1117a3ad7;
+    address internal constant SUSHI_FRAX_USDC_MOONRIVER = 0x310C4d18640aF4878567c4A31cB9cBde7Cd234A3;
+    address internal constant SUSHI_CANFRAX_CANFXS = 0xC5147A6E773343aFE527249a26EF16AFc6a0013F;
+    address internal constant SUSHI_CANFRAX_ANYUSDC = 0x310C4d18640aF4878567c4A31cB9cBde7Cd234A3;
+    address internal constant SUSHI_CANFRAX_WMOVR = 0x756057872D1Ad41C703B68e12701D27874fbe533;
+    address internal constant SUSHI_CANFXS_ANYUSDC = 0xc0EAB66DaDC825c95cA1951A2B02BC56073Fc7B2;
+}
diff --git a/src/addresses/Polygon_zkEVM.sol b/src/addresses/Polygon_zkEVM.sol
new file mode 100644
index 0000000..28a4891
--- /dev/null
+++ b/src/addresses/Polygon_zkEVM.sol
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: ISC
+pragma solidity >=0.8.0;
+
+// **NOTE** Generated code, do not modify.  Run 'npm run generate:constants'.
+
+import { TestBase } from "forge-std/Test.sol";
+
+library Canonicals {
+    address internal constant FRAX = 0xFf8544feD5379D9ffa8D47a74cE6b91e632AC44D;
+    address internal constant FXS = 0x6b856a14CeA1d7dCfaF80fA6936c0b75972cCacE;
+    address internal constant FPI = 0x7E5845b1bFc9e6620893e48346bdB8541995a8D9;
+    address internal constant FPIS = 0xdE7df9036801676aF0cB73661d93a098c0085fba;
+    address internal constant FRXETH = 0xCf7eceE185f19e2E970a301eE37F93536ed66179;
+    address internal constant SFRXETH = 0x7c2aF1Fb79D0b1c67d4eb802d44C673D0A1D2C04;
+    address internal constant SFRAX = 0x2C37fb628b35dfdFD515d41B0cAAe11B542773C3;
+}
+
+library Farms {}
+
+library FraxBonds {}
+
+library FraxFerry {
+    address internal constant FRAXFERRY_V2__ETHEREUM_POLYGON_ZKEVM__FRAX__POLYZKEVM_SIDE =
+        0xEaBd7625056bbD2c260f90D0B08759C69d971a5B;
+    address internal constant FRAXFERRY_V2__ETHEREUM_POLYGON_ZKEVM__FXS__POLYZKEVM_SIDE =
+        0x96720C1E893bB69C14291d8a85475ED9BC484b26;
+    address internal constant FRAXFERRY_V2__ETHEREUM_POLYGON_ZKEVM__FPI__POLYZKEVM_SIDE =
+        0xA31001fbe938C520C27204b984817d998bAeA885;
+    address internal constant FRAXFERRY_V2__ETHEREUM_POLYGON_ZKEVM__FPIS__POLYZKEVM_SIDE =
+        0x3d1bc21F8991091538FfEf535Fe96A449794461C;
+    address internal constant FRAXFERRY_V2__ETHEREUM_POLYGON_ZKEVM__FRXETH__POLYZKEVM_SIDE =
+        0xA711F85672899331900359e5b89848A30BeEBDBe;
+    address internal constant FRAXFERRY_V2__ETHEREUM_POLYGON_ZKEVM__SFRXETH__POLYZKEVM_SIDE =
+        0x4DB406906835ca0B28bFbef344c7d2C707BC4947;
+    address internal constant FRAXFERRY_V2__ETHEREUM_POLYGON_ZKEVM__SFRAX__POLYZKEVM_SIDE =
+        0xE30521fe7f3bEB6Ad556887b50739d6C7CA667E6;
+    address internal constant CAPTAIN = 0xBB437059584e30598b3AF0154472E47E6e2a45B9;
+    address internal constant FIRST_OFFICER = 0xBB437059584e30598b3AF0154472E47E6e2a45B9;
+    address internal constant CREWMEMBER = 0xBB437059584e30598b3AF0154472E47E6e2a45B9;
+}
+
+library FraxlendAndOracles {}
+
+library Fraxswap {}
+
+library Misc {}
+
+library Multisigs {
+    address internal constant COMBO_ORACLE = 0x030BD43af99cb72B51dA233A73F7697Cd2461C0b;
+    address internal constant COMBO_ORACLE_UNIV2_UNIV3 = 0x967d0c5f7362A54b156cf2831Fb17dA8681FAD7D;
+}
+
+library PoolRelatedTokens {}