diff --git a/src/addresses/Ethereum.sol b/src/addresses/Ethereum.sol
index e4f121b..fbd8ecf 100644
--- a/src/addresses/Ethereum.sol
+++ b/src/addresses/Ethereum.sol
@@ -898,10 +898,10 @@ library FraxtalL1 {
     address internal constant PROXY_ADMIN = 0x13Fe62cB24aEa5afd179F20D362c056c3881ABcA;
     address internal constant SUPERCHAIN_CONFIG_PROXY = 0x61ca43CB037aC9181d8Fa5CD0073dC314065Ccc4;
     address internal constant SYSTEM_CONFIG_PROXY = 0x34a9f273cbD847d49c3De015FC26c3E66825f8b2;
-    uint256 internal constant CHAIN_ID = 1;
 }
 
 library Misc {
+    uint256 internal constant CHAIN_ID = 1;
     address internal constant AAVE_AMO = 0x66635DC1EdEfF19e839f152a67278151Aa6e1B61;
     address internal constant AMO_MINTER = 0xcf37B62109b537fa0Cb9A90Af4CA72f6fb85E241; // Old: 0xF9931973fCc0c37908687Eec2CCB28fC3B94B086
     address internal constant AMO_MINTER_OLD = 0x36a0B6a5F7b318A2B4Af75FFFb1b51a5C78dEB8C;
diff --git a/src/addresses/Fraxtal_L1_Devnet.sol b/src/addresses/Fraxtal_L1_Devnet.sol
index bf31249..c36b78e 100644
--- a/src/addresses/Fraxtal_L1_Devnet.sol
+++ b/src/addresses/Fraxtal_L1_Devnet.sol
@@ -6,14 +6,14 @@ pragma solidity >=0.8.0;
 import { TestBase } from "forge-std/Test.sol";
 
 library Canonicals {
-    address internal constant FRAX = 0xac3E018457B222d93114458476f3E3416Abbe38F;
-    address internal constant FXS = 0xbAFA44EFE7901E04E39Dad13167D089C559c1138;
-    address internal constant FPI = 0x67218f66a84809201CfBa5c8b46dBd3aB95A42da;
-    address internal constant FPIS = 0xC0497C072d3015fd7D45893157bCDCC1BcfEb6b5;
-    address internal constant FRXBTC = 0x3fe0150F6Daa6a54C585f85f0e78d665532e5b74;
-    address internal constant FRXETH = 0xB1C4e5a15544f005166880749C46D35a00916462;
-    address internal constant SFRXETH = 0x56390acF12bce9675ab3922060D8d955149BE286;
-    address internal constant SFRAX = 0x1D348307745645b91c49716Fae22Ad5d4CC0b94a;
+    address internal constant FRAX = 0x114a0318Da080A2Ee3380269d796E93DF767D24F;
+    address internal constant FXS = 0xD86518aDB08DF9AcF9E84EB216d7862bc0F634C0;
+    address internal constant FPI = 0xfC75d8fD01fD999D2A4731a01d87131b40A8a645;
+    address internal constant FPIS = 0x9445aD9a63def63CA9D23cfd7cd72538BbF1780A;
+    address internal constant FRXBTC = 0x2a2acd879050aC8910d80dccb428a0AEf77fFA36;
+    address internal constant FRXETH = 0x51Ed07ceB785d2983e56CF00CAf65499dae5df3B;
+    address internal constant SFRXETH = 0x2787eC65f085acbbE94F1bB7E099dF06B56b6DaC;
+    address internal constant SFRAX = 0xB26fDD0FF10A287a73EFaa0b18A0e57fd8168835;
 }
 
 library Farms {}
@@ -27,9 +27,12 @@ library FraxlendAndOracles {}
 library Fraxswap {}
 
 library Misc {
-    address internal constant FRXETH_MINTER = 0x80f1C4F5CD94D49e98D0a975690796f1E8C0379e;
+    uint256 internal constant CHAIN_ID = 2520;
+    address internal constant FRXETH_MINTER = 0x890205b3397a1F273BaD55476F2856886964E788;
 }
 
-library Multisigs {}
+library Multisigs {
+    address internal constant COMPTROLLER = 0x8b1E899ec5d51387a41Ee68261149F7d3Dfd7160;
+}
 
 library PoolRelatedTokens {}
diff --git a/src/addresses/Fraxtal_L2_Devnet.sol b/src/addresses/Fraxtal_L2_Devnet.sol
index 85e8a11..8e90cac 100644
--- a/src/addresses/Fraxtal_L2_Devnet.sol
+++ b/src/addresses/Fraxtal_L2_Devnet.sol
@@ -27,14 +27,19 @@ library FraxlendAndOracles {}
 library Fraxswap {}
 
 library Misc {
-    address internal constant FRAXCHAIN_ADMIN = 0x8b1E899ec5d51387a41Ee68261149F7d3Dfd7160;
-    address internal constant L2_STANDARD_BRIDGE = 0x4200000000000000000000000000000000000010;
+    uint256 internal constant CHAIN_ID = 2521;
     address internal constant PROXY_ADMIN = 0xfC00000000000000000000000000000000000009;
 }
 
 library Multisigs {
-    address internal constant PROXY_ADMIN = 0xfC00000000000000000000000000000000000009;
     address internal constant COMPTROLLER = 0x8b1E899ec5d51387a41Ee68261149F7d3Dfd7160;
 }
 
 library PoolRelatedTokens {}
+
+library SystemContracts {
+    address internal constant CROSS_DOMAIN_MESSENGER = 0x4200000000000000000000000000000000000007;
+    address internal constant ERC20_FACTORY_PROXY = 0x4200000000000000000000000000000000000012;
+    address internal constant L2_STANDARD_BRIDGE_PROXY = 0x4200000000000000000000000000000000000010;
+    address internal constant L2_TO_L1_MESSAGE_PASSER = 0x4200000000000000000000000000000000000016;
+}
diff --git a/src/addresses/Fraxtal_Testnet.sol b/src/addresses/Fraxtal_Testnet.sol
new file mode 100644
index 0000000..9fbd714
--- /dev/null
+++ b/src/addresses/Fraxtal_Testnet.sol
@@ -0,0 +1,43 @@
+// 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 = 0xFc00000000000000000000000000000000000001;
+    address internal constant FXS = 0xFc00000000000000000000000000000000000002;
+    address internal constant FPI = 0xFc00000000000000000000000000000000000003;
+    address internal constant FPIS = 0xfc00000000000000000000000000000000000004;
+    address internal constant SFRXETH = 0xFC00000000000000000000000000000000000005;
+    address internal constant WFRXETH = 0xFC00000000000000000000000000000000000006;
+}
+
+library Farms {}
+
+library FraxBonds {}
+
+library FraxFerry {}
+
+library FraxlendAndOracles {}
+
+library Fraxswap {}
+
+library Misc {
+    uint256 internal constant CHAIN_ID = 2522;
+    address internal constant PROXY_ADMIN = 0xfC00000000000000000000000000000000000007;
+}
+
+library Multisigs {
+    address internal constant COMPTROLLER = 0x8b1E899ec5d51387a41Ee68261149F7d3Dfd7160;
+}
+
+library PoolRelatedTokens {}
+
+library SystemContracts {
+    address internal constant CROSS_DOMAIN_MESSENGER = 0x4200000000000000000000000000000000000007;
+    address internal constant ERC20_FACTORY_PROXY = 0x4200000000000000000000000000000000000012;
+    address internal constant L2_STANDARD_BRIDGE_PROXY = 0x4200000000000000000000000000000000000010;
+    address internal constant L2_TO_L1_MESSAGE_PASSER = 0x4200000000000000000000000000000000000016;
+}
diff --git a/src/addresses/Holesky.sol b/src/addresses/Holesky.sol
index bb33df7..c3181d7 100644
--- a/src/addresses/Holesky.sol
+++ b/src/addresses/Holesky.sol
@@ -32,3 +32,18 @@ library Misc {
 library Multisigs {}
 
 library PoolRelatedTokens {}
+
+library FraxtalL1 {
+    address internal constant ADDRESS_MANAGER = 0x6C52d1f7aAdD1F27aaa6A9e228CE0312E3CB09A6;
+    address internal constant FRAXTAL_COMPTROLLER = 0x88699c59E413e8A47117820D15d8D33b09B21edD;
+    address internal constant L1_CROSS_DOMAIN_MESSENGER_PROXY = 0x45A98115D5722C6cfC48D711e0053758E7C0b8ad;
+    address internal constant L1_ERC721_BRIDGE_PROXY = 0x0301A6b26a37566d3DCebC7fC4c2143B426bBf53;
+    address internal constant L1_STANDARD_BRIDGE_PROXY = 0x0BaafC217162f64930909aD9f2B27125121d6332;
+    address internal constant L2_OUTPUT_ORACLE_PROXY = 0x715EA64DA13F4d0831ece4Ad3E8c1aa013167F32;
+    address internal constant OPTIMISM_MINTABLE_ERC20_FACTORY_PROXY = 0x740fAfe2383F736d0Bd1a042E50fE15dDa2726C6;
+    address internal constant OPTIMISM_PORTAL_PROXY = 0xB9c64BfA498d5b9a8398Ed6f46eb76d90dE5505d;
+    address internal constant PROTOCOL_VERSIONS_PROXY = 0x0D2d3D6540638291C50db5521527d4115c8eddB7;
+    address internal constant PROXY_ADMIN = 0xA0c6294D524f56fF9BdAeE94b69064c529cB9a1e;
+    address internal constant SUPERCHAIN_CONFIG_PROXY = 0x089065000De745708B5EE76Be5dF236Eb6453b82;
+    address internal constant SYSTEM_CONFIG_PROXY = 0x570Bf63A187776A19a44E6D1e055E3da65C1E3Db;
+}