Latest

mehranhydary · Sep 17, 2024 · bcfe03b · bcfe03b
1 parent 1a7ad54
commit bcfe03b
Show file tree

Hide file tree

Showing 19 changed files with 3,006 additions and 883 deletions.
diff --git a/contracts/broadcast/MiladyPoolDeployer.s.sol/31337/run-1726546522.json b/contracts/broadcast/MiladyPoolDeployer.s.sol/31337/run-1726546522.json
diff --git a/contracts/broadcast/MiladyPoolDeployer.s.sol/31337/run-latest.json b/contracts/broadcast/MiladyPoolDeployer.s.sol/31337/run-latest.json
diff --git a/contracts/broadcast/V4Deployer.s.sol/31337/run-1726546483.json b/contracts/broadcast/V4Deployer.s.sol/31337/run-1726546483.json
diff --git a/contracts/broadcast/V4Deployer.s.sol/31337/run-latest.json b/contracts/broadcast/V4Deployer.s.sol/31337/run-latest.json
@@ -1,7 +1,7 @@
 {
   "transactions": [
     {
-      "hash": "0xeaf6af7648b243e51a3e6eab2b081965c92eaccebafc5d16c1e5db3f7b64da8c",
+      "hash": "0x49cee968212525e47c41a5fb7c23bf12820c6821f3f0278bfd90763413cd7f12",
       "transactionType": "CREATE",
       "contractName": "PoolManager",
       "contractAddress": "0x67d269191c92caf3cd7723f116c85e6e9bf55933",
@@ -21,7 +21,7 @@
       "isFixedGasLimit": false
     },
     {
-      "hash": "0xf417853e95d96154e95baa2849a0702b798da67ee59b1dd65c071f3c2f47bf88",
+      "hash": "0x273986548f9f19c015f3f00b58effd3015a2100546c2ef69621d79878da10076",
       "transactionType": "CREATE",
       "contractName": "PoolSwapTest",
       "contractAddress": "0xe6e340d132b5f46d1e472debcd681b2abc16e57e",
@@ -41,7 +41,7 @@
       "isFixedGasLimit": false
     },
     {
-      "hash": "0x6ab286ac68df8c2fa0e7f656e77bd90b76574308958fb71097424a4da1c7eafa",
+      "hash": "0xab7dd5b26570205a1fd9e3449c9c7745cd80ec3291d3438ee8e4bf4551a57727",
       "transactionType": "CREATE",
       "contractName": "MiladyPoolRouter",
       "contractAddress": "0xc3e53f4d16ae77db1c982e75a937b9f60fe63690",
@@ -61,7 +61,7 @@
       "isFixedGasLimit": false
     },
     {
-      "hash": "0xcf0d0342d596f388349e5db6fe8866a2e6a1e2265ffee982f948bca561bfaaa8",
+      "hash": "0xcc30fe929d6257ce24c52b86b4c74ff842a707b42f5df6b69cc0224f3fbce940",
       "transactionType": "CREATE",
       "contractName": "PoolModifyLiquidityTest",
       "contractAddress": "0x84ea74d481ee0a5332c457a4d796187f6ba67feb",
@@ -81,7 +81,7 @@
       "isFixedGasLimit": false
     },
     {
-      "hash": "0x07f1a3ca9013e3de3d3a9188d5b59a878505b16726fb94821078534400d0608c",
+      "hash": "0x47fdb7ee4901e9abd75ee6916021c5924b6eb0bfc1d0403ce46b118dbbadce24",
       "transactionType": "CREATE",
       "contractName": "PoolDonateTest",
       "contractAddress": "0x9e545e3c0baab3e08cdfd552c960a1050f373042",
@@ -101,7 +101,7 @@
       "isFixedGasLimit": false
     },
     {
-      "hash": "0x956b7218c3d0e8258cba0bd0a0c2f64fd54de78c1e2c20be79ce346b4d4bd7f9",
+      "hash": "0xefcc4a50102e72a5479f3ca517e3e152fff92499c4dcfb4df261beb0e4e35968",
       "transactionType": "CREATE",
       "contractName": "PoolTakeTest",
       "contractAddress": "0xa82ff9afd8f496c3d6ac40e2a0f282e47488cfc9",
@@ -121,7 +121,7 @@
       "isFixedGasLimit": false
     },
     {
-      "hash": "0xd7180d5494098eb42182961f0e2ce07c6fd90c1ab7e9e29e9e90d5c41de18ec1",
+      "hash": "0x058a74445688905e8ed0d7ecbfe7ae83dad7f12080f25e6294f44480b4c2fdee",
       "transactionType": "CREATE",
       "contractName": "PoolClaimsTest",
       "contractAddress": "0x1613beb3b2c4f22ee086b2b38c1476a3ce7f78e8",
@@ -154,142 +154,142 @@
             "0x000000000000000000000000f39fd6e51aad88f6f4ce6ab8827279cfffb92266"
           ],
           "data": "0x",
-          "blockHash": "0xff24919d420becc915cae69da33bbb37f073954e273c8391851d88a548e5bede",
-          "blockNumber": "0xd",
-          "blockTimestamp": "0x66e8e576",
-          "transactionHash": "0xeaf6af7648b243e51a3e6eab2b081965c92eaccebafc5d16c1e5db3f7b64da8c",
+          "blockHash": "0x9d22142167b852f7d7a05d82959795218235fc77a4d6a781bac722285852dc25",
+          "blockNumber": "0xe",
+          "blockTimestamp": "0x66e90233",
+          "transactionHash": "0x49cee968212525e47c41a5fb7c23bf12820c6821f3f0278bfd90763413cd7f12",
           "transactionIndex": "0x0",
           "logIndex": "0x0",
           "removed": false
         }
       ],
       "logsBloom": "0x00000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000001000000000000000000000000000000000000020000000000000100000800000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000002000000000000000000020000000000000000000000000000000000000000000000000004000000000000000",
       "type": "0x2",
-      "transactionHash": "0xeaf6af7648b243e51a3e6eab2b081965c92eaccebafc5d16c1e5db3f7b64da8c",
+      "transactionHash": "0x49cee968212525e47c41a5fb7c23bf12820c6821f3f0278bfd90763413cd7f12",
       "transactionIndex": "0x0",
-      "blockHash": "0xff24919d420becc915cae69da33bbb37f073954e273c8391851d88a548e5bede",
-      "blockNumber": "0xd",
+      "blockHash": "0x9d22142167b852f7d7a05d82959795218235fc77a4d6a781bac722285852dc25",
+      "blockNumber": "0xe",
       "gasUsed": "0x3df6a9",
-      "effectiveGasPrice": "0x100ea39e",
+      "effectiveGasPrice": "0xe0ec938",
       "blobGasPrice": "0x1",
       "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
       "to": null,
       "contractAddress": "0x67d269191c92caf3cd7723f116c85e6e9bf55933",
-      "root": "0x4d4c84f7286e5190d3cbdcfcc741def5b13949fc5c6c4cd4aca6176877e8deeb"
+      "root": "0x21119ed7c86e222b81a49b31296d6be59f741f8a53794c76c18ade694a1b6809"
     },
     {
       "status": "0x1",
-      "cumulativeGasUsed": "0x4fb834",
+      "cumulativeGasUsed": "0x11c18b",
       "logs": [],
       "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
       "type": "0x2",
-      "transactionHash": "0xf417853e95d96154e95baa2849a0702b798da67ee59b1dd65c071f3c2f47bf88",
-      "transactionIndex": "0x1",
-      "blockHash": "0xff24919d420becc915cae69da33bbb37f073954e273c8391851d88a548e5bede",
-      "blockNumber": "0xd",
+      "transactionHash": "0x273986548f9f19c015f3f00b58effd3015a2100546c2ef69621d79878da10076",
+      "transactionIndex": "0x0",
+      "blockHash": "0xd2019cc041d73279c7062030359c6a81a91925b8141201d4280535b77ce7d5f6",
+      "blockNumber": "0xf",
       "gasUsed": "0x11c18b",
-      "effectiveGasPrice": "0x100ea39e",
+      "effectiveGasPrice": "0xcc6b8d0",
       "blobGasPrice": "0x1",
       "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
       "to": null,
       "contractAddress": "0xe6e340d132b5f46d1e472debcd681b2abc16e57e",
-      "root": "0x4d4c84f7286e5190d3cbdcfcc741def5b13949fc5c6c4cd4aca6176877e8deeb"
+      "root": "0x4f054bb73fb50e2e6afa5c87e6c2f32f7f06e0e6f1066b74410c2461561f6d50"
     },
     {
       "status": "0x1",
       "cumulativeGasUsed": "0x15363e",
       "logs": [],
       "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
       "type": "0x2",
-      "transactionHash": "0x6ab286ac68df8c2fa0e7f656e77bd90b76574308958fb71097424a4da1c7eafa",
+      "transactionHash": "0xab7dd5b26570205a1fd9e3449c9c7745cd80ec3291d3438ee8e4bf4551a57727",
       "transactionIndex": "0x0",
-      "blockHash": "0x0f9031e319eda61cd084fd49b6cbd4abc6e9a6bde975f8bcd5c22c64e5a3ddd3",
-      "blockNumber": "0xe",
+      "blockHash": "0x688992252378496f6e73d2d6fab6aaf9fefb294a587c185d0e5f7571d9a23565",
+      "blockNumber": "0x10",
       "gasUsed": "0x15363e",
-      "effectiveGasPrice": "0xebfc6b5",
+      "effectiveGasPrice": "0xb4d9931",
       "blobGasPrice": "0x1",
       "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
       "to": null,
       "contractAddress": "0xc3e53f4d16ae77db1c982e75a937b9f60fe63690",
-      "root": "0x52b383c232df636b6de0446338adbb069f125c0019349ae23de469cffd58ac0e"
+      "root": "0xcaace6f53a25c9b0961dc120e0c2d8700a22043f9cd168f8b6f11d559f12b8fe"
     },
     {
       "status": "0x1",
-      "cumulativeGasUsed": "0x25546b",
+      "cumulativeGasUsed": "0x101e2d",
       "logs": [],
       "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
       "type": "0x2",
-      "transactionHash": "0xcf0d0342d596f388349e5db6fe8866a2e6a1e2265ffee982f948bca561bfaaa8",
-      "transactionIndex": "0x1",
-      "blockHash": "0x0f9031e319eda61cd084fd49b6cbd4abc6e9a6bde975f8bcd5c22c64e5a3ddd3",
-      "blockNumber": "0xe",
+      "transactionHash": "0xcc30fe929d6257ce24c52b86b4c74ff842a707b42f5df6b69cc0224f3fbce940",
+      "transactionIndex": "0x0",
+      "blockHash": "0xe5cfee290b456b5e85f4635493ddffc3d9146f6e5375095c18ca003db4a05e90",
+      "blockNumber": "0x11",
       "gasUsed": "0x101e2d",
-      "effectiveGasPrice": "0xebfc6b5",
+      "effectiveGasPrice": "0xa056b68",
       "blobGasPrice": "0x1",
       "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
       "to": null,
       "contractAddress": "0x84ea74d481ee0a5332c457a4d796187f6ba67feb",
-      "root": "0x52b383c232df636b6de0446338adbb069f125c0019349ae23de469cffd58ac0e"
+      "root": "0x284b90f1e68ba9f4e421a9271a82b8d092d4529d4b8037b6a8767654deb26238"
     },
     {
       "status": "0x1",
-      "cumulativeGasUsed": "0x31912f",
+      "cumulativeGasUsed": "0x1c5af1",
       "logs": [],
       "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
       "type": "0x2",
-      "transactionHash": "0x07f1a3ca9013e3de3d3a9188d5b59a878505b16726fb94821078534400d0608c",
-      "transactionIndex": "0x2",
-      "blockHash": "0x0f9031e319eda61cd084fd49b6cbd4abc6e9a6bde975f8bcd5c22c64e5a3ddd3",
-      "blockNumber": "0xe",
+      "transactionHash": "0x47fdb7ee4901e9abd75ee6916021c5924b6eb0bfc1d0403ce46b118dbbadce24",
+      "transactionIndex": "0x1",
+      "blockHash": "0xe5cfee290b456b5e85f4635493ddffc3d9146f6e5375095c18ca003db4a05e90",
+      "blockNumber": "0x11",
       "gasUsed": "0xc3cc4",
-      "effectiveGasPrice": "0xebfc6b5",
+      "effectiveGasPrice": "0xa056b68",
       "blobGasPrice": "0x1",
       "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
       "to": null,
       "contractAddress": "0x9e545e3c0baab3e08cdfd552c960a1050f373042",
-      "root": "0x52b383c232df636b6de0446338adbb069f125c0019349ae23de469cffd58ac0e"
+      "root": "0x284b90f1e68ba9f4e421a9271a82b8d092d4529d4b8037b6a8767654deb26238"
     },
     {
       "status": "0x1",
-      "cumulativeGasUsed": "0x3be0c1",
+      "cumulativeGasUsed": "0x26aa83",
       "logs": [],
       "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
       "type": "0x2",
-      "transactionHash": "0x956b7218c3d0e8258cba0bd0a0c2f64fd54de78c1e2c20be79ce346b4d4bd7f9",
-      "transactionIndex": "0x3",
-      "blockHash": "0x0f9031e319eda61cd084fd49b6cbd4abc6e9a6bde975f8bcd5c22c64e5a3ddd3",
-      "blockNumber": "0xe",
+      "transactionHash": "0xefcc4a50102e72a5479f3ca517e3e152fff92499c4dcfb4df261beb0e4e35968",
+      "transactionIndex": "0x2",
+      "blockHash": "0xe5cfee290b456b5e85f4635493ddffc3d9146f6e5375095c18ca003db4a05e90",
+      "blockNumber": "0x11",
       "gasUsed": "0xa4f92",
-      "effectiveGasPrice": "0xebfc6b5",
+      "effectiveGasPrice": "0xa056b68",
       "blobGasPrice": "0x1",
       "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
       "to": null,
       "contractAddress": "0xa82ff9afd8f496c3d6ac40e2a0f282e47488cfc9",
-      "root": "0x52b383c232df636b6de0446338adbb069f125c0019349ae23de469cffd58ac0e"
+      "root": "0x284b90f1e68ba9f4e421a9271a82b8d092d4529d4b8037b6a8767654deb26238"
     },
     {
       "status": "0x1",
       "cumulativeGasUsed": "0x8562a",
       "logs": [],
       "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
       "type": "0x2",
-      "transactionHash": "0xd7180d5494098eb42182961f0e2ce07c6fd90c1ab7e9e29e9e90d5c41de18ec1",
+      "transactionHash": "0x058a74445688905e8ed0d7ecbfe7ae83dad7f12080f25e6294f44480b4c2fdee",
       "transactionIndex": "0x0",
-      "blockHash": "0xe47bd0c1c246621c0f3d90c3f3682912d23a68b02c5ae0a30762d4aaa19ea38b",
-      "blockNumber": "0xf",
+      "blockHash": "0xe995017d12b89a963e4bf5944d73a1646c44734021a7091751c69e730c329565",
+      "blockNumber": "0x13",
       "gasUsed": "0x8562a",
-      "effectiveGasPrice": "0xd6346f2",
+      "effectiveGasPrice": "0x7db8d1b",
       "blobGasPrice": "0x1",
       "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
       "to": null,
       "contractAddress": "0x1613beb3b2c4f22ee086b2b38c1476a3ce7f78e8",
-      "root": "0x0ffaf3c26221e47835cdc4f0a9bf11e061e170b4d7a96499e66543bbd263a74c"
+      "root": "0x1153fafef9e51f82ed0a6bf4200fb70a6a0a30770c7d73d5539482a2f15c384b"
     }
   ],
   "libraries": [],
   "pending": [],
   "returns": {},
-  "timestamp": 1726539126,
+  "timestamp": 1726546483,
   "chain": 31337,
-  "commit": "f6c9df1"
+  "commit": "1a7ad54"
 }
diff --git a/contracts/script/output/31337/milady_pool_avs_deployment_output.json b/contracts/script/output/31337/milady_pool_avs_deployment_output.json
@@ -1,13 +1,13 @@
 {
   "addresses": {
-    "erc20Mock": "0xc5a5C42992dECbae36851359345FE25997F5C42d",
-    "erc20MockStrategy": "0x67d269191c92Caf3cD7723F116c85e6E9bf55933",
-    "miladyPoolOrderManager": "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8",
-    "miladyPoolOrderManagerImplementation": "0xE35E958618A4A898404C2463102F30734DC910C8",
-    "miladyPoolServiceManager": "0xa82fF9aFd8f496c3d6ac40E2a0F282E47488CFc9",
-    "miladyPoolServiceManagerImplementation": "0x4c5859f0F772848b2D91F1D83E2Fe57935348029",
-    "operatorStateRetriever": "0x70e0bA845a1A0F2DA3359C97E0285013525FFC49",
-    "registryCoordinator": "0x851356ae760d987E095750cCeb3bC6014560891C",
-    "registryCoordinatorImplementation": "0x36C02dA8a0983159322a80FFE9F24b1acfF8B570"
+    "erc20Mock": "0x851356ae760d987E095750cCeb3bC6014560891C",
+    "erc20MockStrategy": "0xf5059a5D33d5853360D16C683c16e67980206f36",
+    "miladyPoolOrderManager": "0x0E801D84Fa97b50751Dbf25036d067dCf18858bF",
+    "miladyPoolOrderManagerImplementation": "0xdE353ac9a1A7f6ecc32d44B96c888E90A7135040",
+    "miladyPoolServiceManager": "0x99bbA657f2BbC93c02D617f8bA121cB8Fc104Acf",
+    "miladyPoolServiceManagerImplementation": "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650",
+    "operatorStateRetriever": "0x809d550fca64d94Bd9F66E60752A544199cfAC3D",
+    "registryCoordinator": "0x8f86403A4DE0BB5791fa46B8e795C547942fE4Cf",
+    "registryCoordinatorImplementation": "0x2bdCC0de6bE1f7D2ee689a0342D76F52E8EFABa3"
   }
 }
diff --git a/operator/lib/web3/index.ts b/operator/lib/web3/index.ts
@@ -95,7 +95,7 @@ const submitValidOrder = async (order: OrderWithPoolKey) => {
 }
 
 export const monitorNewTicks = async () => {
-	miladyPoolContract.on('TickUpdated', async (tick: number) => {
+	miladyPoolContract.on('PriceUpdated', async (tick: number) => {
 		console.log(
 			'Tick updated... check orders in the db to see if any qualify'
 		)

diff --git a/ui/src/components/Actions.tsx b/ui/src/components/Actions.tsx
@@ -1,6 +1,6 @@
 import Image from 'next/image'
 import { useState } from 'react'
-import { toast } from 'react-toastify'
+
 import styled from 'styled-components'
 
 const Actions = ({ createOrder }: { createOrder: () => Promise<void> }) => {
@@ -12,7 +12,6 @@ const Actions = ({ createOrder }: { createOrder: () => Promise<void> }) => {
 
 	const onCreateOrderClick = async () => {
 		await createOrder()
-		toast.success('Order created')
 	}
 
 	return (