epochs wip

foilxyz · Aug 8, 2024 · b314e11 · b314e11
2 parents 5817c45 + 36d543a
commit b314e11
Show file tree

Hide file tree

Showing 35 changed files with 912 additions and 693 deletions.
diff --git a/...ages/app/src/app/markets/[id]/lp/page.tsx → .../src/app/markets/[id]/[epoch]/lp/page.tsx b/...ages/app/src/app/markets/[id]/lp/page.tsx → .../src/app/markets/[id]/[epoch]/lp/page.tsx
diff --git a/packages/app/src/app/markets/[id]/page.tsx → ...app/src/app/markets/[id]/[epoch]/page.tsx b/packages/app/src/app/markets/[id]/page.tsx → ...app/src/app/markets/[id]/[epoch]/page.tsx
@@ -19,11 +19,16 @@ import TraderPosition from '~/lib/components/foil/traderPosition';
 import TraderPositionsTable from '~/lib/components/foil/traderPositionsTable';
 import { MarketProvider } from '~/lib/context/MarketProvider';
 
-const Market = ({ params }: { params: { id: string } }) => {
+const Market = ({ params }: { params: { id: string, epoch: string } }) => {
   const [chainId, marketAddress] = params.id.split('%3A');
+  const { epoch } = params;
 
   return (
-    <MarketProvider chainId={Number(chainId)} address={marketAddress}>
+    <MarketProvider
+      chainId={Number(chainId)}
+      address={marketAddress}
+      epoch={Number(epoch)}
+    >
       <Flex direction="column" alignItems="left" mb={8} w="full" py={8}>
         <PositionsHeader />
         <Flex width="100%" gap={12} mb={12}>

diff --git a/...s/app/src/app/markets/[id]/trade/page.tsx → ...c/app/markets/[id]/[epoch]/trade/page.tsx b/...s/app/src/app/markets/[id]/trade/page.tsx → ...c/app/markets/[id]/[epoch]/trade/page.tsx
diff --git a/packages/app/src/lib/components/foil/addLiquidity.tsx b/packages/app/src/lib/components/foil/addLiquidity.tsx
@@ -45,6 +45,7 @@ const tickToPrice = (tick: number): number => 1.0001 ** tick;
 
 const AddLiquidity = () => {
   const {
+    epoch,
     pool,
     chain,
     collateralAsset,
@@ -159,6 +160,7 @@ const AddLiquidity = () => {
     abi: foilData.abi,
     functionName: 'getTokenAmounts',
     args: [
+      epoch.toString(),
       parseUnits(depositAmount.toString(), collateralAssetDecimals), // uint256 collateralAmount
       pool ? pool.sqrtRatioX96.toString() : '0', // uint160 sqrtPriceX96, // current price of pool
       TickMath.getSqrtRatioAtTick(tickLower).toString(), // uint160 sqrtPriceAX96, // lower tick price in sqrtRatio
@@ -210,56 +212,12 @@ const AddLiquidity = () => {
     setDepositAmount(value);
   };
 
-  useEffect(() => {
-    console.log('Deposit amount changed:', depositAmount);
-    // The following lines have been removed as they are redundant:
-    // const newBaseToken = depositAmount * 0.001;
-    // const newQuoteToken = depositAmount * 0.001;
-    // setBaseToken(newBaseToken);
-    // setQuoteToken(newQuoteToken);
-  }, [depositAmount]);
-
   useEffect(() => {
     if (approveSuccess && transactionStep === 1) {
       setTransactionStep(2);
     }
   }, [approveSuccess, transactionStep]);
 
-  const result = useSimulateContract({
-    address: foilData.address as `0x${string}`,
-    abi: foilData.abi,
-    functionName: 'createLiquidityPosition',
-    args: [
-      {
-        amountTokenA: parseUnits(baseToken.toString(), 18),
-        amountTokenB: parseUnits(quoteToken.toString(), 18),
-        collateralAmount: parseUnits(
-          depositAmount.toString(),
-          collateralAssetDecimals
-        ),
-        lowerTick: BigInt(tickLower),
-        upperTick: BigInt(tickUpper),
-        minAmountTokenA: parseUnits(minAmountTokenA.toString(), 18),
-        minAmountTokenB: parseUnits(minAmountTokenB.toString(), 18),
-      },
-    ],
-    chainId: chain?.id,
-  });
-  console.log('result', result, [
-    {
-      amountTokenA: parseUnits(baseToken.toString(), 18),
-      amountTokenB: parseUnits(quoteToken.toString(), 18),
-      collateralAmount: parseUnits(
-        depositAmount.toString(),
-        collateralAssetDecimals
-      ),
-      lowerTick: BigInt(tickLower),
-      upperTick: BigInt(tickUpper),
-      minAmountTokenA: parseUnits(minAmountTokenA.toString(), 18),
-      minAmountTokenB: parseUnits(minAmountTokenB.toString(), 18),
-    },
-  ]);
-
   useEffect(() => {
     if (transactionStep === 2) {
       addLiquidityWrite({
@@ -268,6 +226,7 @@ const AddLiquidity = () => {
         functionName: 'createLiquidityPosition',
         args: [
           {
+            epochId: epoch,
             amountTokenA: parseUnits(baseToken.toString(), 18),
             amountTokenB: parseUnits(quoteToken.toString(), 18),
             collateralAmount: parseUnits(
@@ -285,6 +244,7 @@ const AddLiquidity = () => {
       setTransactionStep(3);
     }
   }, [
+    epoch,
     transactionStep,
     addLiquidityWrite,
     baseToken,
@@ -311,7 +271,6 @@ const AddLiquidity = () => {
 
   const handleSlippageChange = (newSlippage: number) => {
     setSlippage(newSlippage);
-    console.log(`Slippage tolerance updated to: ${newSlippage}%`);
   };
 
   return (

diff --git a/packages/app/src/lib/context/MarketProvider.tsx b/packages/app/src/lib/context/MarketProvider.tsx
@@ -29,11 +29,13 @@ interface MarketContextType {
   poolAddress: `0x${string}`;
   pool: Pool | null;
   collateralAssetDecimals: number;
+  epoch: number;
 }
 
 interface MarketProviderProps {
   chainId: number;
   address: string;
+  epoch: number;
   children: ReactNode;
 }
 
@@ -51,6 +53,7 @@ export const MarketContext = createContext<MarketContextType>({
   prices: [],
   pool: null,
   poolAddress: '0x',
+  epoch: 0,
 });
 
 export const useUniswapPool = (chainId: number, poolAddress: `0x${string}`) => {
@@ -138,6 +141,7 @@ export const MarketProvider: React.FC<MarketProviderProps> = ({
   chainId,
   address,
   children,
+  epoch,
 }) => {
   const [state, setState] = useState<MarketContextType>({
     chain: undefined,
@@ -153,6 +157,7 @@ export const MarketProvider: React.FC<MarketProviderProps> = ({
     prices: [],
     pool: null,
     poolAddress: '0x',
+    epoch: 0,
   });
 
   // Set chainId and address from the URL
@@ -169,8 +174,9 @@ export const MarketProvider: React.FC<MarketProviderProps> = ({
       ...currentState,
       chain: chain[1] as any,
       address,
+      epoch,
     }));
-  }, [chainId, address]);
+  }, [chainId, address, epoch]);
 
   const contractId = `${chainId}:${address}`;
 

diff --git a/packages/app/src/lib/layout/Header.tsx b/packages/app/src/lib/layout/Header.tsx
@@ -25,8 +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}`}>Local Market</Link>
-          <Link href={`/markets/11155111:${FoilTestnet.address}`}>
+          <Link href={`/markets/13370:${FoilLocal.address}/1`}>
+            Local Market
+          </Link>
+          <Link href={`/markets/11155111:${FoilTestnet.address}/1`}>
             Testnet Market
           </Link>
           <Link href="https://docs.foil.xyz">Docs</Link>

diff --git a/packages/protocol/cannonfile.sepolia.toml b/packages/protocol/cannonfile.sepolia.toml
@@ -1,5 +1,5 @@
 name="foil"
-version="0.2"
+version="0.3"
 
 [var.settings]
 owner="0xE006B58cA5aB7ba53863012dc3067A14b965C1da"

diff --git a/packages/protocol/cannonfile.toml b/packages/protocol/cannonfile.toml
@@ -1,5 +1,5 @@
 name="foil"
-version="0.2"
+version="0.3"
 
 [var.settings]
 owner = "0xEB045D78d273107348b0300c01D29B7552D622ab"

diff --git a/packages/protocol/deployments/11155111/EpochConfigurationModule.json b/packages/protocol/deployments/11155111/EpochConfigurationModule.json
@@ -1,5 +1,5 @@
 {
-  "address": "0xfE6Cc6E08D279dc31e78DCEC9fd49d88E5B599Ed",
+  "address": "0x18E03c74Aa56dbb6c2255F2a7b87331621A1eB03",
   "abi": [
     {
       "type": "function",
@@ -68,6 +68,45 @@
     {
       "type": "function",
       "name": "getEpoch",
+      "inputs": [
+        {
+          "name": "id",
+          "type": "uint256",
+          "internalType": "uint256"
+        }
+      ],
+      "outputs": [
+        {
+          "name": "startTime",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
+        {
+          "name": "endTime",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
+        {
+          "name": "pool",
+          "type": "address",
+          "internalType": "address"
+        },
+        {
+          "name": "ethToken",
+          "type": "address",
+          "internalType": "address"
+        },
+        {
+          "name": "gasToken",
+          "type": "address",
+          "internalType": "address"
+        }
+      ],
+      "stateMutability": "view"
+    },
+    {
+      "type": "function",
+      "name": "getLatestEpoch",
       "inputs": [],
       "outputs": [
         {
@@ -136,7 +175,7 @@
         {
           "name": "epochParams",
           "type": "tuple",
-          "internalType": "struct Market.EpochParams",
+          "internalType": "struct IFoilStructs.EpochParams",
           "components": [
             {
               "name": "baseAssetMinPriceTick",
@@ -256,7 +295,7 @@
         {
           "name": "epochParams",
           "type": "tuple",
-          "internalType": "struct Market.EpochParams",
+          "internalType": "struct IFoilStructs.EpochParams",
           "components": [
             {
               "name": "baseAssetMinPriceTick",
@@ -331,7 +370,7 @@
         {
           "name": "epochParms",
           "type": "tuple",
-          "internalType": "struct Market.EpochParams",
+          "internalType": "struct IFoilStructs.EpochParams",
           "components": [
             {
               "name": "baseAssetMinPriceTick",
@@ -379,6 +418,17 @@
       "name": "EpochAlreadyStarted",
       "inputs": []
     },
+    {
+      "type": "error",
+      "name": "InvalidData",
+      "inputs": [
+        {
+          "name": "message",
+          "type": "string",
+          "internalType": "string"
+        }
+      ]
+    },
     {
       "type": "error",
       "name": "InvalidMarket",
@@ -407,12 +457,12 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0xba4d6ddf7bfd95259df401cf76f672984116b3257c5a999827fe011771060a69",
-  "deployTxnBlockNumber": "6437196",
-  "deployTimestamp": "1722799824",
+  "deployTxnHash": "0x4bad60777f46c1274224ff69cd0e8df2c625d6e80041e8c6b101f764e7fb0216",
+  "deployTxnBlockNumber": "6455400",
+  "deployTimestamp": "1723048644",
   "sourceName": "src/contracts/modules/EpochConfigurationModule.sol",
   "contractName": "EpochConfigurationModule",
   "deployedOn": "deploy.EpochConfigurationModule",
-  "gasUsed": 2257070,
-  "gasCost": "5075557086"
+  "gasUsed": 2338721,
+  "gasCost": "17266776845"
 }
diff --git a/packages/protocol/deployments/11155111/EpochLiquidityModule.json b/packages/protocol/deployments/11155111/EpochLiquidityModule.json
@@ -1,10 +1,15 @@
 {
-  "address": "0x4b50D165D7D85C480374BaAC8547CF7D1953c205",
+  "address": "0x91d122d12863D7620EfFa9812Ad79Abf80f37A01",
   "abi": [
     {
       "type": "function",
       "name": "collectFees",
       "inputs": [
+        {
+          "name": "epochId",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
         {
           "name": "tokenId",
           "type": "uint256",
@@ -34,6 +39,11 @@
           "type": "tuple",
           "internalType": "struct IFoilStructs.LiquidityPositionParams",
           "components": [
+            {
+              "name": "epochId",
+              "type": "uint256",
+              "internalType": "uint256"
+            },
             {
               "name": "amountTokenA",
               "type": "uint256",
@@ -100,6 +110,11 @@
       "type": "function",
       "name": "decreaseLiquidityPosition",
       "inputs": [
+        {
+          "name": "epochId",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
         {
           "name": "accountId",
           "type": "uint256",
@@ -178,6 +193,11 @@
       "type": "function",
       "name": "getTokenAmounts",
       "inputs": [
+        {
+          "name": "epochId",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
         {
           "name": "collateralAmount",
           "type": "uint256",
@@ -222,6 +242,11 @@
       "type": "function",
       "name": "increaseLiquidityPosition",
       "inputs": [
+        {
+          "name": "epochId",
+          "type": "uint256",
+          "internalType": "uint256"
+        },
         {
           "name": "accountId",
           "type": "uint256",
@@ -494,12 +519,12 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0xcf391b1e589d12bdb9bc16f30a8490e15a279507411d74315b6a29b52f9ecaa2",
-  "deployTxnBlockNumber": "6437191",
-  "deployTimestamp": "1722799764",
+  "deployTxnHash": "0x1b8dde6061aa8128612949d63a8caede89ce27e6ec293f2b3b9c38f1a9a8281a",
+  "deployTxnBlockNumber": "6455394",
+  "deployTimestamp": "1723048560",
   "sourceName": "src/contracts/modules/EpochLiquidityModule.sol",
   "contractName": "EpochLiquidityModule",
   "deployedOn": "deploy.EpochLiquidityModule",
-  "gasUsed": 2131396,
-  "gasCost": "4713106815"
+  "gasUsed": 2165858,
+  "gasCost": "16351223971"
 }