Some fixes

packages/app/src/lib/layout/Header.tsx

@@ -25,10 +25,10 @@ const Header = () => {
         <Flex marginLeft="auto" gap={9} align="center" fontWeight="600">
           {/* <Link href="/subscribe">Subscribe</Link> */}
           {/* <Link href="/earn">Earn</Link> */}
-          <Link href={`/markets/13370:${FoilLocal.address}/1722270000`}>
+          <Link href={`/markets/13370:${FoilLocal.address}/1`}>
             Local Market
           </Link>
-          <Link href={`/markets/11155111:${FoilTestnet.address}/1722270000`}>
+          <Link href={`/markets/11155111:${FoilTestnet.address}/1`}>
             Testnet Market
           </Link>
           <Link href="https://docs.foil.xyz">Docs</Link>

packages/protocol/cannonfile.sepolia.toml

@@ -1,5 +1,5 @@
 name="foil"
-version="0.4"
+version="0.5"
 
 [var.settings]
 owner="0xE006B58cA5aB7ba53863012dc3067A14b965C1da"

packages/protocol/cannonfile.toml

@@ -1,10 +1,10 @@
 name="foil"
-version="0.4"
+version="0.5"
 
 [var.settings]
 owner = "0xEB045D78d273107348b0300c01D29B7552D622ab"
 startTime = "1722270000" # Mon Jul 29 2024 16:20:00 GMT+0000
-endTime = "1722458027" # Wed Jul 31 2024 20:33:47 GMT+0000
+endTime = "1725900163" # Fri, 09 Sep 2024 16:42:43 GMT+0000
 baseAssetMinPriceTick = "5200" # 1.709
 baseAssetMaxPriceTick = "28200" # 17.09
 feeRate = "10000" # 1%

packages/protocol/deployments/11155111/EpochConfigurationModule.json

@@ -1,5 +1,5 @@
 {
-  "address": "0x585A9a48190Ff438D69Bbb6F5182843Bc29408d3",
+  "address": "0x233Fdf7aeD41DADcf21E684048649e84769807C5",
   "abi": [
     {
       "type": "function",
@@ -205,6 +205,16 @@
       "name": "MarketAlreadyCreated",
       "inputs": []
     },
+    {
+      "type": "error",
+      "name": "MarketNotInitialized",
+      "inputs": []
+    },
+    {
+      "type": "error",
+      "name": "OnlyOwner",
+      "inputs": []
+    },
     {
       "type": "error",
       "name": "OverflowInt24ToUint256",
@@ -223,12 +233,12 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0x17fb2a7157ddb97a4feac354fe2793dadce755c37f919919512bd145dab63f9b",
-  "deployTxnBlockNumber": "6461958",
-  "deployTimestamp": "1723138788",
+  "deployTxnHash": "0x8c5d6ed2010e2a75000260198e7cb0b009bd1cf3770097874ba764674d995f2b",
+  "deployTxnBlockNumber": "6474235",
+  "deployTimestamp": "1723307100",
   "sourceName": "src/contracts/modules/EpochConfigurationModule.sol",
   "contractName": "EpochConfigurationModule",
   "deployedOn": "deploy.EpochConfigurationModule",
-  "gasUsed": 2035436,
-  "gasCost": "1602056507"
+  "gasUsed": 2016847,
+  "gasCost": "1001154682"
 }

packages/protocol/deployments/11155111/EpochLiquidityModule.json

@@ -1,5 +1,5 @@
 {
-  "address": "0x43B3Be9dd2DCB3aDFe77bcA79c89320578B4B9ED",
+  "address": "0x4AB67EE0d21fE2816EBDCD2286c21e0728BF5a0A",
   "abi": [
     {
       "type": "function",
@@ -486,12 +486,12 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0xa121b459a22e32c74bf27748ffeb0a9d07e21f70678a71dddcd6a25be76d2577",
-  "deployTxnBlockNumber": "6461950",
-  "deployTimestamp": "1723138680",
+  "deployTxnHash": "0x4dbcd6e7c95fe5ed1720baf9be28161605470f785c05c0a9484235b276a39bfa",
+  "deployTxnBlockNumber": "6474229",
+  "deployTimestamp": "1723307028",
   "sourceName": "src/contracts/modules/EpochLiquidityModule.sol",
   "contractName": "EpochLiquidityModule",
   "deployedOn": "deploy.EpochLiquidityModule",
-  "gasUsed": 2136721,
-  "gasCost": "1549256938"
+  "gasUsed": 2082120,
+  "gasCost": "1071720725"
 }

packages/protocol/deployments/11155111/EpochNftModule.json

@@ -1,5 +1,5 @@
 {
-  "address": "0x2976ED5b1387291bccFDe07dbE884E28D7d0E2Ca",
+  "address": "0xde6d24F43752BA9C4bd63fc9942d4384f3af00ac",
   "abi": [
     {
       "type": "constructor",
@@ -463,12 +463,12 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0x89b174e19431ca2c51c8c288538572c0dbacc096cd6aa9da328b93bb3e32f954",
-  "deployTxnBlockNumber": "6461951",
-  "deployTimestamp": "1723138692",
+  "deployTxnHash": "0x7ac01cc6cc6101a034d757bc8a521aa3c2b4e401f8f295cf14b5cb70770b6382",
+  "deployTxnBlockNumber": "6474230",
+  "deployTimestamp": "1723307040",
   "sourceName": "src/contracts/modules/EpochNftModule.sol",
   "contractName": "EpochNftModule",
   "deployedOn": "deploy.EpochNftModule",
   "gasUsed": 1190314,
-  "gasCost": "1553128933"
+  "gasCost": "1046361736"
 }

packages/protocol/deployments/11155111/EpochTradeModule.json

@@ -1,5 +1,5 @@
 {
-  "address": "0xC886d7241B8618BA4E9628AA23D456624fbA308F",
+  "address": "0x7adA6C864c9e0d8DE13334CE8F1F547bB3BF33D4",
   "abi": [
     {
       "type": "function",
@@ -107,6 +107,87 @@
       ],
       "anonymous": false
     },
+    {
+      "type": "error",
+      "name": "EpochNotSettled",
+      "inputs": [
+        {
+          "name": "epochId",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ]
+    },
+    {
+      "type": "error",
+      "name": "EpochNotStarted",
+      "inputs": [
+        {
+          "name": "epochId",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ]
+    },
+    {
+      "type": "error",
+      "name": "InsufficientCollateral",
+      "inputs": [
+        {
+          "name": "amount",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
+        {
+          "name": "collateral",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ]
+    },
+    {
+      "type": "error",
+      "name": "InsufficientVEth",
+      "inputs": [
+        {
+          "name": "amount",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
+        {
+          "name": "vEth",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ]
+    },
+    {
+      "type": "error",
+      "name": "InsufficientVGas",
+      "inputs": [
+        {
+          "name": "amount",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
+        {
+          "name": "vGas",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ]
+    },
+    {
+      "type": "error",
+      "name": "InvalidData",
+      "inputs": [
+        {
+          "name": "message",
+          "type": "string",
+          "internalType": "string"
+        }
+      ]
+    },
     {
       "type": "error",
       "name": "InvalidParameter",
@@ -134,6 +215,32 @@
         }
       ]
     },
+    {
+      "type": "error",
+      "name": "NotAccountOwnerOrAuthorized",
+      "inputs": [
+        {
+          "name": "tokenId",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
+        {
+          "name": "sender",
+          "type": "address",
+          "internalType": "address"
+        }
+      ]
+    },
+    {
+      "type": "error",
+      "name": "OverflowInt24ToUint256",
+      "inputs": []
+    },
+    {
+      "type": "error",
+      "name": "OverflowInt256ToUint256",
+      "inputs": []
+    },
     {
       "type": "error",
       "name": "OverflowInt256ToUint256",
@@ -144,6 +251,11 @@
       "name": "OverflowUint256ToInt256",
       "inputs": []
     },
+    {
+      "type": "error",
+      "name": "OverflowUint256ToInt256",
+      "inputs": []
+    },
     {
       "type": "error",
       "name": "OverflowUint256ToUint160",
@@ -173,12 +285,12 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0xe329216d9352e42ae0e6eba17e119137418a0716291d84245184be81f36033f3",
-  "deployTxnBlockNumber": "6461952",
-  "deployTimestamp": "1723138716",
+  "deployTxnHash": "0x1bbcb9af6846d4cb6c50fd53d8e343be7c27db1dc44184088aa6931c33ee16c8",
+  "deployTxnBlockNumber": "6474231",
+  "deployTimestamp": "1723307052",
   "sourceName": "src/contracts/modules/EpochTradeModule.sol",
   "contractName": "EpochTradeModule",
   "deployedOn": "deploy.EpochTradeModule",
-  "gasUsed": 1841820,
-  "gasCost": "1563348470"
+  "gasUsed": 2196653,
+  "gasCost": "1040865499"
 }

packages/protocol/deployments/11155111/EpochUMASettlementModule.json

@@ -1,5 +1,5 @@
 {
-  "address": "0x099782a2cB6C9F7E9ef48B235B01375Bd11D63a0",
+  "address": "0xd2e77ff7a4a001D070E48eC3090219133f8c37d2",
   "abi": [
     {
       "type": "function",
@@ -157,12 +157,12 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0x3ecae1f4ad905a03cb841d7a79cdcbad54069313c85343b261c434710f925fff",
-  "deployTxnBlockNumber": "6461953",
-  "deployTimestamp": "1723138728",
+  "deployTxnHash": "0x94a85817e24f209ca231d0d93830420880cf0352e49d850eb163b903135c6d36",
+  "deployTxnBlockNumber": "6474232",
+  "deployTimestamp": "1723307064",
   "sourceName": "src/contracts/modules/EpochUMASettlementModule.sol",
   "contractName": "EpochUMASettlementModule",
   "deployedOn": "deploy.EpochUMASettlementModule",
   "gasUsed": 768926,
-  "gasCost": "1653603465"
+  "gasCost": "1025526924"
 }

packages/protocol/deployments/11155111/EpochViewsModule.json

@@ -1,5 +1,5 @@
 {
-  "address": "0xf854ff714f174D0f5ac6859c4D5722C22b213F26",
+  "address": "0x0660A1E92Ff10E2fA30fe971812A1Eb99b2d8313",
   "abi": [
     {
       "type": "function",
@@ -45,6 +45,11 @@
       "name": "getLatestEpoch",
       "inputs": [],
       "outputs": [
+        {
+          "name": "epochId",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
         {
           "name": "startTime",
           "type": "uint256",
@@ -218,16 +223,21 @@
         }
       ],
       "stateMutability": "pure"
+    },
+    {
+      "type": "error",
+      "name": "NoEpochsCreated",
+      "inputs": []
     }
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0x43c9dbbd40f9f7ea4858eac87936e3db2e674178bf4b16ce0224af92c8bb0e49",
-  "deployTxnBlockNumber": "6461955",
-  "deployTimestamp": "1723138752",
+  "deployTxnHash": "0x43fc7637f2e3e32338e8080ec625a984d222c9020f596a068821cc70ef466fc1",
+  "deployTxnBlockNumber": "6474233",
+  "deployTimestamp": "1723307076",
   "sourceName": "src/contracts/modules/EpochViewsModule.sol",
   "contractName": "EpochViewsModule",
   "deployedOn": "deploy.EpochViewsModule",
-  "gasUsed": 440259,
-  "gasCost": "1564225882"
+  "gasUsed": 443339,
+  "gasCost": "1001152855"
 }