diff --git a/networks.json b/networks.json
index a89265f..ca8d65b 100644
--- a/networks.json
+++ b/networks.json
@@ -27,16 +27,16 @@
   },
   "arbitrum-one": {
     "ERC20PoolFactory": {
-      "address": "0x595c823EdAA612972d77aCf324C11F6284B9f5F6",
-      "startBlock": 167209839
+      "address": "0xA3A1e968Bd6C578205E11256c8e6929f21742aAF",
+      "startBlock": 171455195
     },
     "ERC721PoolFactory": {
-      "address": "0xA9Ada58DD3c820b30D3bf5B490226F2ef92107bA",
-      "startBlock": 167209839
+      "address": "0x6ae3324612bEfD4AE460244c369f30Ab9CB8cAE2",
+      "startBlock": 171455195
     },
     "PositionManager": {
-      "address": "0xfD83174bebA9eB582EB67e11df7a234B25612dDa",
-      "startBlock": 167209839
+      "address": "0x9A0BE971530Ed2B53597AC9155AC050ca1Bab7A3",
+      "startBlock": 171455195
     },
     "GrantFund": {
       "address": "0x0000000000000000000000000000000000000000",
@@ -53,16 +53,16 @@
   },
   "base": {
     "ERC20PoolFactory": {
-      "address": "0x154FFf344f426F99E328bacf70f4Eb632210ecdc",
-      "startBlock": 8797468
+      "address": "0x214f62B5836D83f3D6c4f71F174209097B1A779C",
+      "startBlock": 9367126
     },
     "ERC721PoolFactory": {
-      "address": "0xd8B6729E20d141a03eC4BcAC17F1441CD85975C3",
-      "startBlock": 8797468
+      "address": "0xeefEC5d1Cc4bde97279d01D88eFf9e0fEe981769",
+      "startBlock": 9367126
     },
     "PositionManager": {
-      "address": "0xA650Fad48AA4F9cF3a5858460563B2227d6BD4E7",
-      "startBlock": 8797468
+      "address": "0x59710a4149A27585f1841b5783ac704a08274e64",
+      "startBlock": 9367126
     },
     "GrantFund": {
       "address": "0x0000000000000000000000000000000000000000",
@@ -79,16 +79,16 @@
   },
   "matic": {
     "ERC20PoolFactory": {
-      "address": "0x3D6b8B4a2AEC46961AE337F4A9EBbf283aA482AA",
-      "startBlock": 51974039
+      "address": "0x1f172F881eBa06Aa7a991651780527C173783Cf6",
+      "startBlock": 52443388
     },
     "ERC721PoolFactory": {
-      "address": "0x1D705aa62DC4E95fd8A473476aF619AD0853E560",
-      "startBlock": 51974039
+      "address": "0x8B7f874D15c25BeCC4F7c1906b3677533fe60A6e",
+      "startBlock": 52443388
     },
     "PositionManager": {
-      "address": "0x4f5c573115c8F66F046Ab3328e44Ebc4335A584e",
-      "startBlock": 51974039
+      "address": "0xb8DA113516bfb986B7b8738a76C136D1c16c5609",
+      "startBlock": 52443388
     },
     "GrantFund": {
       "address": "0x0000000000000000000000000000000000000000",
@@ -105,16 +105,16 @@
   },
   "optimism": {
     "ERC20PoolFactory": {
-      "address": "0x43cD60250CBBC0C22663438dcf644F5162988C06",
-      "startBlock": 114432276
+      "address": "0x609C4e8804fafC07c96bE81A8a98d0AdCf2b7Dfa",
+      "startBlock": 114962902
     },
     "ERC721PoolFactory": {
-      "address": "0x7F4bE0828dC1523A27f20a597d1F1bB4b5134123",
-      "startBlock": 114432276
+      "address": "0xAAa20ba75A7ed4Fa895E4659861448a828fa6E48",
+      "startBlock": 114962902
     },
     "PositionManager": {
-      "address": "0x80A21A780f1300aa37Df1CCA0F96981FBc2785BD",
-      "startBlock": 114432276
+      "address": "0x72bF565f2BdA43294C6cC2BfE17C7FaE5258F819",
+      "startBlock": 114962902
     },
     "GrantFund": {
       "address": "0x0000000000000000000000000000000000000000",
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 90cbd3e..d0c2d47 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -30,26 +30,26 @@ export const MAX_BUCKET_INDEX = 4156;
 // Pool addresses per network
 export const poolInfoUtilsAddressTable = new TypedMap<string, Address>()
 poolInfoUtilsAddressTable.set('mainnet', Address.fromString('0x30c5eF2997d6a882DE52c4ec01B6D0a5e5B4fAAE'))
-poolInfoUtilsAddressTable.set('arbitrum-one', Address.fromString('0x08432Bb9A4D302450fFAaFD647A0A121D3a143cC'))
-poolInfoUtilsAddressTable.set('base', Address.fromString('0x1358e3be37C191Eb5B842F673fcB5C79Cc4F6644'))
-poolInfoUtilsAddressTable.set('matic', Address.fromString('0x68C75c041BC36AFdce7cae2578BEe31a24888885'))
-poolInfoUtilsAddressTable.set('optimism', Address.fromString('0x6293C850837d617DE66ddf7d8744E2BDbD913A90'))
+poolInfoUtilsAddressTable.set('arbitrum-one', Address.fromString('0x8a7F5aFb7E3c3fD1f3Cc9D874b454b6De11EBbC9'))
+poolInfoUtilsAddressTable.set('base', Address.fromString('0x97fa9b0909C238D170C1ab3B5c728A3a45BBEcBa'))
+poolInfoUtilsAddressTable.set('matic', Address.fromString('0x519021054846cd3D9883359B593B5ED3058Fbe9f'))
+poolInfoUtilsAddressTable.set('optimism', Address.fromString('0xdE6C8171b5b971F71C405631f4e0568ed8491aaC'))
 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('matic', Address.fromString('0xf4E41CC3dd4627B7CD5d43ceEe09eD24d5FB9Ec4'))
-poolInfoUtilsMulticallAddressTable.set('optimism', Address.fromString('0x52DA47c2d656dBB656FEd421010FfFA6f7354B71'))
+poolInfoUtilsMulticallAddressTable.set('arbitrum-one', Address.fromString('0xCcaf0542c78A3A5e55f99630a2B126A5BAA44FC3'))
+poolInfoUtilsMulticallAddressTable.set('base', Address.fromString('0x249BCE105719Ae4183204371697c2743800C225d'))
+poolInfoUtilsMulticallAddressTable.set('matic', Address.fromString('0xe6F4d9711121e5304b30aC2Aae57E3b085ad3c4d'))
+poolInfoUtilsMulticallAddressTable.set('optimism', Address.fromString('0x33e5c2b41e915acFC268a4eaACC567f612f96601'))
 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('matic', Address.fromString('0x4f5c573115c8F66F046Ab3328e44Ebc4335A584e'))
-positionManagerAddressTable.set('optimism', Address.fromString('0x80A21A780f1300aa37Df1CCA0F96981FBc2785BD'))
+positionManagerAddressTable.set('arbitrum-one', Address.fromString('0x9A0BE971530Ed2B53597AC9155AC050ca1Bab7A3'))
+positionManagerAddressTable.set('base', Address.fromString('0x59710a4149A27585f1841b5783ac704a08274e64'))
+positionManagerAddressTable.set('matic', Address.fromString('0xb8DA113516bfb986B7b8738a76C136D1c16c5609'))
+positionManagerAddressTable.set('optimism', Address.fromString('0x72bF565f2BdA43294C6cC2BfE17C7FaE5258F819'))
 positionManagerAddressTable.set('goerli', Address.fromString('0x7b6C6917ACA28BA790837d41e5aA4A49c9Ad4570'))
 positionManagerAddressTable.set('ganache', Address.fromString('0xdF7403003a16c49ebA5883bB5890d474794cea5a'))