diff --git a/networks.json b/networks.json
index 1ee5a9c..aae1afa 100644
--- a/networks.json
+++ b/networks.json
@@ -103,6 +103,32 @@
       "startBlock": 46312499
     }
   },
+  "optimism": {
+    "ERC20PoolFactory": {
+      "address": "0x43cD60250CBBC0C22663438dcf644F5162988C06",
+      "startBlock": 114432276
+    },
+    "ERC721PoolFactory": {
+      "address": "0x7F4bE0828dC1523A27f20a597d1F1bB4b5134123",
+      "startBlock": 114432276
+    },
+    "PositionManager": {
+      "address": "0x80A21A780f1300aa37Df1CCA0F96981FBc2785BD",
+      "startBlock": 114432276
+    },
+    "GrantFund": {
+      "address": "0x0000000000000000000000000000000000000000",
+      "startBlock": 114432276
+    },
+    "AjnaToken": {
+      "address": "0x6c518f9D1a163379235816c543E62922a79863Fa",
+      "startBlock": 108793581
+    },
+    "BurnWrappedAjna": {
+      "address": "0x0000000000000000000000000000000000000000",
+      "startBlock": 114432276
+    }
+  },
   "goerli": {
     "ERC20PoolFactory": {
       "address": "0xDB61f8aD0B3ed0c5522b8FE71b80023fe9188e9e",
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 53bee80..a101ee4 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -33,18 +33,21 @@ poolInfoUtilsAddressTable.set('mainnet', Address.fromString('0x30c5eF2997d6a882D
 poolInfoUtilsAddressTable.set('arbitrum-one', Address.fromString('0x08432Bb9A4D302450fFAaFD647A0A121D3a143cC'))
 poolInfoUtilsAddressTable.set('base', Address.fromString('0x1358e3be37C191Eb5B842F673fcB5C79Cc4F6644'))
 poolInfoUtilsAddressTable.set('matic', Address.fromString('0xA9Ada58DD3c820b30D3bf5B490226F2ef92107bA'))
+poolInfoUtilsAddressTable.set('optimism', Address.fromString('0x6293C850837d617DE66ddf7d8744E2BDbD913A90'))
 poolInfoUtilsAddressTable.set('goerli', Address.fromString('0xdE8D83e069F552fbf3EE5bF04E8C4fa53a097ee5'))
 poolInfoUtilsAddressTable.set('ganache', Address.fromString('0x6c5c7fD98415168ada1930d44447790959097482'))
 export const poolInfoUtilsMulticallAddressTable = new TypedMap<string, Address>()
 poolInfoUtilsMulticallAddressTable.set('mainnet', Address.fromString('0xe4e553243264f2bF7C135F1eC3a8c09078731227'))
 poolInfoUtilsMulticallAddressTable.set('arbitrum-one', Address.fromString('0x54835857382f9617D8f031d5fF535BED0904ECFB'))
 poolInfoUtilsMulticallAddressTable.set('base', Address.fromString('0x372F9c6A49a4E68e47459Eed6e6452c0823956b6'))
+poolInfoUtilsMulticallAddressTable.set('optimism', Address.fromString('0x52DA47c2d656dBB656FEd421010FfFA6f7354B71'))
 poolInfoUtilsMulticallAddressTable.set('goerli', Address.fromString('0x63feF8659ECdC4F909ddFB55a8B701957115B906'))
 poolInfoUtilsMulticallAddressTable.set('ganache', Address.fromString('0x6548dF23A854f72335902e58a1e59B50bb3f11F1'))
 export const positionManagerAddressTable = new TypedMap<string, Address>()
 positionManagerAddressTable.set('mainnet', Address.fromString('0x87B0F458d8F1ACD28A83A748bFFbE24bD6B701B1'))
 positionManagerAddressTable.set('arbitrum-one', Address.fromString('0xfD83174bebA9eB582EB67e11df7a234B25612dDa'))
 positionManagerAddressTable.set('base', Address.fromString('0xA650Fad48AA4F9cF3a5858460563B2227d6BD4E7'))
+positionManagerAddressTable.set('optimism', Address.fromString('0x80A21A780f1300aa37Df1CCA0F96981FBc2785BD'))
 positionManagerAddressTable.set('goerli', Address.fromString('0x7b6C6917ACA28BA790837d41e5aA4A49c9Ad4570'))
 positionManagerAddressTable.set('ganache', Address.fromString('0xdF7403003a16c49ebA5883bB5890d474794cea5a'))