diff --git a/networks.json b/networks.json
index 0e3cca8..a89265f 100644
--- a/networks.json
+++ b/networks.json
@@ -1,72 +1,72 @@
 {
   "mainnet": {
     "ERC20PoolFactory": {
-      "address": "0xe6F4d9711121e5304b30aC2Aae57E3b085ad3c4d",
-      "startBlock": 17622995
+      "address": "0x6146DD43C5622bB6D12A5240ab9CF4de14eDC625",
+      "startBlock": 18938158
     },
     "ERC721PoolFactory": {
-      "address": "0xb8DA113516bfb986B7b8738a76C136D1c16c5609",
-      "startBlock": 17622995
+      "address": "0x27461199d3b7381De66a85D685828E967E35AF4c",
+      "startBlock": 18938158
     },
     "PositionManager": {
-      "address": "0x0000000000000000000000000000000000000000",
-      "startBlock": 17622995
+      "address": "0x87B0F458d8F1ACD28A83A748bFFbE24bD6B701B1",
+      "startBlock": 18938158
     },
     "GrantFund": {
-      "address": "0x0000000000000000000000000000000000000000",
-      "startBlock": 17622995
+      "address": "0x74d5b005ca64a5C9EE3611Bdc6F6C02D93C84b2f",
+      "startBlock": 18964103
     },
     "AjnaToken": {
       "address": "0x9a96ec9B57Fb64FbC60B423d1f4da7691Bd35079",
-      "startBlock": 17622995
+      "startBlock": 15478977
     },
     "BurnWrappedAjna": {
       "address": "0x936Ab482d6bd111910a42849D3A51Ff80BB0A711",
       "startBlock": 17913208
     }
   },
-  "matic": {
+  "arbitrum-one": {
     "ERC20PoolFactory": {
-      "address": "0x7f18C4DAfA5AEF9B0C4baF47e426bc57494ceE33",
-      "startBlock": 46312499
+      "address": "0x595c823EdAA612972d77aCf324C11F6284B9f5F6",
+      "startBlock": 167209839
     },
     "ERC721PoolFactory": {
-      "address": "0x595c823EdAA612972d77aCf324C11F6284B9f5F6",
-      "startBlock": 46312499
+      "address": "0xA9Ada58DD3c820b30D3bf5B490226F2ef92107bA",
+      "startBlock": 167209839
     },
     "PositionManager": {
-      "address": "0x0000000000000000000000000000000000000000",
-      "startBlock": 46312499
+      "address": "0xfD83174bebA9eB582EB67e11df7a234B25612dDa",
+      "startBlock": 167209839
     },
     "GrantFund": {
       "address": "0x0000000000000000000000000000000000000000",
-      "startBlock": 46312499
+      "startBlock": 167209839
     },
     "AjnaToken": {
-      "address": "0xA63b19647787Da652D0826424460D1BBf43Bf9c6",
-      "startBlock": 46312499
+      "address": "0xA98c94d67D9dF259Bee2E7b519dF75aB00E3E2A8",
+      "startBlock": 167085546
     },
     "BurnWrappedAjna": {
       "address": "0x0000000000000000000000000000000000000000",
-      "startBlock": 46312499
+      "startBlock": 167209839
     }
   },
   "base": {
     "ERC20PoolFactory": {
-      "address": "0xdc01502485c02496a929c12762cE99Fd755c6a25",
-      "startBlock": 8156311
+      "address": "0x154FFf344f426F99E328bacf70f4Eb632210ecdc",
+      "startBlock": 8797468
     },
     "ERC721PoolFactory": {
-      "address": "0x513cc6E8De2FC3c7532d867fc6c287ABb56df230",
-      "startBlock": 8156311
+      "address": "0xd8B6729E20d141a03eC4BcAC17F1441CD85975C3",
+      "startBlock": 8797468
     },
     "PositionManager": {
-      "address": "0x72Ce601AecE3C46eF2b7C85712E05d7c0f29A364",
-      "startBlock": 8156311
+      "address": "0xA650Fad48AA4F9cF3a5858460563B2227d6BD4E7",
+      "startBlock": 8797468
     },
     "GrantFund": {
       "address": "0x0000000000000000000000000000000000000000",
-      "startBlock": 8156311
+      "startBlock": 8797468
     },
     "AjnaToken": {
       "address": "0xf0f326af3b1Ed943ab95C29470730CC8Cf66ae47",
@@ -77,81 +77,107 @@
       "startBlock": 3055193
     }
   },
-  "goerli": {
+  "matic": {
     "ERC20PoolFactory": {
-      "address": "0xA2d6694F24c84e428B97bF9fCD8E3e3dba3023D0",
-      "startBlock": 10243942
+      "address": "0x3D6b8B4a2AEC46961AE337F4A9EBbf283aA482AA",
+      "startBlock": 51974039
     },
     "ERC721PoolFactory": {
-      "address": "0x0CC0Ba1bC6f45513422D6BF301Bd1Cb8c78B5861",
-      "startBlock": 10243942
+      "address": "0x1D705aa62DC4E95fd8A473476aF619AD0853E560",
+      "startBlock": 51974039
     },
     "PositionManager": {
-      "address": "0x20BE7129B4126dC39aadBfA4C3360b52313a660D",
-      "startBlock": 10243942
+      "address": "0x4f5c573115c8F66F046Ab3328e44Ebc4335A584e",
+      "startBlock": 51974039
     },
     "GrantFund": {
-      "address": "0x17C7eb98aD29c8C07C2842C4B64342142C405aF4",
-      "startBlock": 9929353
+      "address": "0x0000000000000000000000000000000000000000",
+      "startBlock": 51974039
     },
     "AjnaToken": {
-      "address": "0xaadebCF61AA7Da0573b524DE57c67aDa797D46c5",
-      "startBlock": 9297080
+      "address": "0xA63b19647787Da652D0826424460D1BBf43Bf9c6",
+      "startBlock": 46312499
     },
     "BurnWrappedAjna": {
-      "address": "0xE38DFd7aB36806B882bD7332a8aE454f2273D015",
-      "startBlock": 9445944
+      "address": "0x0000000000000000000000000000000000000000",
+      "startBlock": 51974039
     }
   },
-  "mumbai": {
+  "optimism": {
     "ERC20PoolFactory": {
-      "address": "0x9f7f111c22a23fFD35E386a243F3780cb3ad0d23",
-      "startBlock": 38580888
+      "address": "0x43cD60250CBBC0C22663438dcf644F5162988C06",
+      "startBlock": 114432276
     },
     "ERC721PoolFactory": {
-      "address": "0xBe8f4De14598e1Eb17FeE8df438AD484E56243F2",
-      "startBlock": 38580888
+      "address": "0x7F4bE0828dC1523A27f20a597d1F1bB4b5134123",
+      "startBlock": 114432276
     },
     "PositionManager": {
-      "address": "0x0000000000000000000000000000000000000000",
-      "startBlock": 38580888
+      "address": "0x80A21A780f1300aa37Df1CCA0F96981FBc2785BD",
+      "startBlock": 114432276
     },
     "GrantFund": {
       "address": "0x0000000000000000000000000000000000000000",
-      "startBlock": 38580888
+      "startBlock": 114432276
     },
     "AjnaToken": {
-      "address": "0x5BC519744f3f0b324E3D5c031e6D18326FD0e8ce",
-      "startBlock": 38580888
+      "address": "0x6c518f9D1a163379235816c543E62922a79863Fa",
+      "startBlock": 108793581
     },
     "BurnWrappedAjna": {
       "address": "0x0000000000000000000000000000000000000000",
-      "startBlock": 38580888
+      "startBlock": 114432276
+    }
+  },
+  "goerli": {
+    "ERC20PoolFactory": {
+      "address": "0xDB61f8aD0B3ed0c5522b8FE71b80023fe9188e9e",
+      "startBlock": 10321610
+    },
+    "ERC721PoolFactory": {
+      "address": "0x8FA83D458CDbB2FCeA66d9bc31FDa80511e0AA56",
+      "startBlock": 10321610
+    },
+    "PositionManager": {
+      "address": "0x7b6C6917ACA28BA790837d41e5aA4A49c9Ad4570",
+      "startBlock": 10321610
+    },
+    "GrantFund": {
+      "address": "0x1b8cDBDcffD4fBdC66dC8540227F007901a196C5",
+      "startBlock": 10327592
+    },
+    "AjnaToken": {
+      "address": "0xaadebCF61AA7Da0573b524DE57c67aDa797D46c5",
+      "startBlock": 9297080
+    },
+    "BurnWrappedAjna": {
+      "address": "0xE38DFd7aB36806B882bD7332a8aE454f2273D015",
+      "startBlock": 9445944
     }
   },
   "ganache": {
     "ERC20PoolFactory": {
-      "address": "0x6C3ff638Ad7D4CA25600b5236CeFcb41B3895F8e",
+      "address": "0x9617ABE221F9A9c492D5348be56aef4Db75A692d",
       "startBlock": 0
     },
     "ERC721PoolFactory": {
-      "address": "0x6fE7DEB17CC00A3d65f3CDf852Bb17DddEddf8E7",
+      "address": "0x4f05DA51eAAB00e5812c54e370fB95D4C9c51F21",
       "startBlock": 0
     },
     "PositionManager": {
-      "address": "0x502dD41556B128C23F8B715dBEEBB73D1F1Feb67",
+      "address": "0xdF7403003a16c49ebA5883bB5890d474794cea5a",
       "startBlock": 0
     },
     "GrantFund": {
-      "address": "0x6F985d253b1Be2a2c9267A447F74fE44F413F2a6",
+      "address": "0x0b3A0ea1Fc7207d3e3ed9973025dA9d0e8fb0F3f",
       "startBlock": 0
     },
     "AjnaToken": {
-      "address": "0x3c55A1F2Dde70ce9481621c67Eb4F6d1d1CB8dBc",
+      "address": "0x25Af17eF4E2E6A4A2CE586C9D25dF87FD84D4a7d",
       "startBlock": 0
     },
     "BurnWrappedAjna": {
-      "address": "0x19FCc2FFFc1AB0f56f3e706a76021560F557241d",
+      "address": "0xE340B87CEd1af1AbE1CE8D617c84B7f168e3b18b",
       "startBlock": 0
     }
   }
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 72e8fc0..90cbd3e 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -29,20 +29,29 @@ export const MAX_BUCKET_INDEX = 4156;
 
 // Pool addresses per network
 export const poolInfoUtilsAddressTable = new TypedMap<string, Address>()
-poolInfoUtilsAddressTable.set('mainnet', Address.fromString('0x154FFf344f426F99E328bacf70f4Eb632210ecdc'))
-poolInfoUtilsAddressTable.set('matic', Address.fromString('0xA9Ada58DD3c820b30D3bf5B490226F2ef92107bA'))
-poolInfoUtilsAddressTable.set('base', Address.fromString('0xC086acc9Bf89D8a0E2209e2870fC020D8f3323a8'))
-poolInfoUtilsAddressTable.set('goerli', Address.fromString('0x3c5cf15122903C7CabcAA49FcfC090D3A311C038'))
-poolInfoUtilsAddressTable.set('mumbai', Address.fromString('0x39250241CC84Dadb1cDFE3A1a717631e2aA603eB'))
-poolInfoUtilsAddressTable.set('ganache', Address.fromString('0xab56A77bDFe82b36875e92CE717fE533C1709A9D'))
+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('goerli', Address.fromString('0xdE8D83e069F552fbf3EE5bF04E8C4fa53a097ee5'))
+poolInfoUtilsAddressTable.set('ganache', Address.fromString('0x6c5c7fD98415168ada1930d44447790959097482'))
 export const poolInfoUtilsMulticallAddressTable = new TypedMap<string, Address>()
-poolInfoUtilsMulticallAddressTable.set('base', Address.fromString('0x83bC7AE84B469Fa4c86a91BA8A82D253c0858e13'))
-poolInfoUtilsMulticallAddressTable.set('goerli', Address.fromString('0xE1a73054BA68f31F029bC6D452DF786D900b3Ed0'))
-poolInfoUtilsMulticallAddressTable.set('ganache', Address.fromString('0x1d00b2f5861457F8503a481774903E36872Ea17d'))
+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('goerli', Address.fromString('0x63feF8659ECdC4F909ddFB55a8B701957115B906'))
+poolInfoUtilsMulticallAddressTable.set('ganache', Address.fromString('0x6548dF23A854f72335902e58a1e59B50bb3f11F1'))
 export const positionManagerAddressTable = new TypedMap<string, Address>()
-positionManagerAddressTable.set('base', Address.fromString('0x72Ce601AecE3C46eF2b7C85712E05d7c0f29A364'))
-positionManagerAddressTable.set('goerli', Address.fromString('0x20BE7129B4126dC39aadBfA4C3360b52313a660D'))
-positionManagerAddressTable.set('ganache', Address.fromString('0x502dD41556B128C23F8B715dBEEBB73D1F1Feb67'))
+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('goerli', Address.fromString('0x7b6C6917ACA28BA790837d41e5aA4A49c9Ad4570'))
+positionManagerAddressTable.set('ganache', Address.fromString('0xdF7403003a16c49ebA5883bB5890d474794cea5a'))
 
 // GrantFund constants
 export const CHALLENGE_PERIOD_LENGTH    = BigInt.fromI32(50400)