= ({ well }) => {
return (
@@ -30,7 +46,7 @@ export const LearnPump: FC = () => {
What is a Pump?
-
+
);
diff --git a/projects/dex-ui/src/components/Well/LearnWellFunction.tsx b/projects/dex-ui/src/components/Well/LearnWellFunction.tsx
index 3854df4929..24732ef86f 100644
--- a/projects/dex-ui/src/components/Well/LearnWellFunction.tsx
+++ b/projects/dex-ui/src/components/Well/LearnWellFunction.tsx
@@ -1,63 +1,85 @@
-import React from "react";
+import React, { useEffect } from "react";
import styled from "styled-components";
import { ExpandBox } from "src/components/ExpandBox";
import { TextNudge } from "../Typography";
import { FC } from "src/types";
-import { WellFunction } from "../Icons";
+import { WellFunction as WellFunctionIcon } from "../Icons";
+import { Well } from "@beanstalk/sdk-wells";
+import { CONSTANT_PRODUCT_2_ADDRESS } from "src/utils/addresses";
+import { formatWellTokenSymbols } from "src/wells/utils";
type Props = {
- name: string;
+ well: Well | undefined;
};
-function WellFunctionDetails(functionName: any) {
- if (functionName.functionName === "Constant Product") {
+function WellFunctionDetails({ well }: Props) {
+ const functionName = well?.wellFunction?.name;
+
+ useEffect(() => {
+ if (!functionName) {
+ well?.getWellFunction();
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [functionName]);
+
+ if (functionName === "Constant Product") {
return (
- A Well Function is a pricing function for determining how many tokens users receive for swaps, how
- many LP tokens a user receives for adding liquidity, etc.
+ A Well Function is a pricing function for determining how many tokens users receive for
+ swaps, how many LP tokens a user receives for adding liquidity, etc.
- Constant Product is a reusable pricing function which prices tokens using:
+ Constant Product is a reusable pricing function
+ which prices tokens using:
- x * y = k, where x is the amount of one token, y is the amount of the other and{" "}
- k is a fixed constant.
+ x * y = k, where x is the amount of one token, y is
+ the amount of the other and k is a fixed constant.
);
- } else if (functionName.functionName === "Constant Product 2") {
+ } else if (well?.wellFunction?.address.toLowerCase() === CONSTANT_PRODUCT_2_ADDRESS) {
return (
- A Well Function is a pricing function for determining how many tokens users receive for swaps, how
- many LP tokens a user receives for adding liquidity, etc.
+ A Well Function is a pricing function for determining how many tokens users receive for
+ swaps, how many LP tokens a user receives for adding liquidity, etc.
- The BEAN:WETH Well uses the Constant Product 2 Well Function, which is a gas-efficient pricing function
- for Wells with 2 tokens.
+ The {formatWellTokenSymbols(well)} uses the Constant Product 2 Well Function, which is a
+ gas-efficient pricing function for Wells with 2 tokens.
);
} else {
return (
- {"Each Well utilizes a unique pricing function to price the tokens in the Well."}
- {"Brief descriptions of a Well's pricing function will appear in this box."}
+
+ A Well Function is a pricing function for determining how many tokens users receive for
+ swaps, how many LP tokens a user receives for adding liquidity, etc.
+
+ Each Well utilizes a unique pricing function to price the tokens in the Well.
);
}
}
-export const LearnWellFunction: FC = ({ name }) => {
+export const LearnWellFunction: FC = ({ well }) => {
+ const name = well?.wellFunction?.name;
+
+ const drawerHeaderText = well?.wellFunction?.name
+ ? `What is ${name}?`
+ : "What is a Well Function?";
+
return (
-
+
-
+
What is {name}?
-
+
);
diff --git a/projects/dex-ui/src/components/Well/LearnYield.tsx b/projects/dex-ui/src/components/Well/LearnYield.tsx
index 246deb3865..847319c830 100644
--- a/projects/dex-ui/src/components/Well/LearnYield.tsx
+++ b/projects/dex-ui/src/components/Well/LearnYield.tsx
@@ -5,14 +5,14 @@ import { TextNudge } from "../Typography";
import { FC } from "src/types";
import { YieldSparkle } from "../Icons";
-type Props = {};
+type Props = { isWhitelisted?: boolean };
function YieldDetails() {
return (
- Liquidity providers can earn yield by depositing BEANETH LP in the Beanstalk Silo. You can add liquidity and deposit the LP token in
- the Silo in a single transaction on the{" "}
+ Liquidity providers can earn yield by depositing BEANETH LP in the Beanstalk Silo. You can
+ add liquidity and deposit the LP token in the Silo in a single transaction on the{" "}
= () => {
+export const LearnYield: FC = ({ isWhitelisted }) => {
+ if (!isWhitelisted) return null;
+
return (
diff --git a/projects/dex-ui/src/components/Well/LiquidityBox.tsx b/projects/dex-ui/src/components/Well/LiquidityBox.tsx
index d259b8b05b..1d3893fbf6 100644
--- a/projects/dex-ui/src/components/Well/LiquidityBox.tsx
+++ b/projects/dex-ui/src/components/Well/LiquidityBox.tsx
@@ -43,10 +43,11 @@ export const LiquidityBox: FC = ({ well: _well, loading }) => {
const position = getPositionWithWell(well);
const isWhitelisted = getIsWhitelisted(well);
- const { data: lpTokenPriceMap } = useWellLPTokenPrice(well);
+ const { data: lpTokenPriceMap = {} } = useWellLPTokenPrice(well);
const lpAddress = well?.lpToken?.address;
- const lpTokenPrice = lpAddress && lpAddress in lpTokenPriceMap ? lpTokenPriceMap[lpAddress] : TokenValue.ZERO;
+ const lpTokenPrice =
+ lpAddress && lpAddress in lpTokenPriceMap ? lpTokenPriceMap[lpAddress] : TokenValue.ZERO;
const siloUSD = position?.silo.mul(lpTokenPrice) || TokenValue.ZERO;
const externalUSD = position?.external.mul(lpTokenPrice) || TokenValue.ZERO;
@@ -88,7 +89,12 @@ export const LiquidityBox: FC = ({ well: _well, loading }) => {
content={
BEANETH LP token holders can Deposit their LP tokens in the{" "}
-
+
Beanstalk Silo
for yield.
@@ -114,11 +120,17 @@ export const LiquidityBox: FC
= ({ well: _well, loading }) => {
-
+
Farm Balances
- allow Beanstalk users to hold assets in the protocol on their behalf. Using Farm Balances can reduce gas costs
- and facilitate efficient movement of assets within Beanstalk.
+ allow Beanstalk users to hold assets in the protocol on their behalf.
+ Using Farm Balances can reduce gas costs and facilitate efficient movement
+ of assets within Beanstalk.
| Name |
- Address
- Address
+ Address
+ Address
|
- BEAN:WETH Well
+ {wellTokenDetail} Well
|
-
+
{well.address}
@@ -46,7 +105,7 @@ const OtherSectionContent: FC = ({ well }) => {
Well LP Token - {displayTokenSymbol(well.lpToken as Token)}
|
-
+
{well.address}
@@ -61,9 +120,13 @@ const OtherSectionContent: FC = ({ well }) => {
{`Token ${index + 1} - ${token.symbol}`}
|
-
+
@@ -72,28 +135,38 @@ const OtherSectionContent: FC = ({ well }) => {
- {token.address.substr(0, 5) + "..." + token.address.substr(token.address.length - 5) || `-`}
+ {token.address.substr(0, 5) +
+ "..." +
+ token.address.substr(token.address.length - 5) || `-`}
);
})}
- {tableItems.map(function (tableItem, index) {
+ {items.map(function (tableItem, index) {
return (
|
{tableItem.name}
|
-
- {tableItem.address}
+
+
+ {tableItem.address}
+
- {tableItem.address.substr(0, 5) + "..." + tableItem.address.substr(tableItem.address.length - 5)}
+ {tableItem.address.substr(0, 5) +
+ "..." +
+ tableItem.address.substr(tableItem.address.length - 5)}
@@ -110,7 +183,10 @@ const loadingItemProps = {
lg: { height: 24, width: 200 }
};
-export const OtherSection: FC<{ well: Well | undefined; loading?: boolean }> = ({ well, loading }) => {
+export const OtherSection: FC<{ well: Well | undefined; loading?: boolean }> = ({
+ well,
+ loading
+}) => {
if (!well || loading) {
return (
@@ -155,6 +231,7 @@ const Link = styled.a`
font-weight: 600;
text-decoration: underline;
text-decoration-thickness: 0.5px;
+ color: black;
:link {
color: black;
diff --git a/projects/dex-ui/src/components/Well/Reserves.tsx b/projects/dex-ui/src/components/Well/Reserves.tsx
index fce88a82de..3303471c2d 100644
--- a/projects/dex-ui/src/components/Well/Reserves.tsx
+++ b/projects/dex-ui/src/components/Well/Reserves.tsx
@@ -31,24 +31,32 @@ export const Reserves: FC
= ({ reserves, well, twaReserves }) =>
if (!well) return null;
+ const noPriceData = reserves.some((rsv) => rsv.dollarAmount === null);
+
const rows = (reserves ?? []).map((r, i) => (
-
{r.token?.symbol}
{getIsMultiPumpWell(well) && (
-
+
)}
- {formatNum(r.amount, { minDecimals: 2 })}
-
-
- {formatPercent(r.percentage)}
+ {formatNum(r.amount, { minDecimals: 2, minValue: 0.001 })}
+ {!noPriceData ? (
+
+ {formatPercent(r.percentage)}
+
+ ) : null}
));
diff --git a/projects/dex-ui/src/components/Well/Table/MyWellPositionRow.tsx b/projects/dex-ui/src/components/Well/Table/MyWellPositionRow.tsx
index 778d005e57..e0a441b1cd 100644
--- a/projects/dex-ui/src/components/Well/Table/MyWellPositionRow.tsx
+++ b/projects/dex-ui/src/components/Well/Table/MyWellPositionRow.tsx
@@ -98,7 +98,7 @@ export const MyWellPositionRow: FC<{
symbols.push(token.symbol);
});
- const lpPrice = lpAddress && lpAddress in prices ? prices[lpAddress] : undefined;
+ const lpPrice = lpAddress && prices && lpAddress in prices ? prices[lpAddress] : undefined;
const whitelisted = getIsWhitelisted(well);
const positionsUSD = {
@@ -128,7 +128,7 @@ export const MyWellPositionRow: FC<{
-
+
@@ -148,7 +148,7 @@ export const MyWellPositionRow: FC<{
-
+
diff --git a/projects/dex-ui/src/components/Well/Table/WellDetailRow.tsx b/projects/dex-ui/src/components/Well/Table/WellDetailRow.tsx
index e6abe1250a..6b1cc5c364 100644
--- a/projects/dex-ui/src/components/Well/Table/WellDetailRow.tsx
+++ b/projects/dex-ui/src/components/Well/Table/WellDetailRow.tsx
@@ -14,6 +14,7 @@ import { Item } from "src/components/Layout";
/// format value with 2 decimals, if value is less than 1M, otherwise use short format
const formatMayDecimals = (tv: TokenValue | undefined) => {
if (!tv) return "-.--";
+ if (tv.gt(0) && tv.lt(0.001)) return "<0.001";
if (tv.lt(1_000_000)) {
return formatNum(tv, { minDecimals: 2, maxDecimals: 2 });
}
@@ -24,7 +25,9 @@ export const WellDetailRow: FC<{
well: Well | undefined;
liquidity: TokenValue | undefined;
functionName: string | undefined;
-}> = ({ well, liquidity, functionName }) => {
+ price: TokenValue | undefined;
+ volume: TokenValue | undefined;
+}> = ({ well, liquidity, functionName, price, volume }) => {
const navigate = useNavigate();
if (!well) return null;
@@ -63,6 +66,12 @@ export const WellDetailRow: FC<{
${liquidity ? liquidity.toHuman("short") : "-.--"}
+
+ ${price && price.gt(0) ? price.toHuman("short") : "-.--"}
+
+
+ ${volume ? volume.toHuman("short") : "-.--"}
+
{{smallLogos[0]}}
@@ -103,6 +112,12 @@ export const WellDetailLoadingRow: FC<{}> = () => {
+
+
+
+
+
+
@@ -139,6 +154,23 @@ const TableRow = styled(Row)`
`;
const DesktopContainer = styled(Td)`
+ :nth-child(5) {
+ @media (max-width: ${size.desktop}) {
+ display: none;
+ }
+ }
+ :nth-child(6) {
+ @media (max-width: ${size.desktop}) {
+ display: none;
+ }
+ }
+
+ :nth-child(3) {
+ @media (max-width: ${size.tablet}) {
+ display: none;
+ }
+ }
+
@media (max-width: ${size.mobile}) {
display: none;
}
@@ -191,7 +223,7 @@ const Amount = styled.div`
const Reserves = styled.div`
display: flex;
flex-direction: row;
- justify-content flex-end;
+ justify-content: flex-end;
align-items: center;
gap: 4px;
flex: 1;
diff --git a/projects/dex-ui/src/components/Well/WellYieldWithTooltip.tsx b/projects/dex-ui/src/components/Well/WellYieldWithTooltip.tsx
index 762ef78f49..d57e24c9b3 100644
--- a/projects/dex-ui/src/components/Well/WellYieldWithTooltip.tsx
+++ b/projects/dex-ui/src/components/Well/WellYieldWithTooltip.tsx
@@ -17,9 +17,14 @@ type Props = {
apy?: TokenValue;
loading?: boolean;
tooltipProps?: Partial>;
+ returnNullOnNoAPY?: boolean;
};
-export const WellYieldWithTooltip: React.FC = ({ tooltipProps, well }) => {
+export const WellYieldWithTooltip: React.FC = ({
+ tooltipProps,
+ well,
+ returnNullOnNoAPY = false,
+}) => {
const sdk = useSdk();
const bean = sdk.tokens.BEAN;
@@ -37,6 +42,7 @@ export const WellYieldWithTooltip: React.FC = ({ tooltipProps, well }) =>
const tooltipWidth = isMobile ? 250 : 360;
if (!apy) {
+ if (returnNullOnNoAPY) return null;
return <>{"-"};
}
diff --git a/projects/dex-ui/src/pages/Build.tsx b/projects/dex-ui/src/pages/Build.tsx
index b41ad50e42..d6e566d451 100644
--- a/projects/dex-ui/src/pages/Build.tsx
+++ b/projects/dex-ui/src/pages/Build.tsx
@@ -1,24 +1,78 @@
import React from "react";
+import { useNavigate } from "react-router-dom";
+import { ButtonPrimary } from "src/components/Button";
+
+import { Flex } from "src/components/Layout";
import { Page } from "src/components/Page";
import { Title } from "src/components/PageComponents/Title";
+import { Text } from "src/components/Typography";
+
+import { theme } from "src/utils/ui/theme";
import styled from "styled-components";
+import { ComponentLibraryTable } from "src/components/Create/ComponentLibraryTable";
+
export const Build = () => {
+ const navigate = useNavigate();
+
+ const handleNavigate = () => {
+ navigate("/create");
+ };
+
return (
-
-
-
+
+
+
+ Basin has three unique components which can be composed together to create a custom
+ liquidity pool, or Well.
+
+
+
+
+ Use the Well Deployer to deploy your own Wells.
+
+ Well Deployer →
+
+
+ COMPONENT LIBRARY
+
+ Use existing components which are already available for developers to extend, copy or
+ compose together when building Wells. Select a component to view its implementation.
+
+
+
);
};
-const Box = styled.div`
- outline: 0.5px solid black;
- outline-offset: -0.5px;
- background-color: #ffffffff;
- height: 96px;
- width: 384px;
- margin-left: 96px;
- box-sizing: borderbox;
+const ActionBanner = styled(Flex).attrs({
+ $py: 2,
+ $px: 3,
+ $justifyContent: "space-between",
+ $alignItems: "center",
+ $direction: "row",
+ $gap: 2
+})`
+ background: ${theme.colors.white};
+ border: 0.25px solid ${theme.colors.gray};
+
+ @media (max-width: 500px) {
+ flex-direction: column;
+ gap: ${theme.spacing(2)};
+
+ .banner-text {
+ align-self: flex-start;
+ }
+ }
+`;
+
+const NavigateButton = styled(ButtonPrimary)`
+ white-space: nowrap;
+
+ /* ${theme.media.query.sm.only} { */
+ @media (max-width: 500px) {
+ align-self: flex-end;
+ width: 100%;
+ }
`;
diff --git a/projects/dex-ui/src/pages/Create.tsx b/projects/dex-ui/src/pages/Create.tsx
new file mode 100644
index 0000000000..1f2f8d217d
--- /dev/null
+++ b/projects/dex-ui/src/pages/Create.tsx
@@ -0,0 +1,54 @@
+import React from "react";
+
+import { Page } from "src/components/Page";
+import { Flex } from "src/components/Layout";
+import {
+ CreateWellStep1,
+ CreateWellStep2,
+ CreateWellStep3,
+ CreateWellStep4,
+ CreateWellProvider,
+ useCreateWell
+} from "src/components/Create";
+
+export const Create = () => {
+ return (
+
+
+
+
+
+ );
+};
+
+const CreateSteps = () => {
+ const { step } = useCreateWell();
+
+ return (
+ <>
+ {step === 0 && (
+
+
+
+ )}
+ {step === 1 && (
+
+
+
+ )}
+ {step === 2 && (
+
+
+
+ )}
+ {step === 3 && (
+
+
+
+ )}
+
+ );
+};
+
+const CONTENT_MAX_WIDTH = "1234px";
+const PREVIEW_MAX_WIDTH = "710px";
diff --git a/projects/dex-ui/src/pages/Home.tsx b/projects/dex-ui/src/pages/Home.tsx
index c3eaaee3ca..b6ecf9a1bf 100644
--- a/projects/dex-ui/src/pages/Home.tsx
+++ b/projects/dex-ui/src/pages/Home.tsx
@@ -8,8 +8,10 @@ import { BodyL } from "src/components/Typography";
import { ContractInfoMarquee } from "src/components/Frame/ContractInfoMarquee";
const copy = {
- build: "Use DEX components written, audited and deployed by other developers for your custom liquidity pool.",
- deploy: "Deploy liquidity in pools with unique pricing functions for more granular market making.",
+ build:
+ "Use DEX components written, audited and deployed by other developers for your custom liquidity pool.",
+ deploy:
+ "Deploy liquidity in pools with unique pricing functions for more granular market making.",
fees: "Exchange assets in liquidity pools that don't impose trading fees."
};
@@ -18,7 +20,8 @@ const links = {
whitepaper: "/basin.pdf",
docs: "https://docs.basin.exchange/implementations/overview",
wells: "/#/wells",
- swap: "/#/swap"
+ swap: "/#/swap",
+ build: "/#/build"
};
export const Home = () => {
@@ -31,11 +34,18 @@ export const Home = () => {
Multi Flow Pump is here!
- Explore the inter-block MEV manipulation resistant oracle implementation used by
- the BEAN:WETH Well.
+ Explore the{" "}
+
+ inter-block MEV manipulation resistant oracle implementation
+ {" "}
+ used by the BEAN:WETH Well.
-
+
Read the whitepaper →
@@ -51,7 +61,7 @@ export const Home = () => {
-
+
🔮
@@ -209,10 +219,10 @@ const InfoContainer = styled.div`
gap: 8px;
box-sizing: border-box;
height: 100%;
-
+
${mediaQuery.sm.up} {
padding-top: min(25%, 185px);
- justify-content: flex-start
+ justify-content: flex-start;
align-items: center;
width: 100%;
gap: 72px;
@@ -368,7 +378,9 @@ const AccordionItem = styled.a`
const AccordionContent = styled.div`
overflow: hidden;
opacity: 0; // Initially hidden
- transition: opacity 0.3s ease-out, max-height 0.3s ease-out;
+ transition:
+ opacity 0.3s ease-out,
+ max-height 0.3s ease-out;
max-height: 0;
width: 100%; // Ensure it takes full width
diff --git a/projects/dex-ui/src/pages/Liquidity.tsx b/projects/dex-ui/src/pages/Liquidity.tsx
index 50f29b6a45..32c2cbbd1f 100644
--- a/projects/dex-ui/src/pages/Liquidity.tsx
+++ b/projects/dex-ui/src/pages/Liquidity.tsx
@@ -23,8 +23,7 @@ import { useWellWithParams } from "src/wells/useWellWithParams";
export const Liquidity = () => {
const { well, loading, error } = useWellWithParams();
const navigate = useNavigate();
-
- const [wellFunctionName, setWellFunctionName] = useState("This Well's Function");
+
const [tab, setTab] = useState(0);
const scrollRef = useRef(null);
@@ -47,20 +46,12 @@ export const Liquidity = () => {
setOpen(!open);
}, [open]);
- useEffect(() => {
- const run = async () => {
- if (well && well.wellFunction) {
- const _wellName = await well.wellFunction.contract.name();
- setWellFunctionName(_wellName);
- }
- };
- run();
- }, [well]);
-
if (error) {
return ;
}
+ const nonEmptyReserves = well && well?.reserves?.some((reserve) => reserve.gt(0));
+
return (
@@ -97,10 +88,10 @@ export const Liquidity = () => {
}>
-
+
}>
-
+
@@ -116,7 +107,7 @@ export const Liquidity = () => {
-
- setTab(1)} active={tab === 1} stretch bold justify hover>
+ setTab(1)} active={tab === 1} stretch bold justify hover disabled={!nonEmptyReserves}>
{""}}>
Remove Liquidity
@@ -132,7 +123,7 @@ export const Liquidity = () => {
handleSlippageValueChange={handleSlippageValueChange}
/>
)}
- {tab === 1 && (
+ {tab === 1 && nonEmptyReserves && (
{
const { well, loading: dataLoading, error } = useWellWithParams();
const { isLoading: apysLoading } = useBeanstalkSiloAPYs();
const { isLoading: twaLoading, getTWAReservesWithWell } = useMultiFlowPumpTWAReserves();
+ const { getIsWhitelisted } = useBeanstalkSiloWhitelist();
+
+ const isWhitelistedWell = getIsWhitelisted(well);
const loading = useLagLoading(dataLoading || apysLoading || twaLoading);
@@ -66,7 +70,7 @@ export const Well = () => {
}
if (well.wellFunction) {
- const _wellName = await well.wellFunction.contract.name();
+ const _wellName = await well.wellFunction.getName();
setWellFunctionName(_wellName);
}
};
@@ -75,7 +79,9 @@ export const Well = () => {
}, [sdk, well]);
const title = (well?.tokens ?? []).map((t) => t.symbol).join("/");
- const logos: ReactNode[] = (well?.tokens || []).map((token) => );
+ const logos: ReactNode[] = (well?.tokens || []).map((token) => (
+
+ ));
const reserves = (well?.reserves ?? []).map((amount, i) => {
const token = well!.tokens![i];
@@ -88,10 +94,16 @@ export const Well = () => {
percentage: TokenValue.ZERO
};
});
- const totalUSD = reserves.reduce((total, r) => total.add(r.dollarAmount ?? TokenValue.ZERO), TokenValue.ZERO);
+ const totalUSD = reserves.reduce(
+ (total, r) => total.add(r.dollarAmount ?? TokenValue.ZERO),
+ TokenValue.ZERO
+ );
reserves.forEach((reserve) => {
- reserve.percentage = reserve.dollarAmount && totalUSD.gt(TokenValue.ZERO) ? reserve.dollarAmount.div(totalUSD) : TokenValue.ZERO;
+ reserve.percentage =
+ reserve.dollarAmount && totalUSD.gt(TokenValue.ZERO)
+ ? reserve.dollarAmount.div(totalUSD)
+ : TokenValue.ZERO;
});
const twaReserves = useMemo(() => getTWAReservesWithWell(well), [well, getTWAReservesWithWell]);
@@ -99,7 +111,9 @@ export const Well = () => {
const goLiquidity = () => navigate(`./liquidity`);
const goSwap = () =>
- well && well.tokens ? navigate(`../swap?fromToken=${well.tokens[0].symbol}&toToken=${well.tokens[1].symbol}`) : null;
+ well && well.tokens
+ ? navigate(`../swap?fromToken=${well.tokens[0].symbol}&toToken=${well.tokens[1].symbol}`)
+ : null;
// Code below detects if the component with the Add/Remove Liq + Swap buttons is sticky
const [isSticky, setIsSticky] = useState(false);
@@ -139,7 +153,12 @@ export const Well = () => {
return (
-
+
{/*
*Header
@@ -160,6 +179,7 @@ export const Well = () => {
offsetY: 0,
side: "top"
}}
+ returnNullOnNoAPY={true}
/>
-
- showTab(e, 0)} active={tab === 0} stretch justify bold hover>
+ showTab(e, 0)}
+ active={tab === 0}
+ stretch
+ justify
+ bold
+ hover
+ >
Activity
-
- showTab(e, 1)} active={tab === 1} stretch justify bold hover>
+ showTab(e, 1)}
+ active={tab === 1}
+ stretch
+ justify
+ bold
+ hover
+ >
Contract Addresses
@@ -209,7 +243,14 @@ export const Well = () => {
* Well History & Contract Info Tables
*/}
- {tab === 0 && }
+ {tab === 0 && (
+
+ )}
{tab === 1 && }
@@ -273,13 +314,13 @@ export const Well = () => {
}>
-
+
}>
-
+
}>
-
+
@@ -358,7 +399,7 @@ const HeaderContainer = styled(Row)`
}
${mediaQuery.md.up} {
- align-item: space-between;
+ align-items: space-between;
}
`;
@@ -472,6 +513,7 @@ const BottomContainer = styled.div`
const FunctionName = styled.div`
${BodyL}
+ text-align: right;
${mediaQuery.lg.down} {
${BodyS}
diff --git a/projects/dex-ui/src/pages/Wells.tsx b/projects/dex-ui/src/pages/Wells.tsx
index f497176036..5b8bbbffee 100644
--- a/projects/dex-ui/src/pages/Wells.tsx
+++ b/projects/dex-ui/src/pages/Wells.tsx
@@ -1,4 +1,4 @@
-import { TokenValue } from "@beanstalk/sdk";
+import { BeanstalkSDK, TokenValue } from "@beanstalk/sdk";
import React, { useMemo, useState } from "react";
import { Item } from "src/components/Layout";
import { Page } from "src/components/Page";
@@ -6,8 +6,6 @@ import { Title } from "src/components/PageComponents/Title";
import { TabButton } from "src/components/TabButton";
import { Row, TBody, THead, Table, Th } from "src/components/Table";
import { Row as TabRow } from "src/components/Layout";
-import { getPrice } from "src/utils/price/usePrice";
-import useSdk from "src/utils/sdk/useSdk";
import { useWells } from "src/wells/useWells";
import styled from "styled-components";
import { mediaQuery, size } from "src/breakpoints";
@@ -16,51 +14,46 @@ import { useWellLPTokenPrice } from "src/wells/useWellLPTokenPrice";
import { useLPPositionSummary } from "src/tokens/useLPPositionSummary";
import { WellDetailLoadingRow, WellDetailRow } from "src/components/Well/Table/WellDetailRow";
-import { MyWellPositionLoadingRow, MyWellPositionRow } from "src/components/Well/Table/MyWellPositionRow";
+import {
+ MyWellPositionLoadingRow,
+ MyWellPositionRow
+} from "src/components/Well/Table/MyWellPositionRow";
import { useBeanstalkSiloAPYs } from "src/wells/useBeanstalkSiloAPYs";
import { useLagLoading } from "src/utils/ui/useLagLoading";
+import useBasinStats from "src/wells/useBasinStats";
+import { useTokenPrices } from "src/utils/price/useTokenPrices";
+import { useWellFunctionNames } from "src/wells/wellFunction/useWellFunctionNames";
+import { BasinAPIResponse } from "src/types";
+import { Well } from "@beanstalk/sdk-wells";
+import useSdk from "src/utils/sdk/useSdk";
+import { theme } from "src/utils/ui/theme";
export const Wells = () => {
const { data: wells, isLoading, error } = useWells();
+ const { data: wellStats = [] } = useBasinStats();
const sdk = useSdk();
- const [wellLiquidity, setWellLiquidity] = useState<(TokenValue | undefined)[]>([]);
- const [wellFunctionNames, setWellFunctionNames] = useState([]);
const [tab, showTab] = useState(0);
- const { data: lpTokenPrices } = useWellLPTokenPrice(wells);
+ const { data: lpTokenPrices, isLoading: lpTokenPricesLoading } = useWellLPTokenPrice(wells);
const { hasPositions, getPositionWithWell, isLoading: positionsLoading } = useLPPositionSummary();
const { isLoading: apysLoading } = useBeanstalkSiloAPYs();
+ const { data: tokenPrices, isLoading: tokenPricesLoading } = useTokenPrices(wells);
+ const { data: wellFnNames, isLoading: wellNamesLoading } = useWellFunctionNames(wells);
- const loading = useLagLoading(isLoading || apysLoading || positionsLoading);
-
- useMemo(() => {
- const run = async () => {
- if (!wells || !wells.length) return;
- let _wellsLiquidityUSD = [];
- for (let i = 0; i < wells.length; i++) {
- if (!wells[i].tokens) return;
- const _tokenPrices = await Promise.all(wells[i].tokens!.map((token) => getPrice(token, sdk)));
- const _reserveValues = wells[i].reserves?.map((tokenReserve, index) =>
- tokenReserve.mul((_tokenPrices[index] as TokenValue) || TokenValue.ZERO)
- );
- let initialValue = TokenValue.ZERO;
- const _totalWellLiquidity = _reserveValues?.reduce((accumulator, currentValue) => currentValue.add(accumulator), initialValue);
- _wellsLiquidityUSD[i] = _totalWellLiquidity;
- }
- setWellLiquidity(_wellsLiquidityUSD);
-
- let _wellsFunctionNames = [];
- for (let i = 0; i < wells.length; i++) {
- if (!wells[i].wellFunction) return;
- const _wellName = await wells[i].wellFunction!.contract.name();
- _wellsFunctionNames[i] = _wellName;
- }
- setWellFunctionNames(_wellsFunctionNames);
- };
+ const tableData = useMemo(
+ () => makeTableData(sdk, wells, wellStats, tokenPrices),
+ [sdk, tokenPrices, wellStats, wells]
+ );
- run();
- }, [sdk, wells]);
+ const loading = useLagLoading(
+ isLoading ||
+ apysLoading ||
+ positionsLoading ||
+ lpTokenPricesLoading ||
+ tokenPricesLoading ||
+ wellNamesLoading
+ );
if (error) {
return ;
@@ -89,6 +82,8 @@ export const Wells = () => {
Well Function
Yield
Total Liquidity
+ Price
+ 24H Volume
Reserves
All Wells
@@ -105,7 +100,7 @@ export const Wells = () => {
)}
- {loading ? (
+ {loading || !tableData.length ? (
<>
{Array(5)
.fill(null)
@@ -129,15 +124,24 @@ export const Wells = () => {
) : (
- wells?.map((well, index) => {
- return tab === 0 ? (
-
- ) : (
+ tableData?.map(({ well, baseTokenPrice, liquidityUSD, targetVolume }, index) => {
+ if (tab === 0) {
+ const priceFnName =
+ well.wellFunction?.name || wellFnNames?.[well.wellFunction?.address || ""];
+
+ return (
+
+ );
+ }
+
+ return (
{
)}
+
);
};
+const makeTableData = (
+ sdk: BeanstalkSDK,
+ wells?: Well[],
+ stats?: BasinAPIResponse[],
+ tokenPrices?: Record
+) => {
+ if (!wells || !wells.length || !tokenPrices) return [];
+
+ const statsByPoolId = (stats ?? []).reduce>(
+ (prev, curr) => ({ ...prev, [curr.pool_id.toLowerCase()]: curr }),
+ {}
+ );
+
+ const data = (wells || []).map((well) => {
+ let baseTokenPrice: TokenValue | undefined = undefined;
+ let liquidityUSD: TokenValue | undefined = undefined;
+ let targetVolume: TokenValue | undefined = undefined;
+
+ let liquidityUSDInferred: TokenValue | undefined = undefined;
+
+ const token1 = well.tokens?.[0];
+ const token2 = well.tokens?.[1];
+
+ if (token1 && token2) {
+ const basePrice = tokenPrices[token1.symbol] || TokenValue.ZERO;
+ const targetPrice = tokenPrices[token2.symbol] || TokenValue.ZERO;
+
+ const reserve1 = well.reserves?.[0];
+ const reserve2 = well.reserves?.[1];
+ const reserve1USD = reserve1?.mul(basePrice);
+ const reserve2USD = reserve2?.mul(targetPrice);
+
+ if (reserve2USD && reserve1 && reserve1.gt(0)) {
+ baseTokenPrice = reserve2USD.div(reserve1);
+ }
+ if (reserve1USD && reserve2USD && reserve2USD.gt(0)) {
+ liquidityUSD = reserve1USD.add(reserve2USD);
+ }
+
+ const baseVolume = token2.fromHuman(
+ statsByPoolId[well.address.toLowerCase()]?.target_volume || 0
+ );
+ targetVolume = baseVolume.mul(targetPrice);
+
+ const bothPricesAvailable = !!(reserve1USD && reserve2USD);
+ const atLeastOnePriceAvailable = !!(reserve1USD || reserve1USD);
+
+ if (atLeastOnePriceAvailable && !bothPricesAvailable) {
+ // Since we don't have the other price, we assume reserves are balanced 50% - 50%
+ if (reserve1USD) liquidityUSDInferred = reserve1USD.mul(2);
+ if (reserve2USD) liquidityUSDInferred = reserve2USD.mul(2);
+ } else if (bothPricesAvailable) {
+ liquidityUSDInferred = liquidityUSD;
+ }
+ }
+
+ const hasReserves = well.reserves?.[0]?.gt(0) && well.reserves?.[1]?.gt(0);
+
+ return {
+ well,
+ baseTokenPrice,
+ liquidityUSD,
+ targetVolume,
+ liquidityUSDInferred,
+ hasReserves
+ };
+ });
+
+ const whitelistedSort = data.sort(getSortByWhitelisted(sdk));
+
+ const sortedByLiquidity = whitelistedSort.sort((a, b) => {
+ if (!a.liquidityUSDInferred) return 1;
+ if (!b.liquidityUSDInferred) return -1;
+
+ const diff = a.liquidityUSDInferred.sub(b.liquidityUSDInferred);
+ if (diff.eq(0)) return 0;
+ return diff.gt(0) ? -1 : 1;
+ });
+
+ const sortedByHasReserves = sortedByLiquidity.sort((a, b) => {
+ if (a.hasReserves === b.hasReserves) return 0;
+ return a.hasReserves && !b.hasReserves ? -1 : 1;
+ });
+
+ return sortedByHasReserves;
+};
+
+const getSortByWhitelisted =
+ (sdk: BeanstalkSDK) =>
+ (a: T, b: T) => {
+ const aWhitelisted = a.well.lpToken && sdk.tokens.isWhitelisted(a.well.lpToken);
+ const bWhitelisted = b.well.lpToken && sdk.tokens.isWhitelisted(b.well.lpToken);
+
+ if (aWhitelisted) return -1;
+ if (bWhitelisted) return 1;
+ return 0;
+ };
+
const StyledTable = styled(Table)`
overflow: auto;
`;
@@ -183,6 +286,32 @@ const MobileHeader = styled(Th)`
`;
const DesktopHeader = styled(Th)`
+ :nth-child(1) {
+ width: 10em;
+ }
+ :nth-child(2) {
+ width: 12em;
+ }
+ :nth-child(3) {
+ width: 12em;
+ }
+
+ :nth-child(5) {
+ @media (max-width: ${size.desktop}) {
+ display: none;
+ }
+ }
+ :nth-child(6) {
+ @media (max-width: ${size.desktop}) {
+ display: none;
+ }
+ }
+
+ :nth-child(3) {
+ @media (max-width: ${size.tablet}) {
+ display: none;
+ }
+ }
@media (max-width: ${size.mobile}) {
display: none;
}
@@ -217,3 +346,12 @@ const NoLPMessage = styled.div`
font-size: 14px;
}
`;
+
+const MobileBottomNudge = styled.div`
+ height: ${theme.spacing(8)};
+ width: 100%;
+
+ ${theme.media.query.sm.up} {
+ display: none;
+ }
+`;
\ No newline at end of file
diff --git a/projects/dex-ui/src/queries/GetWellChartData.graphql b/projects/dex-ui/src/queries/GetWellChartData.graphql
index 0ac4d4f2f8..a51405c22a 100644
--- a/projects/dex-ui/src/queries/GetWellChartData.graphql
+++ b/projects/dex-ui/src/queries/GetWellChartData.graphql
@@ -3,7 +3,7 @@ query GetWellChartData($id: ID!, $lastUpdateTimestamp_gte: BigInt!, $resultsToSk
hourlySnapshots(first: 1000, skip: $resultsToSkip, orderBy: lastUpdateTimestamp, orderDirection: asc, where: { lastUpdateTimestamp_gte: $lastUpdateTimestamp_gte }) {
lastUpdateTimestamp
totalLiquidityUSD
- deltaVolumeUSD
+ deltaTradeVolumeUSD
}
}
}
diff --git a/projects/dex-ui/src/settings/index.ts b/projects/dex-ui/src/settings/index.ts
index 4adc6711b6..1eff6a01ee 100644
--- a/projects/dex-ui/src/settings/index.ts
+++ b/projects/dex-ui/src/settings/index.ts
@@ -19,7 +19,7 @@ export type DexSettings = {
NETLIFY_BUILD_ID?: string;
};
-const temp = netlifyContext === "production" ? ProdSettings : DevSettings;
+const temp = netlifyContext === "production" || netlifyContext === "deploy-preview" ? ProdSettings : DevSettings;
export const Settings = {
...temp,
@@ -28,5 +28,7 @@ export const Settings = {
NETLIFY_BUILD_ID: netlifyBuildId
};
+export const isNetlifyContext = netlifyContext === 'deploy-preview';
+
// @ts-ignore
globalThis.settings = () => Log.module("settings").log(Settings);
diff --git a/projects/dex-ui/src/token-metadata.json b/projects/dex-ui/src/token-metadata.json
new file mode 100644
index 0000000000..8fb98ef21e
--- /dev/null
+++ b/projects/dex-ui/src/token-metadata.json
@@ -0,0 +1,151 @@
+{
+ "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599": {
+ "address": "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599",
+ "logoURI": "https://static.alchemyapi.io/images/assets/3717.png",
+ "name": "Wrapped BTC",
+ "symbol": "WBTC",
+ "displayName": "Wrapped Bitcoin",
+ "decimals": 8,
+ "displayDecimals": 3
+ },
+ "0x6982508145454ce325ddbe47a25d4ec3d2311933": {
+ "address": "0x6982508145454ce325ddbe47a25d4ec3d2311933",
+ "logoURI": "https://static.alchemyapi.io/images/assets/24478.png",
+ "name": "Pepe",
+ "symbol": "PEPE",
+ "decimals": 18
+ },
+ "0x576e2bed8f7b46d34016198911cdf9886f78bea7": {
+ "address": "0x576e2bed8f7b46d34016198911cdf9886f78bea7",
+ "logoURI": "https://static.alchemyapi.io/images/assets/27872.png",
+ "name": "MAGA",
+ "symbol": "TRUMP",
+ "decimals": 9
+ },
+ "0x02f92800f57bcd74066f5709f1daa1a4302df875": {
+ "address": "0x02f92800f57bcd74066f5709f1daa1a4302df875",
+ "logoURI": "https://static.alchemyapi.io/images/assets/29186.png",
+ "name": "Peapods",
+ "symbol": "PEAS",
+ "decimals": 18
+ },
+ "0x64aa3364f17a4d01c6f1751fd97c2bd3d7e7f1d5": {
+ "address": "0x64aa3364f17a4d01c6f1751fd97c2bd3d7e7f1d5",
+ "logoURI": "https://static.alchemyapi.io/images/assets/9067.png",
+ "name": "Olympus",
+ "symbol": "OHM",
+ "decimals": 9
+ },
+ "0x514910771af9ca656af840dff83e8264ecf986ca": {
+ "address": "0x514910771af9ca656af840dff83e8264ecf986ca",
+ "logoURI": "https://static.alchemyapi.io/images/assets/1975.png",
+ "name": "ChainLink Token",
+ "symbol": "LINK",
+ "decimals": 18
+ },
+ "0xd29da236dd4aac627346e1bba06a619e8c22d7c5": {
+ "address": "0xd29da236dd4aac627346e1bba06a619e8c22d7c5",
+ "logoURI": "https://static.alchemyapi.io/images/assets/31305.png",
+ "name": "MAGA",
+ "symbol": "MAGA",
+ "decimals": 9
+ },
+ "0x1f9840a85d5af5bf1d1762f925bdaddc4201f984": {
+ "address": "0x1f9840a85d5af5bf1d1762f925bdaddc4201f984",
+ "logoURI": "https://static.alchemyapi.io/images/assets/7083.png",
+ "name": "Uniswap",
+ "symbol": "UNI",
+ "decimals": 18
+ },
+ "0xb8c77482e45f1f44de1745f52c74426c631bdd52": {
+ "address": "0xb8c77482e45f1f44de1745f52c74426c631bdd52",
+ "logoURI": "https://static.alchemyapi.io/images/assets/1839.png",
+ "name": "BNB",
+ "symbol": "BNB",
+ "decimals": 18
+ },
+ "0x4da27a545c0c5b758a6ba100e3a049001de870f5": {
+ "address": "0x4da27a545c0c5b758a6ba100e3a049001de870f5",
+ "logoURI": "https://etherscan.io/token/images/stakedaave_32.png",
+ "name": "Staked Aave",
+ "symbol": "stkAAVE",
+ "decimals": 18
+ },
+ "0x5a98fcbea516cf06857215779fd812ca3bef1b32": {
+ "address": "0x5a98fcbea516cf06857215779fd812ca3bef1b32",
+ "logoURI": "https://static.alchemyapi.io/images/assets/8000.png",
+ "name": "Lido DAO Token",
+ "symbol": "LDO",
+ "decimals": 18
+ },
+ "0xd533a949740bb3306d119cc777fa900ba034cd52": {
+ "address": "0xd533a949740bb3306d119cc777fa900ba034cd52",
+ "logoURI": "https://static.alchemyapi.io/images/assets/6538.png",
+ "name": "Curve DAO Token",
+ "symbol": "CRV",
+ "decimals": 18
+ },
+ "0xb50721bcf8d664c30412cfbc6cf7a15145234ad1": {
+ "address": "0xb50721bcf8d664c30412cfbc6cf7a15145234ad1",
+ "logoURI": "https://static.alchemyapi.io/images/assets/11841.png",
+ "name": "Arbitrum",
+ "symbol": "ARB",
+ "decimals": 18
+ },
+ "0x6985884c4392d348587b19cb9eaaf157f13271cd": {
+ "address": "0x6985884c4392d348587b19cb9eaaf157f13271cd",
+ "logoURI": "https://static.alchemyapi.io/images/assets/26997.png",
+ "name": "LayerZero",
+ "symbol": "ZRO",
+ "decimals": 18
+ },
+ "0x85f17cf997934a597031b2e18a9ab6ebd4b9f6a4": {
+ "address": "0x85f17cf997934a597031b2e18a9ab6ebd4b9f6a4",
+ "logoURI": "https://assets.coingecko.com/coins/images/10365/standard/near.jpg?1696510367",
+ "name": "NEAR",
+ "symbol": "NEAR",
+ "decimals": 24
+ },
+ "0x163f8c2467924be0ae7b5347228cabf260318753": {
+ "address": "0x163f8c2467924be0ae7b5347228cabf260318753",
+ "logoURI": "https://static.alchemyapi.io/images/assets/13502.png",
+ "name": "Worldcoin",
+ "symbol": "WLD",
+ "decimals": 18
+ },
+ "0xfaba6f8e4a5e8ab82f62fe7c39859fa577269be3": {
+ "address": "0xfaba6f8e4a5e8ab82f62fe7c39859fa577269be3",
+ "logoURI": "https://static.alchemyapi.io/images/assets/21159.png",
+ "name": "Ondo",
+ "symbol": "ONDO",
+ "decimals": 18
+ },
+ "0xe28b3b32b6c345a34ff64674606124dd5aceca30": {
+ "address": "0xe28b3b32b6c345a34ff64674606124dd5aceca30",
+ "logoURI": "https://static.alchemyapi.io/images/assets/7226.png",
+ "name": "Injective Token",
+ "symbol": "INJ",
+ "decimals": 18
+ },
+ "0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee": {
+ "address": "0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee",
+ "logoURI": "https://static.alchemyapi.io/images/assets/28695.png",
+ "name": "Wrapped eETH",
+ "symbol": "weETH",
+ "decimals": 18
+ },
+ "0xb9f599ce614feb2e1bbe58f180f370d05b39344e": {
+ "address": "0xb9f599ce614feb2e1bbe58f180f370d05b39344e",
+ "logoURI": "https://static.alchemyapi.io/images/assets/29220.png",
+ "name": "PepeFork",
+ "symbol": "PORK",
+ "decimals": 18
+ },
+ "0x853d955acef822db058eb8505911ed77f175b99e": {
+ "address": "0x853d955acef822db058eb8505911ed77f175b99e",
+ "logoURI": "https://static.alchemyapi.io/images/assets/6952.png",
+ "name": "Frax",
+ "symbol": "FRAX",
+ "decimals": 18
+ }
+}
diff --git a/projects/dex-ui/src/tokens/TokenProvider.tsx b/projects/dex-ui/src/tokens/TokenProvider.tsx
index ae71d6661b..6c814fea61 100644
--- a/projects/dex-ui/src/tokens/TokenProvider.tsx
+++ b/projects/dex-ui/src/tokens/TokenProvider.tsx
@@ -19,7 +19,10 @@ export const TokenProvider = ({ children }: { children: React.ReactNode }) => {
for (const token of tokens || []) {
let logo = images[token.symbol] ?? images.DEFAULT;
- token.setMetadata({ logo });
+
+ if (!logo && token.isLP) logo = images.LP;
+ if (!token.logo) token.setMetadata({ logo });
+
add(token);
}
diff --git a/projects/dex-ui/src/tokens/useAllTokenBalance.tsx b/projects/dex-ui/src/tokens/useAllTokenBalance.tsx
index cbdc43e21c..91624a98e0 100644
--- a/projects/dex-ui/src/tokens/useAllTokenBalance.tsx
+++ b/projects/dex-ui/src/tokens/useAllTokenBalance.tsx
@@ -7,6 +7,8 @@ import { useAccount } from "wagmi";
import { useTokens } from "./TokenProvider";
import { Log } from "src/utils/logger";
import { config } from "src/utils/wagmi/config";
+import { ContractFunctionParameters } from "viem";
+import { queryKeys } from "src/utils/query/queryKeys";
const TokenBalanceABI = [
{
@@ -20,63 +22,78 @@ const TokenBalanceABI = [
}
] as const;
+const MAX_PER_CALL = 20;
+
export const useAllTokensBalance = () => {
const tokens = useTokens();
const { address } = useAccount();
const queryClient = useQueryClient();
- // Remove ETH from this list, manually get the balance below
const tokensToLoad = Object.values(tokens).filter((t) => t.symbol !== "ETH");
- if (tokensToLoad.length > 20) throw new Error("Too many tokens to load balances. Fix me");
const calls = useMemo(() => {
- const contractCalls: any[] = [];
- Log.module("app").debug(`Fetching token balances for ${tokensToLoad.length} tokens, for address ${address}`);
- for (const t of tokensToLoad) {
- contractCalls.push({
- address: t.address as `0x{string}`,
+ const contractCalls: ContractFunctionParameters[][] = [];
+ Log.module("app").debug(
+ `Fetching token balances for ${tokensToLoad.length} tokens, for address ${address}`
+ );
+
+ let callBucket: ContractFunctionParameters[] = [];
+
+ tokensToLoad.forEach((token, i) => {
+ callBucket.push({
+ address: token.address as `0x{string}`,
abi: TokenBalanceABI,
functionName: "balanceOf",
args: [address]
});
- }
+
+ if (i % MAX_PER_CALL === MAX_PER_CALL - 1) {
+ contractCalls.push([...callBucket]);
+ callBucket = [];
+ }
+ });
return contractCalls;
// eslint-disable-next-line react-hooks/exhaustive-deps -- doing just tokensToLoad doesn't work and causes multiple calls
}, [address, tokensToLoad.map((t) => t.symbol).join()]);
const { data, isLoading, error, refetch, isFetching } = useQuery({
- queryKey: ["token", "balance"],
-
+ queryKey: queryKeys.tokenBalancesAll,
queryFn: async () => {
if (!address) return {};
- const res = (await multicall(config, {
- contracts: calls,
- allowFailure: false
- })) as unknown as BigNumber[];
+
+ const ETH = tokens.ETH;
+
+ const [ethBalance, ...results] = await Promise.all([
+ ETH.getBalance(address),
+ ...(calls.map((calls) =>
+ multicall(config, { contracts: calls, allowFailure: false })
+ ) as unknown as BigNumber[])
+ ]);
+
+ const res = results.flat();
const balances: Record = {};
+ if (ethBalance) {
+ Log.module("app").debug(`ETH balance: `, ethBalance.toHuman());
+ queryClient.setQueryData(queryKeys.tokenBalance(ETH.symbol), { ETH: ethBalance });
+ balances.ETH = ethBalance;
+ }
+
for (let i = 0; i < res.length; i++) {
const value = res[i];
const token = tokensToLoad[i];
balances[token.symbol] = token.fromBlockchain(value);
// set the balance in the query cache too
- queryClient.setQueryData(["token", "balance", token.symbol], { [token.symbol]: balances[token.symbol] });
-
- }
-
- const ETH = tokens.ETH;
- if (ETH) {
- const ethBalance = await ETH.getBalance(address);
- Log.module("app").debug(`ETH balance: `, ethBalance.toHuman());
- queryClient.setQueryData(["token", "balance", "ETH"], { ETH: ethBalance });
- balances.ETH = ethBalance;
+ queryClient.setQueryData(queryKeys.tokenBalance(token.symbol), {
+ [token.symbol]: balances[token.symbol]
+ });
}
return balances;
},
-
+ enabled: !!address && !!tokensToLoad.length,
staleTime: 1000 * 30,
refetchInterval: 1000 * 30
});
diff --git a/projects/dex-ui/src/tokens/useERC20Token.ts b/projects/dex-ui/src/tokens/useERC20Token.ts
new file mode 100644
index 0000000000..2f4f00f492
--- /dev/null
+++ b/projects/dex-ui/src/tokens/useERC20Token.ts
@@ -0,0 +1,159 @@
+import { BEANETH_ADDRESS, getIsValidEthereumAddress } from "../utils/addresses";
+import useSdk from "../utils/sdk/useSdk";
+import { ERC20Token } from "@beanstalk/sdk";
+import { useQuery } from "@tanstack/react-query";
+
+import { queryKeys } from "src/utils/query/queryKeys";
+import { erc20Abi as abi } from "viem";
+import { multicall } from "@wagmi/core";
+import { useWells } from "src/wells/useWells";
+import { images } from "src/assets/images/tokens";
+import { alchemy } from "src/utils/alchemy";
+import { config } from "src/utils/wagmi/config";
+
+export const USE_ERC20_TOKEN_ERRORS = {
+ notERC20Ish: "Invalid ERC20 Token Address"
+} as const;
+
+const getERC20Data = async (_address: string) => {
+ const address = _address as `0x{string}`;
+ const args: any[] = [];
+
+ const calls: any[] = [
+ { address, abi, functionName: "decimals", args },
+ { address, abi, functionName: "totalSupply", args }
+ ];
+
+ return multicall(config, { contracts: calls });
+};
+
+export const useERC20TokenWithAddress = (_address: string | undefined = "") => {
+ const address = _address.toLowerCase();
+
+ const { data: wells = [] } = useWells();
+ const sdk = useSdk();
+
+ const lpTokens = wells.map((w) => w.lpToken).filter(Boolean) as ERC20Token[];
+ const isValidAddress = getIsValidEthereumAddress(address);
+ const sdkToken = sdk.tokens.findByAddress(address);
+
+ const {
+ data: tokenMetadata,
+ refetch: refetchTokenMetadata,
+ ...tokenMetadataQuery
+ } = useQuery({
+ queryKey: queryKeys.tokenMetadata(isValidAddress ? address : "invalid"),
+ queryFn: async () => {
+ console.debug("[useERC20Token] fetching: ", address);
+ const multiCallResponse = await getERC20Data(address);
+
+ // Validate as much as we can that this is an ERC20 token
+ if (multiCallResponse[0]?.error || multiCallResponse[1]?.error) {
+ throw new Error(USE_ERC20_TOKEN_ERRORS.notERC20Ish);
+ }
+ console.debug("[useERC20Token] erc20 multicall response: ", multiCallResponse);
+
+ const metadata = await alchemy.core.getTokenMetadata(address);
+
+ console.debug("[useERC20Token] token metadata: ", metadata);
+
+ return {
+ name: metadata?.name ?? "",
+ symbol: metadata?.symbol ?? "",
+ decimals: metadata?.decimals ?? undefined,
+ logo: metadata?.logo ?? images.DEFAULT
+ };
+ },
+ enabled: isValidAddress && !sdkToken,
+ // We never need to refetch this data
+ staleTime: Infinity,
+ refetchOnMount: false,
+ retry: false
+ });
+
+ const getTokenLogo = async (token: ERC20Token) => {
+ let logo: string | undefined = token.logo ?? images[token.symbol];
+ if (logo) return logo;
+
+ if (tokenMetadata) {
+ logo = tokenMetadata.logo;
+ } else {
+ const tokenMetadata = await refetchTokenMetadata();
+ logo = tokenMetadata?.data?.logo ?? undefined;
+ }
+
+ return logo ?? images.DEFAULT;
+ };
+
+ const handleIsLPToken = async () => {
+ const lpToken = lpTokens.find((lp) => lp.address.toLowerCase() === address.toLowerCase());
+ if (!lpToken) return undefined;
+
+ if (!lpToken.logo) {
+ const logo = await getTokenLogo(lpToken);
+ lpToken.setMetadata({ logo: logo });
+ }
+ return lpToken;
+ };
+
+ const handleIsSdkERC20Token = async () => {
+ let token = sdk.tokens.findByAddress(address);
+ if (!token) return undefined;
+
+ if (!(token instanceof ERC20Token)) {
+ return Promise.reject(new Error(USE_ERC20_TOKEN_ERRORS.notERC20Ish));
+ }
+
+ if (!token.logo) {
+ const logo = await getTokenLogo(token);
+ token.setMetadata({ logo: logo });
+ }
+ return token;
+ };
+
+ const shouldRunWhenNonSdkToken = Boolean(!sdkToken && isValidAddress && tokenMetadata);
+ const shouldRunWhenSdkToken = Boolean(sdkToken && isValidAddress && lpTokens.length);
+
+ const erc20Query = useQuery({
+ queryKey: queryKeys.erc20TokenWithAddress(isValidAddress ? address : "invalid"),
+ queryFn: async () => {
+ let token: ERC20Token | undefined = undefined;
+ token = await handleIsLPToken();
+ if (token) return token;
+
+ token = await handleIsSdkERC20Token();
+ if (token) return token;
+
+ // The query have run if this we get to this point
+ const { decimals = 0, name = "", symbol = "", logo } = tokenMetadata ?? {};
+
+ if (!decimals || !name || !symbol) {
+ return undefined;
+ }
+
+ const erc20 = new ERC20Token(
+ sdk.chainId,
+ address.toLowerCase(),
+ decimals,
+ symbol.toString() ?? "",
+ {
+ name: name,
+ logo: logo,
+ displayName: name
+ },
+ sdk.providerOrSigner
+ );
+
+ return erc20;
+ },
+ enabled: shouldRunWhenNonSdkToken || shouldRunWhenSdkToken,
+ staleTime: Infinity
+ });
+
+ return {
+ ...erc20Query,
+ error: erc20Query.error || tokenMetadataQuery.error,
+ isError: erc20Query.isError || tokenMetadataQuery.isError,
+ isLoading: erc20Query.isLoading || tokenMetadataQuery.isLoading
+ };
+};
diff --git a/projects/dex-ui/src/tokens/useTokenAllowance.ts b/projects/dex-ui/src/tokens/useTokenAllowance.ts
new file mode 100644
index 0000000000..da3277c1d4
--- /dev/null
+++ b/projects/dex-ui/src/tokens/useTokenAllowance.ts
@@ -0,0 +1,19 @@
+import { ERC20Token } from "@beanstalk/sdk";
+import { useQuery } from "@tanstack/react-query";
+import { queryKeys } from "src/utils/query/queryKeys";
+import { useAccount } from "wagmi";
+
+export const useTokenAllowance = (token: ERC20Token | undefined, spender: string) => {
+ const { address: walletAddress } = useAccount();
+
+ return useQuery({
+ queryKey: queryKeys.tokenAllowance(token?.address, spender),
+ queryFn: async () => {
+ if (!token) return;
+ return token.getAllowance(walletAddress as string, spender);
+ },
+ enabled: !!token,
+ refetchOnWindowFocus: "always",
+ staleTime: 1000 * 30 // 30 seconds,
+ });
+};
diff --git a/projects/dex-ui/src/tokens/useTokenBalance.tsx b/projects/dex-ui/src/tokens/useTokenBalance.tsx
index e0a94cb5af..f0221083a3 100644
--- a/projects/dex-ui/src/tokens/useTokenBalance.tsx
+++ b/projects/dex-ui/src/tokens/useTokenBalance.tsx
@@ -1,17 +1,20 @@
import { Token, TokenValue } from "@beanstalk/sdk";
import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { queryKeys } from "src/utils/query/queryKeys";
import { useAccount } from "wagmi";
-export const useTokenBalance = (token: Token) => {
+type TokenBalanceCache = undefined | void | Record;
+
+export const useTokenBalance = (token: Token | undefined) => {
const { address } = useAccount();
const queryClient = useQueryClient();
- const key = ["token", "balance", token.symbol];
-
const { data, isLoading, error, refetch, isFetching } = useQuery({
- queryKey: key,
+ queryKey: queryKeys.tokenBalance(token?.symbol),
queryFn: async () => {
+ if (!token) return;
+
let balance: TokenValue;
if (!address) {
balance = TokenValue.ZERO;
@@ -24,7 +27,7 @@ export const useTokenBalance = (token: Token) => {
};
// Also update the cache of "ALL" token query
- queryClient.setQueryData(["token", "balance"], (oldData: undefined | void | Record) => {
+ queryClient.setQueryData(queryKeys.tokenBalancesAll, (oldData: TokenBalanceCache) => {
if (!oldData) return result;
return { ...oldData, ...result };
@@ -32,7 +35,7 @@ export const useTokenBalance = (token: Token) => {
return result;
},
-
+ enabled: !!token,
staleTime: 1000 * 15,
refetchInterval: 1000 * 15,
refetchIntervalInBackground: false,
diff --git a/projects/dex-ui/src/tokens/useTokenMetadata.ts b/projects/dex-ui/src/tokens/useTokenMetadata.ts
new file mode 100644
index 0000000000..e3f3084f9c
--- /dev/null
+++ b/projects/dex-ui/src/tokens/useTokenMetadata.ts
@@ -0,0 +1,100 @@
+import { useQuery } from "@tanstack/react-query";
+import { alchemy } from "../utils/alchemy";
+import { TokenMetadataResponse } from "alchemy-sdk";
+
+import { useTokens } from "src/tokens/TokenProvider";
+import { useWells } from "src/wells/useWells";
+import { getIsValidEthereumAddress } from "src/utils/addresses";
+import { queryKeys } from "src/utils/query/queryKeys";
+import { ERC20Token, Token } from "@beanstalk/sdk";
+import { images } from "src/assets/images/tokens";
+import { useMemo } from "react";
+
+const emptyMetas: TokenMetadataResponse = {
+ decimals: null,
+ logo: null,
+ name: null,
+ symbol: null
+};
+
+const defaultMetas: TokenMetadataResponse = {
+ name: "UNKNOWN",
+ symbol: "UNKNOWN",
+ logo: images.DEFAULT,
+ decimals: null
+};
+
+type TokenIsh = Token | ERC20Token | undefined;
+
+export const useTokenMetadata = (params: string | TokenIsh): TokenMetadataResponse | undefined => {
+ const address = (params instanceof Token ? params.address : params || "").toLowerCase();
+
+ const isValidAddress = getIsValidEthereumAddress(address);
+ const { data: wells } = useWells();
+ const tokens = useTokens();
+
+ const wellPairToken = Object.values(tokens).find((t) => t.address.toLowerCase() === address);
+ const lpToken = wells?.find((well) => well.address.toLowerCase() === address)?.lpToken;
+ const existingToken = wellPairToken || lpToken;
+
+ const existingMetas = useMemo(() => {
+ const metas = { ...emptyMetas };
+ if (isValidAddress && existingToken) {
+ if (existingToken.name) metas.name = existingToken.name;
+ if (existingToken.decimals) metas.decimals = existingToken.decimals;
+ if (existingToken.symbol) metas.symbol = existingToken.symbol;
+ if (existingToken.logo && !existingToken.logo?.includes("DEFAULT.svg")) {
+ metas.logo = existingToken.logo;
+ };
+ }
+
+ return metas;
+ }, [isValidAddress, existingToken]);
+
+ const metaValues = Object.values(existingMetas);
+ const hasAllMetas = metaValues.length && metaValues.every(Boolean);
+
+ const query = useQuery({
+ queryKey: queryKeys.tokenMetadata(address || "invalid"),
+ queryFn: async () => {
+ if (!wells?.length) return;
+
+ let metas = { ...existingMetas };
+ const tokenMeta = await alchemy.core.getTokenMetadata(address ?? "");
+ if (!tokenMeta) return { ...defaultMetas };
+
+ metas = mergeMetas(tokenMeta, metas);
+
+ return metas;
+ },
+ enabled: isValidAddress && !!wells?.length && !hasAllMetas,
+ retry: false,
+ // We never need to refetch this data
+ staleTime: Infinity
+ });
+
+ const metadatas = useMemo(() => {
+ const meta: TokenMetadataResponse = {
+ name: existingMetas?.name ?? query.data?.name ?? null,
+ symbol: existingMetas?.symbol ?? query.data?.symbol ?? null,
+ logo: existingMetas?.logo ?? query.data?.logo ?? null,
+ decimals: existingMetas?.decimals ?? query.data?.decimals ?? null
+ };
+
+ return meta;
+ }, [existingMetas, query.data]);
+
+ return metadatas;
+};
+
+const mergeMetas = (
+ data: Token | TokenMetadataResponse | undefined,
+ meta: TokenMetadataResponse
+) => {
+ if (!data) return meta;
+ if (!meta.decimals && data?.decimals) meta.decimals = data.decimals;
+ if (!meta.symbol && data?.symbol) meta.symbol = data.symbol;
+ if (!meta.name && data?.name) meta.name = data.name;
+ if (!meta.logo && data?.logo) meta.logo = data.logo;
+ return meta;
+};
diff --git a/projects/dex-ui/src/types.tsx b/projects/dex-ui/src/types.tsx
index 78cb440709..eb277adeff 100644
--- a/projects/dex-ui/src/types.tsx
+++ b/projects/dex-ui/src/types.tsx
@@ -3,3 +3,34 @@ import React from "react";
export type FC = React.FC>;
export type Address = `0x${string}`;
+
+export type BasinAPIResponse = {
+ ticker_id: `${Address}_${Address}`;
+ base_currency: Address;
+ target_currency: Address;
+ pool_id: Address;
+ last_price: number;
+ base_volume: number;
+ target_volume: number;
+ liquidity_in_usd: number;
+ high: number;
+ low: number;
+};
+
+// Primitives
+export type MayArray = T | T[];
+
+// Objects
+export type AddressMap = Record;
+
+/// JSON objects
+export type TokenMetadataMap = AddressMap<{
+ address: string;
+ name: string;
+ symbol: string;
+ decimals: number;
+ logoURI: string;
+ displayName?: string;
+ displayDecimals?: number;
+}>;
+
diff --git a/projects/dex-ui/src/utils/addresses.ts b/projects/dex-ui/src/utils/addresses.ts
index 15752e4abe..50d11793e7 100644
--- a/projects/dex-ui/src/utils/addresses.ts
+++ b/projects/dex-ui/src/utils/addresses.ts
@@ -1,7 +1,45 @@
/// All addresses are in lowercase for consistency
+import { ethers } from "ethers";
+import { AddressMap } from "src/types";
+
/// Well LP Tokens
export const BEANETH_ADDRESS = "0xbea0e11282e2bb5893bece110cf199501e872bad";
/// Pump Addresses
-export const BEANETH_MULTIPUMP_ADDRESS = "0xba510f10e3095b83a0f33aa9ad2544e22570a87c";
+export const MULTI_FLOW_PUMP_ADDRESS = "0xBA51AaaAa95bA1d5efB3cB1A3f50a09165315A17";
+
+/// Well Function Addresses
+export const CONSTANT_PRODUCT_2_ADDRESS = "0xba510c20fd2c52e4cb0d23cfc3ccd092f9165a6e";
+
+// Well Implementation
+export const WELL_DOT_SOL_ADDRESS = "0xba510e11eeb387fad877812108a3406ca3f43a4b";
+
+// ---------- METHODS ----------
+
+export const getIsValidEthereumAddress = (
+ address: string | undefined,
+ enforce0Suffix = true
+): boolean => {
+ if (!address) return false;
+ if (enforce0Suffix && !address.startsWith("0x")) return false;
+ return ethers.utils.isAddress(address ?? "");
+};
+
+/**
+ * Converts an object or array of objects with an address property to a map of address to object.
+ */
+export const toAddressMap = (
+ hasAddress: T | T[],
+ options?: {
+ keyLowercase?: boolean;
+ }
+) => {
+ const arr = Array.isArray(hasAddress) ? hasAddress : [hasAddress];
+
+ return arr.reduce>((prev, curr) => {
+ const key = options?.keyLowercase ? curr.address.toLowerCase() : curr.address;
+ prev[key] = curr;
+ return prev;
+ }, {});
+};
\ No newline at end of file
diff --git a/projects/dex-ui/src/utils/alchemy.ts b/projects/dex-ui/src/utils/alchemy.ts
new file mode 100644
index 0000000000..e0c9cbd460
--- /dev/null
+++ b/projects/dex-ui/src/utils/alchemy.ts
@@ -0,0 +1,6 @@
+import { Alchemy, Network } from "alchemy-sdk";
+
+export const alchemy = new Alchemy({
+ apiKey: import.meta.env.VITE_ALCHEMY_API_KEY,
+ network: Network.ETH_MAINNET
+});
diff --git a/projects/dex-ui/src/utils/bytes.ts b/projects/dex-ui/src/utils/bytes.ts
new file mode 100644
index 0000000000..599e7e162b
--- /dev/null
+++ b/projects/dex-ui/src/utils/bytes.ts
@@ -0,0 +1,9 @@
+import { ethers } from "ethers";
+
+export function getBytesHexString(value: string | number, padding?: number) {
+ const bigNumber = ethers.BigNumber.from(value.toString());
+ const hexStr = bigNumber.toHexString();
+ if (!padding) return hexStr;
+
+ return ethers.utils.hexZeroPad(bigNumber.toHexString(), padding);
+}
diff --git a/projects/dex-ui/src/utils/check.ts b/projects/dex-ui/src/utils/check.ts
new file mode 100644
index 0000000000..4c9360cd0f
--- /dev/null
+++ b/projects/dex-ui/src/utils/check.ts
@@ -0,0 +1,7 @@
+export function exists(value: T | undefined | null): value is NonNullable {
+ return value !== undefined && value !== null;
+}
+
+export function existsNot(value: any): value is undefined | null {
+ return !exists(value);
+}
diff --git a/projects/dex-ui/src/utils/format.ts b/projects/dex-ui/src/utils/format.ts
index ebda31e637..e80263aeac 100644
--- a/projects/dex-ui/src/utils/format.ts
+++ b/projects/dex-ui/src/utils/format.ts
@@ -13,12 +13,19 @@ export const formatNum = (
defaultValue?: string;
minDecimals?: number;
maxDecimals?: number;
+ minValue?: number;
}
) => {
if (val === undefined || val === null) return options?.defaultValue || "-.--";
const normalised = val instanceof TokenValue ? val.toHuman() : val.toString();
+ const num = Number(normalised);
+
+ if (options?.minValue && num > 0 && num < options.minValue) {
+ return `<${options.minValue}`
+ }
+
return Number(normalised).toLocaleString("en-US", {
minimumFractionDigits: options?.minDecimals || 0,
maximumFractionDigits: options?.maxDecimals || 2
diff --git a/projects/dex-ui/src/utils/price/priceLookups.ts b/projects/dex-ui/src/utils/price/priceLookups.ts
index 2a958655bd..9dce0f1fc5 100644
--- a/projects/dex-ui/src/utils/price/priceLookups.ts
+++ b/projects/dex-ui/src/utils/price/priceLookups.ts
@@ -12,12 +12,37 @@ import { Log } from "../logger";
*
*/
-const ETH_USD = "0x5f4ec3df9cbd43714fe2740f5e3616155c5b8419";
-const USDC_USD = "0x8fffffd4afb6115b954bd326cbe7b4ba576818f6";
-const DAI_USD = "0xaed0c38402a5d19df6e4c03f4e2dced6e29c1ee9";
+const FEEDS = {
+ /// BTC Feeds
+ WBTC_BTC: "0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23",
-const chainlinkLookup = (address: string) => async (sdk: BeanstalkSDK) => {
- Log.module("price").debug(`Fetching ${sdk.tokens.findByAddress(address)?.symbol || address} price`);
+ /// ETH Data Feeds
+ LDO_ETH: "0x4e844125952D32AcdF339BE976c98E22F6F318dB",
+ WeETH_ETH: "0x5c9C449BbC9a6075A2c061dF312a35fd1E05fF22",
+
+ /// USD Data Feeds
+ ETH_USD: "0x5f4ec3df9cbd43714fe2740f5e3616155c5b8419",
+ USDC_USD: "0x8fffffd4afb6115b954bd326cbe7b4ba576818f6",
+ DAI_USD: "0xaed0c38402a5d19df6e4c03f4e2dced6e29c1ee9",
+ USDT_USD: "0x3E7d1eAB13ad0104d2750B8863b489D65364e32D",
+ BTC_USD: "0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c",
+ BNB_USD: "0x14e613AC84a31f709eadbdF89C6CC390fDc9540A",
+ ARB_USD: "0x31697852a68433DbCc2Ff612c516d69E3D9bd08F",
+ AMPL_USD: "0xe20CA8D7546932360e37E9D72c1a47334af57706",
+ AAVE_USD: "0x547a514d5e3769680Ce22B2361c10Ea13619e8a9",
+ CRV_USD: "0xCd627aA160A6fA45Eb793D19Ef54f5062F20f33f",
+ FRAX_USD: "0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD",
+ LINK_USD: "0x2c1d072e956AFFC0D435Cb7AC38EF18d24d9127c",
+ LUSD_USD: "0x3D7aE7E594f2f2091Ad8798313450130d0Aba3a0",
+ STETH_USD: "0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8",
+ UNI_USD: "0x553303d460EE0afB37EdFf9bE42922D8FF63220e"
+};
+
+const chainlinkLookup = (feed: keyof typeof FEEDS) => async (sdk: BeanstalkSDK) => {
+ const address = FEEDS[feed];
+ Log.module("price").debug(
+ `Fetching ${sdk.tokens.findByAddress(address)?.symbol || address} price`
+ );
const contract = PriceContract__factory.connect(address, sdk.providerOrSigner);
const { answer } = await contract.latestRoundData();
const decimals = await contract.decimals();
@@ -25,6 +50,16 @@ const chainlinkLookup = (address: string) => async (sdk: BeanstalkSDK) => {
return TokenValue.fromBlockchain(answer, decimals);
};
+const multiChainlinkLookup =
+ (from: keyof typeof FEEDS, to: keyof typeof FEEDS) => async (sdk: BeanstalkSDK) => {
+ const [fromPrice, toPrice] = await Promise.all([
+ chainlinkLookup(from)(sdk),
+ chainlinkLookup(to)(sdk)
+ ]);
+
+ return toPrice.mul(fromPrice);
+ };
+
const BEAN = async (sdk: BeanstalkSDK) => {
Log.module("price").debug("Fetching BEAN price");
return sdk.bean.getPrice();
@@ -34,8 +69,23 @@ const PRICE_EXPIRY_TIMEOUT = 60 * 5; // 5 minute cache
export const PriceLookups: Record Promise> = {
BEAN: memoize(BEAN, PRICE_EXPIRY_TIMEOUT),
- ETH: memoize(chainlinkLookup(ETH_USD), PRICE_EXPIRY_TIMEOUT),
- WETH: memoize(chainlinkLookup(ETH_USD), PRICE_EXPIRY_TIMEOUT),
- USDC: memoize(chainlinkLookup(USDC_USD), PRICE_EXPIRY_TIMEOUT),
- DAI: memoize(chainlinkLookup(DAI_USD), PRICE_EXPIRY_TIMEOUT)
+ ETH: memoize(chainlinkLookup("ETH_USD"), PRICE_EXPIRY_TIMEOUT),
+ WETH: memoize(chainlinkLookup("ETH_USD"), PRICE_EXPIRY_TIMEOUT),
+ USDC: memoize(chainlinkLookup("USDC_USD"), PRICE_EXPIRY_TIMEOUT),
+ DAI: memoize(chainlinkLookup("DAI_USD"), PRICE_EXPIRY_TIMEOUT),
+ USDT: memoize(chainlinkLookup("USDT_USD"), PRICE_EXPIRY_TIMEOUT),
+ BNB: memoize(chainlinkLookup("BNB_USD"), PRICE_EXPIRY_TIMEOUT),
+ ARB: memoize(chainlinkLookup("ARB_USD"), PRICE_EXPIRY_TIMEOUT),
+ AMPL: memoize(chainlinkLookup("AMPL_USD"), PRICE_EXPIRY_TIMEOUT),
+ AAVE: memoize(chainlinkLookup("AAVE_USD"), PRICE_EXPIRY_TIMEOUT),
+ CRV: memoize(chainlinkLookup("CRV_USD"), PRICE_EXPIRY_TIMEOUT),
+ FRAX: memoize(chainlinkLookup("FRAX_USD"), PRICE_EXPIRY_TIMEOUT),
+ LINK: memoize(chainlinkLookup("LINK_USD"), PRICE_EXPIRY_TIMEOUT),
+ LUSD: memoize(chainlinkLookup("LUSD_USD"), PRICE_EXPIRY_TIMEOUT),
+ STETH: memoize(chainlinkLookup("STETH_USD"), PRICE_EXPIRY_TIMEOUT),
+ UNI: memoize(chainlinkLookup("UNI_USD"), PRICE_EXPIRY_TIMEOUT),
+ BTC: memoize(chainlinkLookup("BTC_USD"), PRICE_EXPIRY_TIMEOUT),
+ WBTC: memoize(multiChainlinkLookup("WBTC_BTC", "BTC_USD"), PRICE_EXPIRY_TIMEOUT),
+ LDO: memoize(multiChainlinkLookup("LDO_ETH", "ETH_USD"), PRICE_EXPIRY_TIMEOUT),
+ weETH: memoize(multiChainlinkLookup("WeETH_ETH", "ETH_USD"), PRICE_EXPIRY_TIMEOUT)
};
diff --git a/projects/dex-ui/src/utils/price/useTokenPrices.ts b/projects/dex-ui/src/utils/price/useTokenPrices.ts
new file mode 100644
index 0000000000..5ae5946518
--- /dev/null
+++ b/projects/dex-ui/src/utils/price/useTokenPrices.ts
@@ -0,0 +1,81 @@
+import { ERC20Token, TokenValue } from "@beanstalk/sdk";
+import { Well } from "@beanstalk/sdk-wells";
+import { queryKeys } from "../query/queryKeys";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import useSdk from "../sdk/useSdk";
+import { getPrice } from "./usePrice";
+import { PriceLookups } from "./priceLookups";
+import { Log } from "../../utils/logger";
+import { AddressMap } from "src/types";
+import { UseReactQueryOptions } from "../query/types";
+
+type WellOrToken = Well | ERC20Token;
+
+type TokenPricesAllCache = undefined | void | Record;
+
+const getTokens = (wellOrToken: WellOrToken | WellOrToken[] | undefined) => {
+ let tokens: ERC20Token[] = [];
+
+ if (Array.isArray(wellOrToken)) {
+ tokens = wellOrToken.flatMap((w) => (w instanceof Well ? w.tokens || [] : w));
+ } else if (wellOrToken instanceof Well) {
+ tokens = wellOrToken.tokens || [];
+ } else if (wellOrToken instanceof ERC20Token) {
+ tokens = [wellOrToken];
+ }
+
+ return tokens;
+};
+
+/**
+ * returns
+ */
+export const useTokenPrices = >(
+ params: WellOrToken | WellOrToken[] | undefined,
+ options?: UseReactQueryOptions, K>
+) => {
+ const queryClient = useQueryClient();
+ const sdk = useSdk();
+
+ const tokens = getTokens(params);
+
+ const tokenSymbol = tokens.map((token) => token.symbol);
+
+ const query = useQuery({
+ queryKey: queryKeys.tokenPrices(tokenSymbol),
+ queryFn: async () => {
+ const pricesResult = await Promise.all(
+ tokens.map((token) => {
+ if (PriceLookups[token.symbol]) return getPrice(token, sdk);
+
+ Log.module("useTokenPrices").debug("No price lookup function for ", token.symbol, "... resolving with 0");
+ return Promise.resolve(token.fromHuman("0"));
+ })
+ );
+
+ const addressToPriceMap = tokens.reduce>((prev, curr, i) => {
+ const result = pricesResult[i];
+ if (result && result.gt(0)) {
+ prev[curr.symbol] = result;
+ }
+ return prev;
+ }, {});
+
+ /// set the cache for all token prices
+ queryClient.setQueryData(queryKeys.tokenPricesAll, (oldData: TokenPricesAllCache) => {
+ if (!oldData) return { ...addressToPriceMap };
+ return { ...oldData, ...addressToPriceMap };
+ });
+
+ return addressToPriceMap;
+ },
+ enabled: !!params && !!tokenSymbol.length,
+ refetchInterval: 60 * 1000,
+ staleTime: 60 * 1000,
+ refetchOnWindowFocus: false,
+ refetchIntervalInBackground: false,
+ ...options
+ });
+
+ return query;
+};
diff --git a/projects/dex-ui/src/utils/query/queryKeys.ts b/projects/dex-ui/src/utils/query/queryKeys.ts
new file mode 100644
index 0000000000..ec79a4935b
--- /dev/null
+++ b/projects/dex-ui/src/utils/query/queryKeys.ts
@@ -0,0 +1,26 @@
+export const queryKeys = {
+ erc20TokenWithAddress: (address: string) => ["token", "erc20", address],
+ tokenMetadata: (address: string) => ["token", "metadata", address],
+ tokenAllowance: (tokenAddress: string | undefined, spender: string) => [
+ "token",
+ "allowance",
+ tokenAddress || "invalid",
+ spender
+ ],
+
+ // wells
+ wellImplementations: (addresses: string[]) => ["wells", "implementations", addresses],
+
+ // well Function
+ wellFunctionValid: (address: string, data: string) => ["wellFunction", "isValid", address, data],
+ wellFunctionNames: (addresses: string[] | undefined) => ["wellFunctions", "names", addresses],
+
+ // prices
+ tokenPricesAll: ["prices", "token"],
+ tokenPrices: (symbols: string[]) => ["prices", "token", ...symbols],
+ lpTokenPrices: (addresses: string[]) => ["prices", "lp-token", ...addresses],
+
+ // token balance
+ tokenBalancesAll: ["token", "balance"],
+ tokenBalance: (symbol: string | undefined) => ["token", "balance", symbol || "invalid"]
+} as const;
diff --git a/projects/dex-ui/src/utils/query/types.ts b/projects/dex-ui/src/utils/query/types.ts
new file mode 100644
index 0000000000..d03606f0b8
--- /dev/null
+++ b/projects/dex-ui/src/utils/query/types.ts
@@ -0,0 +1,18 @@
+import { UseQueryOptions } from "@tanstack/react-query";
+
+type Options =
+ | "enabled"
+ | "staleTime"
+ | "refetchInterval"
+ | "refetchIntervalInBackground"
+ | "refetchOnWindowFocus"
+ | "refetchOnReconnect"
+ | "refetchOnMount"
+ | "retryOnMount"
+ | "notifyOnChangeProps"
+ | "throwOnError"
+ | "placeholderData";
+
+export type UseReactQueryOptions = Pick, Options> & {
+ select: (data: T) => K;
+};
diff --git a/projects/dex-ui/src/utils/sdk/SdkProvider.tsx b/projects/dex-ui/src/utils/sdk/SdkProvider.tsx
index d67b90c0f0..676aa27917 100644
--- a/projects/dex-ui/src/utils/sdk/SdkProvider.tsx
+++ b/projects/dex-ui/src/utils/sdk/SdkProvider.tsx
@@ -13,15 +13,20 @@ const getSDK = (provider?: JsonRpcProvider, signer?: Signer) => {
provider: provider,
DEBUG: IS_DEVELOPMENT_ENV
});
+
Log.module("sdk").debug("sdk initialized", sdk);
return sdk;
};
const ALCHEMY_API_KEY = import.meta.env.VITE_ALCHEMY_API_KEY;
// TODO: use the correct RPC_URL for the current network
-const RPC_URL = IS_DEVELOPMENT_ENV ? "http://localhost:8545" : `https://eth-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}`;
+const RPC_URL = IS_DEVELOPMENT_ENV
+ ? "http://localhost:8545"
+ : `https://eth-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}`;
-export const BeanstalkSDKContext = createContext(new BeanstalkSDK({ rpcUrl: RPC_URL, DEBUG: import.meta.env.DEV }));
+export const BeanstalkSDKContext = createContext(
+ new BeanstalkSDK({ rpcUrl: RPC_URL, DEBUG: import.meta.env.DEV })
+);
function BeanstalkSDKProvider({ children }: { children: React.ReactNode }) {
const signer = useEthersSigner();
diff --git a/projects/dex-ui/src/utils/ui/styled/box-model.ts b/projects/dex-ui/src/utils/ui/styled/box-model.ts
new file mode 100644
index 0000000000..eb5588dc6c
--- /dev/null
+++ b/projects/dex-ui/src/utils/ui/styled/box-model.ts
@@ -0,0 +1,60 @@
+import { css } from "styled-components";
+import { theme } from "../theme";
+import { exists } from "src/utils/check";
+
+export type BoxModelProps = PaddingProps & MarginProps;
+
+export type PaddingProps = {
+ $p?: number;
+ $px?: number;
+ $py?: number;
+ $pt?: number;
+ $pr?: number;
+ $pb?: number;
+ $pl?: number;
+};
+
+export type MarginProps = {
+ $m?: number;
+ $mx?: number;
+ $my?: number;
+ $mt?: number;
+ $mr?: number;
+ $mb?: number;
+ $ml?: number;
+};
+
+type BoxModelSuffix = "y" | "x" | "t" | "r" | "b" | "l" | "";
+type BoxModelAlias = "padding" | "margin";
+
+const emptyStyle = css``;
+
+const makeBoxModelStyles = (_type: BoxModelAlias, props?: BoxModelProps) => {
+ if (!props) return emptyStyle;
+
+ const type = _type === "padding" ? "p" : "m";
+ const getValue = (suffix: BoxModelSuffix) => (props || {})[`$${type}${suffix}`];
+
+ const base = getValue("") ?? 0;
+ const x = getValue("x") ?? 0;
+ const y = getValue("y") ?? 0;
+ const top = getValue("t");
+ const right = getValue("r");
+ const bottom = getValue("b");
+ const left = getValue("l");
+
+ let baseArr: number[] = base + y + x !== 0 ? [base + y, base + x] : [];
+
+ return css`
+ ${baseArr.length ? `${_type}: ${theme.spacing(...baseArr)};` : ""}
+ ${exists(top) ? `${_type}-top: ${theme.spacing(top)};` : ""}
+ ${exists(right) ? `${_type}-right: ${theme.spacing(right)};` : ""}
+ ${exists(bottom) ? `${_type}-bottom: ${theme.spacing(bottom)};` : ""}
+ ${exists(left) ? `${_type}-left: ${theme.spacing(left)};` : ""}
+ `;
+};
+
+export const BoxModelBase = css`
+ ${(props) => makeBoxModelStyles("padding", props)}
+ ${(props) => makeBoxModelStyles("margin", props)}
+`;
diff --git a/projects/dex-ui/src/utils/ui/styled/common.ts b/projects/dex-ui/src/utils/ui/styled/common.ts
new file mode 100644
index 0000000000..15ae266129
--- /dev/null
+++ b/projects/dex-ui/src/utils/ui/styled/common.ts
@@ -0,0 +1,95 @@
+import type { CSSProperties } from "react";
+import { ThemedStyledProps, css } from "styled-components";
+import { BoxModelBase, BoxModelProps } from "./box-model";
+
+const CSS_PROP_MAP = {
+ // display
+ $display: "display",
+
+ // dimensions
+ $height: "height",
+ $minHeight: "min-height",
+ $maxHeight: "max-height",
+ $width: "width",
+ $minWidth: "min-width",
+ $maxWidth: "max-width",
+
+ // box
+ $boxSizing: "box-sizing",
+
+ // flex
+ $flex: "flex",
+ $flexFlow: "flex-flow",
+ $flexShrink: "flex-shrink",
+ $flexGrow: "flex-grow",
+ $flexBasis: "flex-basis",
+ $direction: "flex-direction",
+ $alignItems: "align-items",
+ $alignSelf: "align-self",
+ $alignContent: "align-content",
+ $justifyContent: "justify-content",
+ $justifySelf: "justify-self",
+ $justifyItems: "justify-items",
+ $order: "order",
+ $gap: "gap",
+
+ //
+ $whiteSpace: "white-space"
+
+ // we can't handle margin / padding here b/c we calculate them differently
+};
+
+export const makeCssStyle = (
+ props: ThemedStyledProps,
+ propKey: keyof typeof CSS_PROP_MAP
+): string => {
+ const prop = props[propKey as keyof typeof props];
+ const cssKey = CSS_PROP_MAP[propKey];
+ return prop && cssKey ? `${cssKey}: ${prop};` : "";
+};
+
+export type DisplayStyleProps = {
+ $display?: CSSProperties["display"];
+};
+
+export const BlockDisplayStyle = css`
+ ${(p) => makeCssStyle(p, "$display")}
+`;
+
+export type DimensionStyleProps = {
+ $height?: CSSProperties["height"];
+ $minHeight?: CSSProperties["minHeight"];
+ $maxHeight?: CSSProperties["maxHeight"];
+ $width?: CSSProperties["width"];
+ $minWidth?: CSSProperties["minWidth"];
+ $maxWidth?: CSSProperties["maxWidth"];
+};
+
+export const DimensionStyles = css`
+ ${(p) => makeCssStyle(p, "$height")}
+ ${(p) => makeCssStyle(p, "$minHeight")}
+ ${(p) => makeCssStyle(p, "$maxHeight")}
+ ${(p) => makeCssStyle(p, "$width")}
+ ${(p) => makeCssStyle(p, "$minWidth")}
+ ${(p) => makeCssStyle(p, "$maxWidth")}
+`;
+
+export type BoxSizingProps = {
+ $boxSizing?: CSSProperties["boxSizing"];
+};
+
+export const BoxSizingStyles = css`
+ ${(p) => makeCssStyle(p, "$boxSizing")}
+`;
+
+export type CommonCssProps = DimensionStyleProps &
+ BoxSizingProps &
+ DisplayStyleProps &
+ BoxModelProps;
+
+export const CommonCssStyles = css`
+ ${DimensionStyles}
+ ${BoxSizingStyles}
+ ${BlockDisplayStyle}
+ ${BoxModelBase}
+`;
diff --git a/projects/dex-ui/src/utils/ui/styled/css-model.ts b/projects/dex-ui/src/utils/ui/styled/css-model.ts
new file mode 100644
index 0000000000..d2ec1f6abf
--- /dev/null
+++ b/projects/dex-ui/src/utils/ui/styled/css-model.ts
@@ -0,0 +1,6 @@
+import { css } from "styled-components";
+import { CssProps } from "../theme";
+
+export const AdditionalCssBase = css`
+ ${(props) => (props.$css ? props.$css : "")}
+`;
diff --git a/projects/dex-ui/src/utils/ui/styled/flex-model.ts b/projects/dex-ui/src/utils/ui/styled/flex-model.ts
new file mode 100644
index 0000000000..66550f866e
--- /dev/null
+++ b/projects/dex-ui/src/utils/ui/styled/flex-model.ts
@@ -0,0 +1,58 @@
+import { exists } from "src/utils/check";
+import type { CSSProperties } from "react";
+import { css } from "styled-components";
+import { theme } from "../theme";
+import { CommonCssProps, CommonCssStyles, makeCssStyle } from "./common";
+
+type FlexModelDirection = "row" | "column" | "row-reverse" | "column-reverse";
+
+export type FlexPropertiesProps = {
+ $flex?: CSSProperties["flex"];
+ $flexFlow?: CSSProperties["flexFlow"];
+ $direction?: FlexModelDirection;
+ $flexShrink?: CSSProperties["flexShrink"];
+ $flexGrow?: CSSProperties["flexGrow"];
+ $flexBasis?: CSSProperties["flexBasis"];
+ $alignItems?: CSSProperties["alignItems"];
+ $alignSelf?: CSSProperties["alignSelf"];
+ $alignContent?: CSSProperties["alignContent"];
+ $justifySelf?: CSSProperties["justifySelf"];
+ $justifyContent?: CSSProperties["justifyContent"];
+ $justifyItems?: CSSProperties["justifyItems"];
+ $order?: CSSProperties["order"];
+ $gap?: number;
+ $rowGap?: number;
+ $columnGap?: number;
+};
+
+export const FlexPropertiesStyle = css`
+ ${(p) => makeCssStyle(p, "$flex")}
+ ${(p) => makeCssStyle(p, "$flexShrink")}
+ ${(p) => makeCssStyle(p, "$flexFlow")}
+ ${(p) => makeCssStyle(p, "$flexGrow")}
+ ${(p) => makeCssStyle(p, "$flexBasis")}
+ ${(p) => makeCssStyle(p, "$alignItems")}
+ ${(p) => makeCssStyle(p, "$alignSelf")}
+ ${(p) => makeCssStyle(p, "$alignContent")}
+ ${(p) => makeCssStyle(p, "$justifySelf")}
+ ${(p) => makeCssStyle(p, "$justifyContent")}
+ ${(p) => makeCssStyle(p, "$justifyItems")}
+ ${(p) => makeCssStyle(p, "$order")}
+ ${(p) => makeCssStyle(p, "$direction")}
+ ${(p) => (exists(p.$gap) ? `gap: ${theme.spacing(p.$gap)};` : "")}
+ ${(p) => (exists(p.$rowGap) ? `row-gap: ${theme.spacing(p.$rowGap)};` : "")}
+ ${(p) => (exists(p.$columnGap) ? `column-gap: ${theme.spacing(p.$columnGap)};` : "")}
+`;
+
+export type FlexModelProps = FlexPropertiesProps &
+ CommonCssProps & {
+ $fullWidth?: boolean;
+ };
+
+export const FlexBase = css`
+ ${FlexPropertiesStyle}
+ display: ${(p) => p.$display || "flex"};
+ flex-direction: ${(p) => p.$direction || "column"};
+ ${CommonCssStyles}
+ ${(p) => (p.$fullWidth ? "width: 100%;" : "")}
+`;
diff --git a/projects/dex-ui/src/utils/ui/styled/index.ts b/projects/dex-ui/src/utils/ui/styled/index.ts
new file mode 100644
index 0000000000..f69a6ec7c6
--- /dev/null
+++ b/projects/dex-ui/src/utils/ui/styled/index.ts
@@ -0,0 +1,4 @@
+export * from "./box-model";
+export * from "./flex-model";
+export * from "./css-model";
+export * from "./common";
\ No newline at end of file
diff --git a/projects/dex-ui/src/utils/ui/theme/colors.ts b/projects/dex-ui/src/utils/ui/theme/colors.ts
new file mode 100644
index 0000000000..73e555f7e1
--- /dev/null
+++ b/projects/dex-ui/src/utils/ui/theme/colors.ts
@@ -0,0 +1,56 @@
+import { css } from "styled-components";
+
+export type ThemeColor =
+ | "primary"
+ | "primaryLight"
+ | "black"
+ | "white"
+ | "lightGray"
+ | "gray"
+ | "darkGray"
+ | "disabled"
+ | "errorRed"
+ | "stone"
+ | "stoneLight";
+
+export const THEME_COLORS: Record = {
+ primary: "#46b955",
+ primaryLight: "#F0FDF4",
+ black: "#000",
+ white: "#fff",
+ gray: "#4B5563",
+ darkGray: "#4b5563",
+ lightGray: "#9ca3af",
+ disabled: "#D1D5DB",
+ errorRed: "#DA2C38",
+ stone: "#78716c",
+ stoneLight: "#F9F8F6"
+} as const;
+
+export type FontColor =
+ | "error"
+ | "primary"
+ | "text.primary"
+ | "text.secondary"
+ | "text.light"
+ | "disabled";
+
+export const FONT_COLORS: Record = {
+ ["text.primary"]: THEME_COLORS.black,
+ ["text.secondary"]: THEME_COLORS.gray,
+ ["text.light"]: THEME_COLORS.lightGray,
+ primary: THEME_COLORS.primary,
+ disabled: THEME_COLORS.disabled,
+ error: THEME_COLORS.errorRed
+};
+
+export const getFontColor = (color: FontColor) => FONT_COLORS[color];
+
+export const FontColorStyle = css<{ $color?: FontColor }>`
+ ${(props) => {
+ const color = props.$color || "text.primary";
+ return `
+ color: ${getFontColor(color)};
+ `;
+ }}
+`;
diff --git a/projects/dex-ui/src/utils/ui/theme/font.ts b/projects/dex-ui/src/utils/ui/theme/font.ts
new file mode 100644
index 0000000000..bb7b7a4dbf
--- /dev/null
+++ b/projects/dex-ui/src/utils/ui/theme/font.ts
@@ -0,0 +1,107 @@
+import { H1, H2, H3, BodyL, BodyS, BodyXS, LinksButtonText } from "src/components/Typography";
+import { exists } from "src/utils/check";
+import { css } from "styled-components";
+
+export type FontWeight = "normal" | "semi-bold" | "bold";
+
+export type TextAlign = "left" | "center" | "right" | "inherit";
+
+export type FontSize = "h1" | "h2" | "h3" | "l" | "s" | "xs";
+
+export type FontVariant = FontSize | "button-link";
+
+const FONT_SIZE_MAP = {
+ h1: 48, // H1
+ h2: 32, // H2
+ h3: 24, // H3
+ l: 20, // BodyL
+ s: 16, // BodyS
+ xs: 14 // BodyXS
+};
+
+/// --------------- Font Size ---------------
+export const getFontSize = (_size: number | FontSize) => {
+ if (typeof _size === "number") return `${_size}px`;
+ return `${FONT_SIZE_MAP[_size in FONT_SIZE_MAP ? _size : "s"]}px`;
+};
+
+export const FontSizeStyle = css<{ $size?: number | FontSize }>`
+ ${({ $size }) => {
+ if (!exists($size)) return "";
+ return `
+ font-size: ${getFontSize($size)};
+ `;
+ }}
+`;
+
+export const LineHeightStyle = css<{ $lineHeight?: number | FontSize }>`
+ ${(props) => {
+ if (!exists(props.$lineHeight)) return "";
+ return `
+ line-height: ${getFontSize(props.$lineHeight)};
+ `;
+ }}
+`;
+
+// --------------- Font Weight ---------------
+export const getFontWeight = (weight: FontWeight) => {
+ switch (weight) {
+ case "semi-bold":
+ return 600;
+ case "bold":
+ return 700;
+ default:
+ return 400;
+ }
+};
+
+export const FontWeightStyle = css<{ $weight?: FontWeight }>`
+ ${(props) => {
+ if (!exists(props.$weight)) return "";
+ return `
+ font-weight: ${getFontWeight(props.$weight)};
+ `;
+ }}
+`;
+
+// --------------- Text Align ---------------
+export const TextAlignStyle = css<{ $align?: TextAlign }>`
+ ${(props) => {
+ if (!exists(props.$align)) return "";
+ return `
+ text-align: ${props.$align};
+ `;
+ }}
+`;
+
+export const getTextAlignStyles = (align: TextAlign) => {
+ return css`
+ text-align: ${align};
+ `;
+};
+
+export const FontUtil = {
+ size: getFontSize,
+ weight: getFontWeight
+};
+
+export const getFontVariantStyles = (variant: FontVariant) => {
+ switch (variant) {
+ case "h1":
+ return H1;
+ case "h2":
+ return H2;
+ case "h3":
+ return H3;
+ case "l":
+ return BodyL;
+ case "s":
+ return BodyS;
+ case "xs":
+ return BodyXS;
+ case "button-link":
+ return LinksButtonText;
+ default:
+ return BodyS;
+ }
+};
diff --git a/projects/dex-ui/src/utils/ui/theme/index.ts b/projects/dex-ui/src/utils/ui/theme/index.ts
new file mode 100644
index 0000000000..2e20a5b678
--- /dev/null
+++ b/projects/dex-ui/src/utils/ui/theme/index.ts
@@ -0,0 +1,4 @@
+export * from "./theme";
+export * from "./font";
+export * from "./colors";
+export * from "./types";
diff --git a/projects/dex-ui/src/utils/ui/theme/spacing.ts b/projects/dex-ui/src/utils/ui/theme/spacing.ts
new file mode 100644
index 0000000000..e541862721
--- /dev/null
+++ b/projects/dex-ui/src/utils/ui/theme/spacing.ts
@@ -0,0 +1,7 @@
+export const GRID_UNIT = 8;
+
+export const themeSpacing = (...args: number[]): string =>
+ args
+ .slice(0, 4)
+ .reduce((str, pts) => `${str} ${pts * GRID_UNIT}px`, "")
+ .trim();
diff --git a/projects/dex-ui/src/utils/ui/theme/theme.ts b/projects/dex-ui/src/utils/ui/theme/theme.ts
new file mode 100644
index 0000000000..1d8bfa3d23
--- /dev/null
+++ b/projects/dex-ui/src/utils/ui/theme/theme.ts
@@ -0,0 +1,21 @@
+import { THEME_COLORS, getFontColor } from "./colors";
+import { themeSpacing } from "./spacing";
+import { getFontSize, getFontVariantStyles, getTextAlignStyles } from "./font";
+import { mediaQuery, size } from "src/breakpoints";
+
+export const theme = {
+ colors: THEME_COLORS,
+ spacing: themeSpacing,
+ font: {
+ styles: {
+ variant: getFontVariantStyles,
+ textAlign: getTextAlignStyles
+ },
+ color: getFontColor,
+ size: getFontSize
+ },
+ media: {
+ size: size,
+ query: mediaQuery
+ }
+} as const;
diff --git a/projects/dex-ui/src/utils/ui/theme/types.ts b/projects/dex-ui/src/utils/ui/theme/types.ts
new file mode 100644
index 0000000000..a533b4ad46
--- /dev/null
+++ b/projects/dex-ui/src/utils/ui/theme/types.ts
@@ -0,0 +1,5 @@
+import { FlattenSimpleInterpolation } from "styled-components";
+
+export type CssProps = {
+ $css?: FlattenSimpleInterpolation;
+};
diff --git a/projects/dex-ui/src/utils/ui/useBoolean.ts b/projects/dex-ui/src/utils/ui/useBoolean.ts
new file mode 100644
index 0000000000..c43b335ce2
--- /dev/null
+++ b/projects/dex-ui/src/utils/ui/useBoolean.ts
@@ -0,0 +1,25 @@
+import { useState, useMemo } from "react";
+
+export const useBoolean = (
+ initialValue?: boolean
+): readonly [
+ boolean,
+ {
+ set: (val: boolean) => void;
+ toggle: () => void;
+ }
+] => {
+ const [value, setValue] = useState(initialValue ?? false);
+
+ const utils = useMemo(() => {
+ const set = (val: boolean) => setValue(val);
+ const toggle = () => setValue((prev) => !prev);
+
+ return {
+ toggle,
+ set
+ };
+ }, []);
+
+ return [value, utils] as const;
+};
diff --git a/projects/dex-ui/src/utils/ui/useDimensions.ts b/projects/dex-ui/src/utils/ui/useDimensions.ts
new file mode 100644
index 0000000000..671a909fb8
--- /dev/null
+++ b/projects/dex-ui/src/utils/ui/useDimensions.ts
@@ -0,0 +1,40 @@
+import { useState, useEffect, useRef } from "react";
+
+// Define a type for the dimensions
+export type ElementDimensions = {
+ width: number;
+ height: number;
+};
+
+// Hook to get element dimensions using a ref
+function useElementDimensions(): [React.RefObject, ElementDimensions] {
+ const ref = useRef(null);
+ const [dimensions, setDimensions] = useState({
+ width: 0, // Default width
+ height: 0 // Default height
+ });
+
+ useEffect(() => {
+ // Function to update dimensions
+ const updateDimensions = () => {
+ if (!ref.current) return;
+
+ setDimensions({
+ width: ref.current.offsetWidth,
+ height: ref.current.offsetHeight
+ });
+ };
+
+ // Update dimensions initially and whenever the window resizes
+ window.addEventListener("resize", updateDimensions);
+ updateDimensions(); // Initial dimensions update
+
+ return () => {
+ window.removeEventListener("resize", updateDimensions);
+ };
+ }, []); // Effect runs only once on mount
+
+ return [ref, dimensions];
+}
+
+export default useElementDimensions;
diff --git a/projects/dex-ui/src/utils/workflow/steps.ts b/projects/dex-ui/src/utils/workflow/steps.ts
new file mode 100644
index 0000000000..80403adfcf
--- /dev/null
+++ b/projects/dex-ui/src/utils/workflow/steps.ts
@@ -0,0 +1,19 @@
+import { TokenValue } from "@beanstalk/sdk";
+import { ethers } from "ethers";
+
+export const makeLocalOnlyStep = (name: string, frontRunAmount?: TokenValue) => {
+ const step = async (amountInStep: ethers.BigNumber) => {
+ return {
+ name: name,
+ amountOut: frontRunAmount?.toBigNumber() || amountInStep,
+ prepare: () => ({
+ target: "",
+ callData: ""
+ }),
+ decode: () => undefined,
+ decodeResult: () => undefined
+ };
+ };
+
+ return step;
+};
diff --git a/projects/dex-ui/src/wells/aquifer/aquifer.ts b/projects/dex-ui/src/wells/aquifer/aquifer.ts
new file mode 100644
index 0000000000..ba251b3cea
--- /dev/null
+++ b/projects/dex-ui/src/wells/aquifer/aquifer.ts
@@ -0,0 +1,13 @@
+import { useMemo } from "react";
+import { Aquifer } from "@beanstalk/sdk-wells";
+import { Settings } from "src/settings";
+
+import useSdk from "src/utils/sdk/useSdk";
+
+export const useAquifer = () => {
+ const sdk = useSdk();
+
+ return useMemo(() => {
+ return new Aquifer(sdk.wells, Settings.AQUIFER_ADDRESS);
+ }, [sdk.wells]);
+};
diff --git a/projects/dex-ui/src/wells/boreWell.ts b/projects/dex-ui/src/wells/boreWell.ts
new file mode 100644
index 0000000000..1b68575f6e
--- /dev/null
+++ b/projects/dex-ui/src/wells/boreWell.ts
@@ -0,0 +1,280 @@
+import { BeanstalkSDK, ERC20Token, FarmFromMode, FarmToMode, TokenValue } from "@beanstalk/sdk";
+import { Aquifer, WellFunction, Pump, Well } from "@beanstalk/sdk-wells";
+import { BigNumber, ethers } from "ethers";
+import { Settings } from "src/settings";
+
+import { getBytesHexString } from "src/utils/bytes";
+import { makeLocalOnlyStep } from "src/utils/workflow/steps";
+import { Log } from "src/utils/logger";
+import { TransactionToast } from "src/components/TxnToast/TransactionToast";
+
+/**
+ * Prepare the parameters for a Aquifer.boreWell call
+ */
+const prepareBoreWellParameters = async (
+ aquifer: Aquifer,
+ implementation: string,
+ tokens: ERC20Token[], // we assume that these tokens are sorted already
+ wellFunction: WellFunction,
+ pumps: Pump | Pump[],
+ name: string,
+ symbol: string,
+ salt?: number
+) => {
+ const immutableData = Aquifer.getEncodedWellImmutableData(
+ aquifer.address,
+ tokens,
+ wellFunction,
+ Array.isArray(pumps) ? pumps : [pumps]
+ );
+
+ const initFunctionCall = await Aquifer.getEncodedWellInitFunctionData(name, symbol);
+
+ const saltBytes32 = getBytesHexString(salt || 0, 32);
+
+ return [implementation, immutableData, initFunctionCall, saltBytes32] as [
+ string,
+ Uint8Array,
+ Uint8Array,
+ string
+ ];
+};
+
+/**
+ * Decode the result of a boreWell wrapped in a advancedPipe callto get the well address
+ */
+const decodeBoreWellPipeCall = (sdk: BeanstalkSDK, aquifer: Aquifer, pipeResult: string[]) => {
+ if (!pipeResult.length) return;
+ const pipeDecoded = sdk.contracts.pipeline.interface.decodeFunctionResult(
+ "advancedPipe",
+ pipeResult[0]
+ );
+
+ if (!pipeDecoded?.length || !pipeDecoded[0]?.length) return;
+ const boreWellDecoded = aquifer.contract.interface.decodeFunctionResult(
+ "boreWell",
+ pipeDecoded[0][0]
+ );
+ if (!boreWellDecoded?.length) return;
+ return boreWellDecoded[0] as string;
+};
+
+/**
+ * Sorts the tokens in the following manner:
+ * - if tokens includes BEAN, BEAN is first
+ * - if tokens includes WETH, WETH is last
+ * - otherwise, the token order is preserved
+ *
+ * this is so that pairs with BEAN are BEAN:X
+ * and pairs with WETH are X:WETH
+ *
+ * TODO: do this with wStETH
+ */
+const prepareTokenOrderForBoreWell = (sdk: BeanstalkSDK, tokens: ERC20Token[]) => {
+ if (tokens.length < 2) {
+ throw new Error("2 Tokens are required");
+ }
+
+ const wethAddress = sdk.tokens.WETH.address.toLowerCase();
+ const beanAddress = sdk.tokens.BEAN.address.toLowerCase();
+
+ return tokens.sort((a, b) => {
+ const addressA = a.address.toLowerCase();
+ const addressB = b.address.toLowerCase();
+ if (addressA === beanAddress || addressB === wethAddress) return -1;
+ if (addressB === beanAddress || addressA === wethAddress) return 1;
+ return 0;
+ });
+};
+
+/**
+ * function to bore well
+ */
+const boreWell = async (
+ sdk: BeanstalkSDK,
+ account: string,
+ implementation: string,
+ wellFunction: WellFunction,
+ pumps: Pump[],
+ token1: ERC20Token,
+ token2: ERC20Token,
+ name: string,
+ symbol: string,
+ saltValue: number,
+ liquidityAmounts: { token1Amount: TokenValue; token2Amount: TokenValue } | undefined,
+ toast?: TransactionToast
+) => {
+ if (liquidityAmounts) {
+ if (liquidityAmounts.token1Amount?.lte(0) && liquidityAmounts.token2Amount.lte(0)) {
+ throw new Error("At least one token amount must be greater than 0 to seed liquidity");
+ }
+ if (saltValue < 1) {
+ throw new Error("Salt value must be greater than 0 if seeding liquidity");
+ }
+ }
+
+ const aquifer = new Aquifer(sdk.wells, Settings.AQUIFER_ADDRESS);
+ const boreWellParams = await prepareBoreWellParameters(
+ aquifer,
+ implementation,
+ [token1, token2],
+ wellFunction,
+ pumps,
+ name,
+ symbol,
+ saltValue
+ );
+ Log.module("boreWell").debug("boreWellParams: ", boreWellParams);
+
+ const callData = aquifer.contract.interface.encodeFunctionData("boreWell", boreWellParams);
+ Log.module("boreWell").debug("callData: ", callData);
+
+ let wellAddress: string = "";
+
+ const staticFarm = sdk.farm.createAdvancedFarm("static-farm");
+ const advancedFarm = sdk.farm.createAdvancedFarm("adv-farm");
+ const advancedPipe = sdk.farm.createAdvancedPipe("adv-pipe");
+
+ advancedPipe.add(makeBoreWellStep(aquifer, callData));
+
+ /// If we are adding liquidity, add steps to advancedFarm & advancedPipe
+ if (liquidityAmounts) {
+ staticFarm.add(advancedPipe);
+
+ wellAddress = await staticFarm
+ .callStatic(BigNumber.from(0), { slippage: 0.05 })
+ .then((result) => decodeBoreWellPipeCall(sdk, aquifer, result) || "");
+
+ if (!wellAddress) {
+ throw new Error("Unable to determine well address");
+ }
+
+ const well = new Well(sdk.wells, wellAddress);
+ Log.module("boreWell").debug("Expected Well Address: ", wellAddress);
+
+ // add transfer token1 to the undeployed well address
+ advancedFarm.add(makeLocalOnlyStep("token1-amount", liquidityAmounts.token1Amount), {
+ onlyLocal: true
+ });
+ advancedFarm.add(
+ new sdk.farm.actions.TransferToken(
+ token1.address,
+ well.address,
+ FarmFromMode.EXTERNAL,
+ FarmToMode.EXTERNAL
+ )
+ );
+
+ // add transfer token2 to the undeployed well address
+ advancedFarm.add(makeLocalOnlyStep("token2-amount", liquidityAmounts.token2Amount), {
+ onlyLocal: true
+ });
+ advancedFarm.add(
+ new sdk.farm.actions.TransferToken(
+ token2.address,
+ well.address,
+ FarmFromMode.EXTERNAL,
+ FarmToMode.EXTERNAL
+ )
+ );
+
+ advancedPipe.add(
+ makeSyncWellStep(
+ well,
+ wellFunction,
+ liquidityAmounts.token1Amount,
+ liquidityAmounts.token2Amount,
+ account
+ )
+ );
+ }
+
+ advancedFarm.add(advancedPipe);
+
+ // build the workflow
+ await advancedFarm.estimate(BigNumber.from(0));
+ const txn = await advancedFarm.execute(BigNumber.from(0), {
+ slippage: 0.1 // TODO: Add slippage to form.
+ });
+
+ toast?.confirming(txn);
+ Log.module("wellDeployer").debug(`Well deploying... Transaction: ${txn.hash}`);
+
+ const receipt = await txn.wait();
+ Log.module("wellDeployer").debug("Well deployed... txn events: ", receipt.events);
+
+ if (!receipt.events?.length) {
+ throw new Error("No Bore Well events found");
+ }
+
+ toast?.success(receipt);
+
+ if (!wellAddress && !liquidityAmounts) {
+ wellAddress = receipt.events[0].address as string;
+ }
+
+ return {
+ wellAddress,
+ receipt
+ };
+};
+
+const makeBoreWellStep = (aquifer: Aquifer, callData: string) => {
+ const boreWellStep = async (_amountInStep: ethers.BigNumber, _context: any) => ({
+ name: "boreWell",
+ amountOut: _amountInStep,
+ prepare: () => ({
+ target: aquifer.address,
+ callData
+ }),
+ decode: (data: string) => aquifer.contract.interface.decodeFunctionData("boreWell", data),
+ decodeResult: (data: string) =>
+ aquifer.contract.interface.decodeFunctionResult("boreWell", data)
+ });
+
+ return boreWellStep;
+};
+
+const makeSyncWellStep = (
+ well: Well,
+ wellFunction: WellFunction,
+ token1Amount: TokenValue,
+ token2Amount: TokenValue,
+ recipient: string
+) => {
+ const syncStep = async (_amt: BigNumber, context: { data: { slippage?: number } }) => {
+ // this is safe b/c regardless of the wellFunction, all WellFunctions extend IWellFunction, which
+ // requires the definition of a 'calcLpTokenSupply' function.
+ const calculatedLPSupply = await wellFunction.contract.calcLpTokenSupply(
+ [token1Amount.toBigNumber(), token2Amount.toBigNumber()],
+ wellFunction.data
+ );
+
+ // calculate the minimum LP supply with slippage
+ const lpSupplyTV = TokenValue.fromBlockchain(calculatedLPSupply, 0);
+ const lpSubSlippage = lpSupplyTV.subSlippage(context.data.slippage ?? 0.1);
+ const minLPTrimmed = lpSubSlippage.toHuman().split(".")[0];
+ const minLP = BigNumber.from(minLPTrimmed);
+
+ return {
+ name: "sync",
+ amountOut: minLP,
+ prepare: () => ({
+ target: well.address,
+ // this is safe b/c all wells extend the IWell interface & are required to define a 'sync' function.
+ callData: well.contract.interface.encodeFunctionData("sync", [recipient, minLP])
+ }),
+ decode: (data: string) => well.contract.interface.decodeFunctionData("sync", data),
+ decodeResult: (data: string) => well.contract.interface.decodeFunctionResult("sync", data)
+ };
+ };
+
+ return syncStep;
+};
+
+const BoreWellUtils = {
+ prepareTokenOrderForBoreWell,
+ boreWell
+};
+
+export default BoreWellUtils;
diff --git a/projects/dex-ui/src/wells/pump/usePumps.ts b/projects/dex-ui/src/wells/pump/usePumps.ts
new file mode 100644
index 0000000000..4f7bf19268
--- /dev/null
+++ b/projects/dex-ui/src/wells/pump/usePumps.ts
@@ -0,0 +1,24 @@
+import { useMemo } from "react";
+import { Pump } from "@beanstalk/sdk-wells";
+
+import { useWells } from "src/wells/useWells";
+
+export const usePumps = () => {
+ const { data: wells } = useWells();
+
+ return useMemo(() => {
+ if (!wells || !wells.length) return [];
+
+ const pumpMap: Record = {};
+
+ for (const well of wells) {
+ for (const pump of well.pumps || []) {
+ const pumpAddress = pump.address.toLowerCase();
+ if (pumpAddress in pumpMap) continue;
+ pumpMap[pumpAddress] = pump;
+ }
+ }
+
+ return Object.values(pumpMap);
+ }, [wells]);
+};
diff --git a/projects/dex-ui/src/wells/useBasinStats.ts b/projects/dex-ui/src/wells/useBasinStats.ts
new file mode 100644
index 0000000000..458bab5b78
--- /dev/null
+++ b/projects/dex-ui/src/wells/useBasinStats.ts
@@ -0,0 +1,34 @@
+import { useQuery } from "@tanstack/react-query";
+import { BasinAPIResponse } from "src/types";
+import { Log } from "src/utils/logger";
+
+const useBasinStats = () => {
+
+ return useQuery({
+ queryKey: ["wells", "basinStats"],
+
+ queryFn: async () => {
+ let output: BasinAPIResponse[] = [];
+ try {
+ const apiQuery = await fetch("https://api.bean.money/basin/tickers", {
+ headers: { accept: "application/json" }
+ });
+
+ const result = await apiQuery.json();
+ if (Array.isArray(result)) {
+ output = result as BasinAPIResponse[];
+ } else {
+ if ("message" in result) {
+ throw new Error(result);
+ }
+ }
+ } catch (e) {
+ Log.module("useBasinStats").error("Failed to fetch data from Basin API :", e)
+ };
+ return output;
+ },
+ staleTime: 1000 * 120
+ });
+};
+
+export default useBasinStats;
\ No newline at end of file
diff --git a/projects/dex-ui/src/wells/useBeanstalkSiloWhitelist.ts b/projects/dex-ui/src/wells/useBeanstalkSiloWhitelist.ts
index 63a859e4ef..fdffadb925 100644
--- a/projects/dex-ui/src/wells/useBeanstalkSiloWhitelist.ts
+++ b/projects/dex-ui/src/wells/useBeanstalkSiloWhitelist.ts
@@ -1,8 +1,13 @@
import { useCallback } from "react";
import { Well } from "@beanstalk/sdk/Wells";
-import { BEANETH_MULTIPUMP_ADDRESS } from "src/utils/addresses";
+import { MULTI_FLOW_PUMP_ADDRESS } from "src/utils/addresses";
import useSdk from "src/utils/sdk/useSdk";
+export const getIsMultiPumpWell = (well: Well | undefined) => {
+ if (!well?.pumps) return false;
+ return !!well.pumps.find((pump) => pump.address.toLowerCase() === MULTI_FLOW_PUMP_ADDRESS);
+};
+
export const useBeanstalkSiloWhitelist = () => {
const sdk = useSdk();
@@ -23,11 +28,6 @@ export const useBeanstalkSiloWhitelist = () => {
[sdk.tokens]
);
- const getIsMultiPumpWell = useCallback((well: Well | undefined) => {
- if (!well?.pumps) return false;
- return !!well.pumps.find((pump) => pump.address.toLowerCase() === BEANETH_MULTIPUMP_ADDRESS);
- }, []);
-
return {
getIsWhitelisted,
getSeedsWithWell,
diff --git a/projects/dex-ui/src/wells/useMultiFlowPumpTWAReserves.tsx b/projects/dex-ui/src/wells/useMultiFlowPumpTWAReserves.tsx
index d4a0420ce3..88c1dfa7ae 100644
--- a/projects/dex-ui/src/wells/useMultiFlowPumpTWAReserves.tsx
+++ b/projects/dex-ui/src/wells/useMultiFlowPumpTWAReserves.tsx
@@ -12,14 +12,14 @@ import { config } from "src/utils/wagmi/config";
export const useMultiFlowPumpTWAReserves = () => {
const { data: wells } = useWells();
- const { getIsMultiPumpWell } = useBeanstalkSiloWhitelist();
+ const { getIsMultiPumpWell, getIsWhitelisted } = useBeanstalkSiloWhitelist();
const sdk = useSdk();
const query = useQuery({
queryKey: ["wells", "multiFlowPumpTWAReserves"],
queryFn: async () => {
- const whitelistedWells = (wells || []).filter((well) => getIsMultiPumpWell(well));
+ const whitelistedWells = (wells || []).filter((well) => getIsMultiPumpWell(well) && getIsWhitelisted(well) );
const [{ timestamp: seasonTimestamp }, ...wellOracleSnapshots] = await Promise.all([
sdk.contracts.beanstalk.time(),
@@ -42,24 +42,23 @@ export const useMultiFlowPumpTWAReserves = () => {
const twaReservesResult: any[] = await multicall(config, { contracts: calls });
const mapping: Record = {};
- let index = 0;
whitelistedWells.forEach((well) => {
const twa = [TokenValue.ZERO, TokenValue.ZERO];
const numPumps = well.pumps?.length || 1;
- well.pumps?.forEach((_pump) => {
- const twaResult = twaReservesResult[index];
+ well.pumps?.forEach((_pump, index) => {
+ const indexedResult = twaReservesResult[index];
+ if (indexedResult.error) return;
+
+ const reserves = indexedResult?.result?.[0]
const token1 = well.tokens?.[0];
const token2 = well.tokens?.[1];
- const reserves = twaResult["twaReserves"];
-
- if (token1 && token2 && reserves.length === 2) {
+ if (token1 && token2 && reserves.length === 2 && reserves.length === 2) {
twa[0] = twa[0].add(TokenValue.fromBlockchain(reserves[0], token1.decimals));
twa[1] = twa[1].add(TokenValue.fromBlockchain(reserves[1], token2.decimals));
}
- index += 1;
});
/// In case there is more than one pump, divide the reserves by the number of pumps
diff --git a/projects/dex-ui/src/wells/useWellImplementations.ts b/projects/dex-ui/src/wells/useWellImplementations.ts
new file mode 100644
index 0000000000..7147407421
--- /dev/null
+++ b/projects/dex-ui/src/wells/useWellImplementations.ts
@@ -0,0 +1,57 @@
+import { multicall } from "@wagmi/core";
+import { useQuery } from "@tanstack/react-query";
+import { config } from "src/utils/wagmi/config";
+import { useWells } from "./useWells";
+import { queryKeys } from "src/utils/query/queryKeys";
+import { useAquifer } from "./aquifer/aquifer";
+
+const aquiferAbiSnippet = [
+ {
+ inputs: [{ internalType: "address", name: "", type: "address" }],
+ name: "wellImplementation",
+ outputs: [{ internalType: "address", name: "", type: "address" }],
+ stateMutability: "view",
+ type: "function"
+ }
+] as const;
+
+const getCallObjects = (aquiferAddress: string, addresses: string[]) => {
+ return addresses.map((address) => ({
+ address: aquiferAddress as "0x{string}",
+ abi: aquiferAbiSnippet,
+ functionName: "wellImplementation",
+ args: [address]
+ }));
+};
+
+export const useWellImplementations = () => {
+ const { data: wells } = useWells();
+ const aquifer = useAquifer();
+
+ const addresses = (wells || []).map((well) => well.address);
+
+ const query = useQuery({
+ queryKey: queryKeys.wellImplementations(addresses),
+ queryFn: async () => {
+ if (!wells || !wells.length) return [];
+
+ return multicall(config, {
+ contracts: getCallObjects(aquifer.address, addresses)
+ });
+ },
+ select: (data) => {
+ return addresses.reduce>((prev, curr, i) => {
+ const result = data[i];
+ if (result.error) return prev;
+ if (result.result) {
+ prev[curr.toLowerCase()] = result.result.toLowerCase() as string;
+ }
+ return prev;
+ }, {});
+ },
+ enabled: !!addresses.length,
+ staleTime: Infinity
+ });
+
+ return query;
+};
diff --git a/projects/dex-ui/src/wells/useWellLPTokenPrice.tsx b/projects/dex-ui/src/wells/useWellLPTokenPrice.tsx
index 64bc3e73fd..6b026b2ce9 100644
--- a/projects/dex-ui/src/wells/useWellLPTokenPrice.tsx
+++ b/projects/dex-ui/src/wells/useWellLPTokenPrice.tsx
@@ -1,11 +1,9 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useMemo } from "react";
import { ERC20Token, TokenValue } from "@beanstalk/sdk";
import { Well } from "@beanstalk/sdk/Wells";
-import useSdk from "src/utils/sdk/useSdk";
-import { getPrice } from "src/utils/price/usePrice";
import { useTokenSupplyMany } from "src/tokens/useTokenSupply";
-
-type TokenMap = Record;
+import { AddressMap } from "src/types";
+import { useTokenPrices } from "src/utils/price/useTokenPrices";
/**
* LP Token Price is calculated as: TVL / total supply
@@ -13,10 +11,7 @@ type TokenMap = Record;
* - TVL = (reserve1 amount * token1 price ) + (reserve2 amount + token2 price)
*/
-export const useWellLPTokenPrice = (params: Well | (Well | undefined)[] | undefined) => {
- const [lpTokenPriceMap, setLPTokenPriceMap] = useState>({});
- const sdk = useSdk();
-
+export const useWellLPTokenPrice = (params: Well | Well[] | undefined) => {
const wells = useMemo(() => {
// Make into array for easier processing
if (!params) return [];
@@ -30,52 +25,45 @@ export const useWellLPTokenPrice = (params: Well | (Well | undefined)[] | undefi
return _tokens;
}, [wells]);
- const { totalSupply: tokenSupplies } = useTokenSupplyMany(lpTokens);
-
- const fetchData = useCallback(async () => {
- if (!wells || !tokenSupplies?.length) return;
-
- const fetchTokenPrices = async () => {
- const _tokenMap = wells.reduce>((memo, well) => {
- if (!well || !well?.tokens) return memo;
- well.tokens.forEach((token) => (memo[token.address] = token));
- return memo;
- }, {});
-
- const tokenLyst = Object.entries(_tokenMap);
+ const { totalSupply: tokenSupplies, loading } = useTokenSupplyMany(lpTokens);
+ const { data: prices, isLoading: tokenPricesLoading } = useTokenPrices(wells);
- const prices = await Promise.all(tokenLyst.map(([, token]) => getPrice(token, sdk)));
- const data = tokenLyst.reduce>((memo, [tokenAddress], index) => {
- memo[tokenAddress] = prices[index] || TokenValue.ZERO;
- return memo;
- }, {});
- return data;
- };
-
- const tokenPriceMap = await fetchTokenPrices();
-
- const lpTokenPrices: TokenMap = {};
+ const lpTokenPrices = useMemo(() => {
+ if (!wells || !tokenSupplies?.length || !prices) return undefined;
+ const lpTokenPrices: AddressMap = {};
for (const wellIdx in wells) {
const well = wells[wellIdx];
const tokens = well?.tokens;
- const reserves = well?.reserves && well.reserves.length === 2 ? well.reserves : [TokenValue.ZERO, TokenValue.ZERO];
+ const reserves =
+ well?.reserves && well.reserves.length === 2
+ ? well.reserves
+ : [TokenValue.ZERO, TokenValue.ZERO];
const lpToken = well?.lpToken;
const lpTokenSupply = tokenSupplies[wellIdx] || TokenValue.ONE;
if (well && tokens && lpToken) {
- const wellReserveValues = reserves.map((reserve, rIdx) => reserve.mul(tokenPriceMap[tokens[rIdx].address] || TokenValue.ZERO));
+ const hasAllPrices = tokens.every((tk) => tk.symbol in prices);
+
+ const wellReserveValues = reserves.map((reserve, rIdx) => {
+ if (hasAllPrices) {
+ return reserve.mul(prices[tokens[rIdx].symbol] || TokenValue.ZERO);
+ }
+ return TokenValue.ZERO;
+ });
+
const wellTVL = wellReserveValues?.reduce((acc, val) => acc.add(val));
- lpTokenPrices[lpToken.address] = wellTVL && lpTokenSupply.gt(0) ? wellTVL.div(lpTokenSupply) : TokenValue.ZERO;
+ lpTokenPrices[lpToken.address] =
+ wellTVL && lpTokenSupply.gt(0) ? wellTVL.div(lpTokenSupply) : TokenValue.ZERO;
}
}
- setLPTokenPriceMap(lpTokenPrices);
- }, [sdk, tokenSupplies, wells]);
- useEffect(() => {
- fetchData();
- }, [fetchData]);
+ return lpTokenPrices;
+ }, [prices, tokenSupplies, wells]);
- return { data: lpTokenPriceMap, fetch: fetchData } as const;
+ return {
+ data: lpTokenPrices,
+ isLoading: loading || tokenPricesLoading
+ };
};
diff --git a/projects/dex-ui/src/wells/useWells.tsx b/projects/dex-ui/src/wells/useWells.tsx
index 4c9cb2ce0a..2e373cecbc 100644
--- a/projects/dex-ui/src/wells/useWells.tsx
+++ b/projects/dex-ui/src/wells/useWells.tsx
@@ -3,6 +3,11 @@ import { useQuery } from "@tanstack/react-query";
import { Well } from "@beanstalk/sdk/Wells";
import { findWells } from "./wellLoader";
import { Log } from "src/utils/logger";
+import tokenMetadataJson from 'src/token-metadata.json';
+import { TokenMetadataMap } from "src/types";
+import { images } from "src/assets/images/tokens";
+
+export const clearWellsCache = () => findWells.cache.clear?.();
export const useWells = () => {
const sdk = useSdk();
@@ -23,6 +28,7 @@ export const useWells = () => {
name: true,
tokens: true,
wellFunction: true,
+ pumps: true,
reserves: true,
lpToken: true
})
@@ -33,7 +39,12 @@ export const useWells = () => {
);
// filter out errored calls
- return res.map((promise) => (promise.status === "fulfilled" ? promise.value : null)).filter((p): p is Well => !!p);
+ const wellsResult = res
+ .map((promise) => (promise.status === "fulfilled" ? promise.value : null))
+ .filter((p): p is Well => !!p);
+ // set token metadatas
+ setTokenMetadatas(wellsResult);
+ return wellsResult;
} catch (err: unknown) {
Log.module("useWells").debug(`Error during findWells(): ${(err as Error).message}`);
return [];
@@ -44,3 +55,23 @@ export const useWells = () => {
staleTime: Infinity
});
};
+
+const tokenMetadata = tokenMetadataJson as TokenMetadataMap;
+
+const setTokenMetadatas = (wells: Well[]) => {
+ for (const well of wells) {
+ if (!well.tokens) continue;
+ well.tokens.forEach((token) => {
+ const address = token.address.toLowerCase();
+
+ let logo = images[token.symbol];
+ if (address in tokenMetadata) {
+ const metadata = tokenMetadata[address];
+ if (metadata?.logoURI) logo = metadata.logoURI;
+ if (metadata.displayDecimals) token.displayDecimals = metadata.displayDecimals;
+ if (metadata.displayName) token.displayName = metadata.displayName;
+ }
+ if (logo) token.setMetadata({ logo });
+ });
+ }
+};
\ No newline at end of file
diff --git a/projects/dex-ui/src/wells/utils.ts b/projects/dex-ui/src/wells/utils.ts
new file mode 100644
index 0000000000..895b53dae5
--- /dev/null
+++ b/projects/dex-ui/src/wells/utils.ts
@@ -0,0 +1,6 @@
+import { Well } from "@beanstalk/sdk-wells";
+
+export const formatWellTokenSymbols = (well: Well | undefined, separator?: string) => {
+ const tokenNames = well?.tokens?.map((token) => token.symbol);
+ return tokenNames?.join(separator || ":");
+};
diff --git a/projects/dex-ui/src/wells/wellFunction/useValidateWellFunction.ts b/projects/dex-ui/src/wells/wellFunction/useValidateWellFunction.ts
new file mode 100644
index 0000000000..23d5195af3
--- /dev/null
+++ b/projects/dex-ui/src/wells/wellFunction/useValidateWellFunction.ts
@@ -0,0 +1,115 @@
+import { multicall } from "@wagmi/core";
+import { useCallback } from "react";
+import { useWellFunctions } from "./useWellFunctions";
+import { WellFunction } from "@beanstalk/sdk-wells";
+import useSdk from "src/utils/sdk/useSdk";
+import { config } from "src/utils/wagmi/config";
+import { BigNumber } from "ethers";
+import { BeanstalkSDK } from "@beanstalk/sdk";
+import { useQueryClient } from "@tanstack/react-query";
+import { queryKeys } from "src/utils/query/queryKeys";
+
+const getWellFunctionCalls = (wellFunction: WellFunction) => {
+ const address = wellFunction.address as `0x${string}`;
+ const bn = BigNumber.from(100); // random big number
+ const abi = WellFunction.abi;
+
+ return [
+ {
+ address,
+ abi,
+ functionName: "calcLPTokenUnderlying",
+ args: [bn, [bn, bn], bn, wellFunction.data]
+ },
+ { address, abi, functionName: "calcLpTokenSupply", args: [[bn, bn], wellFunction.data] },
+ // { // might be flaky
+ // address,
+ // abi,
+ // functionName: "calcReserve",
+ // args: [
+ // [bn, bn],
+ // one,
+ // bn,
+ // wellFunction.data
+ // ]
+ // },
+ { address, abi, functionName: "name", args: [] },
+ { address, abi, functionName: "symbol", args: [] }
+ ];
+};
+
+const validateWellFunction = async (
+ sdk: BeanstalkSDK,
+ knownWellFunctions: WellFunction[],
+ params: {
+ address?: string;
+ data?: string;
+ wellFunction?: WellFunction;
+ }
+) => {
+ const { address, data, wellFunction: wellFn } = params;
+
+ if (!wellFn && !address && !data) return undefined;
+
+ const foundWellFunction =
+ address && knownWellFunctions.find((wf) => wf.address.toLowerCase() === address.toLowerCase());
+ if (foundWellFunction) return foundWellFunction;
+
+ const wellFunction = wellFn || (data && address && new WellFunction(sdk.wells, address, data));
+ if (!wellFunction) return undefined;
+
+ const calls = await multicall(config, { contracts: getWellFunctionCalls(wellFunction) });
+ const allValid = calls.filter((call) => !call.error);
+
+ return allValid.length === calls.length ? wellFunction : undefined;
+};
+
+type ValidateWellFunctionParams = {
+ address?: string;
+ data?: string;
+ wellFunction?: WellFunction;
+};
+
+type CachedWellFunctionData = WellFunction | string | undefined;
+
+// why set the invalidWellFunctionData to a string?
+// react-query doesn't cache undefined values, so we need to set it to a string
+const invalidWellFunctionData = "invalid-well-function";
+
+export const useValidateWellFunction = () => {
+ const wellFunctions = useWellFunctions();
+ const sdk = useSdk();
+
+ const queryClient = useQueryClient();
+
+ const validate = useCallback(
+ async ({ address, data, wellFunction }: ValidateWellFunctionParams) => {
+ const queryKey = queryKeys.wellFunctionValid(address || "no-address", data || "no-data");
+ try {
+ // check the queryClientCache first
+ const cachedWellFunction = queryClient.getQueryData(queryKey) as CachedWellFunctionData;
+ if (cachedWellFunction) {
+ if (typeof cachedWellFunction === "string") return undefined;
+ return cachedWellFunction;
+ }
+
+ const result = await validateWellFunction(sdk, wellFunctions, {
+ address,
+ data,
+ wellFunction
+ });
+
+ // set the queryClientCache for future use.
+ queryClient.setQueryData(queryKey, result || invalidWellFunctionData);
+ return result;
+ } catch (e) {
+ // set the queryClientCache for future use.
+ queryClient.setQueryData(queryKey, invalidWellFunctionData);
+ return undefined;
+ }
+ },
+ [wellFunctions, sdk, queryClient]
+ );
+
+ return [validate] as const;
+};
diff --git a/projects/dex-ui/src/wells/wellFunction/useWellFunctionNames.ts b/projects/dex-ui/src/wells/wellFunction/useWellFunctionNames.ts
new file mode 100644
index 0000000000..5d7e5e51c6
--- /dev/null
+++ b/projects/dex-ui/src/wells/wellFunction/useWellFunctionNames.ts
@@ -0,0 +1,34 @@
+import { Well, WellFunction } from "@beanstalk/sdk-wells";
+import { useQuery } from "@tanstack/react-query";
+import { AddressMap } from "src/types";
+import { queryKeys } from "src/utils/query/queryKeys";
+
+interface WellWithWellFn extends Well {
+ wellFunction: WellFunction;
+}
+
+/**
+ * Returns a Record of well function addresses to their names.
+ */
+export const useWellFunctionNames = (_wells: Well[] | undefined) => {
+ const wells = _wells || [];
+
+ const wellsWithWellFunctions = wells.filter((w) => !!w.wellFunction) as WellWithWellFn[];
+ const addresses = wellsWithWellFunctions.map((well) => well.wellFunction.address);
+
+ return useQuery({
+ queryKey: queryKeys.wellFunctionNames(addresses.length ? addresses : ["invalid"]),
+ queryFn: async () => {
+ // TODO: make me into a multi call at some point.
+ const names = await Promise.all(
+ wellsWithWellFunctions.map((well) => well.wellFunction.getName())
+ );
+
+ return wellsWithWellFunctions.reduce>((prev, curr, i) => {
+ prev[curr.wellFunction.address] = names[i];
+ return prev;
+ }, {});
+ },
+ enabled: !!wells.length
+ });
+};
diff --git a/projects/dex-ui/src/wells/wellFunction/useWellFunctions.ts b/projects/dex-ui/src/wells/wellFunction/useWellFunctions.ts
new file mode 100644
index 0000000000..922b1b00dc
--- /dev/null
+++ b/projects/dex-ui/src/wells/wellFunction/useWellFunctions.ts
@@ -0,0 +1,25 @@
+import { useMemo } from "react";
+import { WellFunction } from "@beanstalk/sdk-wells";
+
+import { useWells } from "src/wells/useWells";
+
+export const useWellFunctions = () => {
+ const { data: wells } = useWells();
+
+ return useMemo(() => {
+ if (!wells || !wells.length) return [];
+
+ const wellFunctionMap: Record = {};
+
+ for (const well of wells) {
+ if (!well.wellFunction) continue;
+ const address = well.wellFunction.address.toLowerCase();
+
+ if (!(address in wellFunctionMap)) {
+ wellFunctionMap[address] = well.wellFunction;
+ }
+ }
+
+ return Object.values(wellFunctionMap);
+ }, [wells]);
+};
diff --git a/projects/dex-ui/src/wells/wellLoader.ts b/projects/dex-ui/src/wells/wellLoader.ts
index ca21c28677..473c3725dd 100644
--- a/projects/dex-ui/src/wells/wellLoader.ts
+++ b/projects/dex-ui/src/wells/wellLoader.ts
@@ -8,7 +8,10 @@ import { GetWellAddressesDocument } from "src/generated/graph/graphql";
type WellAddresses = string[];
-const WELL_BLACKLIST = ["0x875b1da8dcba757398db2bc35043a72b4b62195d"];
+const WELL_BLACKLIST = [
+ "0x875b1da8dcba757398db2bc35043a72b4b62195d",
+ "0xBea0061680A2DEeBFA59076d77e0b6c769660595"
+];
const loadFromChain = async (sdk: BeanstalkSDK): Promise => {
const aquifer = new Aquifer(sdk.wells, Settings.AQUIFER_ADDRESS);
diff --git a/projects/examples/src/silo/convert.ts b/projects/examples/src/silo/convert.ts
index bf4c510163..02e5371e8f 100644
--- a/projects/examples/src/silo/convert.ts
+++ b/projects/examples/src/silo/convert.ts
@@ -8,7 +8,7 @@ main().catch((e) => {
console.log(e);
});
-let sdk:BeanstalkSDK;
+let sdk: BeanstalkSDK;
async function main() {
const account = process.argv[3] || _account;
@@ -16,14 +16,20 @@ async function main() {
let { sdk: _sdk, stop } = await impersonate(account);
sdk = _sdk;
sdk.DEBUG = false;
+ await sdk.refresh();
+ // const fromToken = sdk.tokens.UNRIPE_BEAN_WETH;
+ // const toToken = sdk.tokens.BEAN_ETH_WELL_LP;
+ const fromToken = sdk.tokens.UNRIPE_BEAN;
+ const toToken = sdk.tokens.BEAN;
-
- const fromToken = sdk.tokens.BEAN
- const toToken = sdk.tokens.UNRIPE_BEAN
- const amount = fromToken.amount(2500)
+ const maxConvert = await sdk.contracts.beanstalk.getMaxAmountIn(fromToken.address, toToken.address);
- let tx = await sdk.silo.convert(fromToken, toToken, amount)
+ const amount = fromToken.amount(1000);
+ const quote = await sdk.contracts.beanstalk.getAmountOut(fromToken.address, toToken.address, amount.toBlockchain());
+ console.log(quote.toString());
+
+ let tx = await sdk.silo.convert(fromToken, toToken, amount);
await tx.wait();
-
+
await stop();
}
diff --git a/projects/sdk-wells/src/lib/Aquifer.ts b/projects/sdk-wells/src/lib/Aquifer.ts
index a3adc0d873..e2743fd7be 100644
--- a/projects/sdk-wells/src/lib/Aquifer.ts
+++ b/projects/sdk-wells/src/lib/Aquifer.ts
@@ -1,10 +1,17 @@
import { Aquifer as AquiferContract, Aquifer__factory } from "src/constants/generated";
-import { encodeWellImmutableData, encodeWellInitFunctionCall, setReadOnly } from "./utils";
+import {
+ encodeWellImmutableData,
+ encodeWellInitFunctionCall,
+ getBytesHexString,
+ makeCallObject,
+ setReadOnly,
+ validateAddress,
+ validateHasMinTokensForWell
+} from "./utils";
import { WellsSDK } from "./WellsSDK";
import { WellFunction } from "./WellFunction";
import { ERC20Token } from "@beanstalk/sdk-core";
import { Pump } from "./Pump";
-import { Call } from "src/types";
import { constants } from "ethers";
import { Well } from "./Well";
@@ -33,31 +40,17 @@ export class Aquifer {
* @param pumps
* @returns
*/
- async boreWell(wellAddress: string, tokens: ERC20Token[], wellFunction: WellFunction, pumps: Pump[]): Promise {
- if (tokens.length < 2) {
- throw new Error("Well must have at least 2 tokens");
- }
-
- const tokensAddresses = tokens.map((t) => t.address);
-
- const wellFunctionCall = {
- target: wellFunction.address,
- data: new Uint8Array()
- } as Call;
-
- const pumpCalls = pumps.map(
- (p) =>
- ({
- target: p.address,
- data: new Uint8Array()
- } as Call)
- );
+ async boreWell(wellAddress: string, tokens: ERC20Token[], wellFunction: WellFunction, pumps: Pump[], _symbol?: string, _name?: string, salt?: number): Promise {
+ validateHasMinTokensForWell(tokens);
+ validateSalt(salt);
// Prepare Data
- const immutableData = encodeWellImmutableData(this.address, tokensAddresses, wellFunctionCall, pumpCalls);
- const { name, symbol } = await getNameAndSymbol(wellFunction, tokens);
- const initFunctionCall = await encodeWellInitFunctionCall(name, symbol);
- const saltBytes32 = constants.HashZero;
+ const immutableData = Aquifer.getEncodedWellImmutableData(this.address, tokens, wellFunction, pumps);
+ const { name, symbol } = await getNameAndSymbol(wellFunction, tokens, _name, _symbol);
+ const initFunctionCall = await Aquifer.getEncodedWellInitFunctionData(name, symbol);
+
+ // Default salt to 0. salt gt 0 is required for deterministic address
+ const saltBytes32 = salt ? getBytesHexString(salt, 32) : constants.HashZero;
// Bore It
const deployedWell = await this.contract.boreWell(wellAddress, immutableData, initFunctionCall, saltBytes32);
@@ -73,6 +66,65 @@ export class Aquifer {
return new Well(this.sdk, boredWellAddress);
}
+ async predictWellAddress(implementation: string, tokens: ERC20Token[], wellFunction: WellFunction, pumps: Pump[], salt?: number) {
+ validateHasMinTokensForWell(tokens);
+ validateSalt(salt);
+
+ const immutableData = Aquifer.getEncodedWellImmutableData(this.address, tokens, wellFunction, pumps);
+ const saltBytes32 = salt ? getBytesHexString(salt, 32) : constants.HashZero;
+
+ return this.contract.predictWellAddress(implementation, immutableData, saltBytes32);
+ }
+
+ // Static Methods
+
+ /**
+ * returns pack encoded data (immutableData) to deploy a well via aquifer.boreWell & predict a deterministic well address via aquifer.predictWellAddress
+ * @param aquifer
+ * @param wellImplementation
+ * @param tokens
+ * @param wellFunction
+ * @param pumps
+ * @returns
+ */
+ static getEncodedWellImmutableData(aquifer: string, tokens: ERC20Token[], wellFunction: WellFunction, pumps: Pump[]) {
+ validateAddress(wellFunction.address, wellFunction.address);
+
+ if (tokens.length < 2) {
+ throw new Error("Well must have at least 2 tokens");
+ }
+
+ const pumpCalls = pumps.map((p) => {
+ validateAddress(p.address, p.address);
+ return makeCallObject(p);
+ });
+ const wellFunctionCall = makeCallObject(wellFunction);
+ const tokensAddresses = tokens.map((t) => t.address);
+
+ return encodeWellImmutableData(aquifer, tokensAddresses, wellFunctionCall, pumpCalls);
+ }
+
+ /**
+ * Returns pack encoded data (initFunctionCall) to deploy a well via aquifer.boreWell
+ * @param name
+ * @param symbol
+ * @returns
+ */
+ static async getEncodedWellInitFunctionData(name: string, symbol: string) {
+ if (!name) {
+ throw new Error("Name must be provided");
+ }
+ if (!symbol) {
+ throw new Error("Symbol must be provided");
+ }
+ return encodeWellInitFunctionCall(name, symbol);
+ }
+
+ /**
+ * Deploy a new instance of Aquifer
+ * @param sdk
+ * @returns
+ */
static async BuildAquifer(sdk: WellsSDK): Promise {
const aquiferContract = new Aquifer__factory(sdk.signer);
const deployedAquifer = await aquiferContract.deploy();
@@ -80,14 +132,33 @@ export class Aquifer {
}
}
-async function getNameAndSymbol(wellFunction: WellFunction, tokens: ERC20Token[]) {
- // TODO: make this a multicall
- const fnName = await wellFunction.getName();
- const fnSymbol = await wellFunction.getSymbol();
+function validateSalt(salt?: number) {
+ if (!salt) return;
+ if (!Number.isInteger(salt)) {
+ throw new Error("Salt must be an integer");
+ }
+ if (salt < 0) {
+ throw new Error("Salt must be greater than 0");
+ }
+}
+
+async function getNameAndSymbol(wellFunction: WellFunction, tokens: ERC20Token[], _name?: string, _symbol?: string) {
+ let name = _name ?? "";
+ let symbol = _symbol ?? "";
const symbols = tokens.map((t) => t.symbol);
- const name = symbols.join(":") + " " + fnName + " Well";
- const symbol = symbols.join("") + fnSymbol + "w";
+
+ // TODO: make this a multicall
+
+ if (!name) {
+ const fnName = await wellFunction.getName();
+ name = symbols.join(":") + " " + fnName + " Well";
+ }
+
+ if (!symbol) {
+ const fnSymbol = await wellFunction.getSymbol();
+ symbol = symbols.join("") + fnSymbol + "w";
+ }
return { name, symbol };
}
diff --git a/projects/sdk-wells/src/lib/Pump.ts b/projects/sdk-wells/src/lib/Pump.ts
index 6a674d0eda..1a54df3286 100644
--- a/projects/sdk-wells/src/lib/Pump.ts
+++ b/projects/sdk-wells/src/lib/Pump.ts
@@ -1,13 +1,14 @@
import { MultiFlowPump__factory, MockPump__factory } from "src/constants/generated";
import { WellsSDK } from "./WellsSDK";
import { setReadOnly } from "./utils";
+import { BigNumber } from "ethers";
export class Pump {
readonly sdk: WellsSDK;
readonly contract: MultiFlowPump__factory;
readonly address: string;
- constructor(sdk: WellsSDK, address: string) {
+ constructor(sdk: WellsSDK, address: string, public readonly data: string) {
this.address = address;
setReadOnly(this, "sdk", sdk, false);
const contract = MultiFlowPump__factory.connect(address, sdk.providerOrSigner);
@@ -18,19 +19,20 @@ export class Pump {
const mockPumpContract = new MockPump__factory(sdk.signer);
const deployedMockPump = await mockPumpContract.deploy();
- return new Pump(sdk, deployedMockPump.address);
+ return new Pump(sdk, deployedMockPump.address, "0x");
}
static async BuildMultiFlowPump(sdk: WellsSDK): Promise {
const contract = new MultiFlowPump__factory(sdk.signer);
- // TODO: these are dummy values, this method isn't used yet.
// these will need to be passed in as params and converted to bytelike or whatever
- const inc = "0x";
- const dec = "0x";
- const cap = "0x";
- const alpha = "0x";
- const deployedMockPump = await contract.deploy(inc, dec, cap, alpha);
- return new Pump(sdk, deployedMockPump.address);
+ const maxPctIncrease = "0x3ff50624dd2f1a9fbe76c8b439581062"; // 0.001
+ const maxPctDecrease = "0x3ff505e1d27a3ee9bffd7f3dd1a32671"; // 1 - 1 / (1 + .001)
+ const capInterval = BigNumber.from(12).toHexString(); // 12 seconds
+ const alpha = "0x3ffeef368eb04325c526c2246eec3e55"; // 0.967213114754098360 = 1 - 2 / (1 + blocks) where blocks = 60
+
+ const deployedMockPump = await contract.deploy(maxPctIncrease, maxPctDecrease, capInterval, alpha);
+
+ return new Pump(sdk, deployedMockPump.address, "0x");
}
}
diff --git a/projects/sdk-wells/src/lib/Well.ts b/projects/sdk-wells/src/lib/Well.ts
index 077922c92a..fc4ec1d3b7 100644
--- a/projects/sdk-wells/src/lib/Well.ts
+++ b/projects/sdk-wells/src/lib/Well.ts
@@ -1,5 +1,5 @@
import { ERC20Token, Token, TokenValue } from "@beanstalk/sdk-core";
-import { BigNumber, CallOverrides, constants, ContractFactory, ContractTransaction, Overrides } from "ethers";
+import { BigNumber, CallOverrides, ContractTransaction, Overrides } from "ethers";
import { Well__factory } from "src/constants/generated";
import { Well as WellContract } from "src/constants/generated";
@@ -7,8 +7,6 @@ import { Aquifer } from "./Aquifer";
import { Pump } from "./Pump";
import {
deadlineSecondsToBlockchain,
- encodeWellImmutableData,
- encodeWellInitFunctionCall,
loadToken,
setReadOnly,
validateAddress,
@@ -19,7 +17,6 @@ import {
} from "./utils";
import { WellFunction } from "./WellFunction";
import { WellsSDK } from "./WellsSDK";
-import { Call } from "src/types";
export type WellDetails = {
tokens: ERC20Token[];
@@ -222,7 +219,7 @@ export class Well {
}
private setPumps(pumpData: CallStruct[]) {
- let pumps = (pumpData ?? []).map((p) => new Pump(this.sdk, p.target));
+ let pumps = (pumpData ?? []).map((p, i) => new Pump(this.sdk, p.target, pumpData[i].data));
Object.freeze(pumps);
setReadOnly(this, "pumps", pumps, true);
}
@@ -859,7 +856,7 @@ export class Well {
validateToken(toToken, "toToken");
validateAmount(minAmountOut, "minAmountOut");
validateAddress(recipient, "recipient");
-
+
return this.contract.shift(toToken.address, minAmountOut.toBigNumber(), recipient, overrides ?? {});
}
diff --git a/projects/sdk-wells/src/lib/WellFunction.ts b/projects/sdk-wells/src/lib/WellFunction.ts
index 0f2c6a2e2c..ba74908693 100644
--- a/projects/sdk-wells/src/lib/WellFunction.ts
+++ b/projects/sdk-wells/src/lib/WellFunction.ts
@@ -1,32 +1,54 @@
-import { ConstantProduct__factory, ConstantProduct2__factory, IWellFunction, IWellFunction__factory } from "src/constants/generated";
+import {
+ ConstantProduct__factory,
+ ConstantProduct2__factory,
+ IWellFunction,
+ IWellFunction__factory
+} from "src/constants/generated";
import { WellsSDK } from "./WellsSDK";
+import { setReadOnly } from "./utils";
export class WellFunction {
contract: IWellFunction;
+ name: string | undefined;
+ symbol: string | undefined;
- constructor(public readonly sdk: WellsSDK, public readonly address: string, public readonly data: string) {
+ constructor(
+ public readonly sdk: WellsSDK,
+ public readonly address: string,
+ public readonly data: string
+ ) {
this.sdk = sdk;
this.contract = IWellFunction__factory.connect(address, sdk.providerOrSigner);
}
// TODO: provide these as multicalls
async getName(): Promise {
- return this.contract.name();
+ if (!this.name) {
+ this.name = await this.contract.name();
+ setReadOnly(this, "name", this.name, true);
+ }
+ return this.name;
}
async getSymbol(): Promise {
- return this.contract.symbol();
+ if (!this.symbol) {
+ this.symbol = await this.contract.symbol();
+ setReadOnly(this, "symbol", this.symbol, true);
+ }
+ return this.symbol;
}
static async BuildConstantProduct(sdk: WellsSDK): Promise {
- const constantProductConstract = new ConstantProduct__factory(sdk.signer);
- const deployedWellFunction = await constantProductConstract.deploy();
+ const constantProductContract = new ConstantProduct__factory(sdk.signer);
+ const deployedWellFunction = await constantProductContract.deploy();
return new WellFunction(sdk, deployedWellFunction.address, "0x");
}
static async BuildConstantProduct2(sdk: WellsSDK): Promise {
- const constantProduct2Constract = new ConstantProduct2__factory(sdk.signer);
- const deployedWellFunction = await constantProduct2Constract.deploy();
+ const constantProduct2Contract = new ConstantProduct2__factory(sdk.signer);
+ const deployedWellFunction = await constantProduct2Contract.deploy();
return new WellFunction(sdk, deployedWellFunction.address, "0x");
}
+
+ static abi = IWellFunction__factory.abi;
}
diff --git a/projects/sdk-wells/src/lib/utils.ts b/projects/sdk-wells/src/lib/utils.ts
index f1b590c7b7..aea7bfe64b 100644
--- a/projects/sdk-wells/src/lib/utils.ts
+++ b/projects/sdk-wells/src/lib/utils.ts
@@ -2,6 +2,7 @@ import { ERC20Token, Token, TokenValue } from "@beanstalk/sdk-core";
import { ethers } from "ethers";
import { WellsSDK } from "./WellsSDK";
import { Call } from "src/types";
+import { WellFunction } from "./WellFunction";
export const loadToken = async (sdk: WellsSDK, address: string): Promise => {
// First see this is a built in token provided by the SDK
@@ -24,6 +25,12 @@ export const validateToken = (token: Token, name: string) => {
validateAddress(token.address, name);
};
+export const validateHasMinTokensForWell = (tokens: ERC20Token[]) => {
+ if (tokens.length < 2) {
+ throw new Error("Well must have at least 2 tokens");
+ }
+}
+
export const validateAmount = (value: TokenValue, name: string) => {
if (!(value instanceof TokenValue)) {
throw new Error(`${name} is not an instance of TokenValue`);
@@ -111,3 +118,18 @@ export async function encodeWellInitFunctionCall(name: string, symbol: string):
const initFunctionCall = wellInitInterface.encodeFunctionData("init", [name, symbol]);
return ethers.utils.arrayify(initFunctionCall);
}
+
+export function getBytesHexString(value: string | number, padding?: number) {
+ const bigNumber = ethers.BigNumber.from(value.toString());
+ const hexStr = bigNumber.toHexString();
+ if (!padding) return hexStr;
+
+ return ethers.utils.hexZeroPad(bigNumber.toHexString(), padding);
+}
+
+export function makeCallObject(params: T) {
+ return {
+ target: params.address,
+ data: ethers.utils.arrayify(params.data)
+ } satisfies Call;
+}
diff --git a/projects/sdk/src/classes/Token/Token.ts b/projects/sdk/src/classes/Token/Token.ts
index a33d1cd990..ebba0e4dc5 100644
--- a/projects/sdk/src/classes/Token/Token.ts
+++ b/projects/sdk/src/classes/Token/Token.ts
@@ -9,7 +9,7 @@ declare module "@beanstalk/sdk-core" {
abstract class Token {
static _source: string;
isUnripe: boolean;
- rewards?: { stalk: TokenValue; seeds: TokenValue };
+ rewards?: { stalk: TokenValue; seeds: TokenValue | null };
getStalk(bdv?: TokenValue): TokenValue;
getSeeds(bdv?: TokenValue): TokenValue;
approveBeanstalk(amount: TokenValue | BigNumber): Promise;
@@ -34,7 +34,9 @@ CoreToken.prototype.getStalk = function (bdv?: TokenValue): TokenValue {
* Get the amount of Seeds rewarded per deposited BDV of this Token.
* */
CoreToken.prototype.getSeeds = function (bdv?: TokenValue): TokenValue {
- if (!this.rewards?.seeds) return TokenValue.fromHuman(0, SEED_DECIMALS);
+ if (this.rewards?.seeds === undefined || this.rewards.seeds === null) {
+ throw new Error(`Token ${this.symbol} has no seeds defined!`);
+ }
if (!bdv) return this.rewards.seeds;
return this.rewards.seeds.mul(bdv);
diff --git a/projects/sdk/src/defaultSettings.json b/projects/sdk/src/defaultSettings.json
index 8b9174003c..15dd8ff3aa 100644
--- a/projects/sdk/src/defaultSettings.json
+++ b/projects/sdk/src/defaultSettings.json
@@ -1,3 +1,3 @@
{
- "subgraphUrl": "https://graph.node.bean.money/subgraphs/name/beanstalk-2-1-0"
+ "subgraphUrl": "https://graph.node.bean.money/subgraphs/name/beanstalk-dev"
}
diff --git a/projects/sdk/src/lib/BeanstalkSDK.ts b/projects/sdk/src/lib/BeanstalkSDK.ts
index e320d67e68..ccab9c1074 100644
--- a/projects/sdk/src/lib/BeanstalkSDK.ts
+++ b/projects/sdk/src/lib/BeanstalkSDK.ts
@@ -46,6 +46,7 @@ export class BeanstalkSDK {
public providerOrSigner: Signer | Provider;
public source: DataSource;
public subgraphUrl: string;
+ public lastRefreshTimestamp: number;
public readonly chainId: ChainId;
public readonly addresses: typeof addresses;
@@ -99,6 +100,19 @@ export class BeanstalkSDK {
this.wells = new WellsSDK(config);
}
+ /**
+ * Refreshes the SDK's state with updated data from contracts. This should be called immediately after sdk initialization and after every season
+ */
+ async refresh() {
+ // Reload dynamic stalk per wl token
+ const whitelist = this.tokens.siloWhitelist;
+ for await (const token of whitelist) {
+ const { stalkEarnedPerSeason } = await this.contracts.beanstalk.tokenSettings(token.address);
+ token.rewards!.seeds = this.tokens.SEEDS.fromBlockchain(stalkEarnedPerSeason);
+ }
+ this.lastRefreshTimestamp = Date.now();
+ }
+
debug(...args: any[]) {
if (!this.DEBUG) return;
console.debug(...args);
@@ -167,6 +181,7 @@ export class BeanstalkSDK {
toJSON() {
return {
chainId: this.chainId,
+ lastRefreshTimestamp: this.lastRefreshTimestamp,
provider: {
url: this.provider?.connection?.url,
network: this.provider?._network
diff --git a/projects/sdk/src/lib/events/processor.test.ts b/projects/sdk/src/lib/events/processor.test.ts
index e4e530c13e..7390b20bb0 100644
--- a/projects/sdk/src/lib/events/processor.test.ts
+++ b/projects/sdk/src/lib/events/processor.test.ts
@@ -32,11 +32,14 @@ const account = "0xFARMER";
* and not the indices; this is more for consistency.
*/
const propArray = (o: { [key: string]: any }) =>
- Object.keys(o).reduce((prev, key) => {
- prev[prev.length] = o[key];
- prev[key] = o[key];
- return prev;
- }, [] as (keyof typeof o)[] & typeof o);
+ Object.keys(o).reduce(
+ (prev, key) => {
+ prev[prev.length] = o[key];
+ prev[key] = o[key];
+ return prev;
+ },
+ [] as (keyof typeof o)[] & typeof o
+ );
const mockProcessor = () => new EventProcessor(sdk, account);
@@ -205,8 +208,8 @@ describe("the Silo", () => {
bdv: bdv1
})
} as AddDepositEvent);
-
- expect(p.deposits.get(Bean)?.["6074"]).toStrictEqual({
+ const t = p.deposits.get(Bean);
+ expect(p.deposits.get(Bean)?.["6074000000"]).toStrictEqual({
amount: amount1,
bdv: bdv1
});
@@ -225,7 +228,7 @@ describe("the Silo", () => {
})
} as AddDepositEvent);
- expect(p.deposits.get(Bean)?.["6074"]).toStrictEqual({
+ expect(p.deposits.get(Bean)?.["6074000000"]).toStrictEqual({
amount: amount1.add(amount2),
bdv: bdv1.add(bdv2)
});
@@ -244,7 +247,7 @@ describe("the Silo", () => {
})
} as AddDepositEvent);
- expect(p.deposits.get(BeanCrv3)?.["6100"]).toStrictEqual({
+ expect(p.deposits.get(BeanCrv3)?.["6100000000"]).toStrictEqual({
amount: amount3,
bdv: bdv3
});
@@ -281,7 +284,7 @@ describe("the Silo", () => {
})
} as RemoveDepositEvent);
- expect(p.deposits.get(Bean)?.["6074"]).toStrictEqual({
+ expect(p.deposits.get(Bean)?.["6074000000"]).toStrictEqual({
amount: amount1.sub(amount2),
bdv: bdv1.sub(bdv2)
});
@@ -300,7 +303,7 @@ describe("the Silo", () => {
})
} as RemoveDepositEvent);
- expect(p.deposits.get(Bean)?.["6074"]).toBeUndefined();
+ expect(p.deposits.get(Bean)?.["6074000000"]).toBeUndefined();
});
});
diff --git a/projects/sdk/src/lib/events/processor.ts b/projects/sdk/src/lib/events/processor.ts
index 8a6f82364c..e4f66261fe 100644
--- a/projects/sdk/src/lib/events/processor.ts
+++ b/projects/sdk/src/lib/events/processor.ts
@@ -11,6 +11,7 @@ import {
import { BeanstalkSDK } from "../BeanstalkSDK";
import { EventManager } from "src/lib/events/EventManager";
import { ZERO_BN } from "src/constants";
+import { TokenValue } from "@beanstalk/sdk-core";
// ----------------------------------------
@@ -394,7 +395,7 @@ export class EventProcessor {
AddDeposit(event: EventManager.Simplify) {
const token = this.getToken(event);
- const stem = event.args.stem.toString();
+ const stem = this.migrateStem(event.args.stem);
if (!this.whitelist.has(token)) throw new Error(`Attempted to process an event with an unknown token: ${token}`);
@@ -407,14 +408,22 @@ export class EventProcessor {
RemoveDeposit(event: EventManager.Simplify) {
const token = this.getToken(event);
- const stem = event.args.stem.toString();
+ const stem = this.migrateStem(event.args.stem);
this._removeDeposit(stem, token, event.args.amount);
}
RemoveDeposits(event: EventManager.Simplify) {
const token = this.getToken(event);
event.args.stems.forEach((stem, index) => {
- this._removeDeposit(stem.toString(), token, event.args.amounts[index]);
+ this._removeDeposit(this.migrateStem(stem), token, event.args.amounts[index]);
});
}
+
+ migrateStem(stem: ethers.BigNumber): string {
+ let stemTV = TokenValue.fromBlockchain(stem, 0);
+ if (stemTV.abs().lt(10 ** 6)) stemTV = stemTV.mul(10 ** 6);
+ const migratedStem = stemTV.toHuman();
+
+ return migratedStem;
+ }
}
diff --git a/projects/sdk/src/lib/farm/actions/Convert.ts b/projects/sdk/src/lib/farm/actions/Convert.ts
new file mode 100644
index 0000000000..3fb47effea
--- /dev/null
+++ b/projects/sdk/src/lib/farm/actions/Convert.ts
@@ -0,0 +1,58 @@
+import { BasicPreparedResult, RunContext, Step, StepClass } from "src/classes/Workflow";
+import { ethers } from "ethers";
+import { Token } from "src/classes/Token";
+import { Deposit } from "src/lib/silo/types";
+import { TokenValue } from "@beanstalk/sdk-core";
+
+export class Convert extends StepClass {
+ public name: string = "convert";
+
+ constructor(
+ private _tokenIn: Token,
+ private _tokenOut: Token,
+ private _amountIn: TokenValue,
+ private _minAmountOut: TokenValue,
+ private _deposits: Deposit[],
+
+ ) {
+ super();
+ }
+
+ async run(_amountInStep: ethers.BigNumber, context: RunContext) {
+
+ const siloConvert = Convert.sdk.silo.siloConvert;
+
+ const amountIn = this._amountIn;
+ const minAmountOut = this._minAmountOut;
+ const deposits = this._deposits;
+
+ return {
+ name: this.name,
+ amountOut: _amountInStep,
+ prepare: () => {
+ Convert.sdk.debug(`[${this.name}.encode()]`, {
+ tokenIn: this._tokenIn,
+ tokenOut: this._tokenOut,
+ amountIn: amountIn,
+ minAmountOut: minAmountOut,
+ deposits: this._deposits,
+ });
+ return {
+ target: Convert.sdk.contracts.beanstalk.address,
+ callData: Convert.sdk.contracts.beanstalk.interface.encodeFunctionData("convert", [
+ siloConvert.calculateEncoding(
+ this._tokenIn,
+ this._tokenOut,
+ amountIn,
+ minAmountOut
+ ),
+ deposits.map((c) => c.stem.toString()),
+ deposits.map((c) => c.amount.abs().toBlockchain())
+ ])
+ };
+ },
+ decode: (data: string) => Convert.sdk.contracts.beanstalk.interface.decodeFunctionData("convert", data),
+ decodeResult: (result: string) => Convert.sdk.contracts.beanstalk.interface.decodeFunctionResult("convert", result)
+ };
+ }
+}
diff --git a/projects/sdk/src/lib/farm/actions/Mow.ts b/projects/sdk/src/lib/farm/actions/Mow.ts
new file mode 100644
index 0000000000..3c007cdb20
--- /dev/null
+++ b/projects/sdk/src/lib/farm/actions/Mow.ts
@@ -0,0 +1,62 @@
+import { BasicPreparedResult, RunContext, StepClass } from "src/classes/Workflow";
+import { ethers } from "ethers";
+import { Token } from "src/classes/Token";
+import { TokenValue } from "@beanstalk/sdk-core";
+
+export class Mow extends StepClass {
+ public name: string = "mow";
+
+ constructor(
+ private _account: string,
+ private _tokensToMow: Map
+ ) {
+ super();
+ }
+
+ async run(_amountInStep: ethers.BigNumber, context: RunContext) {
+
+ const tokensToMow: string[] = [];
+
+ this._tokensToMow.forEach((grown, token) => {
+ if (grown.gt(0)) {
+ tokensToMow.push(token.address);
+ }
+ });
+
+ if (tokensToMow.length === 1) {
+ return {
+ name: 'mow',
+ amountOut: _amountInStep,
+ prepare: () => {
+ Mow.sdk.debug(`[${this.name}.encode()]`);
+ return {
+ target: Mow.sdk.contracts.beanstalk.address,
+ callData: Mow.sdk.contracts.beanstalk.interface.encodeFunctionData("mow", [
+ this._account,
+ tokensToMow[0]
+ ])
+ };
+ },
+ decode: (data: string) => Mow.sdk.contracts.beanstalk.interface.decodeFunctionData("mow", data),
+ decodeResult: (result: string) => Mow.sdk.contracts.beanstalk.interface.decodeFunctionResult("mow", result)
+ };
+ } else {
+ return {
+ name: 'mowMultiple',
+ amountOut: _amountInStep,
+ prepare: () => {
+ Mow.sdk.debug(`[${this.name}.encode()]`);
+ return {
+ target: Mow.sdk.contracts.beanstalk.address,
+ callData: Mow.sdk.contracts.beanstalk.interface.encodeFunctionData("mowMultiple", [
+ this._account,
+ tokensToMow
+ ])
+ };
+ },
+ decode: (data: string) => Mow.sdk.contracts.beanstalk.interface.decodeFunctionData("mowMultiple", data),
+ decodeResult: (result: string) => Mow.sdk.contracts.beanstalk.interface.decodeFunctionResult("mowMultiple", result)
+ };
+ }
+ }
+}
\ No newline at end of file
diff --git a/projects/sdk/src/lib/farm/actions/Plant.ts b/projects/sdk/src/lib/farm/actions/Plant.ts
new file mode 100644
index 0000000000..518d0a0b5a
--- /dev/null
+++ b/projects/sdk/src/lib/farm/actions/Plant.ts
@@ -0,0 +1,27 @@
+import { BasicPreparedResult, RunContext, Step, StepClass } from "src/classes/Workflow";
+import { ethers } from "ethers";
+
+export class Plant extends StepClass {
+ public name: string = "plant";
+
+ constructor(
+ ) {
+ super();
+ }
+
+ async run(_amountInStep: ethers.BigNumber, context: RunContext) {
+ return {
+ name: this.name,
+ amountOut: _amountInStep,
+ prepare: () => {
+ Plant.sdk.debug(`[${this.name}.encode()]`);
+ return {
+ target: Plant.sdk.contracts.beanstalk.address,
+ callData: Plant.sdk.contracts.beanstalk.interface.encodeFunctionData("plant", undefined)
+ };
+ },
+ decode: (data: string) => Plant.sdk.contracts.beanstalk.interface.decodeFunctionData("plant", data),
+ decodeResult: (result: string) => Plant.sdk.contracts.beanstalk.interface.decodeFunctionResult("plant", result)
+ };
+ }
+}
diff --git a/projects/sdk/src/lib/farm/actions/index.ts b/projects/sdk/src/lib/farm/actions/index.ts
index 2e4879a90d..58a6f32ebe 100644
--- a/projects/sdk/src/lib/farm/actions/index.ts
+++ b/projects/sdk/src/lib/farm/actions/index.ts
@@ -4,6 +4,9 @@ import { WrapEth } from "./WrapEth";
import { UnwrapEth } from "./UnwrapEth";
import { TransferToken } from "./TransferToken";
import { Deposit } from "./Deposit";
+import { Convert } from "./Convert";
+import { Plant } from "./Plant";
+import { Mow } from "./Mow";
import { WithdrawDeposits } from "./WithdrawDeposits";
import { WithdrawDeposit } from "./WithdrawDeposit";
import { ClaimWithdrawals } from "./ClaimWithdrawals";
@@ -34,6 +37,9 @@ export {
// Beanstalk: Silo
Deposit,
+ Convert,
+ Plant,
+ Mow,
WithdrawDeposits,
WithdrawDeposit,
ClaimWithdrawals,
diff --git a/projects/sdk/src/lib/root.test.ts b/projects/sdk/src/lib/root.test.ts
deleted file mode 100644
index d13780acd8..0000000000
--- a/projects/sdk/src/lib/root.test.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { getTestUtils } from "src/utils/TestUtils/provider";
-
-const { sdk, account, utils } = getTestUtils();
-
-describe("mint function", () => {
- it("uses the right function", async () => {
- expect(true).toBe(true);
- // const typedData = await sdk.root.permit(
- // [sdk.tokens.BEAN],
- // [new BigNumber(1000)],
- // );
- // const permit = await sdk.permit.sign(
- // account,
- // typedData,
- // )
- });
-});
-
-describe("estimateRoots", () => {
- it("test", async () => {
- const estimate = await sdk.root.estimateRoots(sdk.tokens.BEAN, [utils.mockDepositCrate(sdk.tokens.BEAN, 6000, "1000")], true);
-
- expect(estimate.amount.gt(0)).toBe(true);
- });
-});
diff --git a/projects/sdk/src/lib/silo.ts b/projects/sdk/src/lib/silo.ts
index 9b51ffc323..7a01d6fa49 100644
--- a/projects/sdk/src/lib/silo.ts
+++ b/projects/sdk/src/lib/silo.ts
@@ -187,10 +187,11 @@ export class Silo {
options?: { source: DataSource.LEDGER } | { source: DataSource.SUBGRAPH }
): Promise {
const source = Silo.sdk.deriveConfig("source", options);
- const [account, currentSeason, stemTip] = await Promise.all([
+ const [account, currentSeason, stemTip, germinatingStem] = await Promise.all([
Silo.sdk.getAccount(_account),
Silo.sdk.sun.getSeason(),
- this.getStemTip(_token)
+ this.getStemTip(_token),
+ Silo.sdk.contracts.beanstalk.getGerminatingStem(_token.address)
]);
if (!Silo.sdk.tokens.siloWhitelist.has(_token)) throw new Error(`${_token.address} is not whitelisted in the Silo`);
@@ -212,7 +213,8 @@ export class Silo {
utils.applyDeposit(balance, _token, stemTip, {
stem,
amount: deposits[stem].amount,
- bdv: deposits[stem].bdv
+ bdv: deposits[stem].bdv,
+ germinatingStem
});
}
@@ -237,7 +239,8 @@ export class Silo {
utils.applyDeposit(balance, _token, stemTip, {
stem: deposit.season, // FIXME
amount: deposit.amount,
- bdv: deposit.bdv
+ bdv: deposit.bdv,
+ germinatingStem
})
);
@@ -262,17 +265,25 @@ export class Silo {
_account?: string,
options?: { source: DataSource.LEDGER } | { source: DataSource.SUBGRAPH }
): Promise> {
+ /// SETUP
+ const whitelist = Silo.sdk.tokens.siloWhitelist;
+ const whiteListTokens = Array.from(whitelist);
+ const balances = new Map();
+ whitelist.forEach((token) => balances.set(token, utils.makeTokenSiloBalance()));
const source = Silo.sdk.deriveConfig("source", options);
- const [account, currentSeason, stemTips] = await Promise.all([
+
+ const [account, currentSeason, stemTips, germinatingStemsRaw] = await Promise.all([
Silo.sdk.getAccount(_account),
Silo.sdk.sun.getSeason(),
- this.getStemTips([...Silo.sdk.tokens.siloWhitelist])
+ this.getStemTips([...Silo.sdk.tokens.siloWhitelist]),
+ Silo.sdk.contracts.beanstalk.getGerminatingStems(whiteListTokens.map((t) => t.address))
]);
- /// SETUP
- const whitelist = Silo.sdk.tokens.siloWhitelist;
- const balances = new Map();
- whitelist.forEach((token) => balances.set(token, utils.makeTokenSiloBalance()));
+ // Set germinatingStems
+ const germinatingStems = new Map();
+ for (let i = 0; i < germinatingStemsRaw.length; i++) {
+ germinatingStems.set(whiteListTokens[i], germinatingStemsRaw[i]);
+ }
/// LEDGER
if (source === DataSource.LEDGER) {
@@ -283,6 +294,9 @@ export class Silo {
// Handle deposits.
// Attach stalk & seed counts for each crate.
depositsByToken.forEach((deposits, token) => {
+ const germinatingStem = germinatingStems.get(token)!;
+ if (!germinatingStem) throw new Error(`No germinatingStem found for ${token.symbol}`);
+
// If we receive a token that wasn't on the SDK's known whitelist, create
// a new balance object for it. (This shouldn't happen)
if (!balances.has(token)) balances.set(token, utils.makeTokenSiloBalance());
@@ -293,11 +307,15 @@ export class Silo {
if (!stemTip) throw new Error(`No stem tip found for ${token.address}`);
for (let stem in deposits) {
- utils.applyDeposit(balance, token, stemTip, {
- stem,
- amount: deposits[stem].amount,
- bdv: deposits[stem].bdv
- });
+ // Filter dust crates - should help with crate balance too low errors
+ if (deposits[stem].amount.toString() !== "1") {
+ utils.applyDeposit(balance, token, stemTip, {
+ stem,
+ amount: deposits[stem].amount,
+ bdv: deposits[stem].bdv,
+ germinatingStem
+ });
+ };
}
utils.sortCrates(balance);
@@ -319,9 +337,11 @@ export class Silo {
const { deposited } = query.farmer;
// Handle deposits.
- deposited.forEach((deposit: typeof deposited[number]) => {
+ deposited.forEach((deposit: (typeof deposited)[number]) => {
const token = Silo.sdk.tokens.findByAddress(deposit.token);
if (!token) return; // FIXME: unknown token handling
+ const germinatingStem = germinatingStems.get(token)!;
+ if (!germinatingStem) throw new Error(`No germinatingStem found for ${token.symbol}`);
// If we receive a token that wasn't on the SDK's known whitelist, create
// a new balance object for it. (This shouldn't happen)
@@ -332,11 +352,15 @@ export class Silo {
const stemTip = stemTips.get(token.address);
if (!stemTip) throw new Error(`No stem tip found for ${token.address}`);
- utils.applyDeposit(balance, token, stemTip, {
- stem: deposit.stem || deposit.season,
- amount: deposit.amount,
- bdv: deposit.bdv
- });
+ // Filter dust crates - should help with crate balance too low errors
+ if (BigNumber.from(deposit.amount).toString() !== "1") {
+ utils.applyDeposit(balance, token, stemTip, {
+ stem: deposit.stem || deposit.season,
+ amount: deposit.amount,
+ bdv: deposit.bdv,
+ germinatingStem
+ });
+ };
});
return utils.sortTokenMapByWhitelist(Silo.sdk.tokens.siloWhitelist, balances);
diff --git a/projects/sdk/src/lib/silo/Convert.ts b/projects/sdk/src/lib/silo/Convert.ts
index 1f3b38a8c8..3f81bbb6a8 100644
--- a/projects/sdk/src/lib/silo/Convert.ts
+++ b/projects/sdk/src/lib/silo/Convert.ts
@@ -157,6 +157,16 @@ export class Convert {
minAmountOut.toBlockchain(), // minBeans
fromToken.address // output token address = pool address
);
+ } else if (fromToken.address === this.urBean.address && toToken.address === this.Bean.address) {
+ encoding = ConvertEncoder.unripeToRipe(
+ amountIn.toBlockchain(), // unRipe Amount
+ fromToken.address // unRipe Token
+ );
+ } else if (fromToken.address === this.urBeanWeth.address && toToken.address === this.BeanEth.address) {
+ encoding = ConvertEncoder.unripeToRipe(
+ amountIn.toBlockchain(), // unRipe Amount
+ fromToken.address // unRipe Token
+ );
} else {
throw new Error("SDK: Unknown conversion pathway");
}
@@ -176,21 +186,5 @@ export class Convert {
if (fromToken.equals(toToken)) {
throw new Error("Cannot convert between the same token");
}
-
- if (!this.paths.get(fromToken)?.equals(toToken)) {
- throw new Error("Cannot convert between these tokens");
- }
-
- const deltaB = await Convert.sdk.bean.getDeltaB();
-
- if (deltaB.gte(TokenValue.ZERO)) {
- if (fromToken.equals(this.BeanCrv3) || fromToken.equals(this.urBeanWeth) || fromToken.equals(this.BeanEth)) {
- throw new Error("Cannot convert this token when deltaB is >= 0");
- }
- } else if (deltaB.lt(TokenValue.ZERO)) {
- if (fromToken.equals(this.Bean) || fromToken.equals(this.urBean)) {
- throw new Error("Cannot convert this token when deltaB is < 0");
- }
- }
}
}
diff --git a/projects/sdk/src/lib/silo/ConvertEncoder.ts b/projects/sdk/src/lib/silo/ConvertEncoder.ts
index 632727449d..d2bde6db66 100644
--- a/projects/sdk/src/lib/silo/ConvertEncoder.ts
+++ b/projects/sdk/src/lib/silo/ConvertEncoder.ts
@@ -1,48 +1,34 @@
-import { defaultAbiCoder } from 'ethers/lib/utils';
+import { defaultAbiCoder } from "ethers/lib/utils";
export enum ConvertKind {
- BEANS_TO_CURVE_LP = 0,
- CURVE_LP_TO_BEANS = 1,
- UNRIPE_BEANS_TO_LP = 2,
- UNRIPE_LP_TO_BEANS = 3,
- BEANS_TO_WELL_LP = 5,
- WELL_LP_TO_BEANS = 6,
+ BEANS_TO_CURVE_LP = 0,
+ CURVE_LP_TO_BEANS = 1,
+ UNRIPE_BEANS_TO_LP = 2,
+ UNRIPE_LP_TO_BEANS = 3,
+ BEANS_TO_WELL_LP = 5,
+ WELL_LP_TO_BEANS = 6,
+ UNRIPE_TO_RIPE = 7
}
export class ConvertEncoder {
static curveLPToBeans = (amountLP: string, minBeans: string, pool: string) =>
- defaultAbiCoder.encode(
- ['uint256', 'uint256', 'uint256', 'address'],
- [ConvertKind.CURVE_LP_TO_BEANS, amountLP, minBeans, pool]
- );
+ defaultAbiCoder.encode(["uint256", "uint256", "uint256", "address"], [ConvertKind.CURVE_LP_TO_BEANS, amountLP, minBeans, pool]);
static beansToCurveLP = (amountBeans: string, minLP: string, pool: string) =>
- defaultAbiCoder.encode(
- ['uint256', 'uint256', 'uint256', 'address'],
- [ConvertKind.BEANS_TO_CURVE_LP, amountBeans, minLP, pool]
- );
+ defaultAbiCoder.encode(["uint256", "uint256", "uint256", "address"], [ConvertKind.BEANS_TO_CURVE_LP, amountBeans, minLP, pool]);
static unripeLPToBeans = (amountLP: string, minBeans: string) =>
- defaultAbiCoder.encode(
- ['uint256', 'uint256', 'uint256'],
- [ConvertKind.UNRIPE_LP_TO_BEANS, amountLP, minBeans]
- );
+ defaultAbiCoder.encode(["uint256", "uint256", "uint256"], [ConvertKind.UNRIPE_LP_TO_BEANS, amountLP, minBeans]);
static unripeBeansToLP = (amountBeans: string, minLP: string) =>
- defaultAbiCoder.encode(
- ['uint256', 'uint256', 'uint256'],
- [ConvertKind.UNRIPE_BEANS_TO_LP, amountBeans, minLP]
- );
-
+ defaultAbiCoder.encode(["uint256", "uint256", "uint256"], [ConvertKind.UNRIPE_BEANS_TO_LP, amountBeans, minLP]);
+
static beansToWellLP = (amountBeans: string, minLP: string, pool: string) =>
- defaultAbiCoder.encode(
- ['uint256', 'uint256', 'uint256', 'address'],
- [ConvertKind.BEANS_TO_WELL_LP, amountBeans, minLP, pool]
- );
+ defaultAbiCoder.encode(["uint256", "uint256", "uint256", "address"], [ConvertKind.BEANS_TO_WELL_LP, amountBeans, minLP, pool]);
static wellLPToBeans = (amountLP: string, minBeans: string, pool: string) =>
- defaultAbiCoder.encode(
- ['uint256', 'uint256', 'uint256', 'address'],
- [ConvertKind.WELL_LP_TO_BEANS, amountLP, minBeans, pool]
- );
+ defaultAbiCoder.encode(["uint256", "uint256", "uint256", "address"], [ConvertKind.WELL_LP_TO_BEANS, amountLP, minBeans, pool]);
+
+ static unripeToRipe = (unripeAmount: string, unripeToken: string) =>
+ defaultAbiCoder.encode(["uint256", "uint256", "uint256"], [ConvertKind.UNRIPE_TO_RIPE, unripeAmount, unripeToken]);
}
diff --git a/projects/sdk/src/lib/silo/Withdraw.test.ts b/projects/sdk/src/lib/silo/Withdraw.test.ts
index d78ccdbd71..f8d174d6da 100644
--- a/projects/sdk/src/lib/silo/Withdraw.test.ts
+++ b/projects/sdk/src/lib/silo/Withdraw.test.ts
@@ -47,7 +47,7 @@ describe("Silo Withdrawl", function () {
expect(t).rejects.toThrow("Insufficient balance");
});
- it.only("Calculates crates correctly", async () => {
+ it("Calculates crates correctly", async () => {
const currentSeason = 10_000;
const c1 = utils.mockDepositCrate(token, 900, "200", currentSeason);
const c2 = utils.mockDepositCrate(token, 800, "500", currentSeason);
diff --git a/projects/sdk/src/lib/silo/types.ts b/projects/sdk/src/lib/silo/types.ts
index 45de64963a..e914957b32 100644
--- a/projects/sdk/src/lib/silo/types.ts
+++ b/projects/sdk/src/lib/silo/types.ts
@@ -25,6 +25,12 @@ export type Deposit = {
};
/** The amount of Seeds granted for this Deposit. */
seeds: T;
+ /** Whether or not this deposit is germinating.
+ *
+ * If the germinatingStemTip for this token is less than the stem of this deposit, then it is NOT germinating
+ * If it's greater than or equal to, then it is a germinating deposit
+ */
+ isGerminating: boolean;
};
/**
@@ -34,10 +40,14 @@ export type Deposit = {
export type TokenSiloBalance = {
/** The total amount of this Token currently in the Deposited state. */
amount: T;
+ /** The total amount of this Token that is available to Convert. Excludes germinating deposits */
+ convertibleAmount: T;
/** The BDV of this Token currently in the Deposited state. */
bdv: T;
/** All Deposit crates. */
deposits: Deposit[];
+ /** All Deposits that can be used in a Convert operation. Excludes germinating ones. */
+ convertibleDeposits: Deposit[];
};
// FIXME: resolve with EIP712PermitMessage
diff --git a/projects/sdk/src/lib/silo/utils.ts b/projects/sdk/src/lib/silo/utils.ts
index 05c8c8fc93..e29a68ec70 100644
--- a/projects/sdk/src/lib/silo/utils.ts
+++ b/projects/sdk/src/lib/silo/utils.ts
@@ -65,7 +65,8 @@ export function pickCrates(deposits: Deposit[], amount: TokenValue, token: Token
base: baseStalk,
grown: grownStalk
},
- seeds: crateSeeds
+ seeds: crateSeeds,
+ isGerminating: deposit.isGerminating
});
return totalAmount.eq(amount);
@@ -112,8 +113,10 @@ export function sortTokenMapByWhitelist(whitelist: Set, ma
export function makeTokenSiloBalance(): TokenSiloBalance {
return {
amount: TokenValue.ZERO,
+ convertibleAmount: TokenValue.ZERO,
bdv: TokenValue.ZERO,
- deposits: [] as Deposit[]
+ deposits: [] as Deposit[],
+ convertibleDeposits: [] as Deposit[]
};
}
@@ -121,6 +124,7 @@ export type RawDepositData = {
stem: ethers.BigNumberish;
amount: ethers.BigNumberish;
bdv: ethers.BigNumberish;
+ germinatingStem: ethers.BigNumber;
};
/**
@@ -135,12 +139,20 @@ export type RawDepositData = {
*/
export function makeDepositObject(token: Token, stemTipForToken: ethers.BigNumber, data: RawDepositData): Deposit {
// On-chain
- const stem = ethers.BigNumber.from(data.stem);
+ let stem
const amount = token.fromBlockchain(data.amount.toString());
const bdv = Silo.sdk.tokens.BEAN.fromBlockchain(data.bdv.toString()); // Hack
+ // Hack - Remove additional digits added to stem of redeposited unripe tokens in migrateStem
+ if (token.isUnripe && !ethers.BigNumber.from(data.stem).isNegative()) {
+ stem = ethers.BigNumber.from(data.stem).div(1000000);
+ } else {
+ stem = ethers.BigNumber.from(data.stem);
+ };
+ const isGerminating = stem.gte(data.germinatingStem);
// Stalk
- const base = token.getStalk(bdv);
+ // Germinating stalk has 0 base stalk
+ const base = isGerminating ? TokenValue.ZERO : token.getStalk(bdv);
const grown = calculateGrownStalkStems(stemTipForToken, stem, bdv);
const total = base.add(grown);
@@ -153,7 +165,8 @@ export function makeDepositObject(token: Token, stemTipForToken: ethers.BigNumbe
grown,
total
},
- seeds: token.getSeeds(bdv)
+ seeds: token.getSeeds(bdv),
+ isGerminating
};
}
@@ -176,27 +189,34 @@ export function calculateGrownStalkSeeds(
* Formula: `grownStalk = bdv * (stemTip - stem)`
* See: LibTokenSilo.grownStalkForDeposit
*
+ * The grown stalk for a deposit (this applies to both germinating and regular deposits) is calculated by:
+ * ∆Stem * bdv / 1e6 (where bdv is in 6 decimal precision, "1" bdv = 1e6)
+ * ∆Stem = StemTip - Stem of deposit.
+ *
* @param stemTip The current stem tip for the token that is deposited
* @param stem The stem of the deposit
* @param bdv The bdv of the deposit
*/
export function calculateGrownStalkStems(stemTip: ethers.BigNumber, stem: ethers.BigNumber, bdv: TokenValue) {
- const deltaStem = stemTip.sub(stem);
+ const deltaStem = stemTip.sub(stem).div(10 ** 6);
+
if (deltaStem.lt(0)) return Silo.sdk.tokens.STALK.fromHuman("0"); // FIXME
return Silo.sdk.tokens.STALK.fromBlockchain(bdv.toBigNumber().mul(deltaStem));
}
/**
* Apply a Deposit to a TokenSiloBalance.
- * TODO: refactor to accept currentStem instead of currentSeason
- * @note expects inputs to be stringified (no decimals).
*/
export function applyDeposit(balance: TokenSiloBalance, token: Token, stemTipForToken: ethers.BigNumber, data: RawDepositData) {
const deposit = makeDepositObject(token, stemTipForToken, data);
balance.amount = balance.amount.add(deposit.amount);
+ balance.convertibleAmount = balance.convertibleAmount.add(deposit.isGerminating ? TokenValue.ZERO : deposit.amount);
balance.bdv = balance.bdv.add(deposit.bdv);
balance.deposits.push(deposit);
+ if (!deposit.isGerminating) {
+ balance.convertibleDeposits.push(deposit);
+ }
return deposit;
}
diff --git a/projects/sdk/src/lib/sun.ts b/projects/sdk/src/lib/sun.ts
index 22304560d5..fcd508aa1a 100644
--- a/projects/sdk/src/lib/sun.ts
+++ b/projects/sdk/src/lib/sun.ts
@@ -1,3 +1,4 @@
+import { ContractTransaction } from "ethers";
import { BeanstalkSDK } from "./BeanstalkSDK";
export class Sun {
@@ -11,5 +12,7 @@ export class Sun {
return Sun.sdk.contracts.beanstalk.season();
}
- // ... other sun related things
+ async sunrise(): Promise {
+ return Sun.sdk.contracts.beanstalk.sunrise();
+ }
}
diff --git a/projects/sdk/src/lib/tokens.ts b/projects/sdk/src/lib/tokens.ts
index d9e1a9ae64..449803c363 100644
--- a/projects/sdk/src/lib/tokens.ts
+++ b/projects/sdk/src/lib/tokens.ts
@@ -70,7 +70,8 @@ export class Tokens {
18,
"WETH",
{
- name: "Wrapped Ether"
+ name: "Wrapped Ether",
+ displayDecimals: 4
},
providerOrSigner
);
@@ -115,7 +116,7 @@ export class Tokens {
);
this.BEAN.rewards = {
stalk: this.STALK.amount(1),
- seeds: this.SEEDS.amount(3)
+ seeds: null
};
this.BEAN_CRV3_LP = new ERC20Token(
@@ -133,7 +134,7 @@ export class Tokens {
);
this.BEAN_CRV3_LP.rewards = {
stalk: this.STALK.amount(1),
- seeds: this.SEEDS.amount(3.25)
+ seeds: null
};
this.BEAN_ETH_WELL_LP = new ERC20Token(
@@ -151,7 +152,7 @@ export class Tokens {
);
this.BEAN_ETH_WELL_LP.rewards = {
stalk: this.STALK.amount(1),
- seeds: this.SEEDS.amount(4.5)
+ seeds: null
};
this.UNRIPE_BEAN = new ERC20Token(
@@ -168,7 +169,7 @@ export class Tokens {
);
this.UNRIPE_BEAN.rewards = {
stalk: this.STALK.amount(1),
- seeds: this.SEEDS.amount(0)
+ seeds: TokenValue.ZERO
};
this.UNRIPE_BEAN.isUnripe = true;
@@ -186,7 +187,7 @@ export class Tokens {
);
this.UNRIPE_BEAN_WETH.rewards = {
stalk: this.STALK.amount(1),
- seeds: this.SEEDS.amount(0)
+ seeds: TokenValue.ZERO
};
this.UNRIPE_BEAN_WETH.isUnripe = true;
@@ -334,7 +335,7 @@ export class Tokens {
);
this.BEAN_ETH_UNIV2_LP.rewards = {
stalk: this.STALK.amount(1),
- seeds: this.SEEDS.amount(4)
+ seeds: null
};
this.map.set(addresses.BEAN_ETH_UNIV2_LP.get(chainId), this.BEAN_ETH_UNIV2_LP);
diff --git a/projects/sdk/src/utils/TestUtils/BlockchainUtils.ts b/projects/sdk/src/utils/TestUtils/BlockchainUtils.ts
index 329f4f38fb..c7fc5e08d5 100644
--- a/projects/sdk/src/utils/TestUtils/BlockchainUtils.ts
+++ b/projects/sdk/src/utils/TestUtils/BlockchainUtils.ts
@@ -363,8 +363,13 @@ export class BlockchainUtils {
return b.toHexString();
}
- // FIXME: season -> stem
- mockDepositCrate(token: ERC20Token, _season: number, _amount: string, _currentSeason?: number) {
+ mockDepositCrate(
+ token: ERC20Token,
+ _season: number,
+ _amount: string,
+ _currentSeason?: number,
+ _germinatingStem: ethers.BigNumber = ethers.constants.Zero
+ ) {
const amount = token.amount(_amount);
const bdv = TokenValue.fromHuman(amount.toHuman(), 6);
const currentSeason = _currentSeason || _season + 100;
@@ -372,7 +377,8 @@ export class BlockchainUtils {
return makeDepositObject(token, ethers.BigNumber.from(_season), {
stem: currentSeason, // FIXME
amount: amount.toBlockchain(),
- bdv: bdv.toBlockchain()
+ bdv: bdv.toBlockchain(),
+ germinatingStem: _germinatingStem
});
}
diff --git a/projects/subgraph-basin/.github/beanstalk.svg b/projects/subgraph-basin/.github/beanstalk.svg
deleted file mode 100644
index d3ec869ca2..0000000000
--- a/projects/subgraph-basin/.github/beanstalk.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/projects/subgraph-basin/.github/workflows/ci.yaml b/projects/subgraph-basin/.github/workflows/ci.yaml
deleted file mode 100644
index 7af6e213ae..0000000000
--- a/projects/subgraph-basin/.github/workflows/ci.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Continuous Integration
-
-on: [push, pull_request]
-
-jobs:
- compile:
- runs-on: ubuntu-latest
- name: Compile
- steps:
- - name: Check out source repository
- uses: actions/checkout@v2
- - name: Setup Node
- uses: actions/setup-node@v2
- with:
- node-version: "16"
- - name: Install The Graph CLI
- run: npm install -g @graphprotocol/graph-cli
- - name: Install dependencies
- run: npm install
- working-directory: "${{ matrix.value }}"
-
- # Generate code and check for uncommitted changes
- # https://github.com/marketplace/actions/check-uncommitted-changes
- - name: Generate Subgraph Code
- run: npm run codegen
- working-directory: "${{ matrix.value }}"
- - name: Check for uncommitted changes
- id: check-changes
- uses: mskri/check-uncommitted-changes-action@v1.0.1
- - name: Evaluate if there are changes
- if: steps.check-changes.outputs.outcome == failure()
- run: echo "There are uncommitted changes - execute 'npm run codegen' locally and commit the generated files!"
-
- - name: Build Subgraph
- run: npm run build
- working-directory: "${{ matrix.value }}"
- # TODO: add matchstick test suite
- #- name: Run Tests
- # run: npm run test
- # working-directory: "${{ matrix.value }}"
diff --git a/projects/subgraph-basin/.gitignore b/projects/subgraph-basin/.gitignore
index 9f063af372..87a5e3f968 100644
--- a/projects/subgraph-basin/.gitignore
+++ b/projects/subgraph-basin/.gitignore
@@ -71,3 +71,4 @@ generated
# matchstick binary download info
tests/.latest.json
tests/.bin
+tests/.docker
diff --git a/projects/subgraph-basin/matchstick-docker.yaml b/projects/subgraph-basin/matchstick-docker.yaml
new file mode 100644
index 0000000000..fcd5b6dd5d
--- /dev/null
+++ b/projects/subgraph-basin/matchstick-docker.yaml
@@ -0,0 +1,6 @@
+# This configuration is needed when running the matchstick tests in docker.
+# This is because the root project directory is bind mounted to the container, as the
+# subgraph has some dependencies on other projects in the repo.
+testsFolder: repo-mounted/projects/subgraph-basin/tests
+libsFolder: repo-mounted/node_modules
+manifestPath: repo-mounted/projects/subgraph-basin/subgraph.yaml
diff --git a/projects/subgraph-basin/package.json b/projects/subgraph-basin/package.json
index a041e08810..93a659bed9 100644
--- a/projects/subgraph-basin/package.json
+++ b/projects/subgraph-basin/package.json
@@ -11,23 +11,18 @@
"codegen": "rm -rf ./generated && graph codegen",
"build": "yarn codegen && graph build",
"test": "graph test",
- "deploy": "yarn codegen && graph deploy --node https://api.studio.thegraph.com/deploy/ basin",
+ "testd": "docker run -it --rm --mount type=bind,source=\"$(pwd)\"/matchstick-docker.yaml,target=/matchstick/matchstick.yaml --mount type=bind,source=\"$(pwd)\"/../../,target=/matchstick/repo-mounted/ matchstick",
+ "testd-named": "../subgraph-core/tests/scripts/docker-run-named.sh",
"create-local": "graph create --node http://127.0.0.1:8020/ basin",
- "deploy-local": "yarn codegen && graph deploy --node http://127.0.0.1:8020/ --ipfs http://127.0.0.1:5001 basin",
- "create-hosted": "graph create --node http://graph.node.bean.money:8020/ basin",
- "remove-hosted": "graph remove --node http://graph.node.bean.money:8020/ basin",
- "deploy-hosted": "yarn codegen && graph deploy --node http://graph.node.bean.money:8020/ --ipfs http://graph.node.bean.money:5001 basin",
- "create-hosted-staging": "graph create --node http://graph.node.bean.money:8020/ basin-staging",
- "remove-hosted-staging": "graph remove --node http://graph.node.bean.money:8020/ basin-staging",
- "deploy-hosted-staging": "yarn codegen && graph deploy --node http://graph.node.bean.money:8020/ --ipfs http://graph.node.bean.money:5001 basin-staging",
- "create-hosted-dev": "graph create --node http://graph.node.bean.money:8020/ basin-dev",
- "remove-hosted-dev": "graph remove --node http://graph.node.bean.money:8020/ basin-dev",
- "deploy-hosted-dev": "yarn codegen && graph deploy --node http://graph.node.bean.money:8020/ --ipfs http://graph.node.bean.money:5001 basin-dev"
+ "remove-local": "graph remove --node http://127.0.0.1:8020/ basin",
+ "deploy-local": "yarn codegen && graph deploy --node http://127.0.0.1:8020/ --ipfs http://127.0.0.1:5001 basin"
},
"dependencies": {
- "@graphprotocol/graph-cli": "0.56.0",
- "@graphprotocol/graph-ts": "0.31.0",
- "matchstick-as": "^0.5.0"
+ "@graphprotocol/graph-cli": "0.69.0",
+ "@graphprotocol/graph-ts": "0.34.0"
+ },
+ "devDependencies": {
+ "matchstick-as": "^0.6.0"
},
"private": true
}
diff --git a/projects/subgraph-basin/schema.graphql b/projects/subgraph-basin/schema.graphql
index 5a6ad8b8ac..80d545cd04 100644
--- a/projects/subgraph-basin/schema.graphql
+++ b/projects/subgraph-basin/schema.graphql
@@ -81,9 +81,11 @@ type Well @entity {
symbol: String
" Tokens that need to be deposited to take a position in protocol. e.g. WETH and USDC to deposit into the WETH-USDC well. Array to account for multi-asset wells like Curve and Balancer "
- # Check for forced indexing of tokens
tokens: [Token!]!
+ " The order of the tokens in the Well. The above `tokens` association will be sorted by id on any retrieval. "
+ tokenOrder: [Bytes!]!
+
" Pricing function contract used with this well "
wellFunction: WellFunction! @derivedFrom(field: "well")
@@ -113,14 +115,26 @@ type Well @entity {
" USD value of each token in the well. The ordering should be the same as the well's `tokens` field. "
reservesUSD: [BigDecimal!]!
- " All trade volume occurred for a specific token, in native amount. The ordering should be the same as the well's `tokens` field. "
- cumulativeVolumeReserves: [BigInt!]!
+ " All trade volume occurred for a specific token, in native amount. Volume for an individual token is defined as a purchase of that token. This includes any net trading activity as a result of add/remove liquidity. The ordering should be the same as the well's `tokens` field. "
+ cumulativeTradeVolumeReserves: [BigInt!]!
+
+ " All trade volume occurred for a specific token, in USD. Volume for an individual token is defined as a purchase of that token. This includes any net trading activity as a result of add/remove liquidity. The ordering should be the same as the well's `tokens` field. "
+ cumulativeTradeVolumeReservesUSD: [BigDecimal!]!
+
+ " All trade volume occurred in this well, in USD. This includes any net trading activity as a result of add/remove liquidity. Should be equal to the sum of all entries in cumulativeTradeVolumeReservesUSD "
+ cumulativeTradeVolumeUSD: BigDecimal!
+
+ " All trade volume occurred for a specific token, in native amount. This includes absolute tokens on both sides of the trade unlike cumulativeTradeVolumeReserves. This includes any net trading activity as a result of add/remove liquidity. The ordering should be the same as the well's `tokens` field. "
+ cumulativeBiTradeVolumeReserves: [BigInt!]!
+
+ " All transfer volume occurred for a specific token, in native amount. This includes the full amount of tokens transferred in ad/remove liquidity. The ordering should be the same as the well's `tokens` field. "
+ cumulativeTransferVolumeReserves: [BigInt!]!
- " All trade volume occurred for a specific token, in USD. The ordering should be the same as the well's `tokens` field. "
- cumulativeVolumeReservesUSD: [BigDecimal!]!
+ " All transfer volume occurred for a specific token, in USD. This includes the full value of tokens transferred in ad/remove liquidity. The ordering should be the same as the well's `tokens` field. "
+ cumulativeTransferVolumeReservesUSD: [BigDecimal!]!
- " All historical trade volume occurred in this well, in USD "
- cumulativeVolumeUSD: BigDecimal!
+ " All transfer volume occurred in this well, in USD. This includes the full value of tokens transferred in ad/remove liquidity. Should be equal to the sum of all entries in cumulativeTransferVolumeReservesUSD "
+ cumulativeTransferVolumeUSD: BigDecimal!
" Total number of deposit events (add liquidity) "
cumulativeDepositCount: Int!
@@ -131,11 +145,47 @@ type Well @entity {
" Total number of trades (swaps) "
cumulativeSwapCount: Int!
- " Current rolling 24 volume in USD "
- rollingDailyVolumeUSD: BigDecimal!
+ " Current rolling 24h reserve trade volume in token amounts "
+ rollingDailyTradeVolumeReserves: [BigInt!]!
+
+ " Current rolling 24h reserve trade volume in USD "
+ rollingDailyTradeVolumeReservesUSD: [BigDecimal!]!
+
+ " Current rolling 24h trade volume in USD "
+ rollingDailyTradeVolumeUSD: BigDecimal!
+
+ " Current rolling 24h reserve trade volume in token amounts, including absolute tokens on both side of the trade unlike rollingDailyTradeVolumeReserves. "
+ rollingDailyBiTradeVolumeReserves: [BigInt!]!
+
+ " Current rolling 24h reserve transfer volume in token amounts "
+ rollingDailyTransferVolumeReserves: [BigInt!]!
+
+ " Current rolling 24h reserve transfer volume in USD "
+ rollingDailyTransferVolumeReservesUSD: [BigDecimal!]!
+
+ " Current rolling 24h transfer volume in USD "
+ rollingDailyTransferVolumeUSD: BigDecimal!
+
+ " Current rolling weekly reserve trade volume in token amounts "
+ rollingWeeklyTradeVolumeReserves: [BigInt!]!
+
+ " Current rolling weekly reserve trade volume in USD "
+ rollingWeeklyTradeVolumeReservesUSD: [BigDecimal!]!
+
+ " Current rolling weekly trade volume in USD "
+ rollingWeeklyTradeVolumeUSD: BigDecimal!
+
+ " Current rolling weekly reserve trade volume in token amounts, including absolute tokens on both side of the trade unlike rollingWeeklyTradeVolumeReserves. "
+ rollingWeeklyBiTradeVolumeReserves: [BigInt!]!
+
+ " Current rolling weekly reserve transfer volume in token amounts "
+ rollingWeeklyTransferVolumeReserves: [BigInt!]!
+
+ " Current rolling weekly reserve transfer volume in USD "
+ rollingWeeklyTransferVolumeReservesUSD: [BigDecimal!]!
- " Current rolling weekly volume in USD "
- rollingWeeklyVolumeUSD: BigDecimal!
+ " Current rolling weekly transfer volume in USD "
+ rollingWeeklyTransferVolumeUSD: BigDecimal!
" Day ID of the most recent daily snapshot "
lastSnapshotDayID: Int!
@@ -187,14 +237,26 @@ type WellDailySnapshot @entity {
" The sum of all active and non-active liquidity in USD for this well. "
totalLiquidityUSD: BigDecimal!
- " All trade volume occurred for a specific token, in native amount. The ordering should be the same as the well's `tokens` field. "
- cumulativeVolumeReserves: [BigInt!]!
+ " All trade volume occurred for a specific token, in native amount. Volume for an individual token is defined as a purchase of that token. This includes any net trading activity as a result of add/remove liquidity. The ordering should be the same as the well's `tokens` field. "
+ cumulativeTradeVolumeReserves: [BigInt!]!
- " All trade volume occurred for a specific token, in USD. The ordering should be the same as the well's `tokens` field. "
- cumulativeVolumeReservesUSD: [BigDecimal!]!
+ " All trade volume occurred for a specific token, in USD. Volume for an individual token is defined as a purchase of that token. This includes any net trading activity as a result of add/remove liquidity. The ordering should be the same as the well's `tokens` field. "
+ cumulativeTradeVolumeReservesUSD: [BigDecimal!]!
- " All historical trade volume occurred in this well, in USD "
- cumulativeVolumeUSD: BigDecimal!
+ " All trade volume occurred in this well, in USD. This includes any net trading activity as a result of add/remove liquidity. Should be equal to the sum of all entries in cumulativeTradeVolumeReservesUSD "
+ cumulativeTradeVolumeUSD: BigDecimal!
+
+ " All trade volume occurred for a specific token, in native amount. This includes absolute tokens on both sides of the trade unlike cumulativeTradeVolumeReserves. This includes any net trading activity as a result of add/remove liquidity. The ordering should be the same as the well's `tokens` field. "
+ cumulativeBiTradeVolumeReserves: [BigInt!]!
+
+ " All transfer volume occurred for a specific token, in native amount. This includes the full amount of tokens transferred in ad/remove liquidity. The ordering should be the same as the well's `tokens` field. "
+ cumulativeTransferVolumeReserves: [BigInt!]!
+
+ " All transfer volume occurred for a specific token, in USD. This includes the full value of tokens transferred in ad/remove liquidity. The ordering should be the same as the well's `tokens` field. "
+ cumulativeTransferVolumeReservesUSD: [BigDecimal!]!
+
+ " All transfer volume occurred in this well, in USD. This includes the full value of tokens transferred in ad/remove liquidity. Should be equal to the sum of all entries in cumulativeTransferVolumeReservesUSD "
+ cumulativeTransferVolumeUSD: BigDecimal!
" Total number of deposit events (add liquidity) "
cumulativeDepositCount: Int!
@@ -213,14 +275,26 @@ type WellDailySnapshot @entity {
" The sum of all active and non-active liquidity in USD for this well. "
deltaLiquidityUSD: BigDecimal!
- " All trade volume occurred for a specific token, in native amount. The ordering should be the same as the well's `tokens` field. "
- deltaVolumeReserves: [BigInt!]!
+ " Delta of cumulativeTradeVolumeReserves "
+ deltaTradeVolumeReserves: [BigInt!]!
+
+ " Delta of cumulativeTradeVolumeReservesUSD "
+ deltaTradeVolumeReservesUSD: [BigDecimal!]!
+
+ " Delta of cumulativeTradeVolumeUSD "
+ deltaTradeVolumeUSD: BigDecimal!
+
+ " Delta of cumulativeBiTradeVolumeReserves "
+ deltaBiTradeVolumeReserves: [BigInt!]!
+
+ " Delta of cumulativeTransferVolumeReserves "
+ deltaTransferVolumeReserves: [BigInt!]!
- " All trade volume occurred for a specific token, in USD. The ordering should be the same as the well's `tokens` field. "
- deltaVolumeReservesUSD: [BigDecimal!]!
+ " Delta of cumulativeTransferVolumeReservesUSD "
+ deltaTransferVolumeReservesUSD: [BigDecimal!]!
- " All historical trade volume occurred in this well, in USD "
- deltaVolumeUSD: BigDecimal!
+ " Delta of cumulativeTransferVolumeUSD "
+ deltaTransferVolumeUSD: BigDecimal!
" Total number of deposit events (add liquidity) "
deltaDepositCount: Int!
@@ -256,14 +330,26 @@ type WellHourlySnapshot @entity {
" The sum of all active and non-active liquidity in USD for this well. "
totalLiquidityUSD: BigDecimal!
- " All trade volume occurred for a specific token, in native amount. The ordering should be the same as the well's `tokens` field. "
- cumulativeVolumeReserves: [BigInt!]!
+ " All trade volume occurred for a specific token, in native amount. Volume for an individual token is defined as a purchase of that token. This includes any net trading activity as a result of add/remove liquidity. The ordering should be the same as the well's `tokens` field. "
+ cumulativeTradeVolumeReserves: [BigInt!]!
- " All trade volume occurred for a specific token, in USD. The ordering should be the same as the well's `tokens` field. "
- cumulativeVolumeReservesUSD: [BigDecimal!]!
+ " All trade volume occurred for a specific token, in USD. Volume for an individual token is defined as a purchase of that token. This includes any net trading activity as a result of add/remove liquidity. The ordering should be the same as the well's `tokens` field. "
+ cumulativeTradeVolumeReservesUSD: [BigDecimal!]!
- " All historical trade volume occurred in this well, in USD "
- cumulativeVolumeUSD: BigDecimal!
+ " All trade volume occurred in this well, in USD. This includes any net trading activity as a result of add/remove liquidity. Should be equal to the sum of all entries in cumulativeTradeVolumeReservesUSD "
+ cumulativeTradeVolumeUSD: BigDecimal!
+
+ " All trade volume occurred for a specific token, in native amount. This includes absolute tokens on both sides of the trade unlike cumulativeTradeVolumeReserves. This includes any net trading activity as a result of add/remove liquidity. The ordering should be the same as the well's `tokens` field. "
+ cumulativeBiTradeVolumeReserves: [BigInt!]!
+
+ " All transfer volume occurred for a specific token, in native amount. This includes the full amount of tokens transferred in ad/remove liquidity. The ordering should be the same as the well's `tokens` field. "
+ cumulativeTransferVolumeReserves: [BigInt!]!
+
+ " All transfer volume occurred for a specific token, in USD. This includes the full value of tokens transferred in ad/remove liquidity. The ordering should be the same as the well's `tokens` field. "
+ cumulativeTransferVolumeReservesUSD: [BigDecimal!]!
+
+ " All transfer volume occurred in this well, in USD. This includes the full value of tokens transferred in ad/remove liquidity. Should be equal to the sum of all entries in cumulativeTransferVolumeReservesUSD "
+ cumulativeTransferVolumeUSD: BigDecimal!
" Total number of deposit events (add liquidity) "
cumulativeDepositCount: Int!
@@ -282,14 +368,26 @@ type WellHourlySnapshot @entity {
" The sum of all active and non-active liquidity in USD for this well. "
deltaLiquidityUSD: BigDecimal!
- " All trade volume occurred for a specific token, in native amount. The ordering should be the same as the well's `tokens` field. "
- deltaVolumeReserves: [BigInt!]!
+ " Delta of cumulativeTradeVolumeReserves "
+ deltaTradeVolumeReserves: [BigInt!]!
+
+ " Delta of cumulativeTradeVolumeReservesUSD "
+ deltaTradeVolumeReservesUSD: [BigDecimal!]!
+
+ " Delta of cumulativeTradeVolumeUSD "
+ deltaTradeVolumeUSD: BigDecimal!
+
+ " Delta of cumulativeBiTradeVolumeReserves "
+ deltaBiTradeVolumeReserves: [BigInt!]!
+
+ " Delta of cumulativeTransferVolumeReserves "
+ deltaTransferVolumeReserves: [BigInt!]!
- " All trade volume occurred for a specific token, in USD. The ordering should be the same as the well's `tokens` field. "
- deltaVolumeReservesUSD: [BigDecimal!]!
+ " Delta of cumulativeTransferVolumeReservesUSD "
+ deltaTransferVolumeReservesUSD: [BigDecimal!]!
- " All historical trade volume occurred in this well, in USD "
- deltaVolumeUSD: BigDecimal!
+ " Delta of cumulativeTransferVolumeUSD "
+ deltaTransferVolumeUSD: BigDecimal!
" Total number of deposit events (add liquidity) "
deltaDepositCount: Int!
diff --git a/projects/subgraph-basin/src/WellHandler.ts b/projects/subgraph-basin/src/WellHandler.ts
index 329d8054df..d2d84c4ce5 100644
--- a/projects/subgraph-basin/src/WellHandler.ts
+++ b/projects/subgraph-basin/src/WellHandler.ts
@@ -1,13 +1,4 @@
-import {
- AddLiquidity,
- Approval,
- RemoveLiquidity,
- RemoveLiquidityOneToken,
- Shift,
- Swap,
- Sync,
- Transfer
-} from "../generated/templates/Well/Well";
+import { AddLiquidity, RemoveLiquidity, RemoveLiquidityOneToken, Shift, Swap, Sync, Transfer } from "../generated/templates/Well/Well";
import { loadOrCreateAccount } from "./utils/Account";
import { deltaBigIntArray, emptyBigIntArray, ZERO_BI } from "../../subgraph-core/utils/Decimals";
import { recordAddLiquidityEvent, recordRemoveLiquidityEvent, recordRemoveLiquidityOneEvent, recordSyncEvent } from "./utils/Liquidity";
@@ -19,94 +10,117 @@ import {
incrementWellWithdraw,
loadWell,
updateWellLiquidityTokenBalance,
- updateWellTokenBalances,
- updateWellTokenUSDPrices,
- updateWellVolumes
+ updateWellReserves,
+ updateWellTokenUSDPrices
} from "./utils/Well";
-import { Address } from "@graphprotocol/graph-ts";
+import { Address, BigInt } from "@graphprotocol/graph-ts";
+import { updateWellVolumesAfterLiquidity, updateWellVolumesAfterSwap } from "./utils/VolumeCP";
export function handleAddLiquidity(event: AddLiquidity): void {
+ let well = loadWell(event.address);
loadOrCreateAccount(event.transaction.from);
checkForSnapshot(event.address, event.block.timestamp, event.block.number);
- updateWellTokenBalances(event.address, event.params.tokenAmountsIn, event.block.timestamp, event.block.number);
-
- updateWellLiquidityTokenBalance(event.address, event.params.lpAmountOut, event.block.timestamp, event.block.number);
+ updateWellReserves(event.address, event.params.tokenAmountsIn, event.block.timestamp, event.block.number);
updateWellTokenUSDPrices(event.address, event.block.number);
+ updateWellVolumesAfterLiquidity(
+ event.address,
+ well.tokens.map((b) => Address.fromBytes(b)),
+ event.params.tokenAmountsIn,
+ event.block.timestamp,
+ event.block.number
+ );
+
+ updateWellLiquidityTokenBalance(event.address, event.params.lpAmountOut, event.block.timestamp, event.block.number);
+
incrementWellDeposit(event.address);
recordAddLiquidityEvent(event);
}
-export function handleApproval(event: Approval): void {}
-
export function handleRemoveLiquidity(event: RemoveLiquidity): void {
+ let well = loadWell(event.address);
loadOrCreateAccount(event.transaction.from);
// Treat token balances as negative since we are removing liquidity
- let balances = event.params.tokenAmountsOut;
- for (let i = 0; i < balances.length; i++) balances[i] = ZERO_BI.minus(balances[i]);
+ let deltaReserves = event.params.tokenAmountsOut;
+ for (let i = 0; i < deltaReserves.length; i++) {
+ deltaReserves[i] = deltaReserves[i].neg();
+ }
checkForSnapshot(event.address, event.block.timestamp, event.block.number);
- updateWellTokenBalances(event.address, balances, event.block.timestamp, event.block.number);
-
- updateWellLiquidityTokenBalance(event.address, ZERO_BI.minus(event.params.lpAmountIn), event.block.timestamp, event.block.number);
+ updateWellReserves(event.address, deltaReserves, event.block.timestamp, event.block.number);
updateWellTokenUSDPrices(event.address, event.block.number);
+ updateWellVolumesAfterLiquidity(
+ event.address,
+ well.tokens.map((b) => Address.fromBytes(b)),
+ event.params.tokenAmountsOut,
+ event.block.timestamp,
+ event.block.number
+ );
+
+ updateWellLiquidityTokenBalance(event.address, ZERO_BI.minus(event.params.lpAmountIn), event.block.timestamp, event.block.number);
+
incrementWellWithdraw(event.address);
recordRemoveLiquidityEvent(event);
}
export function handleRemoveLiquidityOneToken(event: RemoveLiquidityOneToken): void {
- // Pre-process amount out into an indexed array for the well's input tokens.
-
let well = loadWell(event.address);
- let fromTokenIndex = well.tokens.indexOf(event.params.tokenOut) == 0 ? 1 : 0;
+ loadOrCreateAccount(event.transaction.from);
- let indexedBalances = emptyBigIntArray(well.tokens.length);
+ checkForSnapshot(event.address, event.block.timestamp, event.block.number);
- indexedBalances[well.tokens.indexOf(event.params.tokenOut)] = indexedBalances[well.tokens.indexOf(event.params.tokenOut)].plus(
+ let withdrawnBalances = emptyBigIntArray(well.tokens.length);
+ withdrawnBalances[well.tokens.indexOf(event.params.tokenOut)] = withdrawnBalances[well.tokens.indexOf(event.params.tokenOut)].plus(
event.params.tokenAmountOut
);
- loadOrCreateAccount(event.transaction.from);
-
- recordRemoveLiquidityOneEvent(event, indexedBalances);
-
- // Flip to negative for updating well balances
- for (let i = 0; i < indexedBalances.length; i++) indexedBalances[i] = ZERO_BI.minus(indexedBalances[i]);
+ updateWellReserves(
+ event.address,
+ withdrawnBalances.map((b) => b.neg()),
+ event.block.timestamp,
+ event.block.number
+ );
- checkForSnapshot(event.address, event.block.timestamp, event.block.number);
+ updateWellTokenUSDPrices(event.address, event.block.number);
- updateWellVolumes(
+ updateWellVolumesAfterLiquidity(
event.address,
- Address.fromBytes(well.tokens[fromTokenIndex]),
- indexedBalances[fromTokenIndex],
- event.params.tokenOut,
- event.params.tokenAmountOut,
+ [event.params.tokenOut],
+ [event.params.tokenAmountOut.neg()],
event.block.timestamp,
event.block.number
);
updateWellLiquidityTokenBalance(event.address, ZERO_BI.minus(event.params.lpAmountIn), event.block.timestamp, event.block.number);
- updateWellTokenUSDPrices(event.address, event.block.number);
-
incrementWellWithdraw(event.address);
+
+ recordRemoveLiquidityOneEvent(event, withdrawnBalances);
}
export function handleSwap(event: Swap): void {
+ let well = loadWell(event.address);
loadOrCreateAccount(event.transaction.from);
checkForSnapshot(event.address, event.block.timestamp, event.block.number);
- updateWellVolumes(
+ let deltaReserves = emptyBigIntArray(well.tokens.length);
+ deltaReserves[well.tokens.indexOf(event.params.fromToken)] = event.params.amountIn;
+ deltaReserves[well.tokens.indexOf(event.params.toToken)] = event.params.amountOut.neg();
+ updateWellReserves(event.address, deltaReserves, event.block.timestamp, event.block.number);
+
+ updateWellTokenUSDPrices(event.address, event.block.number);
+
+ updateWellVolumesAfterSwap(
event.address,
event.params.fromToken,
event.params.amountIn,
@@ -116,8 +130,6 @@ export function handleSwap(event: Swap): void {
event.block.number
);
- updateWellTokenUSDPrices(event.address, event.block.number);
-
incrementWellSwap(event.address);
recordSwapEvent(event);
@@ -133,11 +145,14 @@ export function handleShift(event: Shift): void {
let fromTokenIndex = well.tokens.indexOf(event.params.toToken) == 0 ? 1 : 0;
let fromToken = Address.fromBytes(well.tokens[fromTokenIndex]);
- // Subtract starting reserves from the updated amounts emitted by the event.
let deltaReserves = deltaBigIntArray(event.params.reserves, well.reserves);
let amountIn = deltaReserves[fromTokenIndex];
- updateWellVolumes(
+ updateWellReserves(event.address, deltaReserves, event.block.timestamp, event.block.number);
+
+ updateWellTokenUSDPrices(event.address, event.block.number);
+
+ updateWellVolumesAfterSwap(
event.address,
fromToken,
amountIn,
@@ -147,8 +162,6 @@ export function handleShift(event: Shift): void {
event.block.number
);
- updateWellTokenUSDPrices(event.address, event.block.number);
-
incrementWellSwap(event.address);
recordShiftEvent(event, fromToken, amountIn);
@@ -162,20 +175,22 @@ export function handleSync(event: Sync): void {
// Since the token(s) in were already transferred before this event was emitted, we need to find the difference to record as the amountIn
let well = loadWell(event.address);
- // Subtract starting reserves from the updated amounts emitted by the event.
let deltaReserves = deltaBigIntArray(event.params.reserves, well.reserves);
+ updateWellReserves(event.address, deltaReserves, event.block.timestamp, event.block.number);
- updateWellTokenBalances(event.address, deltaReserves, event.block.timestamp, event.block.number);
+ updateWellTokenUSDPrices(event.address, event.block.number);
- updateWellLiquidityTokenBalance(event.address, event.params.lpAmountOut, event.block.timestamp, event.block.number);
+ updateWellVolumesAfterLiquidity(
+ event.address,
+ well.tokens.map((b) => Address.fromBytes(b)),
+ deltaReserves,
+ event.block.timestamp,
+ event.block.number
+ );
- updateWellTokenUSDPrices(event.address, event.block.number);
+ updateWellLiquidityTokenBalance(event.address, event.params.lpAmountOut, event.block.timestamp, event.block.number);
incrementWellDeposit(event.address);
recordSyncEvent(event, deltaReserves);
}
-
-export function handleTransfer(event: Transfer): void {
- // Placeholder for possible future liquidity holdings data
-}
diff --git a/projects/subgraph-basin/src/templates/AquiferHandler.ts b/projects/subgraph-basin/src/templates/AquiferHandler.ts
index 432a8c227e..3c62f87071 100644
--- a/projects/subgraph-basin/src/templates/AquiferHandler.ts
+++ b/projects/subgraph-basin/src/templates/AquiferHandler.ts
@@ -1,4 +1,4 @@
-import { Address } from "@graphprotocol/graph-ts";
+import { Address, Bytes, log } from "@graphprotocol/graph-ts";
import { BoreWell } from "../../generated/Aquifer/Aquifer";
import { ERC20 } from "../../generated/Aquifer/ERC20";
import { Well } from "../../generated/templates";
@@ -17,22 +17,14 @@ export function handleBoreWell(event: BoreWell): void {
Well.create(event.params.well);
let well = createWell(event.params.well, event.params.implementation, event.params.tokens);
-
well.aquifer = event.address;
- // A bit crude, but it works
-
+ const tokens: Bytes[] = [];
for (let i = 0; i < event.params.tokens.length; i++) {
- loadOrCreateToken(event.params.tokens[i]);
- }
-
- if (event.params.tokens.length == 2) {
- well.tokens = [event.params.tokens[0], event.params.tokens[1]];
- } else if (event.params.tokens.length == 3) {
- well.tokens = [event.params.tokens[0], event.params.tokens[1], event.params.tokens[2]];
- } else if (event.params.tokens.length == 4) {
- well.tokens = [event.params.tokens[0], event.params.tokens[1], event.params.tokens[2], event.params.tokens[3]];
+ tokens.push(loadOrCreateToken(event.params.tokens[i]).id);
}
+ well.tokens = tokens;
+ well.tokenOrder = tokens;
for (let i = 0; i < event.params.pumps.length; i++) {
loadOrCreatePump(event.params.pumps[i], event.params.well);
diff --git a/projects/subgraph-basin/src/utils/Token.ts b/projects/subgraph-basin/src/utils/Token.ts
index 3129024418..79fa5a4403 100644
--- a/projects/subgraph-basin/src/utils/Token.ts
+++ b/projects/subgraph-basin/src/utils/Token.ts
@@ -1,5 +1,4 @@
-import { Address, BigDecimal, BigInt } from "@graphprotocol/graph-ts";
-import { log } from "matchstick-as";
+import { Address, BigDecimal, BigInt, log } from "@graphprotocol/graph-ts";
import { ERC20 } from "../../generated/Aquifer/ERC20";
import { Token } from "../../generated/schema";
import { CurvePrice } from "../../generated/templates/Well/CurvePrice";
@@ -14,16 +13,25 @@ export function loadOrCreateToken(tokenAddress: Address): Token {
token = new Token(tokenAddress);
let nameCall = tokenContract.try_name();
- if (nameCall.reverted) token.name = "";
- else token.name = nameCall.value;
+ if (nameCall.reverted) {
+ token.name = "";
+ } else {
+ token.name = nameCall.value;
+ }
let symbolCall = tokenContract.try_symbol();
- if (symbolCall.reverted) token.symbol = "";
- else token.symbol = symbolCall.value;
+ if (symbolCall.reverted) {
+ token.symbol = "";
+ } else {
+ token.symbol = symbolCall.value;
+ }
let decimalCall = tokenContract.try_decimals();
- if (decimalCall.reverted) token.decimals = 18; // Default to 18 decimals
- else token.decimals = decimalCall.value;
+ if (decimalCall.reverted) {
+ token.decimals = 18; // Default to 18 decimals
+ } else {
+ token.decimals = decimalCall.value;
+ }
token.lastPriceUSD = ZERO_BD;
token.lastPriceBlockNumber = ZERO_BI;
@@ -63,10 +71,11 @@ export function updateTokenUSD(tokenAddress: Address, blockNumber: BigInt, beanP
if (curve.reverted) {
return;
}
-
token.lastPriceUSD = toDecimal(curve.value.price);
}
- } else token.lastPriceUSD = beanPrice.times(getBeanPriceUDSC());
+ } else {
+ token.lastPriceUSD = beanPrice.times(getBeanPriceUDSC());
+ }
token.lastPriceBlockNumber = blockNumber;
token.save();
}
diff --git a/projects/subgraph-basin/src/utils/VolumeCP.ts b/projects/subgraph-basin/src/utils/VolumeCP.ts
new file mode 100644
index 0000000000..263e3f8cfa
--- /dev/null
+++ b/projects/subgraph-basin/src/utils/VolumeCP.ts
@@ -0,0 +1,214 @@
+import { Address, BigDecimal, BigInt, log } from "@graphprotocol/graph-ts";
+import { loadWell } from "./Well";
+import { loadToken } from "./Token";
+import { deltaBigIntArray, emptyBigIntArray, toBigInt, toDecimal, ZERO_BD, ZERO_BI } from "../../../subgraph-core/utils/Decimals";
+import { Token, Well } from "../../generated/schema";
+import { BigDecimal_sum } from "../../../subgraph-core/utils/ArrayMath";
+
+// Constant product volume calculations
+
+export function updateWellVolumesAfterSwap(
+ wellAddress: Address,
+ fromToken: Address,
+ amountIn: BigInt,
+ toToken: Address,
+ amountOut: BigInt,
+ timestamp: BigInt,
+ blockNumber: BigInt
+): void {
+ let well = loadWell(wellAddress);
+
+ const deltaTradeVolumeReserves = emptyBigIntArray(well.tokens.length);
+ const deltaTransferVolumeReserves = emptyBigIntArray(well.tokens.length);
+
+ // Trade volume is will ignore the selling end (negative)
+ deltaTradeVolumeReserves[well.tokens.indexOf(fromToken)] = amountIn.neg();
+ deltaTradeVolumeReserves[well.tokens.indexOf(toToken)] = amountOut;
+ // Transfer volume is considered on both ends of the trade
+ deltaTransferVolumeReserves[well.tokens.indexOf(fromToken)] = amountIn;
+ deltaTransferVolumeReserves[well.tokens.indexOf(toToken)] = amountOut;
+
+ updateVolumeStats(well, deltaTradeVolumeReserves, deltaTransferVolumeReserves);
+
+ well.lastUpdateTimestamp = timestamp;
+ well.lastUpdateBlockNumber = blockNumber;
+
+ well.save();
+}
+
+// The current implementation of USD volumes may be incorrect for wells that have more than 2 tokens.
+export function updateWellVolumesAfterLiquidity(
+ wellAddress: Address,
+ tokens: Address[],
+ amounts: BigInt[],
+ timestamp: BigInt,
+ blockNumber: BigInt
+): void {
+ let well = loadWell(wellAddress);
+ const wellTokens = well.tokens.map((t) => Address.fromBytes(t));
+
+ // Determines which tokens were bough/sold and how much
+ const tradeAmount = calcLiquidityVolume(well.reserves, padTokenAmounts(wellTokens, tokens, amounts));
+ const deltaTransferVolumeReserves = padTokenAmounts(wellTokens, tokens, amounts);
+
+ updateVolumeStats(well, tradeAmount, deltaTransferVolumeReserves);
+
+ well.lastUpdateTimestamp = timestamp;
+ well.lastUpdateBlockNumber = blockNumber;
+
+ well.save();
+}
+
+/**
+ * Calculates the amount of volume resulting from a liquidity add operation.
+ * The methodology is as follows:
+ *
+ * When adding liquidity in unbalanced proportions, we treat it as if some of one asset must first be bought,
+ * and then the rest is added in a balanced proportion.
+ *
+ * We know the constant product before adding liquidity, and after adding liquidity. The
+ * newer constant product can be scaled down until it reaches the older constant product.
+ * From there, it becomes clear how much of an asset must have been purchased as a result.
+ *
+ * Example: initial 1500 BEAN and 1 ETH. If 1500 BEAN liquidity is added, in terms of buy pressure, this is equivalent
+ * to buying 0.29289 ETH for 621 BEAN and then adding in equal proportions.
+ * After that purchase there would be 2121 BEAN and 0.70711 ETH, which can be scaled up to (3000, 1) in equal proportion.
+ * The below implementation solves this scenario backwards.
+ *
+ * @param currentReserves - the current reserves, after the liquidity event
+ * @param addedReserves - the net change in reserves after the liquidity event
+ * @returns a list of tokens and the amount bought of each. the purchased token is positive, the sold token negative.
+ */
+export function calcLiquidityVolume(currentReserves: BigInt[], addedReserves: BigInt[]): BigInt[] {
+ // Reserves prior to adding liquidity
+ const initialReserves = deltaBigIntArray(currentReserves, addedReserves);
+ const initialCp = initialReserves[0].times(initialReserves[1]);
+ const currentCp = currentReserves[0].times(currentReserves[1]);
+
+ if (initialCp == ZERO_BI || currentCp == ZERO_BI) {
+ // Either there was no liquidity, or there is no liquidity. In either case, this is not volume.
+ return emptyBigIntArray(2);
+ }
+
+ // The overall product is scaled by `scale`, so the individual assets must be scaled by `scaleSqrt`
+ const scale = new BigDecimal(initialCp).div(new BigDecimal(currentCp));
+ const scaleSqrt = toDecimal(toBigInt(scale, 36).sqrt(), 18);
+ // Reserves after the "buy" portion of the imbalanced liquidity addition
+ const reservesBeforeBalancedAdd = [
+ BigInt.fromString(new BigDecimal(currentReserves[0]).times(scaleSqrt).truncate(0).toString()),
+ BigInt.fromString(new BigDecimal(currentReserves[1]).times(scaleSqrt).truncate(0).toString())
+ ];
+
+ // log.debug("currentReserves [{}, {}]", [currentReserves[0].toString(), currentReserves[1].toString()]);
+ // log.debug("initialReserves [{}, {}]", [initialReserves[0].toString(), initialReserves[1].toString()]);
+ // log.debug("initialCp {}", [initialCp.toString()]);
+ // log.debug("currentCp {}", [currentCp.toString()]);
+ // log.debug("scale {}", [scale.toString()]);
+ // log.debug("scaleSqrt {}", [scaleSqrt.toString()]);
+ // log.debug("reservesBeforeBalancedAdd [{}, {}]", [reservesBeforeBalancedAdd[0].toString(), reservesBeforeBalancedAdd[1].toString()]);
+
+ // Returns the positive value for the token which was bought and negative for the sold token.
+ const tokenAmountBought = [
+ initialReserves[0].minus(reservesBeforeBalancedAdd[0]),
+ initialReserves[1].minus(reservesBeforeBalancedAdd[1])
+ ];
+ return tokenAmountBought;
+}
+
+// Updates all volume statistics associated with this well using the provided values
+function updateVolumeStats(well: Well, deltaTradeVolumeReserves: BigInt[], deltaTransferVolumeReserves: BigInt[]): void {
+ let tradeVolumeReserves = well.cumulativeTradeVolumeReserves;
+ let tradeVolumeReservesUSD = well.cumulativeTradeVolumeReservesUSD;
+ let biTradeVolumeReserves = well.cumulativeBiTradeVolumeReserves;
+ let rollingDailyTradeVolumeReserves = well.rollingDailyTradeVolumeReserves;
+ let rollingDailyTradeVolumeReservesUSD = well.rollingDailyTradeVolumeReservesUSD;
+ let rollingDailyBiTradeVolumeReserves = well.rollingDailyBiTradeVolumeReserves;
+ let rollingWeeklyTradeVolumeReserves = well.rollingWeeklyTradeVolumeReserves;
+ let rollingWeeklyTradeVolumeReservesUSD = well.rollingWeeklyTradeVolumeReservesUSD;
+ let rollingWeeklyBiTradeVolumeReserves = well.rollingWeeklyBiTradeVolumeReserves;
+
+ let transferVolumeReserves = well.cumulativeTransferVolumeReserves;
+ let transferVolumeReservesUSD = well.cumulativeTransferVolumeReservesUSD;
+ let rollingDailyTransferVolumeReserves = well.rollingDailyTransferVolumeReserves;
+ let rollingDailyTransferVolumeReservesUSD = well.rollingDailyTransferVolumeReservesUSD;
+ let rollingWeeklyTransferVolumeReserves = well.rollingWeeklyTransferVolumeReserves;
+ let rollingWeeklyTransferVolumeReservesUSD = well.rollingWeeklyTransferVolumeReservesUSD;
+
+ let totalTradeUSD = ZERO_BD;
+ let totalTransferUSD = ZERO_BD;
+ for (let i = 0; i < deltaTradeVolumeReserves.length; ++i) {
+ const tokenInfo = loadToken(Address.fromBytes(well.tokens[i]));
+ let usdTradeAmount = ZERO_BD;
+ if (deltaTradeVolumeReserves[i] > ZERO_BI) {
+ tradeVolumeReserves[i] = tradeVolumeReserves[i].plus(deltaTradeVolumeReserves[i]);
+ rollingDailyTradeVolumeReserves[i] = rollingDailyTradeVolumeReserves[i].plus(deltaTradeVolumeReserves[i]);
+ rollingWeeklyTradeVolumeReserves[i] = rollingWeeklyTradeVolumeReserves[i].plus(deltaTradeVolumeReserves[i]);
+ usdTradeAmount = toDecimal(deltaTradeVolumeReserves[i], tokenInfo.decimals).times(tokenInfo.lastPriceUSD);
+ }
+ biTradeVolumeReserves[i] = biTradeVolumeReserves[i].plus(deltaTradeVolumeReserves[i].abs());
+ rollingDailyBiTradeVolumeReserves[i] = rollingDailyBiTradeVolumeReserves[i].plus(deltaTradeVolumeReserves[i].abs());
+ rollingWeeklyBiTradeVolumeReserves[i] = rollingWeeklyBiTradeVolumeReserves[i].plus(deltaTradeVolumeReserves[i].abs());
+
+ transferVolumeReserves[i] = transferVolumeReserves[i].plus(deltaTransferVolumeReserves[i].abs());
+ rollingDailyTransferVolumeReserves[i] = rollingDailyTransferVolumeReserves[i].plus(deltaTransferVolumeReserves[i].abs());
+ rollingWeeklyTransferVolumeReserves[i] = rollingWeeklyTransferVolumeReserves[i].plus(deltaTransferVolumeReserves[i].abs());
+ let usdTransferAmount = toDecimal(deltaTransferVolumeReserves[i].abs(), tokenInfo.decimals).times(tokenInfo.lastPriceUSD);
+
+ tradeVolumeReservesUSD[i] = tradeVolumeReservesUSD[i].plus(usdTradeAmount);
+ rollingDailyTradeVolumeReservesUSD[i] = rollingDailyTradeVolumeReservesUSD[i].plus(usdTradeAmount);
+ rollingWeeklyTradeVolumeReservesUSD[i] = rollingWeeklyTradeVolumeReservesUSD[i].plus(usdTradeAmount);
+
+ transferVolumeReservesUSD[i] = transferVolumeReservesUSD[i].plus(usdTransferAmount);
+ rollingDailyTransferVolumeReservesUSD[i] = rollingDailyTransferVolumeReservesUSD[i].plus(usdTransferAmount);
+ rollingWeeklyTransferVolumeReservesUSD[i] = rollingWeeklyTransferVolumeReservesUSD[i].plus(usdTransferAmount);
+
+ totalTradeUSD = totalTradeUSD.plus(usdTradeAmount);
+ totalTransferUSD = totalTransferUSD.plus(usdTransferAmount);
+ }
+
+ well.cumulativeTradeVolumeReserves = tradeVolumeReserves;
+ well.cumulativeTradeVolumeReservesUSD = tradeVolumeReservesUSD;
+ well.cumulativeTradeVolumeUSD = well.cumulativeTradeVolumeUSD.plus(totalTradeUSD);
+ well.cumulativeBiTradeVolumeReserves = biTradeVolumeReserves;
+
+ well.cumulativeTransferVolumeReserves = transferVolumeReserves;
+ well.cumulativeTransferVolumeReservesUSD = transferVolumeReservesUSD;
+ well.cumulativeTransferVolumeUSD = well.cumulativeTransferVolumeUSD.plus(totalTransferUSD);
+
+ // Rolling daily/weekly amounts are added immediately, and at at the top of the hour, the oldest
+ // hour in the period is removed. This means there is always between 0-1hr of extra data for the period,
+ // but this is preferable to having the most recent values being delayed.
+ well.rollingDailyTradeVolumeReserves = rollingDailyTradeVolumeReserves;
+ well.rollingDailyTradeVolumeReservesUSD = rollingDailyTradeVolumeReservesUSD;
+ well.rollingDailyTradeVolumeUSD = well.rollingDailyTradeVolumeUSD.plus(totalTradeUSD);
+ well.rollingDailyBiTradeVolumeReserves = rollingDailyBiTradeVolumeReserves;
+ well.rollingDailyTransferVolumeReserves = rollingDailyTransferVolumeReserves;
+ well.rollingDailyTransferVolumeReservesUSD = rollingDailyTransferVolumeReservesUSD;
+ well.rollingDailyTransferVolumeUSD = well.rollingDailyTransferVolumeUSD.plus(totalTransferUSD);
+
+ well.rollingWeeklyTradeVolumeReserves = rollingWeeklyTradeVolumeReserves;
+ well.rollingWeeklyTradeVolumeReservesUSD = rollingWeeklyTradeVolumeReservesUSD;
+ well.rollingWeeklyTradeVolumeUSD = well.rollingWeeklyTradeVolumeUSD.plus(totalTradeUSD);
+ well.rollingWeeklyBiTradeVolumeReserves = rollingWeeklyBiTradeVolumeReserves;
+ well.rollingWeeklyTransferVolumeReserves = rollingWeeklyTransferVolumeReserves;
+ well.rollingWeeklyTransferVolumeReservesUSD = rollingWeeklyTransferVolumeReservesUSD;
+ well.rollingWeeklyTransferVolumeUSD = well.rollingWeeklyTransferVolumeUSD.plus(totalTransferUSD);
+}
+
+// Returns the provided token amounts in their appropriate position with respect to well reserve tokens
+// Assumption is that if all tokens are already included in the list, their order will be correct.
+function padTokenAmounts(allTokens: Address[], includedTokens: Address[], amounts: BigInt[]): BigInt[] {
+ if (includedTokens.length < allTokens.length) {
+ // Pad with zeros
+ const paddedAmounts = emptyBigIntArray(allTokens.length);
+ for (let i = 0; i < includedTokens.length; ++i) {
+ const tokenIndex = allTokens.indexOf(includedTokens[i]);
+ if (tokenIndex >= 0) {
+ paddedAmounts[tokenIndex] = amounts[i];
+ }
+ }
+ return paddedAmounts;
+ } else {
+ return amounts;
+ }
+}
diff --git a/projects/subgraph-basin/src/utils/Well.ts b/projects/subgraph-basin/src/utils/Well.ts
index bc7d5c276b..abb750041c 100644
--- a/projects/subgraph-basin/src/utils/Well.ts
+++ b/projects/subgraph-basin/src/utils/Well.ts
@@ -27,30 +27,53 @@ export function createWell(wellAddress: Address, implementation: Address, inputT
let wellContract = ERC20.bind(wellAddress);
let nameCall = wellContract.try_name();
- if (nameCall.reverted) well.name = "";
- else well.name = nameCall.value;
+ if (nameCall.reverted) {
+ well.name = "";
+ } else {
+ well.name = nameCall.value;
+ }
let symbolCall = wellContract.try_symbol();
- if (symbolCall.reverted) well.symbol = "";
- else well.symbol = symbolCall.value;
+ if (symbolCall.reverted) {
+ well.symbol = "";
+ } else {
+ well.symbol = symbolCall.value;
+ }
well.aquifer = Bytes.empty();
well.implementation = implementation;
well.tokens = []; // This is currently set in the `handleBoreWell` function
+ well.tokenOrder = [];
well.createdTimestamp = ZERO_BI;
well.createdBlockNumber = ZERO_BI;
well.lpTokenSupply = ZERO_BI;
well.totalLiquidityUSD = ZERO_BD;
well.reserves = emptyBigIntArray(inputTokens.length);
well.reservesUSD = emptyBigDecimalArray(inputTokens.length);
- well.cumulativeVolumeReserves = emptyBigIntArray(inputTokens.length);
- well.cumulativeVolumeReservesUSD = emptyBigDecimalArray(inputTokens.length);
- well.cumulativeVolumeUSD = ZERO_BD;
+ well.cumulativeTradeVolumeReserves = emptyBigIntArray(inputTokens.length);
+ well.cumulativeTradeVolumeReservesUSD = emptyBigDecimalArray(inputTokens.length);
+ well.cumulativeTradeVolumeUSD = ZERO_BD;
+ well.cumulativeBiTradeVolumeReserves = emptyBigIntArray(inputTokens.length);
+ well.cumulativeTransferVolumeReserves = emptyBigIntArray(inputTokens.length);
+ well.cumulativeTransferVolumeReservesUSD = emptyBigDecimalArray(inputTokens.length);
+ well.cumulativeTransferVolumeUSD = ZERO_BD;
well.cumulativeDepositCount = 0;
well.cumulativeWithdrawCount = 0;
well.cumulativeSwapCount = 0;
- well.rollingDailyVolumeUSD = ZERO_BD;
- well.rollingWeeklyVolumeUSD = ZERO_BD;
+ well.rollingDailyTradeVolumeReserves = emptyBigIntArray(inputTokens.length);
+ well.rollingDailyTradeVolumeReservesUSD = emptyBigDecimalArray(inputTokens.length);
+ well.rollingDailyTradeVolumeUSD = ZERO_BD;
+ well.rollingDailyBiTradeVolumeReserves = emptyBigIntArray(inputTokens.length);
+ well.rollingDailyTransferVolumeReserves = emptyBigIntArray(inputTokens.length);
+ well.rollingDailyTransferVolumeReservesUSD = emptyBigDecimalArray(inputTokens.length);
+ well.rollingDailyTransferVolumeUSD = ZERO_BD;
+ well.rollingWeeklyTradeVolumeReserves = emptyBigIntArray(inputTokens.length);
+ well.rollingWeeklyTradeVolumeReservesUSD = emptyBigDecimalArray(inputTokens.length);
+ well.rollingWeeklyTradeVolumeUSD = ZERO_BD;
+ well.rollingWeeklyBiTradeVolumeReserves = emptyBigIntArray(inputTokens.length);
+ well.rollingWeeklyTransferVolumeReserves = emptyBigIntArray(inputTokens.length);
+ well.rollingWeeklyTransferVolumeReservesUSD = emptyBigDecimalArray(inputTokens.length);
+ well.rollingWeeklyTransferVolumeUSD = ZERO_BD;
well.lastSnapshotDayID = 0;
well.lastSnapshotHourID = 0;
well.lastUpdateTimestamp = ZERO_BI;
@@ -77,58 +100,12 @@ export function loadOrCreateWellFunction(functionData: BoreWellWellFunctionStruc
return wellFunction as WellFunction;
}
-export function updateWellVolumes(
- wellAddress: Address,
- fromToken: Address,
- amountIn: BigInt,
- toToken: Address,
- amountOut: BigInt,
- timestamp: BigInt,
- blockNumber: BigInt
-): void {
- let well = loadWell(wellAddress);
- let swapToken = loadToken(fromToken);
-
- let fromTokenIndex = well.tokens.indexOf(fromToken);
- let toTokenIndex = well.tokens.indexOf(toToken);
-
- let usdVolume = toDecimal(amountIn, swapToken.decimals).times(swapToken.lastPriceUSD);
-
- // Remove liquidity one token has no input token amount to calculate volume.
- if (amountIn == ZERO_BI) {
- swapToken = loadToken(toToken);
- usdVolume = toDecimal(amountOut.div(BigInt.fromI32(2)), swapToken.decimals).times(swapToken.lastPriceUSD);
- }
-
- // Update fromToken amounts
-
- let volumeReserves = well.cumulativeVolumeReserves;
- let volumeReservesUSD = well.cumulativeVolumeReservesUSD;
- let reserves = well.reserves;
-
- volumeReserves[fromTokenIndex] = volumeReserves[fromTokenIndex].plus(amountIn);
- volumeReservesUSD[fromTokenIndex] = volumeReservesUSD[fromTokenIndex].plus(usdVolume);
- reserves[fromTokenIndex] = reserves[fromTokenIndex].plus(amountIn);
-
- reserves[toTokenIndex] = reserves[toTokenIndex].minus(amountOut);
-
- well.cumulativeVolumeUSD = well.cumulativeVolumeUSD.plus(usdVolume);
- well.cumulativeVolumeReserves = volumeReserves;
- well.cumulativeVolumeReservesUSD = volumeReservesUSD;
- well.reserves = reserves;
-
- well.lastUpdateTimestamp = timestamp;
- well.lastUpdateBlockNumber = blockNumber;
-
- well.save();
-}
-
-export function updateWellTokenBalances(wellAddress: Address, inputTokenAmounts: BigInt[], timestamp: BigInt, blockNumber: BigInt): void {
+export function updateWellReserves(wellAddress: Address, additiveAmounts: BigInt[], timestamp: BigInt, blockNumber: BigInt): void {
let well = loadWell(wellAddress);
let balances = well.reserves;
for (let i = 0; i < balances.length; i++) {
- balances[i] = balances[i].plus(inputTokenAmounts[i]);
+ balances[i] = balances[i].plus(additiveAmounts[i]);
}
well.reserves = balances;
@@ -161,11 +138,15 @@ export function updateWellTokenUSDPrices(wellAddress: Address, blockNumber: BigI
updateTokenUSD(BEAN_ERC20, blockNumber, BigDecimal.fromString("1"));
let beanIndex = well.tokens.indexOf(BEAN_ERC20);
// Curretly only supporting USD values for Wells with BEAN as a token.
- if (beanIndex == -1) return;
+ if (beanIndex == -1) {
+ return;
+ }
let currentBeans = toDecimal(well.reserves[beanIndex]);
for (let i = 0; i < well.tokens.length; i++) {
- if (i == beanIndex) continue;
+ if (i == beanIndex) {
+ continue;
+ }
let tokenAddress = Address.fromBytes(well.tokens[i]);
if (well.reserves[i].gt(ZERO_BI)) {
updateTokenUSD(tokenAddress, blockNumber, currentBeans.div(toDecimal(well.reserves[i], getTokenDecimals(tokenAddress))));
@@ -197,13 +178,19 @@ export function incrementWellWithdraw(wellAddress: Address): void {
export function checkForSnapshot(wellAddress: Address, timestamp: BigInt, blockNumber: BigInt): void {
// We check for the prior period snapshot and then take one if needed
- let dayID = dayFromTimestamp(timestamp) - 1;
+ // Schedule the "day" to begin at 9am PT/12pm ET.
+ // Future work could include properly adjusting this when DST occurs.
+ let dayID = dayFromTimestamp(timestamp, 8 * 60 * 60) - 1;
let hourID = hourFromTimestamp(timestamp) - 1;
let well = loadWell(wellAddress);
- if (dayID > well.lastSnapshotDayID) takeWellDailySnapshot(wellAddress, dayID, timestamp, blockNumber);
- if (hourID > well.lastSnapshotHourID) takeWellHourlySnapshot(wellAddress, hourID, timestamp, blockNumber);
+ if (dayID > well.lastSnapshotDayID) {
+ takeWellDailySnapshot(wellAddress, dayID, timestamp, blockNumber);
+ }
+ if (hourID > well.lastSnapshotHourID) {
+ takeWellHourlySnapshot(wellAddress, hourID, timestamp, blockNumber);
+ }
}
export function takeWellDailySnapshot(wellAddress: Address, dayID: i32, timestamp: BigInt, blockNumber: BigInt): void {
@@ -225,12 +212,30 @@ export function takeWellDailySnapshot(wellAddress: Address, dayID: i32, timestam
newSnapshot.deltalpTokenSupply = newSnapshot.lpTokenSupply.minus(priorSnapshot.lpTokenSupply);
newSnapshot.deltaLiquidityUSD = newSnapshot.totalLiquidityUSD.minus(priorSnapshot.totalLiquidityUSD);
- newSnapshot.deltaVolumeReserves = deltaBigIntArray(newSnapshot.cumulativeVolumeReserves, priorSnapshot.cumulativeVolumeReserves);
- newSnapshot.deltaVolumeReservesUSD = deltaBigDecimalArray(
- newSnapshot.cumulativeVolumeReservesUSD,
- priorSnapshot.cumulativeVolumeReservesUSD
+
+ newSnapshot.deltaTradeVolumeReserves = deltaBigIntArray(
+ newSnapshot.cumulativeTradeVolumeReserves,
+ priorSnapshot.cumulativeTradeVolumeReserves
+ );
+ newSnapshot.deltaTradeVolumeReservesUSD = deltaBigDecimalArray(
+ newSnapshot.cumulativeTradeVolumeReservesUSD,
+ priorSnapshot.cumulativeTradeVolumeReservesUSD
+ );
+ newSnapshot.deltaTradeVolumeUSD = newSnapshot.cumulativeTradeVolumeUSD.minus(priorSnapshot.cumulativeTradeVolumeUSD);
+ newSnapshot.deltaBiTradeVolumeReserves = deltaBigIntArray(
+ newSnapshot.cumulativeBiTradeVolumeReserves,
+ priorSnapshot.cumulativeBiTradeVolumeReserves
);
- newSnapshot.deltaVolumeUSD = newSnapshot.cumulativeVolumeUSD.minus(priorSnapshot.cumulativeVolumeUSD);
+ newSnapshot.deltaTransferVolumeReserves = deltaBigIntArray(
+ newSnapshot.cumulativeTransferVolumeReserves,
+ priorSnapshot.cumulativeTransferVolumeReserves
+ );
+ newSnapshot.deltaTransferVolumeReservesUSD = deltaBigDecimalArray(
+ newSnapshot.cumulativeTransferVolumeReservesUSD,
+ priorSnapshot.cumulativeTransferVolumeReservesUSD
+ );
+ newSnapshot.deltaTransferVolumeUSD = newSnapshot.cumulativeTransferVolumeUSD.minus(priorSnapshot.cumulativeTransferVolumeUSD);
+
newSnapshot.deltaDepositCount = newSnapshot.cumulativeDepositCount - priorSnapshot.cumulativeDepositCount;
newSnapshot.deltaWithdrawCount = newSnapshot.cumulativeWithdrawCount - priorSnapshot.cumulativeWithdrawCount;
newSnapshot.deltaSwapCount = newSnapshot.cumulativeSwapCount - priorSnapshot.cumulativeSwapCount;
@@ -249,17 +254,25 @@ export function loadOrCreateWellDailySnapshot(wellAddress: Address, dayID: i32,
snapshot.well = wellAddress;
snapshot.lpTokenSupply = well.lpTokenSupply;
snapshot.totalLiquidityUSD = well.totalLiquidityUSD;
- snapshot.cumulativeVolumeReserves = well.cumulativeVolumeReserves;
- snapshot.cumulativeVolumeReservesUSD = well.cumulativeVolumeReservesUSD;
- snapshot.cumulativeVolumeUSD = well.cumulativeVolumeUSD;
+ snapshot.cumulativeTradeVolumeReserves = well.cumulativeTradeVolumeReserves;
+ snapshot.cumulativeTradeVolumeReservesUSD = well.cumulativeTradeVolumeReservesUSD;
+ snapshot.cumulativeTradeVolumeUSD = well.cumulativeTradeVolumeUSD;
+ snapshot.cumulativeBiTradeVolumeReserves = well.cumulativeBiTradeVolumeReserves;
+ snapshot.cumulativeTransferVolumeReserves = well.cumulativeTransferVolumeReserves;
+ snapshot.cumulativeTransferVolumeReservesUSD = well.cumulativeTransferVolumeReservesUSD;
+ snapshot.cumulativeTransferVolumeUSD = well.cumulativeTransferVolumeUSD;
snapshot.cumulativeDepositCount = well.cumulativeDepositCount;
snapshot.cumulativeWithdrawCount = well.cumulativeWithdrawCount;
snapshot.cumulativeSwapCount = well.cumulativeSwapCount;
snapshot.deltalpTokenSupply = ZERO_BI;
snapshot.deltaLiquidityUSD = ZERO_BD;
- snapshot.deltaVolumeReserves = emptyBigIntArray(well.tokens.length);
- snapshot.deltaVolumeReservesUSD = emptyBigDecimalArray(well.tokens.length);
- snapshot.deltaVolumeUSD = ZERO_BD;
+ snapshot.deltaTradeVolumeReserves = emptyBigIntArray(well.tokens.length);
+ snapshot.deltaTradeVolumeReservesUSD = emptyBigDecimalArray(well.tokens.length);
+ snapshot.deltaTradeVolumeUSD = ZERO_BD;
+ snapshot.deltaBiTradeVolumeReserves = emptyBigIntArray(well.tokens.length);
+ snapshot.deltaTransferVolumeReserves = emptyBigIntArray(well.tokens.length);
+ snapshot.deltaTransferVolumeReservesUSD = emptyBigDecimalArray(well.tokens.length);
+ snapshot.deltaTransferVolumeUSD = ZERO_BD;
snapshot.deltaDepositCount = 0;
snapshot.deltaWithdrawCount = 0;
snapshot.deltaSwapCount = 0;
@@ -278,16 +291,34 @@ export function takeWellHourlySnapshot(wellAddress: Address, hourID: i32, timest
well.save();
let priorSnapshot = loadOrCreateWellHourlySnapshot(wellAddress, priorHourID, timestamp, blockNumber);
- let newSnapshot = loadOrCreateWellHourlySnapshot(wellAddress, well.lastSnapshotHourID, timestamp, blockNumber);
+ let newSnapshot = loadOrCreateWellHourlySnapshot(wellAddress, hourID, timestamp, blockNumber);
newSnapshot.deltalpTokenSupply = newSnapshot.lpTokenSupply.minus(priorSnapshot.lpTokenSupply);
newSnapshot.deltaLiquidityUSD = newSnapshot.totalLiquidityUSD.minus(priorSnapshot.totalLiquidityUSD);
- newSnapshot.deltaVolumeReserves = deltaBigIntArray(newSnapshot.cumulativeVolumeReserves, priorSnapshot.cumulativeVolumeReserves);
- newSnapshot.deltaVolumeReservesUSD = deltaBigDecimalArray(
- newSnapshot.cumulativeVolumeReservesUSD,
- priorSnapshot.cumulativeVolumeReservesUSD
+
+ newSnapshot.deltaTradeVolumeReserves = deltaBigIntArray(
+ newSnapshot.cumulativeTradeVolumeReserves,
+ priorSnapshot.cumulativeTradeVolumeReserves
+ );
+ newSnapshot.deltaTradeVolumeReservesUSD = deltaBigDecimalArray(
+ newSnapshot.cumulativeTradeVolumeReservesUSD,
+ priorSnapshot.cumulativeTradeVolumeReservesUSD
);
- newSnapshot.deltaVolumeUSD = newSnapshot.cumulativeVolumeUSD.minus(priorSnapshot.cumulativeVolumeUSD);
+ newSnapshot.deltaTradeVolumeUSD = newSnapshot.cumulativeTradeVolumeUSD.minus(priorSnapshot.cumulativeTradeVolumeUSD);
+ newSnapshot.deltaBiTradeVolumeReserves = deltaBigIntArray(
+ newSnapshot.cumulativeBiTradeVolumeReserves,
+ priorSnapshot.cumulativeBiTradeVolumeReserves
+ );
+ newSnapshot.deltaTransferVolumeReserves = deltaBigIntArray(
+ newSnapshot.cumulativeTransferVolumeReserves,
+ priorSnapshot.cumulativeTransferVolumeReserves
+ );
+ newSnapshot.deltaTransferVolumeReservesUSD = deltaBigDecimalArray(
+ newSnapshot.cumulativeTransferVolumeReservesUSD,
+ priorSnapshot.cumulativeTransferVolumeReservesUSD
+ );
+ newSnapshot.deltaTransferVolumeUSD = newSnapshot.cumulativeTransferVolumeUSD.minus(priorSnapshot.cumulativeTransferVolumeUSD);
+
newSnapshot.deltaDepositCount = newSnapshot.cumulativeDepositCount - priorSnapshot.cumulativeDepositCount;
newSnapshot.deltaWithdrawCount = newSnapshot.cumulativeWithdrawCount - priorSnapshot.cumulativeWithdrawCount;
newSnapshot.deltaSwapCount = newSnapshot.cumulativeSwapCount - priorSnapshot.cumulativeSwapCount;
@@ -295,20 +326,47 @@ export function takeWellHourlySnapshot(wellAddress: Address, hourID: i32, timest
newSnapshot.lastUpdateBlockNumber = blockNumber;
newSnapshot.save();
- // Update the rolling daily and weekly volumes
- well.rollingDailyVolumeUSD = newSnapshot.deltaVolumeUSD;
- well.rollingWeeklyVolumeUSD = newSnapshot.deltaVolumeUSD;
- for (let i = 1; i < 168; i++) {
- let snapshot = WellHourlySnapshot.load(wellAddress.concatI32(hourID - i));
- if (snapshot == null) {
- // We hit the last snapshot to total
- break;
- }
- if (i < 24) {
- well.rollingDailyVolumeUSD = well.rollingDailyVolumeUSD.plus(snapshot.deltaVolumeUSD);
- well.rollingWeeklyVolumeUSD = well.rollingWeeklyVolumeUSD.plus(snapshot.deltaVolumeUSD);
- } else {
- well.rollingWeeklyVolumeUSD = well.rollingWeeklyVolumeUSD.plus(snapshot.deltaVolumeUSD);
+ // Update the rolling daily and weekly volumes by removing the oldest value.
+ // Newer values for the latest hour were already added.
+ let oldest24h = WellHourlySnapshot.load(wellAddress.concatI32(hourID - 24));
+ let oldest7d = WellHourlySnapshot.load(wellAddress.concatI32(hourID - 168));
+ if (oldest24h != null) {
+ well.rollingDailyTradeVolumeReserves = deltaBigIntArray(well.rollingDailyTradeVolumeReserves, oldest24h.deltaTradeVolumeReserves);
+ well.rollingDailyTradeVolumeReservesUSD = deltaBigDecimalArray(
+ well.rollingDailyTradeVolumeReservesUSD,
+ oldest24h.deltaTradeVolumeReservesUSD
+ );
+ well.rollingDailyTradeVolumeUSD = well.rollingDailyTradeVolumeUSD.minus(oldest24h.deltaTradeVolumeUSD);
+ well.rollingDailyBiTradeVolumeReserves = deltaBigIntArray(well.rollingDailyBiTradeVolumeReserves, oldest24h.deltaBiTradeVolumeReserves);
+ well.rollingDailyTransferVolumeReserves = deltaBigIntArray(
+ well.rollingDailyTransferVolumeReserves,
+ oldest24h.deltaTransferVolumeReserves
+ );
+ well.rollingDailyTransferVolumeReservesUSD = deltaBigDecimalArray(
+ well.rollingDailyTransferVolumeReservesUSD,
+ oldest24h.deltaTransferVolumeReservesUSD
+ );
+ well.rollingDailyTransferVolumeUSD = well.rollingDailyTransferVolumeUSD.minus(oldest24h.deltaTransferVolumeUSD);
+ if (oldest7d != null) {
+ well.rollingWeeklyTradeVolumeReserves = deltaBigIntArray(well.rollingWeeklyTradeVolumeReserves, oldest7d.deltaTradeVolumeReserves);
+ well.rollingWeeklyTradeVolumeReservesUSD = deltaBigDecimalArray(
+ well.rollingWeeklyTradeVolumeReservesUSD,
+ oldest7d.deltaTradeVolumeReservesUSD
+ );
+ well.rollingWeeklyTradeVolumeUSD = well.rollingWeeklyTradeVolumeUSD.minus(oldest7d.deltaTradeVolumeUSD);
+ well.rollingWeeklyBiTradeVolumeReserves = deltaBigIntArray(
+ well.rollingWeeklyBiTradeVolumeReserves,
+ oldest7d.deltaBiTradeVolumeReserves
+ );
+ well.rollingWeeklyTransferVolumeReserves = deltaBigIntArray(
+ well.rollingWeeklyTransferVolumeReserves,
+ oldest7d.deltaTransferVolumeReserves
+ );
+ well.rollingWeeklyTransferVolumeReservesUSD = deltaBigDecimalArray(
+ well.rollingWeeklyTransferVolumeReservesUSD,
+ oldest7d.deltaTransferVolumeReservesUSD
+ );
+ well.rollingWeeklyTransferVolumeUSD = well.rollingWeeklyTransferVolumeUSD.minus(oldest7d.deltaTransferVolumeUSD);
}
}
well.save();
@@ -328,17 +386,25 @@ export function loadOrCreateWellHourlySnapshot(
snapshot.well = wellAddress;
snapshot.lpTokenSupply = well.lpTokenSupply;
snapshot.totalLiquidityUSD = well.totalLiquidityUSD;
- snapshot.cumulativeVolumeReserves = well.cumulativeVolumeReserves;
- snapshot.cumulativeVolumeReservesUSD = well.cumulativeVolumeReservesUSD;
- snapshot.cumulativeVolumeUSD = well.cumulativeVolumeUSD;
+ snapshot.cumulativeTradeVolumeReserves = well.cumulativeTradeVolumeReserves;
+ snapshot.cumulativeTradeVolumeReservesUSD = well.cumulativeTradeVolumeReservesUSD;
+ snapshot.cumulativeTradeVolumeUSD = well.cumulativeTradeVolumeUSD;
+ snapshot.cumulativeBiTradeVolumeReserves = well.cumulativeBiTradeVolumeReserves;
+ snapshot.cumulativeTransferVolumeReserves = well.cumulativeTransferVolumeReserves;
+ snapshot.cumulativeTransferVolumeReservesUSD = well.cumulativeTransferVolumeReservesUSD;
+ snapshot.cumulativeTransferVolumeUSD = well.cumulativeTransferVolumeUSD;
snapshot.cumulativeDepositCount = well.cumulativeDepositCount;
snapshot.cumulativeWithdrawCount = well.cumulativeWithdrawCount;
snapshot.cumulativeSwapCount = well.cumulativeSwapCount;
snapshot.deltalpTokenSupply = ZERO_BI;
snapshot.deltaLiquidityUSD = ZERO_BD;
- snapshot.deltaVolumeReserves = emptyBigIntArray(well.tokens.length);
- snapshot.deltaVolumeReservesUSD = emptyBigDecimalArray(well.tokens.length);
- snapshot.deltaVolumeUSD = ZERO_BD;
+ snapshot.deltaTradeVolumeReserves = emptyBigIntArray(well.tokens.length);
+ snapshot.deltaTradeVolumeReservesUSD = emptyBigDecimalArray(well.tokens.length);
+ snapshot.deltaTradeVolumeUSD = ZERO_BD;
+ snapshot.deltaBiTradeVolumeReserves = emptyBigIntArray(well.tokens.length);
+ snapshot.deltaTransferVolumeReserves = emptyBigIntArray(well.tokens.length);
+ snapshot.deltaTransferVolumeReservesUSD = emptyBigDecimalArray(well.tokens.length);
+ snapshot.deltaTransferVolumeUSD = ZERO_BD;
snapshot.deltaDepositCount = 0;
snapshot.deltaWithdrawCount = 0;
snapshot.deltaSwapCount = 0;
diff --git a/projects/subgraph-basin/subgraph.yaml b/projects/subgraph-basin/subgraph.yaml
index f86615b9da..b2e732a229 100644
--- a/projects/subgraph-basin/subgraph.yaml
+++ b/projects/subgraph-basin/subgraph.yaml
@@ -79,3 +79,8 @@ templates:
- event: Sync(uint256[],uint256,address)
handler: handleSync
file: ./src/WellHandler.ts
+# features:
+# - grafting
+# graft:
+# base: QmWHi6hu2wXnyxBHHmQHwCQLoq5KkoTX2qLm8MdyVXTyTu
+# block: 20216425
diff --git a/projects/subgraph-basin/tests/DepositWithdrawEntity.test.ts b/projects/subgraph-basin/tests/DepositWithdrawEntity.test.ts
new file mode 100644
index 0000000000..86761bab3c
--- /dev/null
+++ b/projects/subgraph-basin/tests/DepositWithdrawEntity.test.ts
@@ -0,0 +1,127 @@
+import { afterEach, assert, beforeEach, clearStore, describe, test } from "matchstick-as/assembly/index";
+import { BEAN_ERC20, WETH } from "../../subgraph-core/utils/Constants";
+import { BI_10, ZERO_BI } from "../../subgraph-core/utils/Decimals";
+import { loadWell } from "../src/utils/Well";
+import {
+ ACCOUNT_ENTITY_TYPE,
+ BEAN_SWAP_AMOUNT,
+ DEPOSIT_ENTITY_TYPE,
+ SWAP_ACCOUNT,
+ WELL,
+ WELL_LP_AMOUNT,
+ WETH_SWAP_AMOUNT,
+ WITHDRAW_ENTITY_TYPE
+} from "./helpers/Constants";
+import { boreDefaultWell } from "./helpers/Aquifer";
+import { mockAddLiquidity, mockRemoveLiquidity, mockRemoveLiquidityOneBean, loadWithdraw, mockSync } from "./helpers/Liquidity";
+import { loadDeposit } from "./helpers/Liquidity";
+import { BigInt } from "@graphprotocol/graph-ts";
+
+describe("Deposit/Withdraw Entities", () => {
+ beforeEach(() => {
+ boreDefaultWell();
+ });
+
+ afterEach(() => {
+ clearStore();
+ });
+
+ test("AddLiquidity event", () => {
+ const deltaLiquidity = [BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT];
+ let id = mockAddLiquidity(deltaLiquidity);
+ assert.fieldEquals(DEPOSIT_ENTITY_TYPE, id, "id", id);
+ assert.fieldEquals(DEPOSIT_ENTITY_TYPE, id, "well", WELL.toHexString());
+ assert.fieldEquals(DEPOSIT_ENTITY_TYPE, id, "liquidity", WELL_LP_AMOUNT.toString());
+ assert.fieldEquals(DEPOSIT_ENTITY_TYPE, id, "reserves", "[" + deltaLiquidity[0].toString() + ", " + deltaLiquidity[1].toString() + "]");
+
+ let updatedStore = loadDeposit(id);
+ let tokens = updatedStore.tokens;
+
+ assert.bytesEquals(BEAN_ERC20, tokens[0]);
+ assert.bytesEquals(WETH, tokens[1]);
+
+ let reserves = updatedStore.reserves;
+
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT, reserves[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT, reserves[1]);
+
+ // Account entity exists
+ assert.fieldEquals(ACCOUNT_ENTITY_TYPE, SWAP_ACCOUNT.toHexString(), "id", SWAP_ACCOUNT.toHexString());
+ });
+
+ test("Sync event", () => {
+ const initialReserves = [BigInt.fromU32(50000).times(BI_10.pow(6)), BigInt.fromU32(20).times(BI_10.pow(18))];
+ const syncdReserves = [BigInt.fromU32(52000).times(BI_10.pow(6)), BigInt.fromU32(205).times(BI_10.pow(17))];
+ mockAddLiquidity(initialReserves);
+
+ const deltaLiquidity = [syncdReserves[0].minus(initialReserves[0]), syncdReserves[1].minus(initialReserves[1])];
+ const lpAmount = BI_10;
+ const id = mockSync(syncdReserves, lpAmount);
+
+ assert.fieldEquals(DEPOSIT_ENTITY_TYPE, id, "id", id);
+ assert.fieldEquals(DEPOSIT_ENTITY_TYPE, id, "well", WELL.toHexString());
+ assert.fieldEquals(DEPOSIT_ENTITY_TYPE, id, "liquidity", lpAmount.toString());
+ assert.fieldEquals(DEPOSIT_ENTITY_TYPE, id, "reserves", "[" + deltaLiquidity[0].toString() + ", " + deltaLiquidity[1].toString() + "]");
+
+ // Account entity exists
+ assert.fieldEquals(ACCOUNT_ENTITY_TYPE, SWAP_ACCOUNT.toHexString(), "id", SWAP_ACCOUNT.toHexString());
+ });
+
+ test("RemoveLiquidity event", () => {
+ const deltaLiquidity = [BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT];
+ let id = mockRemoveLiquidity(deltaLiquidity);
+ assert.fieldEquals(WITHDRAW_ENTITY_TYPE, id, "id", id);
+ assert.fieldEquals(WITHDRAW_ENTITY_TYPE, id, "well", WELL.toHexString());
+ assert.fieldEquals(WITHDRAW_ENTITY_TYPE, id, "liquidity", WELL_LP_AMOUNT.toString());
+ assert.fieldEquals(
+ WITHDRAW_ENTITY_TYPE,
+ id,
+ "reserves",
+ "[" + deltaLiquidity[0].toString() + ", " + deltaLiquidity[1].toString() + "]"
+ );
+
+ let updatedStore = loadWithdraw(id);
+ let tokens = updatedStore.tokens;
+
+ assert.bytesEquals(BEAN_ERC20, tokens[0]);
+ assert.bytesEquals(WETH, tokens[1]);
+
+ let reserves = updatedStore.reserves;
+
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT, reserves[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT, reserves[1]);
+
+ // Account entity exists
+ assert.fieldEquals(ACCOUNT_ENTITY_TYPE, SWAP_ACCOUNT.toHexString(), "id", SWAP_ACCOUNT.toHexString());
+ });
+
+ test("RemoveLiquidityOneToken event", () => {
+ const deltaLiquidity = [BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT];
+ mockAddLiquidity(deltaLiquidity);
+ mockAddLiquidity(deltaLiquidity);
+ let id = mockRemoveLiquidityOneBean();
+ assert.fieldEquals(WITHDRAW_ENTITY_TYPE, id, "id", id);
+ assert.fieldEquals(WITHDRAW_ENTITY_TYPE, id, "well", WELL.toHexString());
+ assert.fieldEquals(WITHDRAW_ENTITY_TYPE, id, "liquidity", WELL_LP_AMOUNT.toString());
+ assert.fieldEquals(WITHDRAW_ENTITY_TYPE, id, "reserves", "[" + BEAN_SWAP_AMOUNT.toString() + ", 0]");
+
+ let updatedStore = loadWithdraw(id);
+ let tokens = updatedStore.tokens;
+
+ assert.bytesEquals(BEAN_ERC20, tokens[0]);
+ assert.bytesEquals(WETH, tokens[1]);
+
+ let reserves = updatedStore.reserves;
+
+ let updatedWell = loadWell(WELL);
+ let wellReserves = updatedWell.reserves;
+
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT, reserves[0]);
+ assert.bigIntEquals(ZERO_BI, reserves[1]);
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT, wellReserves[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT.times(BigInt.fromU32(2)), wellReserves[1]);
+
+ // Account entity exists
+ assert.fieldEquals(ACCOUNT_ENTITY_TYPE, SWAP_ACCOUNT.toHexString(), "id", SWAP_ACCOUNT.toHexString());
+ });
+});
diff --git a/projects/subgraph-basin/tests/Exchange.test.ts b/projects/subgraph-basin/tests/Exchange.test.ts
new file mode 100644
index 0000000000..8b07609459
--- /dev/null
+++ b/projects/subgraph-basin/tests/Exchange.test.ts
@@ -0,0 +1,137 @@
+import { afterEach, assert, beforeEach, clearStore, describe, test } from "matchstick-as/assembly/index";
+import { ZERO_BI } from "../../subgraph-core/utils/Decimals";
+import { loadWell } from "../src/utils/Well";
+import {
+ BEAN_SWAP_AMOUNT,
+ BEAN_USD_AMOUNT,
+ CURRENT_BLOCK_TIMESTAMP,
+ WELL,
+ WELL_DAILY_ENTITY_TYPE,
+ WELL_ENTITY_TYPE,
+ WELL_HOURLY_ENTITY_TYPE,
+ WETH_SWAP_AMOUNT,
+ WETH_USD_AMOUNT
+} from "./helpers/Constants";
+import { boreDefaultWell } from "./helpers/Aquifer";
+import { mockShift, mockSwap } from "./helpers/Swap";
+import { mockAddLiquidity } from "./helpers/Liquidity";
+import { dayFromTimestamp, hourFromTimestamp } from "../../subgraph-core/utils/Dates";
+import { BigDecimal, BigInt } from "@graphprotocol/graph-ts";
+import { BEAN_ERC20 } from "../../subgraph-core/utils/Constants";
+
+describe("Well Entity: Exchange Tests", () => {
+ beforeEach(() => {
+ boreDefaultWell();
+ });
+
+ afterEach(() => {
+ clearStore();
+ });
+
+ describe("Swap", () => {
+ test("Swap counter incremented", () => {
+ mockSwap();
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "cumulativeSwapCount", "1");
+ });
+ test("Token Balances updated", () => {
+ mockSwap();
+
+ let updatedStore = loadWell(WELL);
+ let endingBalances = updatedStore.reserves;
+
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT, endingBalances[0]);
+ assert.bigIntEquals(ZERO_BI.minus(WETH_SWAP_AMOUNT), endingBalances[1]);
+ });
+ test("Token Volumes updated", () => {
+ mockSwap();
+
+ let updatedStore = loadWell(WELL);
+ let tradeAmounts = updatedStore.cumulativeTradeVolumeReserves;
+ let transferAmounts = updatedStore.cumulativeTransferVolumeReserves;
+
+ assert.bigIntEquals(ZERO_BI, tradeAmounts[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT, tradeAmounts[1]);
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT, transferAmounts[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT, transferAmounts[1]);
+ });
+ test("Token Volumes USD updated", () => {
+ mockAddLiquidity();
+ mockAddLiquidity();
+ mockSwap(BigDecimal.fromString("0.5"));
+
+ let updatedStore = loadWell(WELL);
+ let tradeAmounts = updatedStore.cumulativeTradeVolumeReservesUSD;
+ let transferAmounts = updatedStore.cumulativeTransferVolumeReservesUSD;
+
+ assert.stringEquals("0", tradeAmounts[0].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.times(BigDecimal.fromString("1.5")).toString(), tradeAmounts[1].toString());
+ assert.stringEquals(BEAN_USD_AMOUNT.times(BigDecimal.fromString("2.5")).toString(), transferAmounts[0].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.times(BigDecimal.fromString("3.5")).toString(), transferAmounts[1].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.times(BigDecimal.fromString("1.5")).toString(), updatedStore.cumulativeTradeVolumeUSD.toString());
+ assert.stringEquals(
+ BEAN_USD_AMOUNT.times(BigDecimal.fromString("2.5"))
+ .plus(WETH_USD_AMOUNT.times(BigDecimal.fromString("3.5")))
+ .toString(),
+ updatedStore.cumulativeTransferVolumeUSD.toString()
+ );
+ });
+ test("Previous day snapshot entity created", () => {
+ mockSwap();
+
+ let dayID = dayFromTimestamp(CURRENT_BLOCK_TIMESTAMP, 8 * 60 * 60) - 1;
+ let daySnapshotID = WELL.concatI32(dayID);
+
+ let hourID = hourFromTimestamp(CURRENT_BLOCK_TIMESTAMP) - 1;
+ let hourSnapshotID = WELL.concatI32(hourID);
+
+ assert.fieldEquals(WELL_DAILY_ENTITY_TYPE, daySnapshotID.toHexString(), "id", daySnapshotID.toHexString());
+ assert.fieldEquals(WELL_HOURLY_ENTITY_TYPE, hourSnapshotID.toHexString(), "id", hourSnapshotID.toHexString());
+ });
+ });
+
+ describe("Shift", () => {
+ beforeEach(() => {
+ mockAddLiquidity();
+ mockAddLiquidity();
+ // Buy beans for 1 weth
+ mockShift([BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT.times(BigInt.fromU32(3))], BEAN_ERC20, BEAN_SWAP_AMOUNT, BigDecimal.fromString("1.5"));
+ });
+ test("Swap counter incremented", () => {
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "cumulativeSwapCount", "1");
+ });
+ test("Token Balances updated", () => {
+ let updatedStore = loadWell(WELL);
+ let endingBalances = updatedStore.reserves;
+
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT, endingBalances[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT.times(BigInt.fromU32(3)), endingBalances[1]);
+ });
+ test("Token Volumes updated", () => {
+ let updatedStore = loadWell(WELL);
+ let tradeAmounts = updatedStore.cumulativeTradeVolumeReserves;
+ let transferAmounts = updatedStore.cumulativeTransferVolumeReserves;
+
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT, tradeAmounts[0]);
+ assert.bigIntEquals(ZERO_BI, tradeAmounts[1]);
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT.times(BigInt.fromU32(3)), transferAmounts[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT.times(BigInt.fromU32(3)), transferAmounts[1]);
+ });
+ test("Token Volumes USD updated", () => {
+ let updatedStore = loadWell(WELL);
+ let tradeAmounts = updatedStore.cumulativeTradeVolumeReservesUSD;
+ let transferAmounts = updatedStore.cumulativeTransferVolumeReservesUSD;
+
+ assert.stringEquals(BEAN_USD_AMOUNT.times(BigDecimal.fromString("1.5")).toString(), tradeAmounts[0].toString());
+ assert.stringEquals("0", tradeAmounts[1].toString());
+ assert.stringEquals(BEAN_USD_AMOUNT.times(BigDecimal.fromString("3.5")).toString(), transferAmounts[0].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.times(BigDecimal.fromString("2.5")).toString(), transferAmounts[1].toString());
+ assert.stringEquals(BEAN_USD_AMOUNT.times(BigDecimal.fromString("1.5")).toString(), updatedStore.cumulativeTradeVolumeUSD.toString());
+ assert.stringEquals(
+ BEAN_USD_AMOUNT.times(BigDecimal.fromString("3.5"))
+ .plus(WETH_USD_AMOUNT.times(BigDecimal.fromString("2.5")))
+ .toString(),
+ updatedStore.cumulativeTransferVolumeUSD.toString()
+ );
+ });
+ });
+});
diff --git a/projects/subgraph-basin/tests/Liquidity.test.ts b/projects/subgraph-basin/tests/Liquidity.test.ts
new file mode 100644
index 0000000000..ec903af16b
--- /dev/null
+++ b/projects/subgraph-basin/tests/Liquidity.test.ts
@@ -0,0 +1,449 @@
+import { afterEach, assert, beforeEach, clearStore, describe, test } from "matchstick-as/assembly/index";
+import { BI_10, toDecimal, ZERO_BD, ZERO_BI } from "../../subgraph-core/utils/Decimals";
+import { loadWell } from "../src/utils/Well";
+import {
+ BEAN_SWAP_AMOUNT,
+ BEAN_USD_AMOUNT,
+ WELL,
+ WELL_ENTITY_TYPE,
+ WELL_LP_AMOUNT,
+ WETH_SWAP_AMOUNT,
+ WETH_USD_AMOUNT
+} from "./helpers/Constants";
+import { boreDefaultWell } from "./helpers/Aquifer";
+import {
+ mockAddLiquidity,
+ mockRemoveLiquidity,
+ mockRemoveLiquidityOneBean,
+ mockRemoveLiquidityOneWeth,
+ mockSync
+} from "./helpers/Liquidity";
+import { BigDecimal, BigInt, log } from "@graphprotocol/graph-ts";
+import { BigDecimal_max, BigDecimal_min } from "../../subgraph-core/utils/ArrayMath";
+import { calcLiquidityVolume } from "../src/utils/VolumeCP";
+import { loadToken } from "../src/utils/Token";
+import { BEAN_ERC20, WETH } from "../../subgraph-core/utils/Constants";
+
+const BI_2 = BigInt.fromU32(2);
+const BI_3 = BigInt.fromU32(3);
+const BI_4 = BigInt.fromU32(4);
+const BD_2 = BigDecimal.fromString("2");
+const BD_3 = BigDecimal.fromString("3");
+const BD_4 = BigDecimal.fromString("4");
+
+function zeroNegative(tokenAmounts: BigInt[]): BigInt[] {
+ return [tokenAmounts[0] < ZERO_BI ? ZERO_BI : tokenAmounts[0], tokenAmounts[1] < ZERO_BI ? ZERO_BI : tokenAmounts[1]];
+}
+
+function assignUSD(tokenAmounts: BigInt[]): BigDecimal[] {
+ const bean = loadToken(BEAN_ERC20);
+ const weth = loadToken(WETH);
+ return [
+ toDecimal(tokenAmounts[0], bean.decimals).times(bean.lastPriceUSD),
+ toDecimal(tokenAmounts[1], weth.decimals).times(weth.lastPriceUSD)
+ ];
+}
+
+describe("Well Entity: Liquidity Event Tests", () => {
+ beforeEach(() => {
+ boreDefaultWell();
+ });
+
+ afterEach(() => {
+ clearStore();
+ });
+
+ describe("Add Liquidity - Multiple", () => {
+ beforeEach(() => {
+ mockAddLiquidity();
+ });
+ test("Deposit counter incremented", () => {
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "cumulativeDepositCount", "1");
+ });
+ test("Token Balances updated", () => {
+ let updatedStore = loadWell(WELL);
+ let endingBalances = updatedStore.reserves;
+
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT, endingBalances[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT, endingBalances[1]);
+ });
+ test("Token Balances USD updated", () => {
+ let updatedStore = loadWell(WELL);
+ let endingBalances = updatedStore.reservesUSD;
+
+ assert.stringEquals(BEAN_USD_AMOUNT.toString(), endingBalances[0].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.toString(), endingBalances[1].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.times(BigDecimal.fromString("2")).toString(), updatedStore.totalLiquidityUSD.toString());
+ });
+ test("Liquidity Token balance", () => {
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "lpTokenSupply", WELL_LP_AMOUNT.toString());
+ });
+ test("Token volumes updated", () => {
+ let updatedStore = loadWell(WELL);
+ const tradeReserves = updatedStore.cumulativeTradeVolumeReserves;
+ const transferReserves = updatedStore.cumulativeTransferVolumeReserves;
+ const tradeReservesUSD = updatedStore.cumulativeTradeVolumeReservesUSD;
+ const transferReservesUSD = updatedStore.cumulativeTransferVolumeReservesUSD;
+
+ const expectedTradeVolume = zeroNegative(
+ calcLiquidityVolume([BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT], [BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT])
+ );
+ const expectedTradeVolumeUSD = assignUSD(expectedTradeVolume);
+
+ assert.bigIntEquals(expectedTradeVolume[0], tradeReserves[0]);
+ assert.bigIntEquals(expectedTradeVolume[1], tradeReserves[1]);
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT, transferReserves[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT, transferReserves[1]);
+ assert.stringEquals(expectedTradeVolumeUSD[0].toString(), tradeReservesUSD[0].toString());
+ assert.stringEquals(expectedTradeVolumeUSD[1].toString(), tradeReservesUSD[1].toString());
+ assert.stringEquals(BEAN_USD_AMOUNT.toString(), transferReservesUSD[0].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.toString(), transferReservesUSD[1].toString());
+ });
+ test("Cumulative volume updated (CP)", () => {
+ let updatedStore = loadWell(WELL);
+ const expectedTradeVolume = zeroNegative(
+ calcLiquidityVolume([BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT], [BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT])
+ );
+ const expectedTradeVolumeUSD = assignUSD(expectedTradeVolume);
+ assert.stringEquals(BigDecimal_max(expectedTradeVolumeUSD).toString(), updatedStore.cumulativeTradeVolumeUSD.toString());
+ assert.stringEquals(BEAN_USD_AMOUNT.plus(WETH_USD_AMOUNT).toString(), updatedStore.cumulativeTransferVolumeUSD.toString());
+ });
+ });
+
+ describe("Add Liquidity - One", () => {
+ beforeEach(() => {
+ mockAddLiquidity();
+ mockAddLiquidity([BEAN_SWAP_AMOUNT, ZERO_BI], BigDecimal.fromString("0.5"));
+ });
+ test("Deposit counter incremented", () => {
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "cumulativeDepositCount", "2");
+ });
+ test("Token Balances updated", () => {
+ let updatedStore = loadWell(WELL);
+ let endingBalances = updatedStore.reserves;
+
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT.times(BI_2), endingBalances[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT, endingBalances[1]);
+ });
+ test("Token Balances USD updated", () => {
+ let updatedStore = loadWell(WELL);
+ let endingBalances = updatedStore.reservesUSD;
+
+ // Bean balance is still only one unit of BEAN_USD_AMOUNT because the price was cut in half on the second deposit
+ assert.stringEquals(BEAN_USD_AMOUNT.toString(), endingBalances[0].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.toString(), endingBalances[1].toString());
+ assert.stringEquals(BEAN_USD_AMOUNT.plus(WETH_USD_AMOUNT).toString(), updatedStore.totalLiquidityUSD.toString());
+ });
+ test("Liquidity Token balance", () => {
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "lpTokenSupply", WELL_LP_AMOUNT.times(BI_2).toString());
+ });
+ test("Token volumes updated", () => {
+ let updatedStore = loadWell(WELL);
+ const tradeReserves = updatedStore.cumulativeTradeVolumeReserves;
+ const transferReserves = updatedStore.cumulativeTransferVolumeReserves;
+ const tradeReservesUSD = updatedStore.cumulativeTradeVolumeReservesUSD;
+ const transferReservesUSD = updatedStore.cumulativeTransferVolumeReservesUSD;
+
+ const expectedTradeVolume = zeroNegative(
+ calcLiquidityVolume([BEAN_SWAP_AMOUNT.times(BI_2), WETH_SWAP_AMOUNT], [BEAN_SWAP_AMOUNT, ZERO_BI])
+ );
+ const expectedTradeVolumeUSD = assignUSD(expectedTradeVolume);
+
+ assert.bigIntEquals(expectedTradeVolume[0], tradeReserves[0]);
+ assert.bigIntEquals(expectedTradeVolume[1], tradeReserves[1]);
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT.times(BI_2), transferReserves[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT, transferReserves[1]);
+ assert.stringEquals(expectedTradeVolumeUSD[0].toString(), tradeReservesUSD[0].toString());
+ assert.stringEquals(expectedTradeVolumeUSD[1].toString(), tradeReservesUSD[1].toString());
+ assert.stringEquals(BEAN_USD_AMOUNT.times(BigDecimal.fromString("1.5")).toString(), transferReservesUSD[0].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.toString(), transferReservesUSD[1].toString());
+ });
+ test("Cumulative volume updated (CP)", () => {
+ let updatedStore = loadWell(WELL);
+ const expectedTradeVolume = zeroNegative(
+ calcLiquidityVolume([BEAN_SWAP_AMOUNT.times(BI_2), WETH_SWAP_AMOUNT], [BEAN_SWAP_AMOUNT, ZERO_BI])
+ );
+ const expectedTradeVolumeUSD = assignUSD(expectedTradeVolume);
+ assert.stringEquals(BigDecimal_max(expectedTradeVolumeUSD).toString(), updatedStore.cumulativeTradeVolumeUSD.toString());
+ assert.stringEquals(
+ BEAN_USD_AMOUNT.times(BigDecimal.fromString("1.5")).plus(WETH_USD_AMOUNT).toString(),
+ updatedStore.cumulativeTransferVolumeUSD.toString()
+ );
+ });
+ });
+
+ describe("Sync (Add Liquidity) - Multiple", () => {
+ beforeEach(() => {
+ mockAddLiquidity([BEAN_SWAP_AMOUNT.div(BI_2), WETH_SWAP_AMOUNT.div(BI_2)]);
+ mockSync([BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT], BI_10);
+ });
+ test("Deposit counter incremented", () => {
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "cumulativeDepositCount", "2");
+ });
+ test("Token Balances updated", () => {
+ let updatedStore = loadWell(WELL);
+ let endingBalances = updatedStore.reserves;
+
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT, endingBalances[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT, endingBalances[1]);
+ });
+ test("Token Balances USD updated", () => {
+ let updatedStore = loadWell(WELL);
+ let endingBalances = updatedStore.reservesUSD;
+
+ assert.stringEquals(BEAN_USD_AMOUNT.toString(), endingBalances[0].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.toString(), endingBalances[1].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.times(BigDecimal.fromString("2")).toString(), updatedStore.totalLiquidityUSD.toString());
+ });
+ test("Liquidity Token balance", () => {
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "lpTokenSupply", WELL_LP_AMOUNT.plus(BI_10).toString());
+ });
+ test("Token volumes updated", () => {
+ let updatedStore = loadWell(WELL);
+ const tradeReserves = updatedStore.cumulativeTradeVolumeReserves;
+ const transferReserves = updatedStore.cumulativeTransferVolumeReserves;
+ const tradeReservesUSD = updatedStore.cumulativeTradeVolumeReservesUSD;
+ const transferReservesUSD = updatedStore.cumulativeTransferVolumeReservesUSD;
+
+ const expectedTradeVolume = zeroNegative(
+ calcLiquidityVolume([BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT], [BEAN_SWAP_AMOUNT.div(BI_2), WETH_SWAP_AMOUNT.div(BI_2)])
+ );
+ const expectedTradeVolumeUSD = assignUSD(expectedTradeVolume);
+
+ assert.bigIntEquals(expectedTradeVolume[0], tradeReserves[0]);
+ assert.bigIntEquals(expectedTradeVolume[1], tradeReserves[1]);
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT, transferReserves[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT, transferReserves[1]);
+ assert.stringEquals(expectedTradeVolumeUSD[0].toString(), tradeReservesUSD[0].toString());
+ assert.stringEquals(expectedTradeVolumeUSD[1].toString(), tradeReservesUSD[1].toString());
+ assert.stringEquals(BEAN_USD_AMOUNT.toString(), transferReservesUSD[0].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.toString(), transferReservesUSD[1].toString());
+ });
+ test("Cumulative volume updated (CP)", () => {
+ let updatedStore = loadWell(WELL);
+ const expectedTradeVolume = zeroNegative(
+ calcLiquidityVolume([BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT], [BEAN_SWAP_AMOUNT.div(BI_2), WETH_SWAP_AMOUNT.div(BI_2)])
+ );
+ const expectedTradeVolumeUSD = assignUSD(expectedTradeVolume);
+ assert.stringEquals(BigDecimal_max(expectedTradeVolumeUSD).toString(), updatedStore.cumulativeTradeVolumeUSD.toString());
+ assert.stringEquals(BEAN_USD_AMOUNT.plus(WETH_USD_AMOUNT).toString(), updatedStore.cumulativeTransferVolumeUSD.toString());
+ });
+ });
+
+ describe("Sync (Add Liquidity) - One", () => {
+ beforeEach(() => {
+ mockAddLiquidity([BEAN_SWAP_AMOUNT.div(BI_2), WETH_SWAP_AMOUNT.div(BI_2)]);
+ // WETH is doubled so the bean price is also doubled
+ mockSync([BEAN_SWAP_AMOUNT.div(BI_2), WETH_SWAP_AMOUNT], BI_10, BigDecimal.fromString("2"));
+ });
+ test("Deposit counter incremented", () => {
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "cumulativeDepositCount", "2");
+ });
+ test("Token Balances updated", () => {
+ let updatedStore = loadWell(WELL);
+ let endingBalances = updatedStore.reserves;
+
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT.div(BI_2), endingBalances[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT, endingBalances[1]);
+ });
+ test("Token Balances USD updated", () => {
+ let updatedStore = loadWell(WELL);
+ let endingBalances = updatedStore.reservesUSD;
+
+ // WETH was doubled from the initial, so the bean price has also doubled
+ assert.stringEquals(BEAN_USD_AMOUNT.toString(), endingBalances[0].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.toString(), endingBalances[1].toString());
+ assert.stringEquals(BEAN_USD_AMOUNT.plus(WETH_USD_AMOUNT).toString(), updatedStore.totalLiquidityUSD.toString());
+ });
+ test("Liquidity Token balance", () => {
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "lpTokenSupply", WELL_LP_AMOUNT.plus(BI_10).toString());
+ });
+ test("Token volumes updated", () => {
+ let updatedStore = loadWell(WELL);
+ const tradeReserves = updatedStore.cumulativeTradeVolumeReserves;
+ const transferReserves = updatedStore.cumulativeTransferVolumeReserves;
+ const tradeReservesUSD = updatedStore.cumulativeTradeVolumeReservesUSD;
+ const transferReservesUSD = updatedStore.cumulativeTransferVolumeReservesUSD;
+
+ const expectedTradeVolume = zeroNegative(
+ calcLiquidityVolume([BEAN_SWAP_AMOUNT.div(BI_2), WETH_SWAP_AMOUNT], [ZERO_BI, WETH_SWAP_AMOUNT.div(BI_2)])
+ );
+ const expectedTradeVolumeUSD = assignUSD(expectedTradeVolume);
+
+ assert.bigIntEquals(expectedTradeVolume[0], tradeReserves[0]);
+ assert.bigIntEquals(expectedTradeVolume[1], tradeReserves[1]);
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT.div(BI_2), transferReserves[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT, transferReserves[1]);
+ assert.stringEquals(expectedTradeVolumeUSD[0].toString(), tradeReservesUSD[0].toString());
+ assert.stringEquals(expectedTradeVolumeUSD[1].toString(), tradeReservesUSD[1].toString());
+ assert.stringEquals(BEAN_USD_AMOUNT.div(BD_2).toString(), transferReservesUSD[0].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.toString(), transferReservesUSD[1].toString());
+ });
+ test("Cumulative volume updated (CP)", () => {
+ let updatedStore = loadWell(WELL);
+ const expectedTradeVolume = zeroNegative(
+ calcLiquidityVolume([BEAN_SWAP_AMOUNT.div(BI_2), WETH_SWAP_AMOUNT], [ZERO_BI, WETH_SWAP_AMOUNT.div(BI_2)])
+ );
+ const expectedTradeVolumeUSD = assignUSD(expectedTradeVolume);
+ assert.stringEquals(BigDecimal_max(expectedTradeVolumeUSD).toString(), updatedStore.cumulativeTradeVolumeUSD.toString());
+ assert.stringEquals(BEAN_USD_AMOUNT.div(BD_2).plus(WETH_USD_AMOUNT).toString(), updatedStore.cumulativeTransferVolumeUSD.toString());
+ });
+ });
+
+ describe("Remove Liquidity - Multiple", () => {
+ beforeEach(() => {
+ mockAddLiquidity();
+ mockRemoveLiquidity();
+ });
+ test("Withdraw counter incremented", () => {
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "cumulativeWithdrawCount", "1");
+ });
+ test("Token Balances updated", () => {
+ let updatedStore = loadWell(WELL);
+ let endingBalances = updatedStore.reserves;
+
+ assert.bigIntEquals(ZERO_BI, endingBalances[0]);
+ assert.bigIntEquals(ZERO_BI, endingBalances[1]);
+ });
+ test("Liquidity Token balance", () => {
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "lpTokenSupply", "0");
+ });
+ test("Token volumes updated", () => {
+ let updatedStore = loadWell(WELL);
+ const tradeReserves = updatedStore.cumulativeTradeVolumeReserves;
+ const transferReserves = updatedStore.cumulativeTransferVolumeReserves;
+ const tradeReservesUSD = updatedStore.cumulativeTradeVolumeReservesUSD;
+ const transferReservesUSD = updatedStore.cumulativeTransferVolumeReservesUSD;
+
+ const expectedTradeVolume = zeroNegative(calcLiquidityVolume([ZERO_BI, ZERO_BI], [BEAN_SWAP_AMOUNT.neg(), WETH_SWAP_AMOUNT.neg()]));
+ const expectedTradeVolumeUSD = assignUSD(expectedTradeVolume);
+
+ assert.bigIntEquals(expectedTradeVolume[0], tradeReserves[0]);
+ assert.bigIntEquals(expectedTradeVolume[1], tradeReserves[1]);
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT.times(BI_2), transferReserves[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT.times(BI_2), transferReserves[1]);
+ assert.stringEquals(expectedTradeVolumeUSD[0].toString(), tradeReservesUSD[0].toString());
+ assert.stringEquals(expectedTradeVolumeUSD[1].toString(), tradeReservesUSD[1].toString());
+ assert.stringEquals(BEAN_USD_AMOUNT.times(BD_2).toString(), transferReservesUSD[0].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.times(BD_2).toString(), transferReservesUSD[1].toString());
+ });
+ test("Cumulative volume updated (CP)", () => {
+ let updatedStore = loadWell(WELL);
+ const expectedTradeVolume = zeroNegative(calcLiquidityVolume([ZERO_BI, ZERO_BI], [BEAN_SWAP_AMOUNT.neg(), WETH_SWAP_AMOUNT.neg()]));
+ const expectedTradeVolumeUSD = assignUSD(expectedTradeVolume);
+ assert.stringEquals(BigDecimal_max(expectedTradeVolumeUSD).toString(), updatedStore.cumulativeTradeVolumeUSD.toString());
+ assert.stringEquals(
+ BEAN_USD_AMOUNT.times(BD_2).plus(WETH_USD_AMOUNT.times(BD_2)).toString(),
+ updatedStore.cumulativeTransferVolumeUSD.toString()
+ );
+ });
+ });
+
+ describe("Remove Liquidity One - Bean", () => {
+ beforeEach(() => {
+ mockAddLiquidity();
+ mockAddLiquidity();
+ mockRemoveLiquidityOneBean();
+ });
+ test("Withdraw counter incremented", () => {
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "cumulativeWithdrawCount", "1");
+ });
+ test("Token Balances updated", () => {
+ let updatedStore = loadWell(WELL);
+ let endingBalances = updatedStore.reserves;
+
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT, endingBalances[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT.times(BI_2), endingBalances[1]);
+ });
+ test("Liquidity Token balance", () => {
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "lpTokenSupply", WELL_LP_AMOUNT.toString());
+ });
+ test("Token volumes updated", () => {
+ let updatedStore = loadWell(WELL);
+ const tradeReserves = updatedStore.cumulativeTradeVolumeReserves;
+ const transferReserves = updatedStore.cumulativeTransferVolumeReserves;
+ const tradeReservesUSD = updatedStore.cumulativeTradeVolumeReservesUSD;
+ const transferReservesUSD = updatedStore.cumulativeTransferVolumeReservesUSD;
+
+ const expectedTradeVolume = zeroNegative(
+ calcLiquidityVolume([BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT.times(BI_2)], [BEAN_SWAP_AMOUNT.neg(), ZERO_BI])
+ );
+ const expectedTradeVolumeUSD = assignUSD(expectedTradeVolume);
+
+ assert.bigIntEquals(expectedTradeVolume[0], tradeReserves[0]);
+ assert.bigIntEquals(expectedTradeVolume[1], tradeReserves[1]);
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT.times(BI_3), transferReserves[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT.times(BI_2), transferReserves[1]);
+ assert.stringEquals(expectedTradeVolumeUSD[0].toString(), tradeReservesUSD[0].toString());
+ assert.stringEquals(expectedTradeVolumeUSD[1].toString(), tradeReservesUSD[1].toString());
+ assert.stringEquals(BEAN_USD_AMOUNT.times(BD_3).toString(), transferReservesUSD[0].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.times(BD_2).toString(), transferReservesUSD[1].toString());
+ });
+ test("Cumulative volume updated (CP)", () => {
+ let updatedStore = loadWell(WELL);
+ const expectedTradeVolume = zeroNegative(
+ calcLiquidityVolume([BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT.times(BI_2)], [BEAN_SWAP_AMOUNT.neg(), ZERO_BI])
+ );
+ const expectedTradeVolumeUSD = assignUSD(expectedTradeVolume);
+ assert.stringEquals(BigDecimal_max(expectedTradeVolumeUSD).toString(), updatedStore.cumulativeTradeVolumeUSD.toString());
+ assert.stringEquals(
+ WETH_USD_AMOUNT.times(BD_2).plus(BEAN_USD_AMOUNT.times(BD_3)).toString(),
+ updatedStore.cumulativeTransferVolumeUSD.toString()
+ );
+ });
+ });
+
+ describe("Remove Liquidity One - WETH", () => {
+ beforeEach(() => {
+ mockAddLiquidity();
+ mockAddLiquidity();
+ mockRemoveLiquidityOneWeth(BigDecimal.fromString("0.5"));
+ });
+ test("Withdraw counter incremented", () => {
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "cumulativeWithdrawCount", "1");
+ });
+ test("Token Balances updated", () => {
+ let updatedStore = loadWell(WELL);
+ let endingBalances = updatedStore.reserves;
+
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT.times(BI_2), endingBalances[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT, endingBalances[1]);
+ });
+ test("Liquidity Token balance", () => {
+ assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "lpTokenSupply", WELL_LP_AMOUNT.toString());
+ });
+ test("Token volumes updated", () => {
+ let updatedStore = loadWell(WELL);
+ const tradeReserves = updatedStore.cumulativeTradeVolumeReserves;
+ const transferReserves = updatedStore.cumulativeTransferVolumeReserves;
+ const tradeReservesUSD = updatedStore.cumulativeTradeVolumeReservesUSD;
+ const transferReservesUSD = updatedStore.cumulativeTransferVolumeReservesUSD;
+
+ const expectedTradeVolume = zeroNegative(
+ calcLiquidityVolume([BEAN_SWAP_AMOUNT.times(BI_2), WETH_SWAP_AMOUNT], [ZERO_BI, WETH_SWAP_AMOUNT.neg()])
+ );
+ const expectedTradeVolumeUSD = assignUSD(expectedTradeVolume);
+
+ assert.bigIntEquals(expectedTradeVolume[0], tradeReserves[0]);
+ assert.bigIntEquals(expectedTradeVolume[1], tradeReserves[1]);
+ assert.bigIntEquals(BEAN_SWAP_AMOUNT.times(BI_2), transferReserves[0]);
+ assert.bigIntEquals(WETH_SWAP_AMOUNT.times(BI_3), transferReserves[1]);
+ assert.stringEquals(expectedTradeVolumeUSD[0].toString(), tradeReservesUSD[0].toString());
+ assert.stringEquals(expectedTradeVolumeUSD[1].toString(), tradeReservesUSD[1].toString());
+ assert.stringEquals(BEAN_USD_AMOUNT.times(BD_2).toString(), transferReservesUSD[0].toString());
+ assert.stringEquals(WETH_USD_AMOUNT.times(BD_3).toString(), transferReservesUSD[1].toString());
+ });
+ test("Cumulative volume updated (CP)", () => {
+ let updatedStore = loadWell(WELL);
+ const expectedTradeVolume = zeroNegative(
+ calcLiquidityVolume([BEAN_SWAP_AMOUNT.times(BI_2), WETH_SWAP_AMOUNT], [ZERO_BI, WETH_SWAP_AMOUNT.neg()])
+ );
+ const expectedTradeVolumeUSD = assignUSD(expectedTradeVolume);
+ assert.stringEquals(BigDecimal_max(expectedTradeVolumeUSD).toString(), updatedStore.cumulativeTradeVolumeUSD.toString());
+ assert.stringEquals(
+ WETH_USD_AMOUNT.times(BD_3).plus(BEAN_USD_AMOUNT.times(BD_2)).toString(),
+ updatedStore.cumulativeTransferVolumeUSD.toString()
+ );
+ });
+ });
+});
diff --git a/projects/subgraph-basin/tests/SwapEntity.test.ts b/projects/subgraph-basin/tests/SwapEntity.test.ts
new file mode 100644
index 0000000000..0ee2806309
--- /dev/null
+++ b/projects/subgraph-basin/tests/SwapEntity.test.ts
@@ -0,0 +1,51 @@
+import { afterEach, assert, beforeEach, clearStore, describe, test } from "matchstick-as/assembly/index";
+import { BEAN_ERC20, WETH } from "../../subgraph-core/utils/Constants";
+import { ACCOUNT_ENTITY_TYPE, BEAN_SWAP_AMOUNT, SWAP_ACCOUNT, SWAP_ENTITY_TYPE, WELL, WETH_SWAP_AMOUNT } from "./helpers/Constants";
+import { boreDefaultWell } from "./helpers/Aquifer";
+import { mockShift, mockSwap } from "./helpers/Swap";
+import { mockAddLiquidity } from "./helpers/Liquidity";
+import { BigInt } from "@graphprotocol/graph-ts";
+import { BI_10 } from "../../subgraph-core/utils/Decimals";
+
+describe("Swap Entity", () => {
+ beforeEach(() => {
+ boreDefaultWell();
+ });
+
+ afterEach(() => {
+ clearStore();
+ });
+
+ test("Swap event", () => {
+ const id = mockSwap();
+ assert.fieldEquals(SWAP_ENTITY_TYPE, id, "id", id);
+ assert.fieldEquals(SWAP_ENTITY_TYPE, id, "well", WELL.toHexString());
+ assert.fieldEquals(SWAP_ENTITY_TYPE, id, "fromToken", BEAN_ERC20.toHexString());
+ assert.fieldEquals(SWAP_ENTITY_TYPE, id, "amountIn", BEAN_SWAP_AMOUNT.toString());
+ assert.fieldEquals(SWAP_ENTITY_TYPE, id, "toToken", WETH.toHexString());
+ assert.fieldEquals(SWAP_ENTITY_TYPE, id, "amountOut", WETH_SWAP_AMOUNT.toString());
+
+ // Account entity exists
+ assert.fieldEquals(ACCOUNT_ENTITY_TYPE, SWAP_ACCOUNT.toHexString(), "id", SWAP_ACCOUNT.toHexString());
+ });
+
+ test("Shift event", () => {
+ const initialReserves = [BigInt.fromU32(50000).times(BI_10.pow(6)), BigInt.fromU32(20).times(BI_10.pow(18))];
+ const shiftedReserves = [BigInt.fromU32(52000).times(BI_10.pow(6)), BigInt.fromU32(19).times(BI_10.pow(18))];
+ mockAddLiquidity(initialReserves);
+
+ const amountIn = shiftedReserves[0].minus(initialReserves[0]);
+ const amountOut = initialReserves[1].minus(shiftedReserves[1]);
+ const id = mockShift(shiftedReserves, WETH, amountOut);
+
+ assert.fieldEquals(SWAP_ENTITY_TYPE, id, "id", id);
+ assert.fieldEquals(SWAP_ENTITY_TYPE, id, "well", WELL.toHexString());
+ assert.fieldEquals(SWAP_ENTITY_TYPE, id, "fromToken", BEAN_ERC20.toHexString());
+ assert.fieldEquals(SWAP_ENTITY_TYPE, id, "amountIn", amountIn.toString());
+ assert.fieldEquals(SWAP_ENTITY_TYPE, id, "toToken", WETH.toHexString());
+ assert.fieldEquals(SWAP_ENTITY_TYPE, id, "amountOut", amountOut.toString());
+
+ // Account entity exists
+ assert.fieldEquals(ACCOUNT_ENTITY_TYPE, SWAP_ACCOUNT.toHexString(), "id", SWAP_ACCOUNT.toHexString());
+ });
+});
diff --git a/projects/subgraph-basin/tests/Well.test.ts b/projects/subgraph-basin/tests/Well.test.ts
deleted file mode 100644
index 85ef7ab48b..0000000000
--- a/projects/subgraph-basin/tests/Well.test.ts
+++ /dev/null
@@ -1,426 +0,0 @@
-import { afterEach, assert, beforeEach, clearStore, describe, logStore, test } from "matchstick-as/assembly/index";
-import { BEAN_ERC20, WETH } from "../../subgraph-core/utils/Constants";
-import { ZERO_BD, ZERO_BI } from "../../subgraph-core/utils/Decimals";
-import { loadWell } from "../src/utils/Well";
-import {
- ACCOUNT_ENTITY_TYPE,
- BEAN_SWAP_AMOUNT,
- BEAN_USD_AMOUNT,
- CURRENT_BLOCK_TIMESTAMP,
- DEPOSIT_ENTITY_TYPE,
- SWAP_ACCOUNT,
- SWAP_ENTITY_TYPE,
- WELL,
- WELL_DAILY_ENTITY_TYPE,
- WELL_ENTITY_TYPE,
- WELL_HOURLY_ENTITY_TYPE,
- WELL_LP_AMOUNT,
- WETH_SWAP_AMOUNT,
- WETH_USD_AMOUNT,
- WITHDRAW_ENTITY_TYPE
-} from "./helpers/Constants";
-import { boreDefaultWell } from "./helpers/Aquifer";
-import { createDefaultSwap } from "./helpers/Swap";
-import {
- createDefaultAddLiquidity,
- createDefaultRemoveLiquidity,
- createRemoveLiquidityOneBean,
- createRemoveLiquidityOneWeth,
- loadWithdraw
-} from "./helpers/Liquidity";
-import { loadDeposit } from "./helpers/Liquidity";
-import { dayFromTimestamp, hourFromTimestamp } from "../../subgraph-core/utils/Dates";
-import { BigDecimal, BigInt } from "@graphprotocol/graph-ts";
-
-describe("Well Entity: Single Event Tests", () => {
- beforeEach(() => {
- boreDefaultWell();
- });
-
- afterEach(() => {
- clearStore();
- });
-
- describe("Add Liquidity", () => {
- test("Deposit counter incremented", () => {
- createDefaultAddLiquidity();
- assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "cumulativeDepositCount", "1");
- });
- test("Token Balances updated", () => {
- createDefaultAddLiquidity();
-
- let updatedStore = loadWell(WELL);
- let endingBalances = updatedStore.reserves;
-
- assert.bigIntEquals(BEAN_SWAP_AMOUNT, endingBalances[0]);
- assert.bigIntEquals(WETH_SWAP_AMOUNT, endingBalances[1]);
- });
- test("Token Balances USD updated", () => {
- createDefaultAddLiquidity();
-
- let updatedStore = loadWell(WELL);
- let endingBalances = updatedStore.reservesUSD;
-
- assert.stringEquals(BEAN_USD_AMOUNT.toString(), endingBalances[0].toString());
- assert.stringEquals(WETH_USD_AMOUNT.toString(), endingBalances[1].toString());
- assert.stringEquals(WETH_USD_AMOUNT.times(BigDecimal.fromString("2")).toString(), updatedStore.totalLiquidityUSD.toString());
- });
- test("Liquidity Token balance", () => {
- createDefaultAddLiquidity();
- assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "lpTokenSupply", WELL_LP_AMOUNT.toString());
- });
- test("Previous day snapshot entity created", () => {
- createDefaultAddLiquidity();
-
- let dayID = dayFromTimestamp(CURRENT_BLOCK_TIMESTAMP) - 1;
- let daySnapshotID = WELL.concatI32(dayID);
-
- let hourID = hourFromTimestamp(CURRENT_BLOCK_TIMESTAMP) - 1;
- let hourSnapshotID = WELL.concatI32(hourID);
-
- assert.fieldEquals(WELL_DAILY_ENTITY_TYPE, daySnapshotID.toHexString(), "id", daySnapshotID.toHexString());
- assert.fieldEquals(WELL_HOURLY_ENTITY_TYPE, hourSnapshotID.toHexString(), "id", hourSnapshotID.toHexString());
- });
- });
-
- describe("Remove Liquidity", () => {
- test("Withdraw counter incremented", () => {
- createDefaultRemoveLiquidity();
- assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "cumulativeWithdrawCount", "1");
- });
- test("Token Balances updated", () => {
- createDefaultRemoveLiquidity();
-
- let updatedStore = loadWell(WELL);
- let endingBalances = updatedStore.reserves;
-
- assert.bigIntEquals(ZERO_BI.minus(BEAN_SWAP_AMOUNT), endingBalances[0]);
- assert.bigIntEquals(ZERO_BI.minus(WETH_SWAP_AMOUNT), endingBalances[1]);
- });
- test("Liquidity Token balance", () => {
- createDefaultRemoveLiquidity();
- assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "lpTokenSupply", ZERO_BI.minus(WELL_LP_AMOUNT).toString());
- });
- test("Previous day snapshot entity created", () => {
- createDefaultAddLiquidity();
-
- let dayID = dayFromTimestamp(CURRENT_BLOCK_TIMESTAMP) - 1;
- let daySnapshotID = WELL.concatI32(dayID);
-
- let hourID = hourFromTimestamp(CURRENT_BLOCK_TIMESTAMP) - 1;
- let hourSnapshotID = WELL.concatI32(hourID);
-
- assert.fieldEquals(WELL_DAILY_ENTITY_TYPE, daySnapshotID.toHexString(), "id", daySnapshotID.toHexString());
- assert.fieldEquals(WELL_HOURLY_ENTITY_TYPE, hourSnapshotID.toHexString(), "id", hourSnapshotID.toHexString());
- });
- });
-
- describe("Remove Liquidity One - Bean", () => {
- test("Withdraw counter incremented", () => {
- createDefaultAddLiquidity();
- createDefaultAddLiquidity();
- createRemoveLiquidityOneBean();
- assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "cumulativeWithdrawCount", "1");
- });
- test("Token Balances updated", () => {
- createDefaultAddLiquidity();
- createDefaultAddLiquidity();
- createRemoveLiquidityOneBean();
-
- let updatedStore = loadWell(WELL);
- let endingBalances = updatedStore.reserves;
-
- assert.bigIntEquals(BEAN_SWAP_AMOUNT, endingBalances[0]);
- assert.bigIntEquals(WETH_SWAP_AMOUNT.times(BigInt.fromI32(2)), endingBalances[1]);
- });
- test("Liquidity Token balance", () => {
- createDefaultAddLiquidity();
- createDefaultAddLiquidity();
- createRemoveLiquidityOneBean();
- assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "lpTokenSupply", WELL_LP_AMOUNT.toString());
- });
- test("Previous day snapshot entity created", () => {
- createDefaultAddLiquidity();
-
- let dayID = dayFromTimestamp(CURRENT_BLOCK_TIMESTAMP) - 1;
- let daySnapshotID = WELL.concatI32(dayID);
-
- let hourID = hourFromTimestamp(CURRENT_BLOCK_TIMESTAMP) - 1;
- let hourSnapshotID = WELL.concatI32(hourID);
-
- assert.fieldEquals(WELL_DAILY_ENTITY_TYPE, daySnapshotID.toHexString(), "id", daySnapshotID.toHexString());
- assert.fieldEquals(WELL_HOURLY_ENTITY_TYPE, hourSnapshotID.toHexString(), "id", hourSnapshotID.toHexString());
- });
- });
-
- describe("Remove Liquidity One - WETH", () => {
- test("Withdraw counter incremented", () => {
- createRemoveLiquidityOneWeth();
- assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "cumulativeWithdrawCount", "1");
- });
- test("Token Balances updated", () => {
- createRemoveLiquidityOneWeth();
-
- let updatedStore = loadWell(WELL);
- let endingBalances = updatedStore.reserves;
-
- assert.bigIntEquals(ZERO_BI, endingBalances[0]);
- assert.bigIntEquals(ZERO_BI.minus(WETH_SWAP_AMOUNT), endingBalances[1]);
- });
- test("Liquidity Token balance", () => {
- createRemoveLiquidityOneWeth();
- assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "lpTokenSupply", ZERO_BI.minus(WELL_LP_AMOUNT).toString());
- });
- test("Previous day snapshot entity created", () => {
- createDefaultAddLiquidity();
-
- let dayID = dayFromTimestamp(CURRENT_BLOCK_TIMESTAMP) - 1;
- let daySnapshotID = WELL.concatI32(dayID);
-
- let hourID = hourFromTimestamp(CURRENT_BLOCK_TIMESTAMP) - 1;
- let hourSnapshotID = WELL.concatI32(hourID);
-
- assert.fieldEquals(WELL_DAILY_ENTITY_TYPE, daySnapshotID.toHexString(), "id", daySnapshotID.toHexString());
- assert.fieldEquals(WELL_HOURLY_ENTITY_TYPE, hourSnapshotID.toHexString(), "id", hourSnapshotID.toHexString());
- });
- });
-
- describe("Swap", () => {
- test("Swap counter incremented", () => {
- createDefaultSwap();
- assert.fieldEquals(WELL_ENTITY_TYPE, WELL.toHexString(), "cumulativeSwapCount", "1");
- });
-
- test("Token Balances updated", () => {
- createDefaultSwap();
-
- let updatedStore = loadWell(WELL);
- let endingBalances = updatedStore.reserves;
-
- assert.bigIntEquals(BEAN_SWAP_AMOUNT, endingBalances[0]);
- assert.bigIntEquals(ZERO_BI.minus(WETH_SWAP_AMOUNT), endingBalances[1]);
- });
-
- test("Token Volumes updated", () => {
- createDefaultSwap();
-
- let updatedStore = loadWell(WELL);
- let endingBalances = updatedStore.cumulativeVolumeReserves;
-
- assert.bigIntEquals(BEAN_SWAP_AMOUNT, endingBalances[0]);
- assert.bigIntEquals(ZERO_BI, endingBalances[1]);
- });
-
- test("Token Volumes USD updated", () => {
- createDefaultAddLiquidity();
- createDefaultAddLiquidity();
- createDefaultSwap();
-
- let updatedStore = loadWell(WELL);
- let endingBalances = updatedStore.cumulativeVolumeReservesUSD;
-
- assert.stringEquals(BEAN_USD_AMOUNT.toString(), endingBalances[0].toString());
- assert.stringEquals(ZERO_BD.toString(), endingBalances[1].toString());
- assert.stringEquals(BEAN_USD_AMOUNT.toString(), updatedStore.cumulativeVolumeUSD.toString());
- });
-
- test("Previous day snapshot entity created", () => {
- createDefaultAddLiquidity();
-
- let dayID = dayFromTimestamp(CURRENT_BLOCK_TIMESTAMP) - 1;
- let daySnapshotID = WELL.concatI32(dayID);
-
- let hourID = hourFromTimestamp(CURRENT_BLOCK_TIMESTAMP) - 1;
- let hourSnapshotID = WELL.concatI32(hourID);
-
- assert.fieldEquals(WELL_DAILY_ENTITY_TYPE, daySnapshotID.toHexString(), "id", daySnapshotID.toHexString());
- assert.fieldEquals(WELL_HOURLY_ENTITY_TYPE, hourSnapshotID.toHexString(), "id", hourSnapshotID.toHexString());
- });
- });
-});
-
-describe("Swap Entity", () => {
- beforeEach(() => {
- boreDefaultWell();
- });
-
- afterEach(() => {
- clearStore();
- });
-
- test("Swap entity exists", () => {
- let id = createDefaultSwap();
- assert.fieldEquals(SWAP_ENTITY_TYPE, id, "id", id);
- });
- test("Account entity exists", () => {
- let id = createDefaultSwap();
- assert.fieldEquals(ACCOUNT_ENTITY_TYPE, SWAP_ACCOUNT.toHexString(), "id", SWAP_ACCOUNT.toHexString());
- });
- test("Well value", () => {
- let id = createDefaultSwap();
- assert.fieldEquals(SWAP_ENTITY_TYPE, id, "well", WELL.toHexString());
- });
- test("fromToken value", () => {
- let id = createDefaultSwap();
- assert.fieldEquals(SWAP_ENTITY_TYPE, id, "fromToken", BEAN_ERC20.toHexString());
- });
- test("amountIn value", () => {
- let id = createDefaultSwap();
- assert.fieldEquals(SWAP_ENTITY_TYPE, id, "amountIn", BEAN_SWAP_AMOUNT.toString());
- });
- test("toToken value", () => {
- let id = createDefaultSwap();
- assert.fieldEquals(SWAP_ENTITY_TYPE, id, "toToken", WETH.toHexString());
- });
- test("amountOut value", () => {
- let id = createDefaultSwap();
- assert.fieldEquals(SWAP_ENTITY_TYPE, id, "amountOut", WETH_SWAP_AMOUNT.toString());
- });
-});
-
-describe("AddLiquidity => Deposit Entity", () => {
- beforeEach(() => {
- boreDefaultWell();
- });
-
- afterEach(() => {
- clearStore();
- });
-
- test("Deposit entity exists", () => {
- let id = createDefaultAddLiquidity();
- assert.fieldEquals(DEPOSIT_ENTITY_TYPE, id, "id", id);
- });
- test("Account entity exists", () => {
- let id = createDefaultAddLiquidity();
- assert.fieldEquals(ACCOUNT_ENTITY_TYPE, SWAP_ACCOUNT.toHexString(), "id", SWAP_ACCOUNT.toHexString());
- });
- test("Well value", () => {
- let id = createDefaultAddLiquidity();
- assert.fieldEquals(DEPOSIT_ENTITY_TYPE, id, "well", WELL.toHexString());
- });
- test("lpAmountOut => liquidity value", () => {
- let id = createDefaultAddLiquidity();
- assert.fieldEquals(DEPOSIT_ENTITY_TYPE, id, "liquidity", WELL_LP_AMOUNT.toString());
- });
- test("inputTokens value", () => {
- let id = createDefaultAddLiquidity();
-
- let updatedStore = loadDeposit(id);
- let tokens = updatedStore.tokens;
-
- assert.bytesEquals(BEAN_ERC20, tokens[0]);
- assert.bytesEquals(WETH, tokens[1]);
- });
- test("inputTokenAmounts value", () => {
- let id = createDefaultAddLiquidity();
-
- let updatedStore = loadDeposit(id);
- let reserves = updatedStore.reserves;
-
- assert.bigIntEquals(BEAN_SWAP_AMOUNT, reserves[0]);
- assert.bigIntEquals(WETH_SWAP_AMOUNT, reserves[1]);
- });
-});
-
-describe("RemoveLiquidity => Withdraw Entity", () => {
- beforeEach(() => {
- boreDefaultWell();
- });
-
- afterEach(() => {
- clearStore();
- });
-
- test("Withdraw entity exists", () => {
- let id = createDefaultRemoveLiquidity();
- assert.fieldEquals(WITHDRAW_ENTITY_TYPE, id, "id", id);
- });
- test("Account entity exists", () => {
- let id = createDefaultRemoveLiquidity();
- assert.fieldEquals(ACCOUNT_ENTITY_TYPE, SWAP_ACCOUNT.toHexString(), "id", SWAP_ACCOUNT.toHexString());
- });
- test("Well value", () => {
- let id = createDefaultRemoveLiquidity();
- assert.fieldEquals(WITHDRAW_ENTITY_TYPE, id, "well", WELL.toHexString());
- });
- test("lpAmountIn => liquidity value", () => {
- let id = createDefaultRemoveLiquidity();
- assert.fieldEquals(WITHDRAW_ENTITY_TYPE, id, "liquidity", WELL_LP_AMOUNT.toString());
- });
- test("inputTokens value", () => {
- let id = createDefaultRemoveLiquidity();
-
- let updatedStore = loadWithdraw(id);
- let tokens = updatedStore.tokens;
-
- assert.bytesEquals(BEAN_ERC20, tokens[0]);
- assert.bytesEquals(WETH, tokens[1]);
- });
- test("inputTokenAmounts value", () => {
- let id = createDefaultRemoveLiquidity();
-
- let updatedStore = loadWithdraw(id);
- let reserves = updatedStore.reserves;
-
- assert.bigIntEquals(BEAN_SWAP_AMOUNT, reserves[0]);
- assert.bigIntEquals(WETH_SWAP_AMOUNT, reserves[1]);
- });
-});
-
-describe("RemoveLiquidityOneToken => Withdraw Entity", () => {
- beforeEach(() => {
- boreDefaultWell();
- });
-
- afterEach(() => {
- clearStore();
- });
-
- test("Withdraw entity exists", () => {
- createDefaultAddLiquidity();
- createDefaultAddLiquidity();
- let id = createRemoveLiquidityOneBean();
- assert.fieldEquals(WITHDRAW_ENTITY_TYPE, id, "id", id);
- });
- test("Account entity exists", () => {
- createDefaultAddLiquidity();
- createDefaultAddLiquidity();
- let id = createRemoveLiquidityOneBean();
- assert.fieldEquals(ACCOUNT_ENTITY_TYPE, SWAP_ACCOUNT.toHexString(), "id", SWAP_ACCOUNT.toHexString());
- });
- test("Well value", () => {
- createDefaultAddLiquidity();
- createDefaultAddLiquidity();
- let id = createRemoveLiquidityOneBean();
- assert.fieldEquals(WITHDRAW_ENTITY_TYPE, id, "well", WELL.toHexString());
- });
- test("lpAmountIn => liquidity value", () => {
- createDefaultAddLiquidity();
- createDefaultAddLiquidity();
- let id = createRemoveLiquidityOneBean();
- assert.fieldEquals(WITHDRAW_ENTITY_TYPE, id, "liquidity", WELL_LP_AMOUNT.toString());
- });
- test("inputTokens value", () => {
- createDefaultAddLiquidity();
- createDefaultAddLiquidity();
- let id = createRemoveLiquidityOneBean();
-
- let updatedStore = loadWithdraw(id);
- let tokens = updatedStore.tokens;
-
- assert.bytesEquals(BEAN_ERC20, tokens[0]);
- assert.bytesEquals(WETH, tokens[1]);
- });
- test("inputTokenAmounts value", () => {
- createDefaultAddLiquidity();
- createDefaultAddLiquidity();
- let id = createRemoveLiquidityOneBean();
-
- let updatedStore = loadWithdraw(id);
- let reserves = updatedStore.reserves;
-
- assert.bigIntEquals(BEAN_SWAP_AMOUNT, reserves[0]);
- assert.bigIntEquals(ZERO_BI, reserves[1]);
- });
-});
diff --git a/projects/subgraph-basin/tests/helpers/Constants.ts b/projects/subgraph-basin/tests/helpers/Constants.ts
index b1e7244bac..9de5c3c1b6 100644
--- a/projects/subgraph-basin/tests/helpers/Constants.ts
+++ b/projects/subgraph-basin/tests/helpers/Constants.ts
@@ -16,9 +16,9 @@ export const WELL_FUNCTION = Address.fromString("0x3E661784267F128e5f706De17Fac1
export const PUMP = Address.fromString("0x6732128F9cc0c4344b2d4DC6285BCd516b7E59E6");
export const WELL_DATA = Bytes.empty();
-export const BEAN_SWAP_AMOUNT = BigInt.fromI32(1500 * 10 ** 6);
-export const WETH_SWAP_AMOUNT = BigInt.fromI64((1 * 10 ** 18));
-export const WELL_LP_AMOUNT = BigInt.fromI64((10 * 10 ** 18));
+export const BEAN_SWAP_AMOUNT = BigInt.fromU32(1500 * 10 ** 6);
+export const WETH_SWAP_AMOUNT = BigInt.fromU64((1 * 10 ** 18));
+export const WELL_LP_AMOUNT = BigInt.fromU64((10 * 10 ** 18));
export const BEAN_USD_PRICE = BigInt.fromString("938452");
export const BEAN_USD_AMOUNT = toDecimal(BEAN_SWAP_AMOUNT).times(toDecimal(BEAN_USD_PRICE));
export const WETH_USD_AMOUNT = toDecimal(BEAN_SWAP_AMOUNT).div(toDecimal(WETH_SWAP_AMOUNT, 18)).times(toDecimal(BEAN_USD_PRICE));
diff --git a/projects/subgraph-basin/tests/helpers/Functions.ts b/projects/subgraph-basin/tests/helpers/Functions.ts
index d43e6a0431..f68dab29fd 100644
--- a/projects/subgraph-basin/tests/helpers/Functions.ts
+++ b/projects/subgraph-basin/tests/helpers/Functions.ts
@@ -1,49 +1,41 @@
-import { Address, BigInt, ethereum } from "@graphprotocol/graph-ts";
-import { createMockedFunction } from "matchstick-as";
-import { BEANSTALK_PRICE, BEAN_ERC20, BEAN_WETH_CP2_WELL, CURVE_PRICE, WETH } from "../../../subgraph-core/utils/Constants";
+import { BigDecimal, BigInt, ethereum } from "@graphprotocol/graph-ts";
+import { createMockedFunction } from "matchstick-as/assembly/index";
+import { BEAN_3CRV, BEAN_ERC20, BEAN_WETH_CP2_WELL, CRV3_TOKEN, WETH } from "../../../subgraph-core/utils/Constants";
import { BEAN_USD_PRICE, WELL } from "./Constants";
+import { setMockCurvePrice, setMockWellPrice } from "../../../subgraph-core/tests/event-mocking/Price";
+import { ONE_BD, ZERO_BD } from "../../../subgraph-core/utils/Decimals";
-export function createContractCallMocks(): void {
- let priceReturn = new ethereum.Tuple();
+let prevMocked = ZERO_BD;
- priceReturn.push(ethereum.Value.fromAddress(Address.fromString("0xc9C32cd16Bf7eFB85Ff14e0c8603cc90F6F2eE49")));
- priceReturn.push(
- ethereum.Value.fromArray([
- ethereum.Value.fromAddress(Address.fromString("0xBEA0000029AD1c77D3d5D23Ba2D8893dB9d1Efab")),
- ethereum.Value.fromAddress(Address.fromString("0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"))
- ])
- );
- priceReturn.push(
- ethereum.Value.fromUnsignedBigIntArray([BigInt.fromString("14306013160240"), BigInt.fromString("12306817594155799426763734")])
- );
- priceReturn.push(ethereum.Value.fromUnsignedBigInt(BEAN_USD_PRICE));
- priceReturn.push(ethereum.Value.fromUnsignedBigInt(BigInt.fromString("26025239751318")));
- priceReturn.push(ethereum.Value.fromSignedBigInt(BigInt.fromString("-866349934591")));
- priceReturn.push(ethereum.Value.fromUnsignedBigInt(BigInt.fromString("969328")));
- priceReturn.push(ethereum.Value.fromUnsignedBigInt(BigInt.fromString("1032515")));
+export function createContractCallMocks(priceMultiple: BigDecimal = ONE_BD): void {
+ if (prevMocked == priceMultiple) {
+ return;
+ }
+ prevMocked = priceMultiple;
- let wellPriceReturn = new ethereum.Tuple();
+ const price = BigInt.fromString(new BigDecimal(BEAN_USD_PRICE).times(priceMultiple).truncate(0).toString());
- wellPriceReturn.push(ethereum.Value.fromAddress(BEAN_WETH_CP2_WELL));
- wellPriceReturn.push(ethereum.Value.fromArray([ethereum.Value.fromAddress(BEAN_ERC20), ethereum.Value.fromAddress(WETH)]));
- wellPriceReturn.push(ethereum.Value.fromUnsignedBigIntArray([BigInt.fromString("2000000000"), BigInt.fromString("1500000000000000000")]));
- wellPriceReturn.push(ethereum.Value.fromUnsignedBigInt(BEAN_USD_PRICE));
- wellPriceReturn.push(ethereum.Value.fromUnsignedBigInt(BigInt.fromString("26025239751318")));
- wellPriceReturn.push(ethereum.Value.fromSignedBigInt(BigInt.fromString("-866349934591")));
- wellPriceReturn.push(ethereum.Value.fromUnsignedBigInt(BigInt.fromString("969328")));
- wellPriceReturn.push(ethereum.Value.fromUnsignedBigInt(BigInt.fromString("1032515")));
+ setMockCurvePrice({
+ contract: BEAN_3CRV,
+ tokens: [BEAN_ERC20, CRV3_TOKEN],
+ balances: [BigInt.fromString("14306013160240"), BigInt.fromString("12306817594155799426763734")],
+ price: price,
+ liquidity: BigInt.fromString("26025239751318"),
+ deltaB: BigInt.fromString("-866349934591"),
+ lpUsd: BigInt.fromString("969328"),
+ lpBdv: BigInt.fromString("1032515")
+ });
- createMockedFunction(CURVE_PRICE, "getCurve", "getCurve():((address,address[2],uint256[2],uint256,uint256,int256,uint256,uint256))")
- .withArgs([])
- .returns([ethereum.Value.fromTuple(priceReturn)]);
-
- createMockedFunction(
- BEANSTALK_PRICE,
- "getConstantProductWell",
- "getConstantProductWell(address):((address,address[2],uint256[2],uint256,uint256,int256,uint256,uint256))"
- )
- .withArgs([ethereum.Value.fromAddress(BEAN_WETH_CP2_WELL)])
- .returns([ethereum.Value.fromTuple(wellPriceReturn)]);
+ setMockWellPrice({
+ contract: BEAN_WETH_CP2_WELL,
+ tokens: [BEAN_ERC20, WETH],
+ balances: [BigInt.fromString("2000000000"), BigInt.fromString("1500000000000000000")],
+ price: price,
+ liquidity: BigInt.fromString("26025239751318"),
+ deltaB: BigInt.fromString("-866349934591"),
+ lpUsd: BigInt.fromString("969328"),
+ lpBdv: BigInt.fromString("1032515")
+ });
createMockedFunction(BEAN_ERC20, "name", "name():(string)")
.withArgs([])
diff --git a/projects/subgraph-basin/tests/helpers/Liquidity.ts b/projects/subgraph-basin/tests/helpers/Liquidity.ts
index 242ca85437..b547596b6f 100644
--- a/projects/subgraph-basin/tests/helpers/Liquidity.ts
+++ b/projects/subgraph-basin/tests/helpers/Liquidity.ts
@@ -1,38 +1,50 @@
+import { BigDecimal, BigInt } from "@graphprotocol/graph-ts";
import { Deposit, Withdraw } from "../../generated/schema";
import { BEAN_ERC20, WETH } from "../../../subgraph-core/utils/Constants";
-import { handleAddLiquidity, handleRemoveLiquidity, handleRemoveLiquidityOneToken } from "../../src/WellHandler";
+import { handleAddLiquidity, handleRemoveLiquidity, handleRemoveLiquidityOneToken, handleSync } from "../../src/WellHandler";
import { BEAN_SWAP_AMOUNT, SWAP_ACCOUNT, WELL, WELL_LP_AMOUNT, WETH_SWAP_AMOUNT } from "./Constants";
import { createContractCallMocks } from "./Functions";
-import { createAddLiquidityEvent, createRemoveLiquidityEvent, createRemoveLiquidityOneTokenEvent } from "./Well";
+import { createAddLiquidityEvent, createRemoveLiquidityEvent, createRemoveLiquidityOneTokenEvent, createSyncEvent } from "./Well";
+import { ONE_BD } from "../../../subgraph-core/utils/Decimals";
-export function createDefaultAddLiquidity(): string {
- createContractCallMocks();
- let newEvent = createAddLiquidityEvent(WELL, SWAP_ACCOUNT, WELL_LP_AMOUNT, [BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT]);
+export function mockAddLiquidity(
+ tokenAmounts: BigInt[] = [BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT],
+ beanPriceMultiple: BigDecimal = ONE_BD
+): string {
+ createContractCallMocks(beanPriceMultiple);
+ let newEvent = createAddLiquidityEvent(WELL, SWAP_ACCOUNT, WELL_LP_AMOUNT, tokenAmounts);
handleAddLiquidity(newEvent);
return newEvent.transaction.hash.toHexString() + "-" + newEvent.logIndex.toString();
}
-export function createDefaultRemoveLiquidity(): string {
+export function mockRemoveLiquidity(tokenAmounts: BigInt[] = [BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT]): string {
createContractCallMocks();
- let newEvent = createRemoveLiquidityEvent(WELL, SWAP_ACCOUNT, WELL_LP_AMOUNT, [BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT]);
+ let newEvent = createRemoveLiquidityEvent(WELL, SWAP_ACCOUNT, WELL_LP_AMOUNT, tokenAmounts);
handleRemoveLiquidity(newEvent);
return newEvent.transaction.hash.toHexString() + "-" + newEvent.logIndex.toString();
}
-export function createRemoveLiquidityOneBean(): string {
+export function mockRemoveLiquidityOneBean(): string {
createContractCallMocks();
let newEvent = createRemoveLiquidityOneTokenEvent(WELL, SWAP_ACCOUNT, WELL_LP_AMOUNT, BEAN_ERC20, BEAN_SWAP_AMOUNT);
handleRemoveLiquidityOneToken(newEvent);
return newEvent.transaction.hash.toHexString() + "-" + newEvent.logIndex.toString();
}
-export function createRemoveLiquidityOneWeth(): string {
- createContractCallMocks();
+export function mockRemoveLiquidityOneWeth(beanPriceMultiple: BigDecimal = ONE_BD): string {
+ createContractCallMocks(beanPriceMultiple);
let newEvent = createRemoveLiquidityOneTokenEvent(WELL, SWAP_ACCOUNT, WELL_LP_AMOUNT, WETH, WETH_SWAP_AMOUNT);
handleRemoveLiquidityOneToken(newEvent);
return newEvent.transaction.hash.toHexString() + "-" + newEvent.logIndex.toString();
}
+export function mockSync(newReserves: BigInt[], lpAmountOut: BigInt, beanPriceMultiple: BigDecimal = ONE_BD): string {
+ createContractCallMocks(beanPriceMultiple);
+ let newSyncEvent = createSyncEvent(WELL, SWAP_ACCOUNT, newReserves, lpAmountOut);
+ handleSync(newSyncEvent);
+ return newSyncEvent.transaction.hash.toHexString() + "-" + newSyncEvent.logIndex.toString();
+}
+
export function loadDeposit(id: string): Deposit {
return Deposit.load(id) as Deposit;
}
diff --git a/projects/subgraph-basin/tests/helpers/Swap.ts b/projects/subgraph-basin/tests/helpers/Swap.ts
index b2ba6e3dd8..b1d0977200 100644
--- a/projects/subgraph-basin/tests/helpers/Swap.ts
+++ b/projects/subgraph-basin/tests/helpers/Swap.ts
@@ -1,12 +1,21 @@
+import { Address, BigDecimal, BigInt } from "@graphprotocol/graph-ts";
import { BEAN_ERC20, WETH } from "../../../subgraph-core/utils/Constants";
-import { handleSwap } from "../../src/WellHandler";
+import { handleShift, handleSwap } from "../../src/WellHandler";
import { BEAN_SWAP_AMOUNT, SWAP_ACCOUNT, WELL, WETH_SWAP_AMOUNT } from "./Constants";
import { createContractCallMocks } from "./Functions";
-import { createSwapEvent } from "./Well";
+import { createShiftEvent, createSwapEvent } from "./Well";
+import { ONE_BD } from "../../../subgraph-core/utils/Decimals";
-export function createDefaultSwap(): string {
- createContractCallMocks();
+export function mockSwap(beanPriceMultiple: BigDecimal = ONE_BD): string {
+ createContractCallMocks(beanPriceMultiple);
let newSwapEvent = createSwapEvent(WELL, SWAP_ACCOUNT, BEAN_ERC20, WETH, BEAN_SWAP_AMOUNT, WETH_SWAP_AMOUNT);
handleSwap(newSwapEvent);
return newSwapEvent.transaction.hash.toHexString() + "-" + newSwapEvent.logIndex.toString();
}
+
+export function mockShift(newReserves: BigInt[], toToken: Address, amountOut: BigInt, beanPriceMultiple: BigDecimal = ONE_BD): string {
+ createContractCallMocks(beanPriceMultiple);
+ let newShiftEvent = createShiftEvent(WELL, SWAP_ACCOUNT, newReserves, toToken, amountOut);
+ handleShift(newShiftEvent);
+ return newShiftEvent.transaction.hash.toHexString() + "-" + newShiftEvent.logIndex.toString();
+}
diff --git a/projects/subgraph-basin/tests/helpers/Well.ts b/projects/subgraph-basin/tests/helpers/Well.ts
index 5710a9ed5e..8d1f85193a 100644
--- a/projects/subgraph-basin/tests/helpers/Well.ts
+++ b/projects/subgraph-basin/tests/helpers/Well.ts
@@ -1,6 +1,6 @@
import { Address, BigInt, ethereum } from "@graphprotocol/graph-ts";
import { newMockEvent } from "matchstick-as/assembly/index";
-import { AddLiquidity, RemoveLiquidity, RemoveLiquidityOneToken, Swap } from "../../generated/templates/Well/Well";
+import { AddLiquidity, RemoveLiquidity, RemoveLiquidityOneToken, Shift, Swap, Sync } from "../../generated/templates/Well/Well";
import { CURRENT_BLOCK_TIMESTAMP } from "./Constants";
export function createAddLiquidityEvent(well: Address, account: Address, lpAmountOut: BigInt, tokenAmountsIn: BigInt[]): AddLiquidity {
@@ -13,9 +13,11 @@ export function createAddLiquidityEvent(well: Address, account: Address, lpAmoun
let param1 = new ethereum.EventParam("tokenAmountsIn", ethereum.Value.fromUnsignedBigIntArray(tokenAmountsIn));
let param2 = new ethereum.EventParam("lpAmountOut", ethereum.Value.fromUnsignedBigInt(lpAmountOut));
+ let param3 = new ethereum.EventParam("recipient", ethereum.Value.fromAddress(account));
event.parameters.push(param1);
event.parameters.push(param2);
+ event.parameters.push(param3);
return event as AddLiquidity;
}
@@ -36,10 +38,12 @@ export function createRemoveLiquidityEvent(
event.parameters = new Array();
let param1 = new ethereum.EventParam("lpAmountOut", ethereum.Value.fromUnsignedBigInt(lpAmountIn));
- let param2 = new ethereum.EventParam("tokenAmountsIn", ethereum.Value.fromUnsignedBigIntArray(tokenAmountsOut));
+ let param2 = new ethereum.EventParam("tokenAmountsOut", ethereum.Value.fromUnsignedBigIntArray(tokenAmountsOut));
+ let param3 = new ethereum.EventParam("recipient", ethereum.Value.fromAddress(account));
event.parameters.push(param1);
event.parameters.push(param2);
+ event.parameters.push(param3);
return event as RemoveLiquidity;
}
@@ -61,14 +65,35 @@ export function createRemoveLiquidityOneTokenEvent(
let param1 = new ethereum.EventParam("lpAmountOut", ethereum.Value.fromUnsignedBigInt(lpAmountIn));
let param2 = new ethereum.EventParam("tokenOut", ethereum.Value.fromAddress(tokenOut));
let param3 = new ethereum.EventParam("tokenAmountOut", ethereum.Value.fromUnsignedBigInt(tokenAmountOut));
+ let param4 = new ethereum.EventParam("recipient", ethereum.Value.fromAddress(account));
event.parameters.push(param1);
event.parameters.push(param2);
event.parameters.push(param3);
+ event.parameters.push(param4);
return event as RemoveLiquidityOneToken;
}
+export function createSyncEvent(well: Address, account: Address, reserves: BigInt[], lpAmountOut: BigInt): Sync {
+ let event = changetype(newMockEvent());
+
+ event.address = well;
+ event.transaction.from = account;
+ event.block.timestamp = CURRENT_BLOCK_TIMESTAMP;
+ event.parameters = new Array();
+
+ let param1 = new ethereum.EventParam("reserves", ethereum.Value.fromUnsignedBigIntArray(reserves));
+ let param2 = new ethereum.EventParam("lpAmountOut", ethereum.Value.fromUnsignedBigInt(lpAmountOut));
+ let param3 = new ethereum.EventParam("recipient", ethereum.Value.fromAddress(account));
+
+ event.parameters.push(param1);
+ event.parameters.push(param2);
+ event.parameters.push(param3);
+
+ return event as Sync;
+}
+
export function createSwapEvent(
well: Address,
account: Address,
@@ -97,4 +122,23 @@ export function createSwapEvent(
return event as Swap;
}
-export function createTransferEvent(): void {}
+export function createShiftEvent(well: Address, account: Address, reserves: BigInt[], toToken: Address, amountOut: BigInt): Shift {
+ let event = changetype(newMockEvent());
+
+ event.address = well;
+ event.transaction.from = account;
+ event.block.timestamp = CURRENT_BLOCK_TIMESTAMP;
+ event.parameters = new Array();
+
+ let param1 = new ethereum.EventParam("reserves", ethereum.Value.fromUnsignedBigIntArray(reserves));
+ let param2 = new ethereum.EventParam("toToken", ethereum.Value.fromAddress(toToken));
+ let param3 = new ethereum.EventParam("amountOut", ethereum.Value.fromUnsignedBigInt(amountOut));
+ let param4 = new ethereum.EventParam("recipient", ethereum.Value.fromAddress(account));
+
+ event.parameters.push(param1);
+ event.parameters.push(param2);
+ event.parameters.push(param3);
+ event.parameters.push(param4);
+
+ return event as Shift;
+}
diff --git a/projects/subgraph-bean/.gitignore b/projects/subgraph-bean/.gitignore
index f5708adef4..bed545a0b5 100644
--- a/projects/subgraph-bean/.gitignore
+++ b/projects/subgraph-bean/.gitignore
@@ -3,3 +3,8 @@ generated/*
yarn.lock
.DS_Store
node_modules/*
+
+# matchstick binary download info
+tests/.latest.json
+tests/.bin
+tests/.docker
\ No newline at end of file
diff --git a/projects/subgraph-bean/matchstick-docker.yaml b/projects/subgraph-bean/matchstick-docker.yaml
new file mode 100644
index 0000000000..aa83a54948
--- /dev/null
+++ b/projects/subgraph-bean/matchstick-docker.yaml
@@ -0,0 +1,6 @@
+# This configuration is needed when running the matchstick tests in docker.
+# This is because the root project directory is bind mounted to the container, as the
+# subgraph has some dependencies on other projects in the repo.
+testsFolder: repo-mounted/projects/subgraph-bean/tests
+libsFolder: repo-mounted/node_modules
+manifestPath: repo-mounted/projects/subgraph-bean/subgraph.yaml
diff --git a/projects/subgraph-bean/matchstick.yaml b/projects/subgraph-bean/matchstick.yaml
new file mode 100644
index 0000000000..8851578cc6
--- /dev/null
+++ b/projects/subgraph-bean/matchstick.yaml
@@ -0,0 +1 @@
+libsFolder: ../../node_modules
diff --git a/projects/subgraph-bean/package.json b/projects/subgraph-bean/package.json
index 5e9731e61e..7f945e3933 100644
--- a/projects/subgraph-bean/package.json
+++ b/projects/subgraph-bean/package.json
@@ -10,24 +10,19 @@
"scripts": {
"codegen": "graph codegen",
"build": "graph build",
- "deploy": "graph deploy --node https://api.studio.thegraph.com/deploy/ bean",
+ "test": "graph test",
+ "testd": "docker run -it --rm --mount type=bind,source=\"$(pwd)\"/matchstick-docker.yaml,target=/matchstick/matchstick.yaml --mount type=bind,source=\"$(pwd)\"/../../,target=/matchstick/repo-mounted/ matchstick",
+ "testd-named": "../subgraph-core/tests/scripts/docker-run-named.sh",
"create-local": "graph create --node http://127.0.0.1:8020/ bean",
"remove-local": "graph remove --node http://127.0.0.1:8020/ bean",
- "deploy-local": "graph deploy --node http://127.0.0.1:8020/ --ipfs http://127.0.0.1:5001 bean",
- "create-hosted": "graph create --node http://graph.node.bean.money:8020/ bean",
- "remove-hosted": "graph remove --node http://graph.node.bean.money:8020/ bean",
- "deploy-hosted": "graph deploy --node http://graph.node.bean.money:8020/ --ipfs http://graph.node.bean.money:5001 bean",
- "create-hosted-dev": "graph create --node http://graph.node.bean.money:8020/ bean-dev",
- "remove-hosted-dev": "graph remove --node http://graph.node.bean.money:8020/ bean-dev",
- "deploy-hosted-dev": "graph deploy --node http://graph.node.bean.money:8020/ --ipfs http://graph.node.bean.money:5001 bean-dev",
- "create-hosted-test": "graph create --node http://graph.node.bean.money:8020/ bean-testing",
- "remove-hosted-test": "graph remove --node http://graph.node.bean.money:8020/ bean-testing",
- "deploy-hosted-test": "graph deploy --node http://graph.node.bean.money:8020/ --ipfs http://graph.node.bean.money:5001 bean-testing"
+ "deploy-local": "graph deploy --node http://127.0.0.1:8020/ --ipfs http://127.0.0.1:5001 bean"
},
"dependencies": {
- "@graphprotocol/graph-cli": "0.56.0",
- "@graphprotocol/graph-ts": "0.31.0",
- "matchstick-as": "^0.5.0"
+ "@graphprotocol/graph-cli": "0.69.0",
+ "@graphprotocol/graph-ts": "0.34.0"
+ },
+ "devDependencies": {
+ "matchstick-as": "^0.6.0"
},
"private": true
}
diff --git a/projects/subgraph-bean/schema.graphql b/projects/subgraph-bean/schema.graphql
index 999f7e6206..f740f8b026 100644
--- a/projects/subgraph-bean/schema.graphql
+++ b/projects/subgraph-bean/schema.graphql
@@ -2,10 +2,13 @@ type Token @entity {
"Smart contract address of the token"
id: ID!
+ "Name of the token, i.e. BEAN, WETH"
+ name: String!
+
"Number of decimals"
decimals: BigInt!
- "Last USD price calculated"
+ "Last USD price calculated. Isn't calculated for all tokens, in those cases will be zero."
lastPriceUSD: BigDecimal!
}
@@ -13,6 +16,12 @@ type Bean @entity {
"Contract address of the Bean token"
id: ID!
+ "Which chain this Bean is from"
+ chain: String!
+
+ "Smart contract address of the Beanstalk this Bean is associated with"
+ beanstalk: String!
+
"Current supply"
supply: BigInt!
@@ -22,6 +31,9 @@ type Bean @entity {
"Current market cap"
marketCap: BigDecimal!
+ "Amount of the supply which is considered Locked Beans (untradeable due to chop rate)"
+ lockedBeans: BigInt!
+
"Percent of supply in LP used for peg maintenance"
supplyInPegLP: BigDecimal!
@@ -49,6 +61,9 @@ type Bean @entity {
"Pools that include this Bean"
pools: [Pool!]!
+ "Dewhitelisted pools that include this Bean"
+ dewhitelistedPools: [Pool!]!
+
"Hourly snapshot of Bean data"
hourlySnapshot: [BeanHourlySnapshot!]! @derivedFrom(field: "bean")
@@ -69,9 +84,18 @@ type BeanHourlySnapshot @entity {
"Current market cap"
marketCap: BigDecimal!
+ "Amount of the supply which is considered Locked Beans (untradeable due to chop rate)"
+ lockedBeans: BigInt!
+
"Percent of supply in LP used for peg maintenance"
supplyInPegLP: BigDecimal!
+ "Instantaneous deltaB across all whitelisted pools"
+ instantaneousDeltaB: BigInt!
+
+ "Time-Weighted deltaB in whitelisted pools over the previous season"
+ twaDeltaB: BigInt!
+
"Cumulative volume in BEAN"
volume: BigInt!
@@ -84,12 +108,12 @@ type BeanHourlySnapshot @entity {
"Current USD price"
price: BigDecimal!
+ "Time-Weighted price over the previous season"
+ twaPrice: BigDecimal!
+
"Cumulative number of crosses"
crosses: Int!
- "Current deltaB for peg"
- deltaBeans: BigInt!
-
"Volume in BEAN for this snapshot"
deltaVolume: BigInt!
@@ -121,14 +145,21 @@ type BeanDailySnapshot @entity {
supply: BigInt!
marketCap: BigDecimal!
+ "Amount of the supply which is considered Locked Beans (untradeable due to chop rate)"
+ lockedBeans: BigInt!
"Percent of supply in LP used for peg maintenance"
supplyInPegLP: BigDecimal!
+ "Instantaneous deltaB across all whitelisted pools"
+ instantaneousDeltaB: BigInt!
+ "Time-Weighted deltaB in whitelisted pools over the previous season"
+ twaDeltaB: BigInt!
volume: BigInt!
volumeUSD: BigDecimal!
liquidityUSD: BigDecimal!
price: BigDecimal!
+ "Time-Weighted price over the previous season"
+ twaPrice: BigDecimal!
crosses: Int!
- deltaBeans: BigInt!
deltaVolume: BigInt!
deltaVolumeUSD: BigDecimal!
deltaLiquidityUSD: BigDecimal!
@@ -143,6 +174,7 @@ type BeanCross @entity {
id: ID!
bean: Bean!
price: BigDecimal!
+ blockNumber: BigInt!
timestamp: BigInt!
timeSinceLastCross: BigInt!
above: Boolean!
@@ -154,6 +186,7 @@ type PoolCross @entity {
id: ID!
pool: Pool!
price: BigDecimal!
+ blockNumber: BigInt!
timestamp: BigInt!
timeSinceLastCross: BigInt!
above: Boolean!
@@ -163,7 +196,10 @@ type PoolCross @entity {
type Pool @entity {
id: ID!
+ "The Bean token that is in this pool"
bean: Bean!
+ "All tokens in this pool"
+ tokens: [Token!]!
reserves: [BigInt!]!
lastSeason: Int!
lastPrice: BigDecimal!
@@ -174,6 +210,7 @@ type Pool @entity {
"Last timestamp a cross was seen for this pool"
lastCross: BigInt!
crossEvents: [PoolCross!]! @derivedFrom(field: "pool")
+ "Instantaneous deltaB"
deltaBeans: BigInt!
hourlySnapshot: [PoolHourlySnapshot!]! @derivedFrom(field: "pool")
dailySnapshot: [PoolDailySnapshot!]! @derivedFrom(field: "pool")
@@ -184,12 +221,19 @@ type PoolHourlySnapshot @entity {
pool: Pool!
reserves: [BigInt!]!
lastPrice: BigDecimal!
+ "Time-Weighted bean price over the previous season"
+ twaPrice: BigDecimal!
+ "Time-Weighted price of the other token in the pool over the previous season, if applicable"
+ twaToken2Price: BigDecimal
volume: BigInt!
volumeUSD: BigDecimal!
liquidityUSD: BigDecimal!
crosses: Int!
utilization: BigDecimal!
+ "Instantaneous deltaB"
deltaBeans: BigInt!
+ "Time-Weighted deltaB over the previous season"
+ twaDeltaBeans: BigInt!
deltaReserves: [BigInt!]!
deltaVolume: BigInt!
deltaVolumeUSD: BigDecimal!
@@ -206,12 +250,19 @@ type PoolDailySnapshot @entity {
pool: Pool!
reserves: [BigInt!]!
lastPrice: BigDecimal!
+ "Time-Weighted price over the previous season"
+ twaPrice: BigDecimal!
+ "Time-Weighted price of the other token in the pool over the previous season, if applicable"
+ twaToken2Price: BigDecimal
volume: BigInt!
volumeUSD: BigDecimal!
liquidityUSD: BigDecimal!
crosses: Int!
utilization: BigDecimal!
+ "Instantaneous deltaB"
deltaBeans: BigInt!
+ "Time-Weighted deltaB over the previous season"
+ twaDeltaBeans: BigInt!
deltaReserves: [BigInt!]!
deltaVolume: BigInt!
deltaVolumeUSD: BigDecimal!
@@ -222,3 +273,26 @@ type PoolDailySnapshot @entity {
createdAt: BigInt!
updatedAt: BigInt!
}
+
+# For tracking twa balances as the seasons progress
+type TwaOracle @entity {
+ id: ID!
+ pool: Pool!
+ # These two fields are used to determine twa over the previous season.
+ # priceCumulativeSun is the value of priceCumulativeLast at the time of the previous sunrise (lastSun)
+ priceCumulativeSun: [BigInt!]!
+ lastSun: BigInt!
+ # These three fields are for when manual calculation of price cumulative last is required (beanlusd, wells)
+ # Otherwise the equivalent values are derived from the corresponding contract functions.
+ priceCumulativeLast: [BigInt!]!
+ lastBalances: [BigInt!]!
+ lastUpdated: BigInt!
+ # These fields are for saving the raw Well reserves outputted by the WellOracle event
+ # The previous two seasons are needed because in the same block as a new season starts, the newest value cannot be used.
+ cumulativeWellReserves: Bytes!
+ cumulativeWellReservesTime: BigInt!
+ cumulativeWellReservesBlock: BigInt!
+ cumulativeWellReservesPrev: Bytes!
+ cumulativeWellReservesPrevTime: BigInt!
+ cumulativeWellReservesPrevBlock: BigInt!
+}
diff --git a/projects/subgraph-bean/src/Bean3CRVHandler.ts b/projects/subgraph-bean/src/Bean3CRVHandler.ts
index 99ebd27142..8b89562185 100644
--- a/projects/subgraph-bean/src/Bean3CRVHandler.ts
+++ b/projects/subgraph-bean/src/Bean3CRVHandler.ts
@@ -1,4 +1,4 @@
-import { BigInt, BigDecimal } from "@graphprotocol/graph-ts";
+import { BigInt, BigDecimal, Address } from "@graphprotocol/graph-ts";
import {
AddLiquidity,
RemoveLiquidity,
@@ -8,12 +8,10 @@ import {
TokenExchangeUnderlying
} from "../generated/Bean3CRV/Bean3CRV";
import { CurvePrice } from "../generated/Bean3CRV/CurvePrice";
-import { loadBean, updateBeanSupplyPegPercent, updateBeanValues } from "./utils/Bean";
-import { BEANSTALK_PRICE, BEAN_ERC20, CURVE_PRICE } from "../../subgraph-core/utils/Constants";
+import { updateBeanAfterPoolSwap } from "./utils/Bean";
+import { CURVE_PRICE } from "../../subgraph-core/utils/Constants";
import { toDecimal, ZERO_BD, ZERO_BI } from "../../subgraph-core/utils/Decimals";
-import { getPoolLiquidityUSD, loadOrCreatePool, setPoolReserves, updatePoolPrice, updatePoolValues } from "./utils/Pool";
-import { BeanstalkPrice } from "../generated/Bean3CRV/BeanstalkPrice";
-import { checkBeanCross } from "./utils/Cross";
+import { getPoolLiquidityUSD, setPoolReserves, updatePoolPrice, updatePoolValues } from "./utils/Pool";
export function handleTokenExchange(event: TokenExchange): void {
handleSwap(
@@ -88,17 +86,6 @@ function handleLiquidityChange(
return;
}
- let beanPrice = toDecimal(curve.value.price);
-
- // Attempt to pull from Beanstalk Price contract first for the overall Bean price update
- let beanstalkPrice = BeanstalkPrice.bind(BEANSTALK_PRICE);
- let beanstalkQuery = beanstalkPrice.try_price();
- if (!beanstalkQuery.reverted) {
- beanPrice = toDecimal(beanstalkQuery.value.price);
- }
-
- let bean = loadBean(BEAN_ERC20.toHexString());
- let oldBeanPrice = bean.price;
let startingLiquidity = getPoolLiquidityUSD(poolAddress, blockNumber);
let newPrice = toDecimal(curve.value.price);
@@ -115,14 +102,11 @@ function handleLiquidityChange(
volumeBean = ZERO_BI;
}
- setPoolReserves(poolAddress, curve.value.balances, blockNumber);
- updateBeanSupplyPegPercent(blockNumber);
-
- updateBeanValues(BEAN_ERC20.toHexString(), timestamp, beanPrice, ZERO_BI, volumeBean, volumeUSD, deltaLiquidityUSD);
-
+ setPoolReserves(poolAddress, curve.value.balances, timestamp, blockNumber);
updatePoolValues(poolAddress, timestamp, blockNumber, volumeBean, volumeUSD, deltaLiquidityUSD, curve.value.deltaB);
updatePoolPrice(poolAddress, timestamp, blockNumber, newPrice);
- checkBeanCross(BEAN_ERC20.toHexString(), timestamp, blockNumber, oldBeanPrice, beanPrice);
+
+ updateBeanAfterPoolSwap(poolAddress, toDecimal(curve.value.price), volumeBean, volumeUSD, deltaLiquidityUSD, timestamp, blockNumber);
}
function handleSwap(
@@ -142,17 +126,6 @@ function handleSwap(
return;
}
- let beanPrice = toDecimal(curve.value.price);
-
- // Attempt to pull from Beanstalk Price contract first for the overall Bean price update
- let beanstalkPrice = BeanstalkPrice.bind(BEANSTALK_PRICE);
- let beanstalkQuery = beanstalkPrice.try_price();
- if (!beanstalkQuery.reverted) {
- beanPrice = toDecimal(beanstalkQuery.value.price);
- }
-
- let bean = loadBean(BEAN_ERC20.toHexString());
- let oldBeanPrice = bean.price;
let startingLiquidity = getPoolLiquidityUSD(poolAddress, blockNumber);
let newPrice = toDecimal(curve.value.price);
@@ -166,12 +139,9 @@ function handleSwap(
let volumeUSD = toDecimal(volumeBean).times(newPrice);
let deltaLiquidityUSD = toDecimal(curve.value.liquidity).minus(startingLiquidity);
- setPoolReserves(poolAddress, curve.value.balances, blockNumber);
- updateBeanSupplyPegPercent(blockNumber);
-
- updateBeanValues(BEAN_ERC20.toHexString(), timestamp, beanPrice, ZERO_BI, volumeBean, volumeUSD, deltaLiquidityUSD);
-
+ setPoolReserves(poolAddress, curve.value.balances, timestamp, blockNumber);
updatePoolValues(poolAddress, timestamp, blockNumber, volumeBean, volumeUSD, deltaLiquidityUSD, curve.value.deltaB);
updatePoolPrice(poolAddress, timestamp, blockNumber, newPrice);
- checkBeanCross(BEAN_ERC20.toHexString(), timestamp, blockNumber, oldBeanPrice, beanPrice);
+
+ updateBeanAfterPoolSwap(poolAddress, toDecimal(curve.value.price), volumeBean, volumeUSD, deltaLiquidityUSD, timestamp, blockNumber);
}
diff --git a/projects/subgraph-bean/src/Bean3CRVHandler_V1.ts b/projects/subgraph-bean/src/Bean3CRVHandler_V1.ts
index b9c0070df0..8297092cd1 100644
--- a/projects/subgraph-bean/src/Bean3CRVHandler_V1.ts
+++ b/projects/subgraph-bean/src/Bean3CRVHandler_V1.ts
@@ -1,4 +1,4 @@
-import { BigInt, BigDecimal, Address, log } from "@graphprotocol/graph-ts";
+import { BigInt, BigDecimal, Address } from "@graphprotocol/graph-ts";
import {
AddLiquidity,
RemoveLiquidity,
@@ -6,22 +6,17 @@ import {
RemoveLiquidityOne,
TokenExchange,
TokenExchangeUnderlying
-} from "../generated/Bean3CRV/Bean3CRV";
-import { loadBean, updateBeanSupplyPegPercent, updateBeanValues } from "./utils/Bean";
-import {
- BEAN_3CRV_V1,
- BEAN_ERC20_V1,
- BEAN_LUSD_V1,
- CALCULATIONS_CURVE,
- CRV3_POOL_V1,
- LUSD_3POOL
-} from "../../subgraph-core/utils/Constants";
+} from "../generated/Bean3CRV-V1/Bean3CRV";
+import { calcLiquidityWeightedBeanPrice, getLastBeanPrice, loadBean, updateBeanSupplyPegPercent, updateBeanValues } from "./utils/Bean";
+import { BEAN_ERC20_V1, BEAN_LUSD_V1, BEAN_WETH_V1 } from "../../subgraph-core/utils/Constants";
import { toDecimal, ZERO_BD, ZERO_BI } from "../../subgraph-core/utils/Decimals";
import { loadOrCreatePool, setPoolReserves, updatePoolPrice, updatePoolValues } from "./utils/Pool";
-import { CalculationsCurve } from "../generated/Bean3CRV-V1/CalculationsCurve";
import { Bean3CRV } from "../generated/Bean3CRV-V1/Bean3CRV";
import { ERC20 } from "../generated/Bean3CRV-V1/ERC20";
import { checkBeanCross } from "./utils/Cross";
+import { curveDeltaBUsingVPrice, curvePriceAndLp } from "./utils/price/CurvePrice";
+import { manualTwa } from "./utils/price/TwaOracle";
+import { externalUpdatePoolPrice as univ2_externalUpdatePoolPrice } from "./UniswapV2Handler";
export function handleTokenExchange(event: TokenExchange): void {
// Do not index post-exploit data
@@ -96,9 +91,11 @@ export function handleRemoveLiquidityOne(event: RemoveLiquidityOne): void {
// Do not index post-exploit data
if (event.block.number >= BigInt.fromI32(14602790)) return;
- if (event.params.provider == BEAN_ERC20_V1)
+ if (event.params.provider == BEAN_ERC20_V1) {
handleLiquidityChange(event.address.toHexString(), event.block.timestamp, event.block.number, event.params.token_amount, ZERO_BI);
- else handleLiquidityChange(event.address.toHexString(), event.block.timestamp, event.block.number, ZERO_BI, event.params.token_amount);
+ } else {
+ handleLiquidityChange(event.address.toHexString(), event.block.timestamp, event.block.number, ZERO_BI, event.params.token_amount);
+ }
}
function handleLiquidityChange(
@@ -110,64 +107,24 @@ function handleLiquidityChange(
): void {
let pool = loadOrCreatePool(poolAddress, blockNumber);
- // Get Curve Price Details
- let curveCalc = CalculationsCurve.bind(CALCULATIONS_CURVE);
- let metapoolPrice = toDecimal(curveCalc.getCurvePriceUsdc(CRV3_POOL_V1));
-
let lpContract = Bean3CRV.bind(Address.fromString(poolAddress));
- let beanCrvPrice = ZERO_BD;
- let lusd3crvPrice = ZERO_BD;
-
- if (poolAddress == BEAN_3CRV_V1.toHexString()) {
- beanCrvPrice = toDecimal(lpContract.get_dy(ZERO_BI, BigInt.fromI32(1), BigInt.fromI32(1000000)), 18);
- } else if (poolAddress == BEAN_LUSD_V1.toHexString()) {
- // price in LUSD
- let priceInLusd = toDecimal(lpContract.get_dy(ZERO_BI, BigInt.fromI32(1), BigInt.fromI32(1000000)), 18);
- log.info("LiquidityChange: Bean LUSD price: {}", [priceInLusd.toString()]);
-
- let lusdContract = Bean3CRV.bind(LUSD_3POOL);
- log.info("LiquidityChange: LUSD Crv price {}", [
- toDecimal(lusdContract.get_dy(ZERO_BI, BigInt.fromI32(1), BigInt.fromString("1000000000000000000")), 18).toString()
- ]);
-
- lusd3crvPrice = toDecimal(lusdContract.get_dy(ZERO_BI, BigInt.fromI32(1), BigInt.fromString("1000000000000000000")), 18);
- beanCrvPrice = priceInLusd.times(lusd3crvPrice);
- }
-
- log.info("LiquidityChange: Bean Crv price: {}", [beanCrvPrice.toString()]);
- let newPrice = metapoolPrice.times(beanCrvPrice);
-
- log.info("LiquidityChange: Bean USD price: {}", [newPrice.toString()]);
-
- let bean = loadBean(BEAN_ERC20_V1.toHexString());
- let oldBeanPrice = bean.price;
+ let priceAndLp = curvePriceAndLp(Address.fromString(poolAddress));
+ let newPoolPrice = priceAndLp[0];
+ let lpValue = priceAndLp[1];
let beanContract = ERC20.bind(BEAN_ERC20_V1);
- let crv3PoolContract = ERC20.bind(CRV3_POOL_V1);
- let lusdContract = ERC20.bind(LUSD_3POOL);
-
let beanHolding = toDecimal(beanContract.balanceOf(Address.fromString(poolAddress)));
- let crvHolding = toDecimal(crv3PoolContract.balanceOf(Address.fromString(poolAddress)), 18);
- let lusdHolding = toDecimal(lusdContract.balanceOf(Address.fromString(poolAddress)), 18);
-
- let beanValue = beanHolding.times(newPrice);
- let crvValue = crvHolding.times(metapoolPrice);
- let lusdValue = lusdHolding.times(lusd3crvPrice).times(metapoolPrice);
-
- let deltaB = BigInt.fromString(
- crvValue.plus(lusdValue).minus(beanHolding).times(BigDecimal.fromString("1000000")).truncate(0).toString()
- );
-
- let liquidityUSD = beanValue.plus(crvValue).plus(lusdValue);
+ let beanValue = beanHolding.times(newPoolPrice);
+ let liquidityUSD = beanValue.plus(lpValue);
let deltaLiquidityUSD = liquidityUSD.minus(pool.liquidityUSD);
let volumeUSD =
deltaLiquidityUSD < ZERO_BD
? deltaLiquidityUSD.div(BigDecimal.fromString("2")).times(BigDecimal.fromString("-1"))
: deltaLiquidityUSD.div(BigDecimal.fromString("2"));
- let volumeBean = BigInt.fromString(volumeUSD.div(newPrice).times(BigDecimal.fromString("1000000")).truncate(0).toString());
+ let volumeBean = BigInt.fromString(volumeUSD.div(newPoolPrice).times(BigDecimal.fromString("1000000")).truncate(0).toString());
if (token0Amount !== ZERO_BI && token1Amount !== ZERO_BI) {
volumeUSD = ZERO_BD;
@@ -175,14 +132,18 @@ function handleLiquidityChange(
}
let reserveBalances = lpContract.try_get_balances();
- if (!reserveBalances.reverted) setPoolReserves(poolAddress, reserveBalances.value, blockNumber);
+ if (!reserveBalances.reverted) {
+ setPoolReserves(poolAddress, reserveBalances.value, timestamp, blockNumber);
+ if (poolAddress == BEAN_LUSD_V1.toHexString()) {
+ manualTwa(poolAddress, reserveBalances.value, timestamp);
+ }
+ }
updateBeanSupplyPegPercent(blockNumber);
- updateBeanValues(BEAN_ERC20_V1.toHexString(), timestamp, newPrice, ZERO_BI, volumeBean, volumeUSD, deltaLiquidityUSD);
- updatePoolValues(poolAddress, timestamp, blockNumber, volumeBean, volumeUSD, deltaLiquidityUSD, deltaB);
- updatePoolPrice(poolAddress, timestamp, blockNumber, newPrice);
- checkBeanCross(BEAN_ERC20_V1.toHexString(), timestamp, blockNumber, oldBeanPrice, newPrice);
+ let deltaB = curveDeltaBUsingVPrice(Address.fromString(poolAddress), reserveBalances.value[0]);
+
+ updatePricesAndCheckCrosses(poolAddress, newPoolPrice, volumeBean, volumeUSD, deltaLiquidityUSD, deltaB, timestamp, blockNumber);
}
function handleSwap(
@@ -196,57 +157,17 @@ function handleSwap(
): void {
let pool = loadOrCreatePool(poolAddress, blockNumber);
- // Get Curve Price Details
- let curveCalc = CalculationsCurve.bind(CALCULATIONS_CURVE);
- let metapoolPrice = toDecimal(curveCalc.getCurvePriceUsdc(CRV3_POOL_V1));
-
let lpContract = Bean3CRV.bind(Address.fromString(poolAddress));
- let beanCrvPrice = ZERO_BD;
- let lusd3crvPrice = ZERO_BD;
-
- if (poolAddress == BEAN_3CRV_V1.toHexString()) {
- beanCrvPrice = toDecimal(lpContract.get_dy(ZERO_BI, BigInt.fromI32(1), BigInt.fromI32(1000000)), 18);
- } else if (poolAddress == BEAN_LUSD_V1.toHexString()) {
- // price in LUSD
- let priceInLusd = toDecimal(lpContract.get_dy(ZERO_BI, BigInt.fromI32(1), BigInt.fromI32(1000000)), 18);
- log.info("LiquidityChange: Bean LUSD price: {}", [priceInLusd.toString()]);
-
- let lusdContract = Bean3CRV.bind(LUSD_3POOL);
- log.info("LiquidityChange: LUSD Crv price {}", [
- toDecimal(lusdContract.get_dy(ZERO_BI, BigInt.fromI32(1), BigInt.fromString("1000000000000000000")), 18).toString()
- ]);
-
- lusd3crvPrice = toDecimal(lusdContract.get_dy(ZERO_BI, BigInt.fromI32(1), BigInt.fromString("1000000000000000000")), 18);
- beanCrvPrice = priceInLusd.times(lusd3crvPrice);
- }
-
- log.info("LiquidityChange: Bean Crv price: {}", [beanCrvPrice.toString()]);
- let newPrice = metapoolPrice.times(beanCrvPrice);
-
- log.info("LiquidityChange: Bean USD price: {}", [newPrice.toString()]);
-
- let bean = loadBean(BEAN_ERC20_V1.toHexString());
- let oldBeanPrice = bean.price;
+ let priceAndLp = curvePriceAndLp(Address.fromString(poolAddress));
+ let newPoolPrice = priceAndLp[0];
+ let lpValue = priceAndLp[1];
let beanContract = ERC20.bind(BEAN_ERC20_V1);
- let crv3PoolContract = ERC20.bind(CRV3_POOL_V1);
- let lusdContract = ERC20.bind(LUSD_3POOL);
-
let beanHolding = toDecimal(beanContract.balanceOf(Address.fromString(poolAddress)));
- let crvHolding = toDecimal(crv3PoolContract.balanceOf(Address.fromString(poolAddress)), 18);
- let lusdHolding = toDecimal(lusdContract.balanceOf(Address.fromString(poolAddress)), 18);
-
- let beanValue = beanHolding.times(newPrice);
- let crvValue = crvHolding.times(metapoolPrice);
- let lusdValue = lusdHolding.times(lusd3crvPrice).times(metapoolPrice);
-
- let deltaB = BigInt.fromString(
- crvValue.plus(lusdValue).minus(beanHolding).times(BigDecimal.fromString("1000000")).truncate(0).toString()
- );
-
- let liquidityUSD = beanValue.plus(crvValue);
+ let beanValue = beanHolding.times(newPoolPrice);
+ let liquidityUSD = beanValue.plus(lpValue);
let deltaLiquidityUSD = liquidityUSD.minus(pool.liquidityUSD);
let volumeBean = ZERO_BI;
@@ -257,13 +178,41 @@ function handleSwap(
}
let reserveBalances = lpContract.try_get_balances();
- if (!reserveBalances.reverted) setPoolReserves(poolAddress, reserveBalances.value, blockNumber);
+ if (!reserveBalances.reverted) {
+ setPoolReserves(poolAddress, reserveBalances.value, timestamp, blockNumber);
+ if (poolAddress == BEAN_LUSD_V1.toHexString()) {
+ manualTwa(poolAddress, reserveBalances.value, timestamp);
+ }
+ }
+
+ let deltaB = curveDeltaBUsingVPrice(Address.fromString(poolAddress), reserveBalances.value[0]);
updateBeanSupplyPegPercent(blockNumber);
- let volumeUSD = toDecimal(volumeBean).times(newPrice);
- updateBeanValues(BEAN_ERC20_V1.toHexString(), timestamp, newPrice, ZERO_BI, volumeBean, volumeUSD, deltaLiquidityUSD);
+ let volumeUSD = toDecimal(volumeBean).times(newPoolPrice);
+
+ updatePricesAndCheckCrosses(poolAddress, newPoolPrice, volumeBean, volumeUSD, deltaLiquidityUSD, deltaB, timestamp, blockNumber);
+}
+
+export function updatePricesAndCheckCrosses(
+ poolAddress: string,
+ newPoolPrice: BigDecimal,
+ volumeBean: BigInt,
+ volumeUSD: BigDecimal,
+ deltaLiquidityUSD: BigDecimal,
+ deltaB: BigInt,
+ timestamp: BigInt,
+ blockNumber: BigInt
+): void {
updatePoolValues(poolAddress, timestamp, blockNumber, volumeBean, volumeUSD, deltaLiquidityUSD, deltaB);
- updatePoolPrice(poolAddress, timestamp, blockNumber, newPrice);
- checkBeanCross(BEAN_ERC20_V1.toHexString(), timestamp, blockNumber, oldBeanPrice, newPrice);
+ updatePoolPrice(poolAddress, timestamp, blockNumber, newPoolPrice);
+
+ // Update volatile pools (in practice, for pre-replant its beaneth only)
+ univ2_externalUpdatePoolPrice(BEAN_WETH_V1, timestamp, blockNumber);
+
+ // Check for bean peg cross
+ let oldBeanPrice = getLastBeanPrice(BEAN_ERC20_V1.toHexString());
+ const newBeanPrice = calcLiquidityWeightedBeanPrice(BEAN_ERC20_V1.toHexString());
+ updateBeanValues(BEAN_ERC20_V1.toHexString(), timestamp, newBeanPrice, ZERO_BI, volumeBean, volumeUSD, deltaLiquidityUSD);
+ checkBeanCross(BEAN_ERC20_V1.toHexString(), timestamp, blockNumber, oldBeanPrice, newBeanPrice);
}
diff --git a/projects/subgraph-bean/src/BeanHandler.ts b/projects/subgraph-bean/src/BeanHandler.ts
index 9ac26f8742..3f46f0fe39 100644
--- a/projects/subgraph-bean/src/BeanHandler.ts
+++ b/projects/subgraph-bean/src/BeanHandler.ts
@@ -1,6 +1,6 @@
-import { Transfer } from "../generated/Bean/Bean";
+import { Transfer } from "../generated/Bean/ERC20";
import { loadBean, updateBeanSupplyPegPercent } from "./utils/Bean";
-import { ADDRESS_ZERO } from "../../subgraph-core/utils/Constants";
+import { ADDRESS_ZERO, BEAN_ERC20_V1 } from "../../subgraph-core/utils/Constants";
export function handleTransfer(event: Transfer): void {
if (event.params.from == ADDRESS_ZERO || event.params.to == ADDRESS_ZERO) {
@@ -15,6 +15,8 @@ export function handleTransfer(event: Transfer): void {
}
bean.save();
- updateBeanSupplyPegPercent(event.block.number);
+ if (event.address != BEAN_ERC20_V1) {
+ updateBeanSupplyPegPercent(event.block.number);
+ }
}
}
diff --git a/projects/subgraph-bean/src/BeanWellHandler.ts b/projects/subgraph-bean/src/BeanWellHandler.ts
index 4658b50a61..e09be16f99 100644
--- a/projects/subgraph-bean/src/BeanWellHandler.ts
+++ b/projects/subgraph-bean/src/BeanWellHandler.ts
@@ -1,11 +1,10 @@
import { Address, BigDecimal, BigInt } from "@graphprotocol/graph-ts";
-import { BEANSTALK_PRICE, BEAN_ERC20 } from "../../subgraph-core/utils/Constants";
+import { BEAN_ERC20 } from "../../subgraph-core/utils/Constants";
import { ZERO_BD, ZERO_BI, deltaBigIntArray, toDecimal } from "../../subgraph-core/utils/Decimals";
-import { BeanstalkPrice } from "../generated/BeanWETHCP2w/BeanstalkPrice";
import { AddLiquidity, RemoveLiquidity, RemoveLiquidityOneToken, Shift, Swap, Sync } from "../generated/BeanWETHCP2w/Well";
-import { loadBean, updateBeanSupplyPegPercent, updateBeanValues } from "./utils/Bean";
+import { updateBeanAfterPoolSwap } from "./utils/Bean";
import { getPoolLiquidityUSD, loadOrCreatePool, setPoolReserves, updatePoolPrice, updatePoolValues } from "./utils/Pool";
-import { checkBeanCross } from "./utils/Cross";
+import { BeanstalkPrice_try_price, getPoolPrice } from "./utils/price/BeanstalkPrice";
export function handleAddLiquidity(event: AddLiquidity): void {
handleLiquidityChange(
@@ -83,30 +82,25 @@ function handleLiquidityChange(
removal: boolean
): void {
// Get Price Details via Price contract
- let beanstalkPrice = BeanstalkPrice.bind(BEANSTALK_PRICE);
- let wellPrice = beanstalkPrice.try_getConstantProductWell(Address.fromString(poolAddress));
- let beanPrice = beanstalkPrice.try_price();
-
- if (wellPrice.reverted || beanPrice.reverted) {
+ let beanPrice = BeanstalkPrice_try_price(BEAN_ERC20, blockNumber);
+ if (beanPrice.reverted) {
return;
}
-
- let bean = loadBean(BEAN_ERC20.toHexString());
- let oldBeanPrice = bean.price;
+ let wellPrice = getPoolPrice(beanPrice, Address.fromString(poolAddress))!;
let startingLiquidity = getPoolLiquidityUSD(poolAddress, blockNumber);
- let newPrice = toDecimal(wellPrice.value.price);
- let deltaLiquidityUSD = toDecimal(wellPrice.value.liquidity).minus(startingLiquidity);
+ let newPrice = toDecimal(wellPrice.price);
+ let deltaLiquidityUSD = toDecimal(wellPrice.liquidity).minus(startingLiquidity);
let volumeUSD = ZERO_BD;
let volumeBean = ZERO_BI;
if ((token0Amount == ZERO_BI || token1Amount == ZERO_BI) && removal) {
if (token0Amount != ZERO_BI) {
volumeBean = token0Amount.div(BigInt.fromI32(2));
- volumeUSD = toDecimal(token0Amount).times(toDecimal(wellPrice.value.price));
+ volumeUSD = toDecimal(token0Amount).times(toDecimal(wellPrice.price));
} else {
- let wellPairInBean = toDecimal(wellPrice.value.balances[0]).div(toDecimal(wellPrice.value.balances[1], 18));
+ let wellPairInBean = toDecimal(wellPrice.balances[0]).div(toDecimal(wellPrice.balances[1], 18));
volumeBean = BigInt.fromString(
toDecimal(token1Amount, 18)
.times(wellPairInBean)
@@ -115,26 +109,24 @@ function handleLiquidityChange(
.truncate(0)
.toString()
);
- volumeUSD = toDecimal(volumeBean).times(toDecimal(wellPrice.value.price));
+ volumeUSD = toDecimal(volumeBean).times(toDecimal(wellPrice.price));
}
}
- setPoolReserves(poolAddress, wellPrice.value.balances, blockNumber);
- updateBeanSupplyPegPercent(blockNumber);
+ setPoolReserves(poolAddress, wellPrice.balances, timestamp, blockNumber);
+ updatePoolValues(poolAddress, timestamp, blockNumber, volumeBean, volumeUSD, deltaLiquidityUSD, wellPrice.deltaB);
+ updatePoolPrice(poolAddress, timestamp, blockNumber, newPrice);
- updateBeanValues(
- BEAN_ERC20.toHexString(),
- timestamp,
- toDecimal(beanPrice.value.price),
- ZERO_BI,
+ updateBeanAfterPoolSwap(
+ poolAddress,
+ toDecimal(wellPrice.price),
volumeBean,
volumeUSD,
- deltaLiquidityUSD
+ deltaLiquidityUSD,
+ timestamp,
+ blockNumber,
+ beanPrice
);
-
- updatePoolValues(poolAddress, timestamp, blockNumber, volumeBean, volumeUSD, deltaLiquidityUSD, wellPrice.value.deltaB);
- updatePoolPrice(poolAddress, timestamp, blockNumber, newPrice);
- checkBeanCross(BEAN_ERC20.toHexString(), timestamp, blockNumber, oldBeanPrice, toDecimal(beanPrice.value.price));
}
function handleSwapEvent(
@@ -146,39 +138,32 @@ function handleSwapEvent(
blockNumber: BigInt
): void {
// Get Price Details via Price contract
- let beanstalkPrice = BeanstalkPrice.bind(BEANSTALK_PRICE);
- let wellPrice = beanstalkPrice.try_getConstantProductWell(Address.fromString(poolAddress));
- let beanPrice = beanstalkPrice.try_price();
-
- if (wellPrice.reverted || beanPrice.reverted) {
+ let beanPrice = BeanstalkPrice_try_price(BEAN_ERC20, blockNumber);
+ if (beanPrice.reverted) {
return;
}
-
- let bean = loadBean(BEAN_ERC20.toHexString());
- let oldBeanPrice = bean.price;
+ let wellPrice = getPoolPrice(beanPrice, Address.fromString(poolAddress))!;
let startingLiquidity = getPoolLiquidityUSD(poolAddress, blockNumber);
- let newPrice = toDecimal(wellPrice.value.price);
+ let newPrice = toDecimal(wellPrice.price);
let volumeBean = toToken == BEAN_ERC20 ? amountOut : amountIn;
let volumeUSD = toDecimal(volumeBean).times(newPrice);
- let deltaLiquidityUSD = toDecimal(wellPrice.value.liquidity).minus(startingLiquidity);
+ let deltaLiquidityUSD = toDecimal(wellPrice.liquidity).minus(startingLiquidity);
- setPoolReserves(poolAddress, wellPrice.value.balances, blockNumber);
- updateBeanSupplyPegPercent(blockNumber);
+ setPoolReserves(poolAddress, wellPrice.balances, timestamp, blockNumber);
+ updatePoolValues(poolAddress, timestamp, blockNumber, volumeBean, volumeUSD, deltaLiquidityUSD, wellPrice.deltaB);
+ updatePoolPrice(poolAddress, timestamp, blockNumber, newPrice);
- updateBeanValues(
- BEAN_ERC20.toHexString(),
- timestamp,
- toDecimal(beanPrice.value.price),
- ZERO_BI,
+ updateBeanAfterPoolSwap(
+ poolAddress,
+ toDecimal(wellPrice.price),
volumeBean,
volumeUSD,
- deltaLiquidityUSD
+ deltaLiquidityUSD,
+ timestamp,
+ blockNumber,
+ beanPrice
);
-
- updatePoolValues(poolAddress, timestamp, blockNumber, volumeBean, volumeUSD, deltaLiquidityUSD, wellPrice.value.deltaB);
- updatePoolPrice(poolAddress, timestamp, blockNumber, newPrice);
- checkBeanCross(BEAN_ERC20.toHexString(), timestamp, blockNumber, oldBeanPrice, toDecimal(beanPrice.value.price));
}
diff --git a/projects/subgraph-bean/src/BeanstalkHandler.ts b/projects/subgraph-bean/src/BeanstalkHandler.ts
index b01e3ece45..2bcb75863a 100644
--- a/projects/subgraph-bean/src/BeanstalkHandler.ts
+++ b/projects/subgraph-bean/src/BeanstalkHandler.ts
@@ -1,12 +1,27 @@
-import { BigInt } from "@graphprotocol/graph-ts";
-import { Sunrise } from "../generated/Beanstalk/Beanstalk";
-import { getBeanTokenAddress, loadBean, updateBeanSeason, updateBeanValues } from "./utils/Bean";
+import { Address, BigInt } from "@graphprotocol/graph-ts";
+import { Chop, DewhitelistToken, Reward, Sunrise } from "../generated/Beanstalk/Beanstalk";
+import { getBeanTokenAddress, loadBean, updateBeanSeason, updateBeanSupplyPegPercent, updateBeanTwa, updateBeanValues } from "./utils/Bean";
import { loadOrCreatePool, updatePoolPrice, updatePoolSeason, updatePoolValues } from "./utils/Pool";
import { BeanstalkPrice } from "../generated/Beanstalk/BeanstalkPrice";
-import { BEANSTALK_PRICE, BEAN_3CRV, BEAN_ERC20, BEAN_WETH_CP2_WELL, CURVE_PRICE } from "../../subgraph-core/utils/Constants";
+import {
+ BEANSTALK_PRICE,
+ BEAN_3CRV,
+ BEAN_ERC20,
+ BEAN_ERC20_V1,
+ BEAN_WETH_CP2_WELL,
+ BEAN_WETH_V1,
+ CURVE_PRICE
+} from "../../subgraph-core/utils/Constants";
import { ZERO_BD, ZERO_BI, toDecimal } from "../../subgraph-core/utils/Decimals";
import { CurvePrice } from "../generated/Beanstalk/CurvePrice";
import { checkBeanCross } from "./utils/Cross";
+import { calcUniswapV2Inst, setUniswapV2Twa } from "./utils/price/UniswapPrice";
+import { calcCurveInst, setCurveTwa } from "./utils/price/CurvePrice";
+import { MetapoolOracle, WellOracle } from "../generated/TWAPOracles/BIP37";
+import { DeltaBPriceLiquidity } from "./utils/price/Types";
+import { setRawWellReserves, setTwaLast } from "./utils/price/TwaOracle";
+import { decodeCumulativeWellReserves, setWellTwa } from "./utils/price/WellPrice";
+import { beanstalkPrice_updatePoolPrices } from "./BlockHandler";
export function handleSunrise(event: Sunrise): void {
// Update the season for hourly and daily liquidity metrics
@@ -17,57 +32,21 @@ export function handleSunrise(event: Sunrise): void {
let bean = loadBean(beanToken);
let oldBeanPrice = bean.price;
- let oldBeanLiquidity = bean.liquidityUSD;
for (let i = 0; i < bean.pools.length; i++) {
updatePoolSeason(bean.pools[i], event.block.timestamp, event.block.number, event.params.season.toI32());
}
- // Fetch price from price contract to capture any 3CRV movements against peg.
+ for (let i = 0; i < bean.dewhitelistedPools.length; i++) {
+ updatePoolSeason(bean.dewhitelistedPools[i], event.block.timestamp, event.block.number, event.params.season.toI32());
+ }
+
+ // Fetch price from price contract to capture any non-bean token price movevements
if (event.params.season > BigInt.fromI32(6074)) {
// Attempt to pull from Beanstalk Price contract first for the overall Bean price update
- let beanstalkPrice = BeanstalkPrice.bind(BEANSTALK_PRICE);
- let beanstalkQuery = beanstalkPrice.try_price();
-
- if (!beanstalkQuery.reverted) {
- // We can use the Beanstalk Price contract to update overall price, and call the updates for Curve and Well price updates
- // We also know that the additional calls should not revert at this point
- let beanCurve = loadOrCreatePool(BEAN_3CRV.toHexString(), event.block.number);
- let beanWell = loadOrCreatePool(BEAN_WETH_CP2_WELL.toHexString(), event.block.number);
-
- let deltaBeanLiquidity = toDecimal(beanstalkQuery.value.liquidity).minus(oldBeanLiquidity);
-
- let beanPrice = toDecimal(beanstalkQuery.value.price);
- // Overall Bean update
- updateBeanValues(BEAN_ERC20.toHexString(), event.block.timestamp, beanPrice, ZERO_BI, ZERO_BI, ZERO_BD, deltaBeanLiquidity);
+ // Update the current price regardless of a peg cross
+ let updatedPrices = beanstalkPrice_updatePoolPrices(false, event.block);
- // Curve pool update
- let curvePrice = beanstalkPrice.getCurve();
- updatePoolValues(
- BEAN_3CRV.toHexString(),
- event.block.timestamp,
- event.block.number,
- ZERO_BI,
- ZERO_BD,
- toDecimal(curvePrice.liquidity).minus(beanCurve.liquidityUSD),
- curvePrice.deltaB
- );
- updatePoolPrice(BEAN_3CRV.toHexString(), event.block.timestamp, event.block.number, toDecimal(curvePrice.price));
-
- // Well pool update
- let wellPrice = beanstalkPrice.getConstantProductWell(BEAN_WETH_CP2_WELL);
- updatePoolValues(
- BEAN_WETH_CP2_WELL.toHexString(),
- event.block.timestamp,
- event.block.number,
- ZERO_BI,
- ZERO_BD,
- toDecimal(wellPrice.liquidity).minus(beanWell.liquidityUSD),
- wellPrice.deltaB
- );
- updatePoolPrice(BEAN_WETH_CP2_WELL.toHexString(), event.block.timestamp, event.block.number, toDecimal(wellPrice.price));
-
- checkBeanCross(BEAN_ERC20.toHexString(), event.block.timestamp, event.block.number, oldBeanPrice, beanPrice);
- } else {
+ if (!updatedPrices) {
// Pre Basin deployment - Use original Curve price contract to update on each season.
let curvePrice = CurvePrice.bind(CURVE_PRICE);
let curve = curvePrice.try_getCurve();
@@ -88,5 +67,92 @@ export function handleSunrise(event: Sunrise): void {
checkBeanCross(BEAN_ERC20.toHexString(), event.block.timestamp, event.block.number, oldBeanPrice, toDecimal(curve.value.price));
}
}
+ } else {
+ // Pre-Replant
+ let bean = loadBean(BEAN_ERC20_V1.toHexString());
+ let weightedPrice = ZERO_BD;
+ let totalLiquidity = ZERO_BD;
+ for (let i = 0; i < bean.pools.length; i++) {
+ const pool = loadOrCreatePool(bean.pools[i], event.block.number);
+ let inst: DeltaBPriceLiquidity;
+ if (bean.pools[i] == BEAN_WETH_V1.toHexString()) {
+ inst = calcUniswapV2Inst(pool);
+ setUniswapV2Twa(bean.pools[i], event.block.timestamp, event.block.number);
+ } else {
+ inst = calcCurveInst(pool);
+ setCurveTwa(bean.pools[i], event.block.timestamp, event.block.number);
+ }
+
+ // Update price, liquidity, and deltaB in the pool
+ updatePoolValues(
+ bean.pools[i],
+ event.block.timestamp,
+ event.block.number,
+ ZERO_BI,
+ ZERO_BD,
+ inst.liquidity.minus(pool.liquidityUSD),
+ inst.deltaB
+ );
+ updatePoolPrice(bean.pools[i], event.block.timestamp, event.block.number, inst.price);
+
+ weightedPrice = weightedPrice.plus(inst.price.times(inst.liquidity));
+ totalLiquidity = totalLiquidity.plus(inst.liquidity);
+ }
+
+ const totalPrice = weightedPrice.div(totalLiquidity);
+ updateBeanValues(
+ BEAN_ERC20_V1.toHexString(),
+ event.block.timestamp,
+ totalPrice,
+ ZERO_BI,
+ ZERO_BI,
+ ZERO_BD,
+ totalLiquidity.minus(bean.liquidityUSD)
+ );
+ checkBeanCross(BEAN_ERC20_V1.toHexString(), event.block.timestamp, event.block.number, bean.price, totalPrice);
+ updateBeanTwa(event.block.timestamp, event.block.number);
+ }
+}
+
+// Assumption is that the whitelisted token corresponds to a pool lp. If not, this method will simply do nothing.
+export function handleDewhitelistToken(event: DewhitelistToken): void {
+ let bean = loadBean(getBeanTokenAddress(event.block.number));
+ let index = bean.pools.indexOf(event.params.token.toHexString());
+ if (index >= 0) {
+ const newPools = bean.pools;
+ const newDewhitelistedPools = bean.dewhitelistedPools;
+ newDewhitelistedPools.push(newPools.splice(index, 1)[0]);
+ bean.pools = newPools;
+ bean.dewhitelistedPools = newDewhitelistedPools;
+ bean.save();
}
}
+
+// POST REPLANT TWA DELTAB //
+
+export function handleMetapoolOracle(event: MetapoolOracle): void {
+ setTwaLast(BEAN_3CRV.toHexString(), event.params.balances, event.block.timestamp);
+ setCurveTwa(BEAN_3CRV.toHexString(), event.block.timestamp, event.block.number);
+ updateBeanTwa(event.block.timestamp, event.block.number);
+}
+
+export function handleWellOracle(event: WellOracle): void {
+ setRawWellReserves(event);
+ setTwaLast(event.params.well.toHexString(), decodeCumulativeWellReserves(event.params.cumulativeReserves), event.block.timestamp);
+ setWellTwa(event.params.well.toHexString(), event.params.deltaB, event.block.timestamp, event.block.number);
+ updateBeanTwa(event.block.timestamp, event.block.number);
+}
+
+// LOCKED BEANS //
+
+// Locked beans are a function of the number of unripe assets, and the chop rate.
+// In addition to during a swap, it should be updated according to chops, bean mints, and fertilizer purchases.
+// The result of fertilizer purchases will be included by the AddLiquidity event
+
+export function handleChop(event: Chop): void {
+ updateBeanSupplyPegPercent(event.block.number);
+}
+
+export function handleRewardMint(event: Reward): void {
+ updateBeanSupplyPegPercent(event.block.number);
+}
diff --git a/projects/subgraph-bean/src/BlockHandler.ts b/projects/subgraph-bean/src/BlockHandler.ts
new file mode 100644
index 0000000000..308febd162
--- /dev/null
+++ b/projects/subgraph-bean/src/BlockHandler.ts
@@ -0,0 +1,88 @@
+import { ethereum } from "@graphprotocol/graph-ts";
+import { BEAN_ERC20, BEAN_WETH_CP2_WELL_BLOCK, BEANSTALK_PRICE, EXPLOIT_BLOCK } from "../../subgraph-core/utils/Constants";
+import { checkPegCrossEth as univ2_checkPegCrossEth } from "./UniswapV2Handler";
+import { loadBean, updateBeanValues } from "./utils/Bean";
+import { toDecimal, ZERO_BD, ZERO_BI } from "../../subgraph-core/utils/Decimals";
+import { checkBeanCross, checkPoolCross } from "./utils/Cross";
+import { loadOrCreatePool, updatePoolPrice, updatePoolValues } from "./utils/Pool";
+import { BeanstalkPrice_try_price } from "./utils/price/BeanstalkPrice";
+import { PEG_CROSS_BLOCKS, PEG_CROSS_BLOCKS_LAST } from "./result_cache/PegCrossBlocks";
+import { u32_binarySearchIndex } from "../../subgraph-core/utils/Math";
+
+// Processing as each new ethereum block is created
+export function handleBlock(block: ethereum.Block): void {
+ // Avoid checking for peg crosses on blocks which are already known to not have any cross.
+ // The underlying methods do not write any data unless there is a cross
+ if (block.number.toU32() > PEG_CROSS_BLOCKS_LAST || u32_binarySearchIndex(PEG_CROSS_BLOCKS, block.number.toU32()) != -1) {
+ if (block.number < EXPLOIT_BLOCK) {
+ univ2_checkPegCrossEth(block);
+ } else if (block.number >= BEAN_WETH_CP2_WELL_BLOCK) {
+ beanstalkPrice_updatePoolPrices(true, block);
+ }
+ }
+}
+
+/**
+ * Using the BeanstalkPrice contract, updates pool prices and checks for peg crosses
+ * @param priceOnlyOnCross - true if the pool price should only be updated on a peg cross
+ * @param block
+ * @returns false if the price contract reverted
+ */
+export function beanstalkPrice_updatePoolPrices(priceOnlyOnCross: boolean, block: ethereum.Block): boolean {
+ const priceResult = BeanstalkPrice_try_price(BEAN_ERC20, block.number);
+ if (priceResult.reverted) {
+ // Price contract was unavailable briefly after well deployment
+ return false;
+ }
+ const bean = loadBean(BEAN_ERC20.toHexString());
+ const prevPrice = bean.price;
+ const newPrice = toDecimal(priceResult.value.price);
+
+ // log.debug("Prev/New bean price {} / {}", [prevPrice.toString(), newPrice.toString()]);
+
+ // Check for overall peg cross
+ const beanCrossed = checkBeanCross(BEAN_ERC20.toHexString(), block.timestamp, block.number, prevPrice, newPrice);
+
+ // Update pool price for each pool - necessary for checking pool cross
+ let totalLiquidity = ZERO_BD;
+ for (let i = 0; i < priceResult.value.ps.length; ++i) {
+ const poolPriceInfo = priceResult.value.ps[i];
+ const pool = loadOrCreatePool(poolPriceInfo.pool.toHexString(), block.number);
+
+ const poolCrossed = checkPoolCross(
+ poolPriceInfo.pool.toHexString(),
+ block.timestamp,
+ block.number,
+ pool.lastPrice,
+ toDecimal(poolPriceInfo.price)
+ );
+
+ if (!priceOnlyOnCross || poolCrossed || beanCrossed) {
+ totalLiquidity = totalLiquidity.plus(toDecimal(poolPriceInfo.liquidity));
+ updatePoolValues(
+ poolPriceInfo.pool.toHexString(),
+ block.timestamp,
+ block.number,
+ ZERO_BI,
+ ZERO_BD,
+ toDecimal(poolPriceInfo.liquidity).minus(pool.liquidityUSD),
+ poolPriceInfo.deltaB
+ );
+ updatePoolPrice(poolPriceInfo.pool.toHexString(), block.timestamp, block.number, toDecimal(poolPriceInfo.price), false);
+ }
+ }
+
+ // Update bean values at the end now that the summation of pool liquidity is known
+ if (!priceOnlyOnCross || beanCrossed) {
+ updateBeanValues(
+ BEAN_ERC20.toHexString(),
+ block.timestamp,
+ newPrice,
+ ZERO_BI,
+ ZERO_BI,
+ ZERO_BD,
+ totalLiquidity.minus(bean.liquidityUSD)
+ );
+ }
+ return true;
+}
diff --git a/projects/subgraph-bean/src/UniswapV2Handler.ts b/projects/subgraph-bean/src/UniswapV2Handler.ts
index f0779aac63..743670d283 100644
--- a/projects/subgraph-bean/src/UniswapV2Handler.ts
+++ b/projects/subgraph-bean/src/UniswapV2Handler.ts
@@ -1,11 +1,12 @@
-import { BigDecimal, BigInt } from "@graphprotocol/graph-ts";
-import { Swap, Sync, UniswapV2Pair } from "../generated/BeanUniswapV2Pair/UniswapV2Pair";
-import { loadBean, updateBeanSupplyPegPercent, updateBeanValues } from "./utils/Bean";
-import { BEAN_ERC20_V1, WETH, WETH_USDC_PAIR } from "../../subgraph-core/utils/Constants";
-import { toBigInt, toDecimal, ZERO_BD, ZERO_BI } from "../../subgraph-core/utils/Decimals";
-import { loadOrCreatePool, setPoolReserves, updatePoolPrice, updatePoolReserves, updatePoolValues } from "./utils/Pool";
-import { loadOrCreateToken } from "./utils/Token";
-import { checkBeanCross } from "./utils/Cross";
+import { BigDecimal, BigInt, ethereum, Address, log } from "@graphprotocol/graph-ts";
+import { Swap, Sync } from "../generated/BeanUniswapV2Pair/UniswapV2Pair";
+import { getLastBeanPrice, calcLiquidityWeightedBeanPrice, loadBean, updateBeanSupplyPegPercent, updateBeanValues } from "./utils/Bean";
+import { BEAN_ERC20_V1, BEAN_WETH_V1, WETH } from "../../subgraph-core/utils/Constants";
+import { toDecimal, ZERO_BD, ZERO_BI } from "../../subgraph-core/utils/Decimals";
+import { loadOrCreatePool, setPoolReserves, updatePoolPrice, updatePoolValues } from "./utils/Pool";
+import { loadOrCreateToken, updateTokenPrice } from "./utils/Token";
+import { checkBeanCross, checkPoolCross } from "./utils/Cross";
+import { getPreReplantPriceETH, updatePreReplantPriceETH, calcUniswapV2Inst_2 } from "./utils/price/UniswapPrice";
// export function handleMint(event: Mint): void {
// updatePoolReserves(event.address.toHexString(), event.params.amount0, event.params.amount1, event.block.number);
@@ -24,19 +25,16 @@ import { checkBeanCross } from "./utils/Cross";
// updateBeanSupplyPegPercent(event.block.number);
// }
-// Liquidity and cross checks happen on the Sync event handler
+// Reserves/price already updated by Sync event. Sync event is always emitted prior to a swap.
+// Just update the volume for usd/bean
export function handleSwap(event: Swap): void {
// Do not index post-exploit data
if (event.block.number >= BigInt.fromI32(14602790)) return;
let weth = loadOrCreateToken(WETH.toHexString());
-
- let pool = loadOrCreatePool(event.address.toHexString(), event.block.number);
-
let usdVolume = toDecimal(event.params.amount0In.plus(event.params.amount0Out), 18).times(weth.lastPriceUSD);
- // Token 0 is WETH and Token 1 is BEAN
-
+ let pool = loadOrCreatePool(event.address.toHexString(), event.block.number);
updatePoolValues(
event.address.toHexString(),
event.block.timestamp,
@@ -47,16 +45,7 @@ export function handleSwap(event: Swap): void {
pool.deltaBeans
);
- updatePoolReserves(
- event.address.toHexString(),
- event.params.amount0In.minus(event.params.amount0Out),
- event.params.amount1In.minus(event.params.amount1Out),
- event.block.number
- );
-
- updateBeanSupplyPegPercent(event.block.number);
-
- updateBeanValues(BEAN_ERC20_V1.toHexString(), event.block.timestamp, pool.lastPrice, ZERO_BI, ZERO_BI, usdVolume, ZERO_BD);
+ updateBeanValues(BEAN_ERC20_V1.toHexString(), event.block.timestamp, null, ZERO_BI, ZERO_BI, usdVolume, ZERO_BD);
}
// Sync is called in UniswapV2 on any liquidity or swap transaction.
@@ -66,55 +55,92 @@ export function handleSync(event: Sync): void {
// Do not index post-exploit data
if (event.block.number >= BigInt.fromI32(14602790)) return;
- let bean = loadBean(BEAN_ERC20_V1.toHexString());
- let oldBeanPrice = bean.price;
-
- let pair = UniswapV2Pair.bind(event.address);
-
- let reserves = pair.try_getReserves();
- if (reserves.reverted) {
- return;
- }
+ const oldBeanPrice = getLastBeanPrice(BEAN_ERC20_V1.toHexString());
// Token 0 is WETH and Token 1 is BEAN
+ let reserves = [event.params.reserve0, event.params.reserve1];
- updatePriceETH();
- let weth = loadOrCreateToken(WETH.toHexString());
+ let wethPrice = updatePreReplantPriceETH();
- let wethBalance = toDecimal(reserves.value.value0, 18);
- let beanBalance = toDecimal(reserves.value.value1);
+ const newPoolPrices = calcUniswapV2Inst_2(toDecimal(reserves[1]), toDecimal(reserves[0], 18), wethPrice);
let pool = loadOrCreatePool(event.address.toHexString(), event.block.number);
- let startLiquidityUSD = pool.liquidityUSD;
- let endLiquidityUSD = wethBalance.times(weth.lastPriceUSD).times(BigDecimal.fromString("2"));
- let deltaLiquidityUSD = endLiquidityUSD.minus(startLiquidityUSD);
- let deltaBeans = toBigInt(wethBalance.times(weth.lastPriceUSD).minus(beanBalance), 6);
-
- updatePoolValues(event.address.toHexString(), event.block.timestamp, event.block.number, ZERO_BI, ZERO_BD, deltaLiquidityUSD, deltaBeans);
+ let deltaLiquidityUSD = newPoolPrices.liquidity.minus(pool.liquidityUSD);
- let currentBeanPrice = wethBalance.times(weth.lastPriceUSD).div(beanBalance);
+ setPoolReserves(event.address.toHexString(), reserves, event.block.timestamp, event.block.number);
+ updatePoolValues(
+ event.address.toHexString(),
+ event.block.timestamp,
+ event.block.number,
+ ZERO_BI,
+ ZERO_BD,
+ deltaLiquidityUSD,
+ newPoolPrices.deltaB
+ );
+ updatePoolPrice(event.address.toHexString(), event.block.timestamp, event.block.number, newPoolPrices.price);
- updatePoolPrice(event.address.toHexString(), event.block.timestamp, event.block.number, currentBeanPrice);
+ updateBeanSupplyPegPercent(event.block.number);
- checkBeanCross(BEAN_ERC20_V1.toHexString(), event.block.timestamp, event.block.number, oldBeanPrice, currentBeanPrice);
+ const newBeanPrice = calcLiquidityWeightedBeanPrice(BEAN_ERC20_V1.toHexString());
+ checkBeanCross(BEAN_ERC20_V1.toHexString(), event.block.timestamp, event.block.number, oldBeanPrice, newBeanPrice);
+ updateBeanValues(BEAN_ERC20_V1.toHexString(), event.block.timestamp, newBeanPrice, ZERO_BI, ZERO_BI, ZERO_BD, deltaLiquidityUSD);
+}
- setPoolReserves(event.address.toHexString(), [reserves.value.value0, reserves.value.value1], event.block.number);
+// Update pool price/liquidity/deltaB. This is for updating the price when a swap occurs in another pool.
+// The caller is expected to update overall bean prices after this function completes.
+export function externalUpdatePoolPrice(poolAddr: Address, timestamp: BigInt, blockNumber: BigInt): void {
+ const pool = loadOrCreatePool(poolAddr.toHexString(), blockNumber);
- updateBeanSupplyPegPercent(event.block.number);
+ const ethPrice = updatePreReplantPriceETH();
+ const newPoolPrices = calcUniswapV2Inst_2(toDecimal(pool.reserves[1]), toDecimal(pool.reserves[0], 18), ethPrice);
+ const deltaLiquidityUSD = newPoolPrices.liquidity.minus(pool.liquidityUSD);
- updateBeanValues(BEAN_ERC20_V1.toHexString(), event.block.timestamp, currentBeanPrice, ZERO_BI, ZERO_BI, ZERO_BD, deltaLiquidityUSD);
+ updatePoolValues(BEAN_WETH_V1.toHexString(), timestamp, blockNumber, ZERO_BI, ZERO_BD, deltaLiquidityUSD, newPoolPrices.deltaB);
+ updatePoolPrice(BEAN_WETH_V1.toHexString(), timestamp, blockNumber, newPoolPrices.price);
}
-function updatePriceETH(): void {
- let token = loadOrCreateToken(WETH.toHexString());
- let pair = UniswapV2Pair.bind(WETH_USDC_PAIR);
+export function checkPegCrossEth(block: ethereum.Block): void {
+ const pool = loadOrCreatePool(BEAN_WETH_V1.toHexString(), block.number);
+ const prevPoolPrice = pool.lastPrice;
- let reserves = pair.try_getReserves();
- if (reserves.reverted) {
+ const reserves = pool.reserves;
+ if (reserves[0] == ZERO_BI || reserves[1] == ZERO_BI) {
return;
}
+ const ethPrice = getPreReplantPriceETH();
+ const newPoolPrices = calcUniswapV2Inst_2(toDecimal(reserves[1]), toDecimal(reserves[0], 18), ethPrice);
+
+ // log.debug("Prev/New bean price {} / {}", [prevPrice.toString(), newPrice.toString()]);
+
+ // Check for pool peg cross
+ const poolCrossed = checkPoolCross(BEAN_WETH_V1.toHexString(), block.timestamp, block.number, prevPoolPrice, newPoolPrices.price);
+
+ let deltaLiquidityUSD = ZERO_BD;
+ if (poolCrossed) {
+ // Update price for the pool
+ deltaLiquidityUSD = newPoolPrices.liquidity.minus(pool.liquidityUSD);
+ updatePoolValues(BEAN_WETH_V1.toHexString(), block.timestamp, block.number, ZERO_BI, ZERO_BD, deltaLiquidityUSD, newPoolPrices.deltaB);
+ updatePoolPrice(BEAN_WETH_V1.toHexString(), block.timestamp, block.number, newPoolPrices.price, false);
+ }
+
+ // Check for overall Bean cross
+ const oldBeanPrice = getLastBeanPrice(BEAN_ERC20_V1.toHexString());
+ const newBeanPrice = calcLiquidityWeightedBeanPrice(BEAN_ERC20_V1.toHexString());
+ // log.info("old {} new bp {}", [oldBeanPrice.toString(), newBeanPrice.toString()]);
+ const beanCrossed = checkBeanCross(BEAN_ERC20_V1.toHexString(), block.timestamp, block.number, oldBeanPrice, newBeanPrice);
+ if (beanCrossed) {
+ updateBeanValues(
+ BEAN_ERC20_V1.toHexString(),
+ block.timestamp,
+ newBeanPrice,
+ ZERO_BI,
+ ZERO_BI,
+ ZERO_BD,
+ deltaLiquidityUSD // Assumption is that 3crv/lusd prices are constant
+ );
+ }
- // Token 0 is USDC and Token 1 is WETH
- token.lastPriceUSD = toDecimal(reserves.value.value0).div(toDecimal(reserves.value.value1, 18));
- token.save();
+ if (poolCrossed || beanCrossed) {
+ updateTokenPrice(WETH.toHexString(), ethPrice);
+ }
}
diff --git a/projects/subgraph-bean/src/constants/PooledTokens.ts b/projects/subgraph-bean/src/constants/PooledTokens.ts
new file mode 100644
index 0000000000..6937a83187
--- /dev/null
+++ b/projects/subgraph-bean/src/constants/PooledTokens.ts
@@ -0,0 +1,96 @@
+import { BigInt, log } from "@graphprotocol/graph-ts";
+import {
+ BEAN_ERC20,
+ BEAN_ERC20_V1,
+ WETH,
+ CRV3_TOKEN,
+ LUSD,
+ BEAN_WETH_V1,
+ BEAN_3CRV_V1,
+ BEAN_LUSD_V1,
+ BEAN_3CRV,
+ BEAN_WETH_CP2_WELL
+} from "../../../subgraph-core/utils/Constants";
+
+// Use this mapping to determine which tokens are in each pool. Pools may each follow a distinct interface,
+// so a view function shouldn't be used, and a new subgraph build is already required to track a newly whitelisted asset.
+export function getTokensForPool(pool: string): string[] {
+ for (let i = 0; i < poolTokens.length; ++i) {
+ if (poolTokens[i].pool == pool) {
+ return poolTokens[i].tokens;
+ }
+ }
+ throw new Error("Pool has not been configured");
+}
+
+// Name/Decimals are not guaranteed as part of the ERC20 interface, so predefined values are necessary
+export function getTokenInfo(token: string): TokenInfo {
+ for (let i = 0; i < tokens.length; ++i) {
+ if (tokens[i].address == token) {
+ return tokens[i].info;
+ }
+ }
+ throw new Error("Token has not been configured");
+}
+
+class PoolTokens {
+ pool: string;
+ tokens: string[];
+}
+// WHITELIST: Add new pools here
+const poolTokens: PoolTokens[] = [
+ {
+ pool: BEAN_WETH_V1.toHexString(),
+ tokens: [BEAN_ERC20_V1.toHexString(), WETH.toHexString()]
+ },
+ {
+ pool: BEAN_3CRV_V1.toHexString(),
+ tokens: [BEAN_ERC20_V1.toHexString(), CRV3_TOKEN.toHexString()]
+ },
+ {
+ pool: BEAN_LUSD_V1.toHexString(),
+ tokens: [BEAN_ERC20_V1.toHexString(), LUSD.toHexString()]
+ },
+ {
+ pool: BEAN_3CRV.toHexString(),
+ tokens: [BEAN_ERC20.toHexString(), CRV3_TOKEN.toHexString()]
+ },
+ {
+ pool: BEAN_WETH_CP2_WELL.toHexString(),
+ tokens: [BEAN_ERC20.toHexString(), WETH.toHexString()]
+ }
+];
+
+class Token {
+ address: string;
+ info: TokenInfo;
+}
+
+class TokenInfo {
+ name: string;
+ decimals: BigInt;
+}
+
+// WHITELIST: Add new tokens here
+const tokens: Token[] = [
+ {
+ address: BEAN_ERC20_V1.toHexString(),
+ info: { name: "BEAN", decimals: BigInt.fromU32(6) }
+ },
+ {
+ address: BEAN_ERC20.toHexString(),
+ info: { name: "BEAN", decimals: BigInt.fromU32(6) }
+ },
+ {
+ address: WETH.toHexString(),
+ info: { name: "WETH", decimals: BigInt.fromU32(18) }
+ },
+ {
+ address: CRV3_TOKEN.toHexString(),
+ info: { name: "3CRV", decimals: BigInt.fromU32(18) }
+ },
+ {
+ address: LUSD.toHexString(),
+ info: { name: "LUSD", decimals: BigInt.fromU32(18) }
+ }
+];
diff --git a/projects/subgraph-bean/src/result_cache/PegCrossBlocks.ts b/projects/subgraph-bean/src/result_cache/PegCrossBlocks.ts
new file mode 100644
index 0000000000..e47390b948
--- /dev/null
+++ b/projects/subgraph-bean/src/result_cache/PegCrossBlocks.ts
@@ -0,0 +1,610 @@
+export const PEG_CROSS_BLOCKS: u32[] = [
+ 12974091, 12975421, 12978538, 12978615, 12978680, 12978911, 12979148, 12979149, 12979167, 12979171, 12979228, 12979230, 12979607,
+ 12983847, 12983871, 12983895, 12983897, 12983926, 12984038, 12984104, 12984170, 12984257, 12984310, 12984929, 12986590, 12986603,
+ 12986901, 12987603, 12990064, 12991358, 12991399, 12992193, 12992519, 12993217, 12993281, 12998537, 12998539, 12998546, 12998550,
+ 12998551, 12998553, 12999530, 12999585, 12999767, 12999776, 12999777, 12999779, 12999817, 12999840, 13000158, 13000196, 13000305,
+ 13000309, 13000334, 13000347, 13000356, 13000377, 13000577, 13000587, 13001082, 13001089, 13001396, 13001414, 13001894, 13001913,
+ 13001956, 13002009, 13002735, 13002738, 13003196, 13003198, 13004037, 13004045, 13004360, 13004364, 13004638, 13004646, 13004655,
+ 13004657, 13004817, 13004839, 13004843, 13004883, 13005075, 13005103, 13005107, 13005109, 13005372, 13005380, 13005673, 13005715,
+ 13005730, 13005733, 13005944, 13005946, 13006200, 13006202, 13006203, 13006321, 13006487, 13006488, 13006499, 13006546, 13006708,
+ 13006709, 13006980, 13007010, 13007245, 13007246, 13007274, 13007275, 13007509, 13007525, 13007574, 13007607, 13007780, 13007798,
+ 13007859, 13007898, 13008063, 13008065, 13008117, 13008191, 13008375, 13008387, 13008617, 13008671, 13008712, 13008736, 13008895,
+ 13008901, 13008906, 13008912, 13009163, 13009169, 13009190, 13009193, 13009199, 13009203, 13009381, 13009423, 13009669, 13009671,
+ 13009676, 13009679, 13009681, 13009687, 13009958, 13009972, 13009973, 13010009, 13010222, 13010231, 13010492, 13010556, 13010779,
+ 13014211, 13016266, 13018933, 13019023, 13019754, 13020690, 13020782, 13022699, 13022701, 13022825, 13023185, 13023247, 13023922,
+ 13025396, 13025666, 13026184, 13026256, 13026638, 13026640, 13027512, 13029384, 13030010, 13030107, 13030123, 13030393, 13030528,
+ 13031004, 13031259, 13032695, 13032731, 13032942, 13033010, 13033033, 13033210, 13034517, 13034543, 13035839, 13035922, 13035929,
+ 13036165, 13036689, 13036884, 13036897, 13036926, 13037135, 13037615, 13037642, 13038069, 13038108, 13038138, 13038145, 13038184,
+ 13039743, 13043682, 13043699, 13044756, 13044762, 13044770, 13044955, 13045801, 13046502, 13051141, 13051348, 13056233, 13056234,
+ 13057499, 13057501, 13057527, 13057595, 13058927, 13059717, 13059983, 13060079, 13060086, 13060118, 13060119, 13060121, 13060123,
+ 13060132, 13060160, 13060198, 13060449, 13060450, 13060479, 13060489, 13060492, 13060680, 13060716, 13060796, 13060802, 13060842,
+ 13060960, 13062059, 13062295, 13062299, 13062306, 13062319, 13062333, 13062352, 13062366, 13063788, 13063838, 13063861, 13063878,
+ 13075770, 13075888, 13076058, 13076195, 13076316, 13076435, 13076636, 13076662, 13076679, 13076703, 13076890, 13076891, 13076899,
+ 13076947, 13076964, 13076972, 13077164, 13077246, 13077426, 13077429, 13077495, 13077503, 13077730, 13077736, 13078272, 13078287,
+ 13078449, 13078457, 13078466, 13078470, 13078482, 13078487, 13078488, 13078519, 13078541, 13078561, 13078796, 13078810, 13078813,
+ 13078834, 13079299, 13079303, 13079572, 13079587, 13079588, 13079596, 13079620, 13079642, 13079648, 13079683, 13079724, 13079755,
+ 13079814, 13079885, 13079887, 13079895, 13079899, 13079919, 13079920, 13079941, 13080074, 13080179, 13080198, 13080229, 13080352,
+ 13080375, 13080400, 13080408, 13080634, 13080637, 13080648, 13080660, 13080672, 13080677, 13080678, 13080680, 13080768, 13080770,
+ 13080887, 13080888, 13080932, 13080934, 13080937, 13080958, 13080977, 13080990, 13080996, 13080999, 13081011, 13081057, 13081145,
+ 13081209, 13081632, 13081635, 13081700, 13081721, 13081750, 13081754, 13081766, 13081895, 13081963, 13081977, 13081992, 13081994,
+ 13082000, 13082006, 13082094, 13082163, 13082230, 13082282, 13082300, 13082301, 13082504, 13082507, 13082510, 13082555, 13082863,
+ 13082876, 13082878, 13082888, 13082969, 13083844, 13084930, 13084956, 13084984, 13085212, 13085233, 13085236, 13085311, 13085508,
+ 13085645, 13085877, 13086288, 13086337, 13086338, 13086356, 13086362, 13086369, 13086376, 13086400, 13086422, 13086440, 13086459,
+ 13086461, 13087211, 13087217, 13087221, 13087225, 13087231, 13087377, 13087393, 13087405, 13087410, 13087411, 13087527, 13088104,
+ 13088272, 13093705, 13093899, 13093903, 13093921, 13093932, 13093971, 13093975, 13099188, 13099189, 13099353, 13099362, 13099414,
+ 13099461, 13099465, 13099710, 13099714, 13099747, 13100289, 13100319, 13100358, 13100371, 13100898, 13100923, 13102868, 13102939,
+ 13107071, 13107096, 13110581, 13110588, 13110634, 13110706, 13110819, 13110844, 13111074, 13113042, 13113109, 13113110, 13113423,
+ 13113442, 13113448, 13113452, 13113453, 13113553, 13114481, 13114574, 13115940, 13115946, 13115955, 13115972, 13115989, 13115990,
+ 13117862, 13118077, 13118145, 13118291, 13118320, 13118321, 13118355, 13118356, 13118402, 13118413, 13118423, 13118428, 13118436,
+ 13118467, 13121070, 13121089, 13121099, 13121128, 13121178, 13121244, 13121307, 13121310, 13122225, 13122395, 13122407, 13122455,
+ 13122874, 13122951, 13122985, 13124397, 13124895, 13129783, 13129786, 13129854, 13129981, 13129991, 13130001, 13130094, 13130178,
+ 13131625, 13131662, 13131722, 13131929, 13137125, 13137568, 13138520, 13138647, 13138700, 13138778, 13138782, 13138813, 13138856,
+ 13138858, 13139212, 13139273, 13139367, 13139407, 13139408, 13139410, 13139609, 13140003, 13140015, 13140024, 13140027, 13140327,
+ 13140447, 13140687, 13141148, 13141156, 13141160, 13141165, 13141195, 13141863, 13141869, 13141870, 13141940, 13142135, 13143729,
+ 13143754, 13143760, 13143762, 13143763, 13143816, 13144293, 13144300, 13144362, 13144364, 13144774, 13144823, 13145005, 13145190,
+ 13145194, 13145195, 13145198, 13145206, 13145220, 13145747, 13146082, 13146089, 13147016, 13147028, 13147044, 13147045, 13148291,
+ 13148316, 13149112, 13150275, 13150279, 13150280, 13151314, 13151333, 13151356, 13151443, 13151450, 13151451, 13151460, 13151462,
+ 13151595, 13151598, 13151696, 13151700, 13151863, 13151867, 13152103, 13152260, 13152269, 13153306, 13153325, 13155620, 13156284,
+ 13156748, 13156781, 13157326, 13158957, 13159234, 13159235, 13159247, 13159248, 13159486, 13159495, 13161064, 13161086, 13161299,
+ 13161376, 13161392, 13161406, 13161416, 13161423, 13161487, 13161550, 13161611, 13161634, 13161636, 13162200, 13162208, 13162329,
+ 13162331, 13163395, 13163536, 13163565, 13163567, 13163596, 13163597, 13163604, 13163670, 13163995, 13164187, 13164189, 13164192,
+ 13164658, 13164746, 13165237, 13165391, 13165408, 13165727, 13165897, 13165996, 13166015, 13166072, 13166219, 13166222, 13166242,
+ 13166250, 13166251, 13166258, 13166259, 13166283, 13166287, 13166319, 13166381, 13166437, 13167205, 13167549, 13167575, 13167591,
+ 13167742, 13167972, 13168519, 13168524, 13169110, 13171988, 13175038, 13175053, 13175058, 13175064, 13175069, 13175146, 13175397,
+ 13175452, 13175497, 13175514, 13175520, 13175609, 13177587, 13177589, 13177597, 13177615, 13177647, 13177659, 13177660, 13177714,
+ 13177758, 13178360, 13178584, 13178652, 13179149, 13179177, 13179251, 13179252, 13179253, 13179274, 13179308, 13179337, 13179353,
+ 13179400, 13180079, 13180083, 13180101, 13180102, 13180117, 13180145, 13180189, 13180216, 13180664, 13180692, 13180713, 13180715,
+ 13180730, 13180758, 13180833, 13180888, 13180897, 13180909, 13181023, 13181155, 13181755, 13181777, 13181802, 13181820, 13182646,
+ 13182655, 13183890, 13183894, 13183955, 13183956, 13183957, 13184012, 13184973, 13184974, 13185191, 13185260, 13185321, 13185384,
+ 13185495, 13185703, 13185732, 13185850, 13187086, 13187116, 13187178, 13187233, 13188042, 13189001, 13189010, 13189082, 13191072,
+ 13191091, 13191099, 13191106, 13191522, 13191635, 13191637, 13191644, 13192232, 13192596, 13192599, 13192604, 13193031, 13193802,
+ 13194379, 13194410, 13194615, 13194717, 13194719, 13194824, 13196049, 13196067, 13196141, 13196190, 13196445, 13196459, 13196460,
+ 13198164, 13198273, 13198316, 13198557, 13198899, 13198902, 13198907, 13198909, 13198925, 13199052, 13199074, 13199086, 13199099,
+ 13199116, 13199129, 13199131, 13199260, 13199361, 13199363, 13200193, 13200194, 13200216, 13200219, 13200224, 13201208, 13201289,
+ 13201290, 13201321, 13201322, 13206138, 13206229, 13206338, 13206947, 13207266, 13207395, 13207435, 13207444, 13207445, 13207578,
+ 13207663, 13208184, 13211822, 13211897, 13211967, 13213641, 13214042, 13214163, 13214206, 13215008, 13215982, 13217044, 13217061,
+ 13217222, 13217341, 13217478, 13217783, 13217784, 13217810, 13217953, 13217970, 13217973, 13218020, 13218050, 13218279, 13218810,
+ 13218815, 13218816, 13218909, 13218949, 13218953, 13218954, 13225077, 13225299, 13226246, 13226559, 13226732, 13226957, 13227000,
+ 13229110, 13229499, 13229747, 13232674, 13232699, 13232717, 13233025, 13234172, 13234178, 13234264, 13234554, 13236246, 13236247,
+ 13236250, 13236319, 13237109, 13237552, 13244459, 13244462, 13245028, 13245032, 13245040, 13245162, 13245172, 13245175, 13245180,
+ 13245275, 13245545, 13245546, 13246387, 13246388, 13246647, 13246651, 13246920, 13246926, 13246980, 13246983, 13247415, 13247416,
+ 13247678, 13247695, 13247947, 13247952, 13248208, 13248209, 13248470, 13248473, 13249273, 13249276, 13249292, 13249294, 13249543,
+ 13249561, 13249800, 13249818, 13249822, 13250039, 13250057, 13250059, 13256813, 13256815, 13257386, 13257389, 13258210, 13258214,
+ 13259590, 13259594, 13259863, 13259865, 13260039, 13260056, 13260062, 13260063, 13260114, 13260126, 13260381, 13260386, 13260388,
+ 13260389, 13260884, 13260886, 13261140, 13261142, 13261145, 13261155, 13261156, 13261186, 13261206, 13261363, 13261373, 13261399,
+ 13262381, 13262382, 13262425, 13262428, 13262440, 13262442, 13262455, 13262462, 13262465, 13262469, 13262553, 13262554, 13262569,
+ 13262592, 13262593, 13262713, 13262719, 13262729, 13262748, 13262896, 13262899, 13262913, 13263080, 13263772, 13263871, 13264127,
+ 13264135, 13264139, 13264149, 13272546, 13272560, 13272905, 13272934, 13273058, 13273061, 13273064, 13273373, 13273436, 13273458,
+ 13273503, 13273513, 13273717, 13273719, 13274023, 13274030, 13274057, 13274064, 13274105, 13274148, 13274189, 13274198, 13274217,
+ 13274220, 13274242, 13274248, 13335750, 13335755, 13335869, 13336244, 13336323, 13336461, 13336505, 13336560, 13336618, 13336695,
+ 13336714, 13336777, 13336959, 13337532, 13337559, 13337935, 13337937, 13337959, 13340698, 13340781, 13340820, 13340947, 13341028,
+ 13341076, 13341108, 13341147, 13341156, 13341366, 13341373, 13342047, 13342121, 13342224, 13342548, 13376585, 13376710, 13376778,
+ 13378143, 13378793, 13378816, 13378829, 13379464, 13434006, 13434877, 13435565, 13435971, 13436006, 13436018, 13436025, 13436035,
+ 13436049, 13436107, 13437998, 13438644, 13438667, 13440517, 13442086, 13442913, 13443210, 13443231, 13443232, 13443239, 13443256,
+ 13443258, 13443270, 13443271, 13444653, 13444660, 13444712, 13446459, 13448008, 13449065, 13449128, 13449167, 13449303, 13449313,
+ 13449493, 13449495, 13449505, 13449506, 13449551, 13449634, 13449650, 13449705, 13449790, 13449821, 13449841, 13449855, 13449875,
+ 13449913, 13450052, 13450154, 13450187, 13450472, 13450507, 13450522, 13451061, 13451131, 13451155, 13451468, 13451543, 13451544,
+ 13451550, 13451555, 13451564, 13451596, 13451598, 13451649, 13451671, 13451675, 13455280, 13455282, 13455557, 13455600, 13455618,
+ 13455860, 13455891, 13455896, 13455911, 13461738, 13462027, 13462049, 13462066, 13462165, 13463379, 13463381, 13464408, 13466451,
+ 13467419, 13467691, 13468508, 13468675, 13468784, 13469000, 13469007, 13469012, 13469034, 13470634, 13470770, 13471747, 13474744,
+ 13474934, 13475341, 13475377, 13475394, 13475519, 13475523, 13475746, 13476174, 13476209, 13476325, 13476418, 13476419, 13479133,
+ 13479136, 13479138, 13479152, 13479196, 13479242, 13479941, 13480370, 13480372, 13480449, 13480647, 13480648, 13480717, 13481304,
+ 13481717, 13481988, 13482011, 13482102, 13483897, 13483977, 13483982, 13483998, 13484811, 13484846, 13484847, 13486887, 13486969,
+ 13488473, 13488482, 13489574, 13489977, 13490465, 13490505, 13490507, 13490517, 13490518, 13491374, 13494424, 13494752, 13494754,
+ 13495520, 13495854, 13497794, 13497797, 13497803, 13497820, 13497844, 13497868, 13498035, 13503686, 13503690, 13503704, 13503709,
+ 13503751, 13503763, 13503770, 13503813, 13503910, 13508461, 13508666, 13508680, 13508728, 13508759, 13508780, 13510297, 13510507,
+ 13510508, 13510514, 13510516, 13510518, 13510520, 13510556, 13510590, 13510603, 13510605, 13510610, 13510727, 13511700, 13511890,
+ 13511907, 13512045, 13512048, 13512304, 13512305, 13512359, 13512365, 13514281, 13514282, 13514705, 13514719, 13514721, 13514734,
+ 13515060, 13516318, 13516526, 13516569, 13517036, 13517567, 13518970, 13519495, 13519497, 13519756, 13521882, 13522133, 13523828,
+ 13523847, 13523862, 13523885, 13523912, 13523967, 13523969, 13524379, 13524397, 13525787, 13525872, 13525873, 13528534, 13528544,
+ 13528546, 13528558, 13528574, 13528579, 13528967, 13529028, 13531631, 13531875, 13531910, 13531954, 13531961, 13531990, 13532016,
+ 13532023, 13532081, 13532126, 13532137, 13532138, 13532143, 13532151, 13532161, 13532176, 13532179, 13532198, 13532239, 13532920,
+ 13532929, 13532946, 13533454, 13533933, 13535490, 13535493, 13535494, 13535499, 13538211, 13538232, 13538866, 13538895, 13539218,
+ 13539249, 13539673, 13539923, 13539946, 13539951, 13540826, 13540841, 13541140, 13541325, 13541849, 13541933, 13541958, 13541980,
+ 13541997, 13542002, 13542077, 13542086, 13542175, 13542179, 13542232, 13542254, 13543917, 13544624, 13545832, 13545837, 13545858,
+ 13546411, 13547018, 13547059, 13547095, 13547595, 13547630, 13548233, 13548387, 13550252, 13550987, 13551029, 13551119, 13551280,
+ 13551291, 13552190, 13552241, 13552260, 13552307, 13552675, 13552678, 13552681, 13552684, 13552688, 13552701, 13552704, 13552750,
+ 13552752, 13552754, 13552943, 13553661, 13553662, 13553676, 13553677, 13553853, 13554976, 13555095, 13555457, 13557196, 13557954,
+ 13558105, 13558112, 13558113, 13558114, 13558116, 13558121, 13558735, 13558752, 13558776, 13559078, 13559084, 13559255, 13559291,
+ 13559303, 13559410, 13559415, 13559416, 13559425, 13559561, 13559568, 13559602, 13559647, 13559656, 13559658, 13559791, 13559882,
+ 13560317, 13560318, 13560937, 13564634, 13564681, 13564697, 13564713, 13564837, 13564852, 13564859, 13564871, 13564879, 13564889,
+ 13564891, 13566648, 13568113, 13568302, 13568342, 13568345, 13568357, 13568484, 13568492, 13568495, 13568667, 13570256, 13570277,
+ 13570284, 13570300, 13570316, 13570318, 13570944, 13570952, 13571175, 13572652, 13572673, 13572674, 13572854, 13572856, 13572884,
+ 13572895, 13572918, 13572923, 13572958, 13572969, 13573024, 13573028, 13573096, 13573097, 13573405, 13573522, 13573523, 13573686,
+ 13573687, 13573693, 13573695, 13574201, 13574213, 13574289, 13574294, 13575376, 13575377, 13576614, 13576620, 13576635, 13576661,
+ 13576663, 13577153, 13577969, 13578897, 13578901, 13578940, 13578947, 13579158, 13579160, 13579235, 13579351, 13579385, 13579447,
+ 13579490, 13579530, 13579565, 13579572, 13579588, 13579894, 13579900, 13579911, 13579912, 13579914, 13579918, 13579942, 13580072,
+ 13580087, 13580260, 13580280, 13581920, 13582005, 13582060, 13582068, 13582069, 13582090, 13582096, 13582336, 13582467, 13582468,
+ 13582749, 13583449, 13583933, 13584045, 13584069, 13584076, 13584080, 13584082, 13584102, 13584104, 13584107, 13584126, 13584153,
+ 13584183, 13584184, 13584192, 13584195, 13584208, 13584209, 13584211, 13584243, 13584286, 13584294, 13584296, 13584485, 13584486,
+ 13585001, 13585594, 13585602, 13585607, 13585610, 13585641, 13585748, 13585775, 13585976, 13585992, 13586067, 13587038, 13587054,
+ 13587160, 13589367, 13589405, 13589454, 13589471, 13589485, 13589486, 13589512, 13589515, 13589527, 13589532, 13589574, 13589656,
+ 13589661, 13589867, 13590103, 13592391, 13594358, 13595502, 13595599, 13595883, 13596659, 13596666, 13596668, 13596671, 13598662,
+ 13599510, 13599974, 13600003, 13600116, 13600221, 13600229, 13600230, 13600343, 13600344, 13600519, 13602309, 13602377, 13602479,
+ 13602483, 13602486, 13602488, 13602489, 13602490, 13602493, 13602978, 13603574, 13603586, 13603652, 13603887, 13604255, 13605773,
+ 13605779, 13606896, 13607198, 13607202, 13607203, 13608420, 13608519, 13608665, 13608681, 13608968, 13610066, 13611161, 13614876,
+ 13614927, 13614991, 13614998, 13615404, 13617630, 13618342, 13621035, 13622147, 13623486, 13623495, 13623499, 13623577, 13623590,
+ 13623764, 13624270, 13624355, 13624363, 13624366, 13624383, 13624517, 13625958, 13625960, 13625982, 13626112, 13626125, 13626166,
+ 13626170, 13626212, 13628785, 13628854, 13628864, 13628865, 13629661, 13629662, 13629784, 13629785, 13629852, 13630011, 13630129,
+ 13630230, 13630429, 13630583, 13630683, 13630775, 13630780, 13630796, 13631292, 13631331, 13640082, 13640087, 13640104, 13640132,
+ 13640218, 13640556, 13640587, 13640615, 13641928, 13641929, 13642057, 13642071, 13642137, 13642155, 13642160, 13642167, 13642168,
+ 13642207, 13642212, 13642215, 13642216, 13642265, 13642911, 13644410, 13646116, 13646163, 13647476, 13647732, 13647733, 13647905,
+ 13657931, 13657936, 13658078, 13658083, 13658088, 13658106, 13666892, 13666908, 13667064, 13667842, 13671879, 13672266, 13685409,
+ 13685501, 13687313, 13687327, 13688700, 13688718, 13688728, 13688770, 13688773, 13689077, 13693941, 13693995, 13694143, 13694177,
+ 13703288, 13703407, 13704796, 13704804, 13704850, 13704871, 13710244, 13710333, 13710534, 13710568, 13717643, 13717686, 13720847,
+ 13720981, 13721138, 13721150, 13721209, 13721255, 13721263, 13721265, 13721279, 13721280, 13722372, 13722456, 13722731, 13722854,
+ 13722860, 13722861, 13722883, 13722884, 13722898, 13722924, 13723078, 13723597, 13723611, 13723617, 13724121, 13724580, 13724940,
+ 13724949, 13724958, 13725168, 13725481, 13725714, 13725715, 13725761, 13726532, 13728022, 13728049, 13729075, 13729079, 13729488,
+ 13729572, 13729622, 13729660, 13729666, 13729719, 13729765, 13729836, 13731361, 13731396, 13731754, 13731765, 13731769, 13731770,
+ 13731798, 13731966, 13732954, 13732957, 13732964, 13734204, 13734565, 13734582, 13734613, 13734671, 13735055, 13735059, 13735060,
+ 13735378, 13740278, 13740773, 13740781, 13740808, 13740821, 13740879, 13741264, 13742045, 13742386, 13742413, 13742433, 13742461,
+ 13742522, 13743142, 13743432, 13743636, 13743643, 13743676, 13744107, 13744604, 13800996, 13800999, 13801241, 13801243, 13804633,
+ 13804667, 13804672, 13804727, 13812443, 13812884, 13812892, 13812903, 13813249, 13813688, 13829732, 13829784, 13844956, 13844964,
+ 13845655, 13845657, 13845739, 13845745, 13845757, 13845780, 13848953, 13851591, 13851617, 13852217, 13852286, 13852519, 13853027,
+ 13854735, 13854789, 13854927, 13854932, 13854936, 13854950, 13854954, 13856012, 13856028, 13856077, 13856953, 13856955, 13857267,
+ 13857323, 13857365, 13857466, 13857469, 13857483, 13857490, 13857624, 13857918, 13858695, 13858898, 13858902, 13858904, 13858923,
+ 13858924, 13859670, 13859826, 13859936, 13860025, 13860899, 13861827, 13861932, 13861937, 13862044, 13862064, 13862197, 13862355,
+ 13862374, 13863113, 13864512, 13864522, 13864530, 13864926, 13864941, 13864946, 13864969, 13865001, 13865043, 13865070, 13865081,
+ 13865342, 13865516, 13865553, 13865581, 13865604, 13865623, 13865647, 13865678, 13866062, 13869401, 13869405, 13869422, 13869451,
+ 13869457, 13869834, 13870311, 13870632, 13871204, 13871210, 13871302, 13871334, 13871339, 13871363, 13871424, 13871435, 13871497,
+ 13871551, 13871568, 13871570, 13871583, 13871761, 13872175, 13872207, 13872240, 13872304, 13872378, 13872402, 13872443, 13872834,
+ 13872889, 13872979, 13873525, 13873669, 13874108, 13874137, 13874154, 13874198, 13874244, 13874484, 13875063, 13875708, 13875709,
+ 13876095, 13876631, 13876822, 13876828, 13876980, 13877074, 13877075, 13877496, 13877517, 13877520, 13877638, 13877848, 13878148,
+ 13882302, 13882360, 13882365, 13882591, 13882592, 13882597, 13882599, 13882806, 13882807, 13883051, 13883360, 13883433, 13884709,
+ 13885349, 13885866, 13885918, 13886883, 13887001, 13887338, 13887344, 13887380, 13887548, 13887611, 13888142, 13888577, 13888593,
+ 13888668, 13888746, 13889461, 13889503, 13889510, 13889524, 13889539, 13889649, 13890458, 13891050, 13891076, 13891081, 13891130,
+ 13891135, 13891138, 13902888, 13902992, 13906563, 13906944, 13908405, 13908630, 13912128, 13912739, 13913099, 13913121, 13913454,
+ 13913585, 13913596, 13914008, 13926989, 13926996, 13927003, 13927014, 13927024, 13927479, 13927483, 13927492, 13938606, 13938669,
+ 13939585, 13939590, 13939599, 13939708, 13939849, 13939850, 13942560, 13942563, 13942611, 13954079, 13954146, 13954148, 13954178,
+ 13985645, 13985651, 13992100, 14005135, 14005139, 14005140, 14005142, 14005185, 14009388, 14009390, 14038443, 14043167, 14043168,
+ 14098158, 14098190, 14098343, 14098347, 14098363, 14098372, 14098448, 14098510, 14099411, 14099421, 14111704, 14111988, 14112175,
+ 14112178, 14112222, 14112272, 14112281, 14112322, 14112332, 14112523, 14112534, 14112721, 14112870, 14113018, 14113027, 14113380,
+ 14113524, 14113544, 14113990, 14114153, 14114184, 14114266, 14114286, 14114342, 14114380, 14114399, 14114404, 14114436, 14114512,
+ 14114628, 14114673, 14114833, 14114886, 14114898, 14115278, 14115362, 14115372, 14115446, 14115500, 14115574, 14116384, 14116406,
+ 14116506, 14116797, 14116986, 14117002, 14117059, 14117070, 14117097, 14117135, 14117265, 14117322, 14117503, 14117521, 14117550,
+ 14118001, 14118142, 14118146, 14118158, 14118197, 14118368, 14118496, 14118533, 14118647, 14118701, 14118714, 14118937, 14119187,
+ 14119295, 14119413, 14119877, 14119901, 14119970, 14120278, 14120281, 14120282, 14120389, 14120437, 14120542, 14120552, 14120595,
+ 14121317, 14121366, 14121432, 14121455, 14121577, 14121580, 14121596, 14121601, 14121630, 14121638, 14121679, 14121684, 14121722,
+ 14121856, 14122382, 14122403, 14122483, 14122757, 14122763, 14122767, 14122824, 14122827, 14122833, 14122844, 14122853, 14122877,
+ 14123193, 14123200, 14123302, 14123407, 14124143, 14124163, 14124204, 14124296, 14124337, 14124352, 14124366, 14124368, 14124374,
+ 14124391, 14124991, 14125047, 14126549, 14126762, 14126770, 14126771, 14126782, 14126791, 14126823, 14126841, 14128740, 14128817,
+ 14128883, 14128944, 14129293, 14129452, 14129553, 14129573, 14129597, 14129617, 14129837, 14129898, 14129913, 14129915, 14129939,
+ 14130007, 14130296, 14130298, 14130316, 14130334, 14130355, 14130372, 14130378, 14130387, 14130388, 14130423, 14130440, 14130465,
+ 14130641, 14131066, 14131081, 14131115, 14131324, 14131407, 14131588, 14132136, 14132310, 14133768, 14133783, 14133786, 14133815,
+ 14133830, 14133981, 14134041, 14135528, 14135807, 14135812, 14135828, 14137560, 14137824, 14137853, 14138293, 14138307, 14138600,
+ 14138669, 14138825, 14138845, 14138888, 14139112, 14139816, 14140071, 14140079, 14140134, 14140318, 14140343, 14140597, 14140903,
+ 14140910, 14141386, 14141418, 14141461, 14141473, 14141478, 14141480, 14141489, 14141517, 14141541, 14141549, 14141628, 14141732,
+ 14141733, 14141780, 14141786, 14141800, 14142398, 14142742, 14142749, 14143111, 14143196, 14143745, 14143763, 14143828, 14143864,
+ 14144282, 14144473, 14145076, 14145285, 14145784, 14145908, 14145935, 14145988, 14146061, 14146091, 14146109, 14146166, 14146173,
+ 14146182, 14146184, 14146190, 14146207, 14146234, 14146754, 14146771, 14146832, 14147019, 14147204, 14147423, 14147483, 14147519,
+ 14147526, 14147554, 14147587, 14147607, 14147732, 14148521, 14148714, 14149592, 14149619, 14149789, 14149804, 14149812, 14149940,
+ 14149961, 14149966, 14149992, 14151350, 14151353, 14153570, 14154639, 14154760, 14154939, 14155463, 14155476, 14155742, 14155762,
+ 14155771, 14155906, 14155935, 14156644, 14156695, 14156824, 14157718, 14158023, 14158178, 14158179, 14158192, 14158225, 14158234,
+ 14160434, 14160448, 14160484, 14160591, 14160631, 14160678, 14161007, 14161029, 14161053, 14161067, 14161227, 14161241, 14161396,
+ 14161541, 14161546, 14161548, 14161549, 14161604, 14161618, 14161833, 14161976, 14161996, 14162133, 14162387, 14162615, 14162897,
+ 14163117, 14163286, 14163301, 14163309, 14163900, 14163967, 14164571, 14165063, 14165098, 14165182, 14165193, 14165728, 14165832,
+ 14166064, 14166499, 14166555, 14166559, 14166586, 14167320, 14167457, 14167507, 14167584, 14167707, 14167751, 14167792, 14167806,
+ 14167809, 14167830, 14167859, 14167868, 14167877, 14167979, 14167980, 14171368, 14171777, 14171890, 14171953, 14172042, 14172047,
+ 14172089, 14172170, 14172332, 14172456, 14172572, 14172639, 14173001, 14174547, 14174910, 14175087, 14175109, 14175111, 14175869,
+ 14175907, 14176246, 14176253, 14176343, 14176607, 14177124, 14177447, 14177503, 14177734, 14178614, 14178630, 14178820, 14178821,
+ 14178839, 14179074, 14179192, 14179237, 14179326, 14180592, 14180796, 14180851, 14181128, 14181137, 14181693, 14181698, 14181762,
+ 14181792, 14182209, 14182468, 14182581, 14183420, 14183543, 14183809, 14183872, 14184752, 14184842, 14185023, 14185412, 14185453,
+ 14185501, 14185653, 14185710, 14185798, 14186682, 14186733, 14187745, 14187752, 14187757, 14187821, 14188264, 14188460, 14188465,
+ 14188729, 14188778, 14189095, 14189171, 14191103, 14191217, 14191927, 14192000, 14192052, 14192242, 14192398, 14192827, 14192854,
+ 14193065, 14193073, 14193103, 14193143, 14193158, 14193482, 14193580, 14194305, 14194319, 14194412, 14194419, 14194484, 14194546,
+ 14194595, 14199795, 14199935, 14199983, 14199986, 14200044, 14200084, 14200111, 14200139, 14200182, 14200190, 14204347, 14204418,
+ 14204510, 14204511, 14204779, 14204797, 14204839, 14205356, 14205469, 14205477, 14205495, 14206818, 14206853, 14207065, 14207638,
+ 14207651, 14207666, 14207674, 14207769, 14208925, 14208929, 14208933, 14209218, 14209304, 14209336, 14209575, 14209637, 14209654,
+ 14209658, 14209756, 14209776, 14209798, 14209927, 14210583, 14210845, 14211495, 14211541, 14211907, 14211929, 14212341, 14212472,
+ 14212477, 14212690, 14213033, 14213418, 14213497, 14213514, 14213530, 14213652, 14213946, 14213953, 14213972, 14214116, 14214142,
+ 14214143, 14214366, 14214977, 14214987, 14215167, 14215207, 14215399, 14215416, 14215450, 14215516, 14217199, 14217219, 14217260,
+ 14217509, 14218325, 14218896, 14218935, 14219106, 14219113, 14219114, 14219119, 14219130, 14219957, 14219958, 14220038, 14220087,
+ 14220173, 14220219, 14220804, 14221341, 14222488, 14222500, 14222878, 14222894, 14222935, 14223004, 14223669, 14223764, 14227432,
+ 14227444, 14227445, 14227450, 14227692, 14227697, 14228042, 14228163, 14228181, 14228408, 14228421, 14228485, 14228486, 14228491,
+ 14228508, 14228587, 14228717, 14228762, 14228769, 14228773, 14228791, 14228792, 14228804, 14228903, 14229010, 14229018, 14229159,
+ 14231125, 14231300, 14231443, 14231448, 14232109, 14232208, 14232209, 14232381, 14232406, 14232802, 14232810, 14232864, 14232909,
+ 14233312, 14233318, 14233470, 14233715, 14233727, 14233759, 14235991, 14236061, 14236156, 14236267, 14236301, 14236377, 14236429,
+ 14236512, 14236650, 14236713, 14236756, 14236769, 14236824, 14236825, 14237021, 14237138, 14237249, 14237357, 14237367, 14237368,
+ 14237405, 14237422, 14237465, 14237979, 14238006, 14238047, 14238053, 14238054, 14238064, 14238210, 14241229, 14242371, 14242374,
+ 14242376, 14242495, 14242761, 14242796, 14242807, 14242848, 14242857, 14242860, 14242895, 14242902, 14242903, 14243742, 14243745,
+ 14243747, 14243828, 14243830, 14243898, 14243995, 14244554, 14244572, 14244661, 14244663, 14245554, 14245560, 14245614, 14245629,
+ 14245794, 14246045, 14246318, 14246687, 14246846, 14247108, 14247338, 14247826, 14247928, 14247954, 14247963, 14247985, 14248202,
+ 14248403, 14248732, 14249055, 14249278, 14249875, 14250216, 14250927, 14250928, 14251116, 14251143, 14251320, 14251343, 14251406,
+ 14251457, 14251569, 14251635, 14251874, 14251884, 14251898, 14252039, 14252092, 14252144, 14252246, 14252318, 14252972, 14253022,
+ 14255299, 14255310, 14255475, 14255516, 14255543, 14255556, 14255822, 14255995, 14256057, 14256504, 14256561, 14256571, 14256620,
+ 14258923, 14258985, 14259150, 14259607, 14259661, 14260250, 14260264, 14261054, 14261145, 14261150, 14261244, 14261398, 14261838,
+ 14261932, 14261969, 14262054, 14262427, 14262460, 14262621, 14263627, 14263682, 14267276, 14267288, 14267519, 14267528, 14267529,
+ 14267548, 14267622, 14267663, 14268607, 14268629, 14268630, 14268672, 14268685, 14268744, 14268750, 14268751, 14268755, 14269086,
+ 14269140, 14269168, 14269178, 14269347, 14269356, 14269543, 14269547, 14269776, 14269820, 14270276, 14270280, 14270283, 14270286,
+ 14270294, 14270310, 14270354, 14270419, 14270466, 14270486, 14270530, 14270550, 14270654, 14270738, 14270744, 14270751, 14270757,
+ 14270778, 14270784, 14270811, 14270841, 14270889, 14270897, 14270940, 14270943, 14270967, 14270972, 14271360, 14271401, 14271992,
+ 14271999, 14272079, 14272130, 14272289, 14272325, 14272717, 14272750, 14274773, 14274777, 14274997, 14275001, 14275127, 14275130,
+ 14275146, 14275323, 14275353, 14275424, 14275668, 14276086, 14276123, 14276168, 14276309, 14276370, 14276458, 14276520, 14277427,
+ 14277434, 14277438, 14277439, 14277514, 14277581, 14277637, 14278054, 14278075, 14278093, 14278096, 14278100, 14278142, 14278209,
+ 14278267, 14278302, 14278331, 14278429, 14278440, 14278687, 14278756, 14278811, 14279537, 14279693, 14279798, 14280053, 14280185,
+ 14280204, 14280267, 14280452, 14280583, 14280616, 14280703, 14281278, 14281362, 14281532, 14281603, 14281860, 14281911, 14282559,
+ 14283530, 14283550, 14283560, 14283564, 14283579, 14283595, 14283598, 14283613, 14283697, 14283746, 14284070, 14284218, 14284578,
+ 14284847, 14286487, 14286490, 14286613, 14286765, 14287334, 14287353, 14287608, 14287664, 14287752, 14287787, 14287796, 14287799,
+ 14287800, 14287802, 14287945, 14288161, 14288307, 14288451, 14288502, 14288846, 14288983, 14289001, 14289005, 14289016, 14289060,
+ 14289723, 14290173, 14290424, 14290457, 14290459, 14290506, 14290571, 14290766, 14290801, 14290962, 14291669, 14291708, 14291718,
+ 14291815, 14292939, 14292956, 14293247, 14293268, 14293297, 14293393, 14293441, 14293602, 14293740, 14293803, 14294518, 14294563,
+ 14294601, 14294625, 14295118, 14295131, 14295183, 14295205, 14295233, 14295243, 14295256, 14295279, 14295325, 14295328, 14295332,
+ 14295394, 14295420, 14295683, 14295688, 14295809, 14296174, 14296471, 14296495, 14296520, 14296596, 14296598, 14296727, 14296803,
+ 14296887, 14296913, 14296925, 14297069, 14297070, 14297260, 14297371, 14297452, 14297529, 14297538, 14297676, 14297759, 14297807,
+ 14297822, 14298409, 14298639, 14298896, 14298903, 14298932, 14299363, 14299554, 14300286, 14300298, 14300301, 14300495, 14300640,
+ 14300659, 14301074, 14301263, 14301438, 14301472, 14301639, 14301663, 14301665, 14301705, 14301827, 14302166, 14302216, 14302438,
+ 14302631, 14302782, 14302982, 14303337, 14303485, 14303928, 14304191, 14304195, 14304374, 14304577, 14304591, 14304640, 14305416,
+ 14305568, 14305668, 14305702, 14305917, 14305920, 14306074, 14306134, 14306454, 14307152, 14307386, 14307402, 14307413, 14307462,
+ 14307466, 14307547, 14307632, 14307804, 14307929, 14308045, 14308232, 14308345, 14308437, 14308448, 14309558, 14309627, 14309634,
+ 14309679, 14309714, 14309805, 14309832, 14309939, 14310154, 14310541, 14310658, 14310887, 14310987, 14311341, 14312039, 14312218,
+ 14312227, 14312251, 14312317, 14312327, 14312447, 14312532, 14313179, 14313565, 14313860, 14313880, 14313896, 14313985, 14314069,
+ 14314262, 14314503, 14314504, 14315064, 14315149, 14315158, 14315195, 14315406, 14315429, 14315534, 14315796, 14316030, 14316190,
+ 14316259, 14316600, 14316647, 14316861, 14317147, 14317635, 14317647, 14317657, 14317734, 14317812, 14317833, 14317844, 14317921,
+ 14317930, 14317937, 14317942, 14317945, 14317982, 14317988, 14318921, 14318922, 14319270, 14319315, 14319942, 14320162, 14320227,
+ 14320284, 14320753, 14320763, 14322722, 14322745, 14322786, 14322880, 14322990, 14323725, 14323744, 14324520, 14324584, 14324706,
+ 14324707, 14328007, 14328024, 14331549, 14331550, 14331679, 14332651, 14332653, 14332760, 14332764, 14332800, 14332809, 14333294,
+ 14333328, 14333336, 14333346, 14333551, 14333562, 14334351, 14334509, 14334540, 14334564, 14337693, 14340622, 14342084, 14342092,
+ 14342313, 14342321, 14342457, 14342462, 14343083, 14343087, 14343141, 14343154, 14343161, 14343551, 14343566, 14343577, 14343609,
+ 14343647, 14343803, 14343938, 14343962, 14344087, 14344928, 14344933, 14345088, 14345153, 14345161, 14345601, 14345744, 14345777,
+ 14346561, 14346614, 14346765, 14346782, 14346783, 14347126, 14347150, 14347420, 14347452, 14347570, 14347598, 14347626, 14347635,
+ 14347637, 14347725, 14347781, 14348725, 14348905, 14349352, 14349447, 14351917, 14352564, 14352616, 14352773, 14352923, 14353039,
+ 14354130, 14354236, 14354276, 14354277, 14354290, 14354327, 14354329, 14354337, 14354362, 14354420, 14354429, 14354456, 14354679,
+ 14354688, 14354691, 14354801, 14354829, 14354874, 14354902, 14354918, 14355487, 14355501, 14355611, 14355907, 14356212, 14356334,
+ 14356358, 14356391, 14356876, 14357035, 14357313, 14357658, 14357681, 14357718, 14357730, 14357799, 14357850, 14357987, 14358091,
+ 14358190, 14358267, 14358722, 14359057, 14359213, 14359358, 14359371, 14359465, 14359589, 14359597, 14359648, 14359654, 14360676,
+ 14360709, 14360796, 14361052, 14361484, 14361538, 14361631, 14361731, 14362244, 14362395, 14362428, 14362460, 14362496, 14362567,
+ 14362798, 14362805, 14362808, 14363004, 14363041, 14363050, 14363058, 14363068, 14363172, 14363510, 14363570, 14363734, 14364469,
+ 14364510, 14364518, 14365738, 14365742, 14365752, 14365867, 14365890, 14366055, 14366116, 14366211, 14366224, 14366233, 14366246,
+ 14366288, 14366309, 14366329, 14366429, 14366430, 14366443, 14366448, 14366472, 14366539, 14366589, 14366750, 14366765, 14366794,
+ 14366934, 14367112, 14367251, 14367272, 14367282, 14367466, 14367467, 14367468, 14367469, 14367477, 14367496, 14367530, 14367687,
+ 14367800, 14367833, 14367960, 14368004, 14368015, 14368024, 14368061, 14368069, 14368160, 14368167, 14368170, 14368194, 14368302,
+ 14368786, 14368797, 14368798, 14368810, 14368823, 14370205, 14370209, 14370844, 14370852, 14371635, 14371854, 14372502, 14372811,
+ 14375059, 14375196, 14375337, 14375353, 14376850, 14377162, 14377188, 14378134, 14378139, 14378142, 14378262, 14378276, 14378281,
+ 14378284, 14378300, 14378310, 14378366, 14378380, 14378433, 14380203, 14380358, 14380376, 14380432, 14380454, 14380479, 14380500,
+ 14380502, 14380511, 14380523, 14380526, 14380576, 14381101, 14381108, 14381116, 14381149, 14381187, 14381336, 14381643, 14381650,
+ 14384971, 14385017, 14385299, 14385327, 14385345, 14385346, 14385398, 14385409, 14386643, 14386717, 14387783, 14387792, 14387814,
+ 14387938, 14388060, 14388082, 14388164, 14388173, 14388184, 14388185, 14388190, 14388205, 14388211, 14388234, 14388244, 14388337,
+ 14388466, 14389756, 14389760, 14391505, 14391529, 14392389, 14392425, 14392444, 14392452, 14392466, 14392654, 14393420, 14393502,
+ 14393594, 14393595, 14393599, 14393671, 14394385, 14395110, 14395112, 14395122, 14395139, 14395232, 14395237, 14395341, 14395364,
+ 14395414, 14395416, 14397686, 14397758, 14397792, 14397865, 14398937, 14398955, 14398982, 14399110, 14399114, 14399131, 14399141,
+ 14399198, 14399200, 14399218, 14399248, 14399251, 14399276, 14399914, 14399919, 14399960, 14399989, 14399992, 14400040, 14400043,
+ 14400048, 14400097, 14400128, 14400131, 14402470, 14402526, 14402741, 14402794, 14402800, 14402805, 14402891, 14402926, 14404738,
+ 14404762, 14404988, 14405199, 14405204, 14405237, 14405348, 14406107, 14406164, 14406177, 14406665, 14406666, 14406887, 14406900,
+ 14406901, 14406982, 14406984, 14407108, 14407204, 14407309, 14407326, 14408372, 14408387, 14408522, 14408523, 14408534, 14408798,
+ 14408824, 14408858, 14410649, 14410860, 14410915, 14410986, 14411113, 14411190, 14411745, 14411764, 14412210, 14412275, 14412297,
+ 14412428, 14412434, 14412741, 14412857, 14412866, 14412869, 14413198, 14413199, 14413906, 14413934, 14414045, 14414168, 14414430,
+ 14414443, 14414710, 14415221, 14415252, 14415388, 14415429, 14415469, 14415513, 14415554, 14415608, 14415656, 14415660, 14415666,
+ 14415927, 14415975, 14416165, 14417518, 14418203, 14418277, 14418301, 14418317, 14418392, 14418533, 14418543, 14418546, 14419038,
+ 14419373, 14419466, 14419469, 14419481, 14419488, 14419499, 14419512, 14419521, 14419616, 14419697, 14419698, 14419805, 14419900,
+ 14419928, 14419929, 14419941, 14419942, 14419962, 14420023, 14420069, 14420082, 14420084, 14420086, 14420091, 14420094, 14420112,
+ 14420116, 14420129, 14420131, 14420180, 14420183, 14420193, 14420247, 14420253, 14420256, 14420275, 14420293, 14420303, 14420341,
+ 14420348, 14420480, 14420699, 14420814, 14420849, 14420851, 14420971, 14421014, 14421036, 14421045, 14421046, 14421169, 14421176,
+ 14421440, 14421858, 14421886, 14421920, 14422148, 14422321, 14422453, 14422593, 14422767, 14422856, 14423018, 14423133, 14423196,
+ 14423206, 14423268, 14423271, 14423515, 14423532, 14423583, 14423860, 14423881, 14423932, 14424014, 14424043, 14424067, 14424296,
+ 14424429, 14424452, 14424558, 14424562, 14424571, 14424585, 14424586, 14424589, 14424636, 14424685, 14424736, 14424750, 14424769,
+ 14425463, 14425546, 14425574, 14425575, 14425633, 14425767, 14425781, 14425849, 14425993, 14426028, 14426072, 14426221, 14426583,
+ 14427051, 14427197, 14427202, 14427208, 14427399, 14427441, 14427452, 14427473, 14427870, 14428817, 14428898, 14428920, 14429168,
+ 14429174, 14429180, 14429324, 14430071, 14430108, 14430138, 14430143, 14430231, 14430255, 14430816, 14430855, 14430886, 14430899,
+ 14430901, 14430902, 14430905, 14430924, 14430965, 14431006, 14431063, 14431282, 14431502, 14431545, 14431559, 14431720, 14431721,
+ 14432038, 14432172, 14432192, 14432201, 14432626, 14432636, 14432638, 14433023, 14433345, 14433362, 14433891, 14433944, 14434390,
+ 14434409, 14434414, 14434471, 14434649, 14436439, 14436511, 14436521, 14436616, 14436975, 14437026, 14437134, 14437167, 14437191,
+ 14437201, 14437204, 14437205, 14437268, 14437527, 14437534, 14437547, 14437565, 14437613, 14437807, 14437820, 14438118, 14438156,
+ 14438160, 14438162, 14438168, 14438215, 14438333, 14438365, 14438531, 14438538, 14438956, 14439014, 14439085, 14439105, 14439107,
+ 14439173, 14439501, 14439515, 14439776, 14439868, 14440295, 14440312, 14440363, 14440392, 14440418, 14440420, 14440431, 14440986,
+ 14440993, 14441010, 14441090, 14441114, 14441175, 14441182, 14441421, 14441424, 14441436, 14441455, 14442331, 14442410, 14442412,
+ 14442499, 14442590, 14443032, 14443124, 14443702, 14443783, 14443785, 14443880, 14443986, 14443987, 14443996, 14444016, 14444291,
+ 14444335, 14444348, 14444958, 14445106, 14445730, 14445744, 14445796, 14445857, 14445956, 14445960, 14449012, 14449107, 14449279,
+ 14449287, 14450086, 14450107, 14450169, 14450196, 14451369, 14451491, 14451664, 14451679, 14452080, 14452088, 14452158, 14452281,
+ 14452377, 14452464, 14454060, 14454100, 14454259, 14454284, 14455932, 14455937, 14456161, 14456169, 14456173, 14456215, 14456220,
+ 14456251, 14456262, 14456272, 14456374, 14456386, 14456389, 14456408, 14456422, 14456596, 14456654, 14456697, 14456714, 14457226,
+ 14457236, 14457251, 14457272, 14457294, 14457295, 14457323, 14457332, 14457341, 14457872, 14457925, 14458268, 14458361, 14462180,
+ 14462204, 14462241, 14462308, 14464172, 14464255, 14466306, 14466331, 14466411, 14466425, 14466470, 14466488, 14466497, 14466523,
+ 14466972, 14466984, 14467004, 14467023, 14468341, 14468496, 14469581, 14469604, 14469619, 14469675, 14470339, 14470341, 14470456,
+ 14470514, 14470520, 14470622, 14470887, 14470888, 14471412, 14471417, 14471591, 14471594, 14473086, 14473092, 14473096, 14473097,
+ 14473637, 14473642, 14475479, 14475496, 14475695, 14475733, 14476630, 14476676, 14476712, 14476812, 14477122, 14477145, 14477588,
+ 14477589, 14477594, 14477605, 14477607, 14477633, 14477742, 14477772, 14477777, 14478030, 14478043, 14478624, 14478666, 14479141,
+ 14479784, 14479865, 14479943, 14479950, 14479961, 14481636, 14481637, 14481722, 14481726, 14481758, 14481986, 14481997, 14482096,
+ 14482102, 14482118, 14482138, 14482420, 14482427, 14482457, 14482487, 14482508, 14482687, 14482693, 14482834, 14482845, 14483435,
+ 14483438, 14483442, 14483453, 14483471, 14483605, 14483834, 14483839, 14484322, 14484339, 14484341, 14484392, 14484412, 14484498,
+ 14484698, 14484752, 14484755, 14488867, 14488878, 14488894, 14488896, 14489287, 14489291, 14489510, 14489549, 14490029, 14490073,
+ 14490084, 14490085, 14490086, 14490088, 14490123, 14490128, 14490190, 14490213, 14490644, 14490652, 14490708, 14490728, 14490903,
+ 14490908, 14491415, 14491754, 14491757, 14491758, 14491805, 14492838, 14493628, 14494367, 14494372, 14494373, 14494376, 14494379,
+ 14494381, 14494646, 14494656, 14494661, 14494752, 14494868, 14494907, 14494921, 14494941, 14494953, 14494954, 14495034, 14495065,
+ 14495075, 14495076, 14495135, 14495154, 14495165, 14495173, 14495188, 14495192, 14495488, 14495493, 14495495, 14495501, 14495644,
+ 14495687, 14495688, 14495840, 14495967, 14495968, 14496394, 14496406, 14496408, 14496432, 14496500, 14496551, 14496604, 14496966,
+ 14497034, 14497038, 14497550, 14497568, 14497570, 14497668, 14497702, 14497706, 14497708, 14497820, 14497848, 14497895, 14497913,
+ 14497935, 14497937, 14498323, 14498354, 14498355, 14501002, 14501005, 14501526, 14502186, 14502208, 14502215, 14502229, 14502284,
+ 14502295, 14502315, 14502353, 14502605, 14502627, 14502635, 14502663, 14502758, 14502769, 14503020, 14503058, 14503061, 14503068,
+ 14503086, 14503134, 14503288, 14503395, 14503429, 14503435, 14503522, 14503525, 14504153, 14504162, 14504169, 14504173, 14504371,
+ 14504422, 14504432, 14504442, 14507145, 14507147, 14507476, 14507486, 14507489, 14507515, 14507520, 14507570, 14507702, 14507732,
+ 14508208, 14508212, 14509089, 14509103, 14509612, 14509623, 14511370, 14511373, 14511378, 14511379, 14511768, 14511773, 14512246,
+ 14512248, 14514087, 14514094, 14514100, 14514117, 14514130, 14514133, 14514156, 14514162, 14514508, 14514588, 14514908, 14514918,
+ 14514964, 14514971, 14514989, 14515007, 14515063, 14515165, 14515419, 14515421, 14515591, 14515593, 14515714, 14515716, 14515719,
+ 14515720, 14515748, 14515749, 14515854, 14515860, 14515903, 14515904, 14515951, 14515955, 14515993, 14515997, 14516253, 14516270,
+ 14516372, 14516412, 14516497, 14516503, 14517397, 14517439, 14519618, 14519619, 14519694, 14519701, 14519702, 14519714, 14519776,
+ 14519782, 14519803, 14519804, 14519955, 14519996, 14520020, 14520024, 14520043, 14520060, 14520061, 14520062, 14520115, 14520126,
+ 14520159, 14520172, 14520186, 14520190, 14520198, 14520212, 14520222, 14520227, 14520235, 14520497, 14520498, 14520746, 14520774,
+ 14520977, 14520982, 14520986, 14521011, 14521066, 14521069, 14522110, 14522112, 14522118, 14522165, 14522218, 14522219, 14522733,
+ 14522797, 14523118, 14523126, 14523830, 14523835, 14524242, 14524243, 14524259, 14524266, 14526070, 14526077, 14526083, 14526086,
+ 14526087, 14526099, 14526120, 14526126, 14526141, 14526211, 14526215, 14526221, 14526244, 14526255, 14526300, 14526321, 14526332,
+ 14526340, 14526344, 14526346, 14526356, 14526363, 14526380, 14526442, 14526463, 14527065, 14527080, 14527084, 14527176, 14527178,
+ 14527369, 14527370, 14527424, 14527431, 14527447, 14527451, 14527599, 14527626, 14527627, 14527633, 14527696, 14527715, 14527723,
+ 14527735, 14527839, 14528084, 14528085, 14528093, 14528124, 14528171, 14528614, 14528712, 14528723, 14528757, 14528758, 14528864,
+ 14528925, 14528961, 14528969, 14528986, 14528993, 14528997, 14529009, 14529012, 14529017, 14529021, 14529024, 14529026, 14529029,
+ 14529033, 14529037, 14529046, 14529100, 14529124, 14529557, 14530096, 14530149, 14531104, 14531141, 14531213, 14531235, 14531744,
+ 14531775, 14531956, 14531968, 14531999, 14532026, 14532066, 14532097, 14532696, 14532706, 14532729, 14532730, 14532739, 14532749,
+ 14532758, 14532838, 14532843, 14533032, 14533035, 14533049, 14533066, 14533070, 14533079, 14533136, 14533141, 14533267, 14533299,
+ 14533319, 14533321, 14533346, 14533372, 14533410, 14533430, 14533442, 14533526, 14533548, 14533722, 14533805, 14533836, 14533847,
+ 14533860, 14533861, 14533873, 14533878, 14533920, 14534184, 14534185, 14534191, 14534193, 14534233, 14534256, 14534343, 14534366,
+ 14534397, 14534426, 14535016, 14535017, 14535020, 14535028, 14535045, 14535083, 14535119, 14535180, 14535199, 14535394, 14535426,
+ 14535428, 14535456, 14535475, 14535634, 14535662, 14535688, 14535691, 14535692, 14535702, 14536479, 14536480, 14536489, 14536490,
+ 14536492, 14536493, 14538931, 14538950, 14539037, 14539038, 14539216, 14539309, 14539334, 14539344, 14539390, 14539420, 14539473,
+ 14539534, 14539537, 14539564, 14540149, 14540166, 14540656, 14540667, 14540769, 14540796, 14541039, 14541063, 14541069, 14541071,
+ 14541159, 14541165, 14541181, 14541201, 14541315, 14541323, 14541325, 14541328, 14541535, 14542840, 14542888, 14542906, 14542907,
+ 14543190, 14543248, 14543853, 14543908, 14544590, 14544596, 14544603, 14544616, 14544670, 14544671, 14544700, 14544710, 14544746,
+ 14544754, 14544827, 14544828, 14544837, 14544856, 14544877, 14544962, 14545025, 14545172, 14545204, 14545224, 14545226, 14545234,
+ 14545464, 14545483, 14545723, 14545743, 14545958, 14545994, 14546116, 14546131, 14546151, 14546163, 14546371, 14546380, 14546408,
+ 14546419, 14546448, 14546450, 14546509, 14546553, 14546560, 14546608, 14546630, 14546636, 14546678, 14546684, 14546867, 14546869,
+ 14547247, 14547249, 14547565, 14547577, 14547724, 14547850, 14547854, 14547861, 14547962, 14548000, 14550132, 14550221, 14552498,
+ 14552506, 14552667, 14552671, 14552813, 14552828, 14553470, 14553472, 14553476, 14554183, 14554188, 14554192, 14554225, 14554740,
+ 14554785, 14555988, 14556013, 14556021, 14556022, 14556083, 14556084, 14556089, 14556092, 14556100, 14556103, 14556108, 14556140,
+ 14556651, 14558534, 14559061, 14559072, 14559085, 14559733, 14559791, 14560016, 14560026, 14560028, 14560038, 14560040, 14560076,
+ 14560273, 14560275, 14560303, 14560306, 14560310, 14560322, 14560576, 14560577, 14560582, 14560595, 14560608, 14560622, 14560728,
+ 14560734, 14561795, 14561825, 14561840, 14562587, 14562623, 14562630, 14562645, 14563527, 14563541, 14563542, 14563549, 14563729,
+ 14563739, 14563740, 14563748, 14563749, 14563755, 14563766, 14563768, 14563774, 14563775, 14563894, 14563959, 14563963, 14563967,
+ 14564050, 14564054, 14564058, 14564075, 14564164, 14564730, 14564733, 14565457, 14565462, 14565943, 14566817, 14566822, 14588081,
+ 15278993, 15298860, 15299275, 15299420, 15299520, 15299715, 15299731, 15299757, 15301708, 15301850, 15301875, 15302455, 15302967,
+ 15304019, 15305121, 15305561, 15307407, 15307490, 15307868, 15308032, 15311107, 15311210, 15311599, 15316343, 15316528, 15316535,
+ 15317411, 15318069, 15318235, 15318288, 15318437, 15318758, 15319019, 15319366, 15319403, 15320313, 15321005, 15321511, 15321634,
+ 15321707, 15321890, 15322055, 15322136, 15323088, 15323182, 15323543, 15324636, 15327600, 15328789, 15328903, 15328961, 15329151,
+ 15330358, 15330441, 15330468, 15331215, 15331280, 15333764, 15333830, 15335397, 15336059, 15337247, 15337395, 15337630, 15339099,
+ 15340038, 15340971, 15341319, 15341479, 15341544, 15342783, 15343155, 15343302, 15343551, 15343809, 15344150, 15344169, 15344370,
+ 15344584, 15346218, 15346421, 15346604, 15346684, 15346714, 15346716, 15350123, 15350143, 15350966, 15351041, 15351346, 15351348,
+ 15352316, 15352341, 15353576, 15353802, 15354436, 15354503, 15354708, 15354744, 15355751, 15355938, 15356263, 15356464, 15357773,
+ 15357806, 15357836, 15357870, 15359242, 15359261, 15359409, 15359557, 15359701, 15359731, 15359846, 15359932, 15360348, 15360351,
+ 15360966, 15360968, 15360998, 15361018, 15363267, 15363312, 15363413, 15363420, 15363920, 15364070, 15364136, 15364150, 15364663,
+ 15364715, 15367310, 15367326, 15368095, 15368104, 15368537, 15368541, 15368874, 15368881, 15369797, 15369898, 15370883, 15370885,
+ 15371463, 15371516, 15372941, 15373029, 15373035, 15373039, 15373489, 15373548, 15374297, 15374326, 15374448, 15374596, 15375231,
+ 15375318, 15375776, 15375803, 15376049, 15376057, 15377278, 15377371, 15378036, 15378043, 15378052, 15378059, 15378164, 15378166,
+ 15379378, 15379430, 15379848, 15379863, 15379880, 15379890, 15381333, 15381472, 15381587, 15381594, 15382319, 15382335, 15382622,
+ 15382689, 15384884, 15384889, 15386453, 15386482, 15386506, 15386762, 15386943, 15387036, 15387461, 15387465, 15387752, 15387804,
+ 15388394, 15388486, 15388606, 15388617, 15389904, 15390109, 15390434, 15390437, 15390816, 15390866, 15393023, 15393050, 15393079,
+ 15393299, 15393785, 15393789, 15394171, 15394184, 15394223, 15394363, 15397304, 15397311, 15397367, 15397572, 15398540, 15398542,
+ 15398966, 15398984, 15400273, 15400276, 15400610, 15400638, 15401565, 15401650, 15404521, 15404620, 15406007, 15406017, 15406624,
+ 15406687, 15407958, 15407964, 15408278, 15408287, 15410615, 15410769, 15411104, 15411119, 15411326, 15411591, 15411833, 15411836,
+ 15413038, 15413046, 15413111, 15413148, 15413371, 15413374, 15413483, 15413499, 15415282, 15415416, 15417725, 15417802, 15417896,
+ 15417906, 15419558, 15419604, 15419797, 15419800, 15419980, 15420000, 15420016, 15420019, 15421514, 15421544, 15423424, 15423558,
+ 15423661, 15423673, 15424869, 15424873, 15425240, 15425382, 15425895, 15425897, 15426289, 15426372, 15427195, 15427225, 15427230,
+ 15427233, 15427289, 15427298, 15427993, 15427999, 15428176, 15428217, 15428227, 15428516, 15428529, 15428567, 15428784, 15429008,
+ 15429020, 15429026, 15429032, 15429281, 15430344, 15430346, 15430706, 15430735, 15430879, 15430885, 15431260, 15431365, 15432397,
+ 15432422, 15432649, 15432654, 15432804, 15432819, 15433923, 15433932, 15435272, 15435298, 15437041, 15437050, 15438105, 15438114,
+ 15440121, 15440253, 15441104, 15441282, 15442199, 15442584, 15443871, 15444142, 15444188, 15444408, 15444685, 15444690, 15445733,
+ 15445736, 15445863, 15445878, 15447031, 15447065, 15448796, 15448816, 15449403, 15449413, 15449587, 15449609, 15449711, 15449878,
+ 15449962, 15449964, 15450263, 15450405, 15450446, 15450450, 15451400, 15451408, 15451819, 15451857, 15452179, 15452192, 15452979,
+ 15453020, 15453357, 15453514, 15455431, 15455434, 15455761, 15455880, 15456762, 15456784, 15457983, 15459043, 15459439, 15459567,
+ 15459814, 15459822, 15460508, 15460591, 15461069, 15461082, 15462424, 15462426, 15462594, 15462656, 15462690, 15462696, 15463436,
+ 15463936, 15464266, 15465784, 15465839, 15465937, 15466610, 15466631, 15467021, 15467085, 15467103, 15467109, 15467756, 15467851,
+ 15468430, 15468503, 15468511, 15468652, 15469184, 15469200, 15469285, 15469458, 15469754, 15469759, 15470276, 15470283, 15470370,
+ 15470392, 15471545, 15471785, 15473261, 15473269, 15473454, 15473460, 15474422, 15474425, 15474922, 15475151, 15475640, 15475643,
+ 15476163, 15476405, 15476427, 15476439, 15477009, 15477179, 15477640, 15477649, 15479093, 15479107, 15480142, 15480151, 15480580,
+ 15480814, 15481022, 15481026, 15481035, 15481037, 15481562, 15481565, 15481590, 15481591, 15481741, 15481744, 15482067, 15482078,
+ 15482616, 15482683, 15486561, 15486564, 15486616, 15486617, 15486666, 15486668, 15486678, 15486680, 15487459, 15487500, 15488119,
+ 15488127, 15488401, 15488409, 15488440, 15488442, 15488965, 15488970, 15489694, 15489700, 15490595, 15490615, 15491720, 15491760,
+ 15492016, 15492020, 15492072, 15492087, 15492855, 15492857, 15493002, 15493004, 15493071, 15493074, 15493106, 15493108, 15493360,
+ 15493365, 15494319, 15494332, 15496258, 15496263, 15497235, 15497254, 15497321, 15497338, 15498352, 15498354, 15499365, 15499369,
+ 15501348, 15501354, 15502470, 15502478, 15503665, 15503673, 15504523, 15504537, 15504621, 15504628, 15504938, 15505080, 15506069,
+ 15506072, 15506112, 15506113, 15506426, 15506436, 15507433, 15507435, 15508130, 15508192, 15508250, 15508358, 15510418, 15510430,
+ 15510706, 15510712, 15511523, 15511526, 15511628, 15511629, 15512065, 15512071, 15512120, 15512121, 15513126, 15513199, 15513214,
+ 15513441, 15514260, 15514460, 15515518, 15515520, 15515699, 15515701, 15516480, 15516482, 15517627, 15517654, 15518075, 15518102,
+ 15519576, 15519578, 15520859, 15520864, 15521342, 15521351, 15521537, 15521553, 15521701, 15521707, 15522808, 15523015, 15523483,
+ 15523488, 15524388, 15524397, 15524703, 15524713, 15525341, 15525343, 15525349, 15525353, 15526412, 15526559, 15527127, 15527133,
+ 15527672, 15527675, 15528231, 15528248, 15528274, 15528307, 15529512, 15529522, 15529961, 15530071, 15530915, 15530926, 15531367,
+ 15531370, 15533472, 15533487, 15534560, 15534786, 15535306, 15535318, 15535392, 15535522, 15538116, 15539371, 15540337, 15540602,
+ 15541064, 15541071, 15541659, 15541666, 15541681, 15541719, 15541771, 15541777, 15542276, 15542282, 15542576, 15542585, 15542589,
+ 15542594, 15542886, 15542896, 15543880, 15543976, 15544196, 15546926, 15547006, 15547018, 15547117, 15547119, 15547436, 15547520,
+ 15547554, 15547587, 15547642, 15547644, 15549036, 15549039, 15549429, 15549448, 15550823, 15550828, 15551147, 15551381, 15551716,
+ 15551720, 15552150, 15552267, 15554087, 15554090, 15554449, 15554456, 15555207, 15555210, 15556032, 15556037, 15556177, 15556184,
+ 15557755, 15557761, 15558433, 15558443, 15559082, 15559107, 15560806, 15560890, 15561941, 15562075, 15562258, 15562260, 15563500,
+ 15563507, 15563620, 15563624, 15565974, 15565985, 15566159, 15566161, 15566675, 15567720, 15567772, 15697646, 15698252, 15699048,
+ 15699049, 15699308, 15699355, 15701033, 15701037, 15701139, 15701868, 15722361, 15723839, 15725644, 15726602, 15726621, 15726727,
+ 15726730, 15728420, 15728425, 15729973, 15729986, 15731110, 15731125, 15732349, 15732819, 15733345, 15733382, 15736966, 15741478,
+ 15742747, 15743712, 15744541, 15746902, 15748357, 15751438, 15751801, 15754322, 15755697, 15768595, 15768635, 15768636, 15771170,
+ 15771235, 15771418, 15771566, 15772511, 15772514, 15773217, 15773287, 15773693, 15775062, 15775162, 15775170, 15775628, 15775748,
+ 15777966, 15778518, 15780571, 15780590, 15781334, 15781414, 15783805, 15784103, 15784218, 15784222, 15784336, 15786288, 15786350,
+ 15786412, 15786880, 15787424, 15791418, 15791577, 15791945, 15792759, 15792904, 15792905, 15793375, 15799982, 15800147, 15800148,
+ 15800738, 15800739, 15801497, 15801498, 15803568, 15803571, 15805641, 15808771, 15809000, 15815539, 15815540, 15815571, 15816365,
+ 15816366, 15820482, 15820483, 15820930, 15820933, 15822783, 15822784, 15823306, 15823308, 15823485, 15823486, 15827101, 15827102,
+ 15830019, 15830020, 15830105, 15830106, 15835137, 15835138, 15838243, 15839723, 15840576, 15841503, 15841688, 15841690, 15847048,
+ 15847050, 15847745, 15848829, 15850375, 15855827, 15859288, 15859289, 15860023, 15860373, 15860606, 15860607, 15860828, 15860829,
+ 15861647, 15861648, 15861982, 15861983, 15863539, 15865475, 15865811, 15865812, 15865814, 15865819, 15865939, 15865940, 15866722,
+ 15866723, 15867794, 15869548, 15870297, 15870823, 15870956, 15870957, 15871190, 15871197, 15871254, 15871766, 15872132, 15873270,
+ 15875334, 15875634, 15875797, 15876025, 15876802, 15876803, 15876808, 15876810, 15876831, 15876833, 15876844, 15876845, 15876858,
+ 15876859, 15876865, 15876866, 15876996, 15877054, 15877147, 15878253, 15878396, 15878397, 15878409, 15878410, 15880251, 15880252,
+ 15880976, 15883223, 15883257, 15883258, 15883267, 15883268, 15883338, 15883366, 15883572, 15883573, 15883704, 15883705, 15883815,
+ 15883866, 15884708, 15885134, 15886585, 15886948, 15889015, 15889135, 15889263, 15889264, 15889297, 15890107, 15890836, 15890856,
+ 15891258, 15891259, 15891595, 15891596, 15898995, 15899413, 15900484, 15900485, 15900856, 15900857, 15900999, 15901784, 15902052,
+ 15902074, 15903287, 15904479, 15904560, 15904561, 15904756, 15904948, 15905428, 15905429, 15908728, 15908729, 15908732, 15908733,
+ 15908737, 15908739, 15911168, 15911169, 15911465, 15911466, 15912295, 15912378, 15912429, 15912435, 15912645, 15913367, 15915228,
+ 15915229, 15915232, 15915233, 15915473, 15915474, 15915509, 15915510, 15915885, 15915886, 15916207, 15916208, 15916906, 15916907,
+ 15917200, 15917202, 15917206, 15917207, 15921490, 15921491, 15921519, 15922789, 15923115, 15923117, 15924339, 15924525, 15924533,
+ 15926434, 15927196, 15928263, 15929673, 15929674, 15929698, 15929766, 15930272, 15941143, 15941944, 15941945, 15941949, 15941950,
+ 15941954, 15941955, 15941966, 15941967, 15942041, 15942242, 15943918, 15944225, 15944958, 15948423, 15948742, 15948893, 15948934,
+ 15948935, 15948952, 15948953, 15948974, 15948975, 15948980, 15948981, 15948984, 15948985, 15948995, 15948996, 15949061, 15949062,
+ 15950050, 15950051, 15950637, 15950638, 15950642, 15950643, 15950646, 15950647, 15950650, 15950651, 15950666, 15950667, 15950686,
+ 15950687, 15951694, 15951695, 15951941, 15951942, 15951970, 15951971, 15951974, 15951975, 15951978, 15951979, 15952040, 15954672,
+ 15956700, 15956815, 15957170, 15957963, 15965549, 15968309, 15969082, 15969120, 15970110, 15970111, 15970828, 15970854, 15971891,
+ 15971916, 15971980, 15972006, 15973526, 15973527, 15973835, 15974371, 15976265, 15977379, 15978362, 15978948, 15979197, 15980087,
+ 15980290, 15980299, 15981105, 15981106, 15981914, 15981915, 15982995, 15985005, 15985847, 15986020, 15986468, 15990277, 15990962,
+ 15991688, 15992374, 15992627, 15992966, 15994933, 15995140, 15995217, 15998964, 16006307, 16010481, 16011214, 16012893, 16013844,
+ 16015906, 17636688, 17637873, 17638275, 17638348, 17638487, 17638892, 17664726, 17667175, 17673330, 17673544, 17673816, 17681905,
+ 17685084, 17685085, 17687705, 17691885, 17692405, 17693311, 17694199, 17698519, 17699421, 17699575, 17699776, 17704976, 17705868,
+ 17707335, 17707490, 17710949, 17711356, 17711906, 17712444, 17720306, 17720567, 17723439, 17723538, 17729149, 17729172, 17730669,
+ 17735353, 17738506, 17739593, 17742978, 17746144, 17752865, 17759547, 17770240, 17774229, 17774250, 17778606, 17779105, 17782179,
+ 17783310, 17783420, 17784087, 17791119, 17792330, 17793195, 17795208, 17796208, 17798702, 17803925, 17806758, 17808553, 17811929,
+ 17815836, 17818217, 17853647, 17855162, 17855180, 17874661, 17881967, 17886031, 17886472, 17886499, 17892400, 17892586, 17893593,
+ 17918105, 17920208, 17923983, 17932312, 17940478, 17949572, 17950256, 17978577, 17978638, 17979243, 17981913, 17981914, 17986345,
+ 17995612, 17998455, 18001936, 18018601, 18019359, 18020832, 18020852, 18020857, 18021161, 18024791, 18028665, 18028982, 18029024,
+ 18029065, 18029402, 18029410, 18029412, 18029430, 18029461, 18029535, 18029709, 18029941, 18030109, 18030158, 18030174, 18030618,
+ 18030897, 18031010, 18031050, 18031102, 18031119, 18033407, 18033471, 18033519, 18034800, 18035522, 18035524, 18035558, 18035587,
+ 18035592, 18035611, 18035718, 18036283, 18037159, 18037177, 18037518, 18037756, 18037831, 18038107, 18038314, 18040137, 18040830,
+ 18042044, 18042107, 18042113, 18042989, 18044136, 18044214, 18045284, 18046457, 18046504, 18046619, 18046757, 18047186, 18047597,
+ 18047661, 18047776, 18047878, 18047880, 18048688, 18049264, 18050153, 18050586, 18050926, 18051022, 18052532, 18052575, 18052827,
+ 18053165, 18053676, 18053753, 18054135, 18055170, 18056994, 18057401, 18057693, 18057697, 18058403, 18058457, 18058779, 18058896,
+ 18059950, 18059951, 18061046, 18061130, 18061163, 18061330, 18062045, 18062047, 18062332, 18063045, 18063475, 18063531, 18063738,
+ 18064294, 18065075, 18065242, 18065980, 18066212, 18066443, 18066962, 18067060, 18067533, 18067720, 18067880, 18067908, 18067926,
+ 18069030, 18069287, 18069478, 18069486, 18070682, 18070696, 18070945, 18070960, 18071100, 18071247, 18071778, 18071877, 18071965,
+ 18072000, 18072080, 18072170, 18072197, 18072238, 18072391, 18072987, 18073243, 18074765, 18075302, 18075625, 18075780, 18075781,
+ 18075911, 18075915, 18075944, 18075961, 18078850, 18079649, 18082360, 18084867, 18084911, 18085324, 18085709, 18087962, 18087963,
+ 18088191, 18088242, 18088250, 18088280, 18088356, 18088559, 18088585, 18088685, 18088801, 18089141, 18089688, 18089823, 18090573,
+ 18092942, 18093321, 18093525, 18093792, 18094278, 18094280, 18094353, 18094818, 18095086, 18096830, 18096870, 18096945, 18099264,
+ 18099563, 18103567, 18105534, 18105712, 18105730, 18106676, 18106758, 18107898, 18108072, 18108109, 18108251, 18108364, 18108366,
+ 18108385, 18108608, 18109192, 18109630, 18109736, 18109886, 18110216, 18111914, 18117472, 18120015, 18121451, 18121461, 18123475,
+ 18126178, 18127068, 18127313, 18128050, 18128330, 18128335, 18128741, 18129173, 18129186, 18129274, 18129299, 18129598, 18129647,
+ 18130999, 18131052, 18132357, 18132384, 18132993, 18133129, 18133459, 18134121, 18134494, 18134563, 18134668, 18134725, 18135378,
+ 18135538, 18135637, 18136098, 18136421, 18136723, 18136850, 18138655, 18138798, 18139149, 18139266, 18139885, 18144618, 18145061,
+ 18145076, 18145167, 18145171, 18145489, 18145498, 18151530, 18154233, 18157193, 18157230, 18157352, 18157653, 18158227, 18159887,
+ 18160433, 18160599, 18163130, 18167158, 18167584, 18167696, 18168147, 18168194, 18169252, 18169257, 18169269, 18171907, 18171970,
+ 18173270, 18173746, 18173941, 18173950, 18174259, 18174963, 18176304, 18176339, 18176342, 18177237, 18177283, 18177395, 18177473,
+ 18177557, 18177648, 18178048, 18178068, 18179144, 18179923, 18180023, 18180031, 18182471, 18182554, 18183350, 18185302, 18186630,
+ 18189759, 18191550, 18191572, 18191690, 18191760, 18209428, 18209658, 18210069, 18210134, 18211447, 18211680, 18213658, 18214305,
+ 18226915, 18227231, 18233695, 18234036, 18234679, 18237160, 18237345, 18237354, 18237447, 18238159, 18238169, 18238305, 18238306,
+ 18238341, 18239452, 18239552, 18239591, 18242107, 18243775, 18247187, 18248062, 18248090, 18248152, 18248702, 18248948, 18251287,
+ 18253159, 18253172, 18253256, 18253494, 18253674, 18253702, 18253731, 18253737, 18254465, 18254579, 18254961, 18255157, 18255423,
+ 18255953, 18255964, 18255975, 18256059, 18256119, 18256175, 18256361, 18258481, 18258531, 18258617, 18258894, 18258898, 18258975,
+ 18259049, 18259278, 18259287, 18259310, 18260016, 18261458, 18261488, 18261623, 18262488, 18262528, 18262642, 18262749, 18262798,
+ 18262808, 18262813, 18262819, 18262827, 18262860, 18263274, 18265073, 18265373, 18274127, 18274713, 18274727, 18275088, 18275112,
+ 18275130, 18278505, 18278955, 18279067, 18279081, 18282620, 18282661, 18283406, 18283563, 18283848, 18284148, 18284248, 18284447,
+ 18284548, 18285101, 18285102, 18285296, 18285465, 18285587, 18286538, 18286732, 18286922, 18287028, 18287423, 18287435, 18288316,
+ 18288614, 18288684, 18289315, 18289388, 18289811, 18290157, 18291493, 18291622, 18291700, 18291765, 18292103, 18292104, 18292192,
+ 18292266, 18293383, 18293550, 18293680, 18293751, 18293811, 18294213, 18294759, 18299826, 18299990, 18300398, 18301246, 18301327,
+ 18303702, 18303813, 18304121, 18306402, 18306490, 18306738, 18307134, 18307258, 18307380, 18307382, 18307680, 18308694, 18308707,
+ 18308744, 18308789, 18308936, 18309470, 18309756, 18310124, 18310324, 18310679, 18313272, 18313276, 18313936, 18313942, 18314463,
+ 18314471, 18314489, 18314786, 18314944, 18314957, 18315430, 18315905, 18315975, 18316319, 18316622, 18316913, 18317424, 18317507,
+ 18317562, 18317614, 18318101, 18318833, 18319890, 18320642, 18320688, 18322258, 18322526, 18322711, 18323528, 18323546, 18324258,
+ 18326071, 18328517, 18329261, 18333428, 18334440, 18334468, 18340005, 18340701, 18341515, 18342104, 18343985, 18344306, 18344387,
+ 18344445, 18349782, 18354524, 18354532, 18354567, 18354647, 18355784, 18355800, 18355890, 18356093, 18356174, 18357105, 18358907,
+ 18359179, 18360540, 18360761, 18361109, 18362474, 18362701, 18363071, 18363333, 18363353, 18363359, 18363669, 18363849, 18364852,
+ 18365537, 18365642, 18370037, 18374101, 18374518, 18374703, 18378858, 18378979, 18379121, 18388650, 18392831, 18392906, 18393035,
+ 18393498, 18395705, 18396655, 18396696, 18399717, 18399721, 18399791, 18399885, 18400237, 18400318, 18401555, 18403896, 18403898,
+ 18403948, 18403950, 18404071, 18404074, 18404115, 18404117, 18404169, 18404170, 18404177, 18404214, 18408893, 18409021, 18409026,
+ 18409046, 18409296, 18409304, 18409332, 18409338, 18409342, 18409356, 18409383, 18409396, 18409511, 18409551, 18409567, 18409579,
+ 18409581, 18409638, 18409642, 18409660, 18409669, 18409705, 18409710, 18409737, 18410309, 18410336, 18410366, 18410382, 18410392,
+ 18410418, 18410426, 18410429, 18410929, 18410976, 18411158, 18414923, 18414966, 18414967, 18414971, 18414973, 18414996, 18415012,
+ 18415335, 18415343, 18415344, 18415372, 18415383, 18415401, 18415404, 18415409, 18415410, 18415439, 18415463, 18415730, 18415734,
+ 18415751, 18415752, 18415755, 18415762, 18415770, 18415789, 18415907, 18415911, 18415914, 18415915, 18415918, 18415919, 18415924,
+ 18415934, 18415935, 18415948, 18415951, 18415960, 18415962, 18415969, 18415974, 18415988, 18415996, 18416003, 18416007, 18416096,
+ 18416097, 18416098, 18416099, 18416110, 18416111, 18416121, 18417000, 18417004, 18417110, 18417111, 18417153, 18417223, 18417250,
+ 18417254, 18417255, 18417271, 18417276, 18417298, 18417306, 18418074, 18418081, 18419778, 18419803, 18419847, 18419867, 18419982,
+ 18420104, 18420138, 18420139, 18420149, 18420289, 18420295, 18421340, 18421341, 18421351, 18421354, 18421396, 18422027, 18422036,
+ 18422039, 18422146, 18422232, 18422238, 18422335, 18422473, 18422479, 18422569, 18422577, 18422932, 18423232, 18423233, 18423380,
+ 18423386, 18423801, 18423803, 18424005, 18424006, 18424106, 18424119, 18427918, 18428063, 18428188, 18428190, 18428341, 18428344,
+ 18428376, 18428378, 18428415, 18429089, 18429190, 18429191, 18429295, 18429301, 18429401, 18429408, 18429419, 18429425, 18429515,
+ 18429526, 18429763, 18430201, 18430203, 18430403, 18431180, 18431188, 18431554, 18431563, 18431586, 18431622, 18431858, 18431859,
+ 18432040, 18432050, 18432832, 18433010, 18433079, 18433119, 18459655, 18461356, 18461857, 18462173, 18463453, 18463531, 18479349,
+ 18479433, 18479437, 18479545, 18479547, 18479583, 18479584, 18479595, 18479615, 18479616, 18479622, 18481099, 18481103, 18481144,
+ 18481145, 18481150, 18481262, 18481457, 18481554, 18481769, 18485920, 18501825, 18501901, 18501914, 18503176, 18503321, 18503324,
+ 18503327, 18503748, 18503861, 18505085, 18505121, 18505795, 18505826, 18505827, 18505942, 18507352, 18507393, 18507395, 18507485,
+ 18507493, 18513155, 18513195, 18513450, 18513477, 18513488, 18513513, 18513532, 18513740, 18535188, 18535211, 18535223, 18535504,
+ 18535506, 18535511, 18535523, 18535526, 18535693, 18535863, 18535867, 18535950, 18535960, 18536171, 18536855, 18536862, 18536866,
+ 18536868, 18536869, 18537563, 18537686, 18537828, 18537830, 18539322, 18539428, 18539449, 18539565, 18539569, 18542957, 18549853,
+ 18549867, 18614667, 18614674, 18614685, 18614689, 18629129, 18629130, 18629263, 18629369, 18629370, 18629490, 18629492, 18630041,
+ 18630174, 18630284, 18640752, 18640754, 18640811, 18640900, 18640907, 18640943, 18640945, 18641080, 18641081, 18641157, 18641158,
+ 18641209, 18641401, 18642300, 18642313, 18642314, 18642405, 18642455, 18642533, 18642534, 18642593, 18642798, 18642799, 18644754,
+ 18690658, 18690699, 18692929, 18692939, 18698953, 18698954, 18699153, 18699427, 18699430, 18700378, 18700541, 18700543, 18700746,
+ 18700748, 18700766, 18700833, 18700834, 18700841, 18700842, 18701022, 18701473, 18701507, 18701522, 18701524, 18701573, 18701579,
+ 18701583, 18701911, 18702014, 18702025, 18702055, 18702094, 18702904, 18703319, 18703328, 18703920, 18704157, 18704427, 18704428,
+ 18705700, 18706080, 18707114, 18707117, 18707253, 18707486, 18707577, 18707592, 18707596, 18707946, 18707947, 18707956, 18707959,
+ 18707960, 18708017, 18708020, 18708754, 18708755, 18708938, 18709230, 18709237, 18709605, 18709606, 18709614, 18709621, 18709666,
+ 18709675, 18709742, 18709754, 18709760, 18709875, 18709881, 18709972, 18709987, 18710107, 18710153, 18710156, 18710159, 18710194,
+ 18710203, 18710456, 18710530, 18710672, 18722404, 18722407, 18722441, 18722444, 18722474, 18722476, 18722661, 18722684, 18722853,
+ 18722855, 18722857, 18722860, 18722964, 18722965, 18722991, 18723370, 18723413, 18723704, 18723707, 18723764, 18723766, 18723857,
+ 18723860, 18723916, 18723941, 18723981, 18735304, 18735677, 18737090, 18737199, 18737256, 18737264, 18737394, 18737400, 18738534,
+ 18738537, 18738632, 18738633, 18738690, 18738691, 18738755, 18739002, 18739014, 18739017, 18739026, 18739095, 18739204, 18739715,
+ 18739719, 18739774, 18739780, 18741326, 18741377, 18742319, 18742321, 18742401, 18743044, 18743049, 18743102, 18743109, 18743127,
+ 18743150, 18743153, 18744034, 18744038, 18744047, 18744053, 18744099, 18744100, 18744161, 18744178, 18744272, 18744440, 18744448,
+ 18744503, 18744507, 18744957, 18744963, 18745309, 18746182, 18746720, 18746766, 18746769, 18747055, 18747115, 18747509, 18748208,
+ 18748215, 18748216, 18748616, 18748632, 18748881, 18748930, 18749143, 18749153, 18749347, 18749597, 18749859, 18749862, 18749865,
+ 18750557, 18750566, 18750749, 18751180, 18751334, 18751358, 18751444, 18751733, 18751772, 18751777, 18751784, 18751800, 18751962,
+ 18751964, 18751967, 18751970, 18751974, 18751975, 18751977, 18752073, 18752085, 18752241, 18752245, 18752369, 18752782, 18752796,
+ 18753020, 18753025, 18753230, 18753299, 18753321, 18753444, 18754157, 18754468, 18754629, 18754632, 18755348, 18755580, 18755647,
+ 18756137, 18756196, 18757143, 18757175, 18757227, 18757294, 18757300, 18757544, 18757547, 18757917, 18757930, 18758219, 18758228,
+ 18758428, 18783923, 18784255, 18784257, 18784278, 18784506, 18784512, 18785925, 18785928, 18786059, 18787397, 18787805, 18787842,
+ 18840505, 18840540, 18842111, 18842255, 18842546, 18842613, 18843081, 18843086, 18843202, 18877846, 18877886, 18877938, 18877995,
+ 18878286, 18878288, 18878602, 18878604, 18878910, 18879022, 18879087, 18879201, 18879299, 18879376, 18879694, 18879819, 18879825,
+ 18879959, 18879963, 18880086, 18880208, 18880209, 18880253, 18880256, 18880438, 18880477, 18880478, 18880579, 18880588, 18880589,
+ 18880590, 18880674, 18880675, 18880688, 18880690, 18880698, 18880703, 18880710, 18880723, 18880777, 18880778, 18880818, 18880829,
+ 18880956, 18880957, 18880961, 18880971, 18881047, 18881049, 18881057, 18881059, 18881244, 18881250, 18881271, 18881309, 18881313,
+ 18881413, 18881417, 18881470, 18881473, 18881573, 18881588, 18881603, 18881665, 18881667, 18881833, 18881834, 18881875, 18881876,
+ 18881945, 18881946, 18882110, 18882201, 18882333, 18882334, 18882600, 18882620, 18882747, 18882795, 18882797, 18882825, 18882827,
+ 18882864, 18882874, 18883468, 18883469, 18883511, 18883515, 18883910, 18884107, 18884303, 18884455, 18884839, 18884840, 18884853,
+ 18885134, 18885240, 18885713, 18885715, 18885719, 18885720, 18890921, 18890923, 18890924, 18891002, 18891007, 18891013, 18891073,
+ 18891226, 18891230, 18891902, 18892071, 18916117, 18916500, 18917173, 18917229, 18917481, 18917487, 18917714, 18918454, 18918700,
+ 18919243, 18919244, 18919304, 18919307, 18919365, 18919372, 18919534, 18919859, 18919932, 18920320, 18934396, 18934399, 18934421,
+ 18934700, 18935088, 18935417, 18935420, 18935494, 18935501, 18936000, 18936103, 18936391, 18936459, 18936570, 18936578, 18936587,
+ 18936614, 18936649, 18936673, 18962602, 18962613, 18962625, 18962645, 18962662, 18962676, 18963370, 18963420, 18963833, 18963836,
+ 18963887, 18963911, 18964240, 18964303, 18964451, 18964454, 18964458, 18964500, 18964761, 18965395, 18965426, 18965875, 18965880,
+ 18965881, 18965931, 18965958, 18965959, 18965984, 18965985, 18967428, 18967463, 18967632, 18968583, 18968607, 18972151, 18972181,
+ 18972195, 18972196, 18972221, 18972231, 18972471, 18972549, 18972554, 18972611, 18972613, 18972651, 18972928, 18972929, 18972973,
+ 18972974, 18972992, 18972993, 18973042, 18973044, 18973048, 18973096, 18973098, 18973116, 18973218, 18973912, 18973952, 18973955,
+ 18974076, 18974093, 18974104, 18974117, 18974129, 18974206, 18974209, 18974419, 18974465, 18974797, 18974894, 18975162, 18975166,
+ 18975316, 18975374, 18975576, 18975578, 18976376, 18976386, 18976399, 18976405, 18977338, 18977345, 18977358, 18977728, 18977730,
+ 18977734, 18977736, 18978127, 18978129, 18978246, 18978494, 18978496, 18978826, 18978859, 18978866, 18978868, 18978873, 18978921,
+ 18978923, 18978933, 18978935, 18979157, 18979213, 18979247, 18979362, 18979627, 18979629, 18979659, 18979665, 18979666, 18979668,
+ 18979670, 18979746, 18979760, 18979767, 18979772, 18979782, 18979798, 18979820, 18979833, 18979855, 18979857, 18979955, 18979956,
+ 18980169, 18980439, 18980547, 18980548, 18980554, 18980591, 18980595, 18980691, 18980698, 18980831, 18980853, 18981626, 18981703,
+ 18981830, 18981937, 18981943, 18982171, 18982176, 18982186, 18982188, 18982196, 18982429, 18982431, 18982437, 18982740, 18982825,
+ 18982829, 18982867, 18982883, 18982926, 18983055, 18983244, 18983397, 18983401, 18983612, 18983619, 18983620, 18983932, 18983935,
+ 18983996, 18984329, 18984386, 18984405, 18984407, 18984413, 18984431, 18984501, 18984511, 18984763, 18984769, 18984913, 18984991,
+ 18985047, 18985161, 18985246, 18985248, 18985301, 18985304, 18985312, 18985520, 18985521, 18985726, 18985822, 18985850, 18986106,
+ 18986173, 18986174, 18986252, 18986266, 18986267, 18987017, 18987031, 18987048, 18987053, 18987081, 18987680, 18988159, 18988166,
+ 18988194, 18988205, 18988573, 18988712, 18988715, 18988857, 18988982, 18988984, 18988985, 18989012, 18989013, 18989018, 18989086,
+ 18989099, 18989125, 18989132, 18989165, 18989462, 18989464, 18989759, 18989899, 18989954, 18989955, 18990839, 18990846, 18990863,
+ 18990866, 18991105, 18991433, 18991452, 18991456, 18991462, 18991467, 18991469, 18991662, 18992464, 18992650, 18992774, 18992801,
+ 18992856, 18992860, 18992906, 18999657, 18999676, 18999686, 18999697, 18999881, 18999886, 19000091, 19000224, 19000241, 19000489,
+ 19000503, 19001195, 19001201, 19001347, 19001359, 19007968, 19007971, 19008121, 19011401, 19011569, 19011588, 19011656, 19011677,
+ 19011754, 19011759, 19012403, 19012416, 19012603, 19012613, 19012746, 19012747, 19014099, 19014206, 19020339, 19020428, 19020735,
+ 19020954, 19020959, 19021745, 19021748, 19021802, 19021803, 19022518, 19022523, 19157469, 19157470, 19157562, 19157597, 19157681,
+ 19157693, 19157727, 19157735, 19177628, 19177631, 19179127, 19180014, 19180478, 19180496, 19180576, 19180594, 19180601, 19180609,
+ 19182388, 19182390, 19182566, 19182598, 19183939, 19184062, 19184172, 19184613, 19187655, 19187674, 19187949, 19187959, 19189135,
+ 19190233, 19190353, 19190502, 19190504, 19190594, 19191003, 19191043, 19191046, 19191091, 19191098, 19191118, 19191122, 19191234,
+ 19191237, 19191305, 19191307, 19191407, 19191408, 19191453, 19191858, 19192015, 19192485, 19192487, 19192606, 19192607, 19192611,
+ 19192615, 19192896, 19192903, 19193680, 19193768, 19193789, 19193876, 19193879, 19194492, 19195385, 19200168, 19200172, 19200274,
+ 19200290, 19200578, 19200583, 19202205, 19202286, 19202388, 19202392, 19202403, 19202424, 19202450, 19202506, 19202509, 19203134,
+ 19203366, 19203572, 19203746, 19203752, 19204197, 19206989, 19207000, 19207077, 19207171, 19207271, 19207272, 19208337, 19208345,
+ 19208730, 19212689, 19212690, 19212744, 19212946, 19212947, 19213039, 19213045, 19213048, 19213301, 19213303, 19213574, 19213575,
+ 19213942, 19214581, 19214583, 19214681, 19214684, 19214905, 19215052, 19215418, 19216089, 19216095, 19218331, 19218601, 19218604,
+ 19218875, 19219205, 19220095, 19220100, 19221680, 19221683, 19221894, 19222484, 19222586, 19222590, 19224624, 19224626, 19225180,
+ 19226142, 19226145, 19226595, 19226609, 19226890, 19226896, 19226910, 19226911, 19226927, 19227005, 19227837, 19227907, 19227909,
+ 19228054, 19228056, 19228106, 19228107, 19228121, 19228123, 19228259, 19228261, 19228302, 19228304, 19229883, 19229890, 19230123,
+ 19233910, 19234320, 19234345, 19234424, 19234537, 19234956, 19235288, 19235308, 19237190, 19237199, 19237208, 19237233, 19239254,
+ 19239258, 19239376, 19239377, 19239389, 19239407, 19240001, 19240024, 19240499, 19240901, 19250124, 19250127, 19250230, 19250239,
+ 19252820, 19252824, 19252856, 19252859, 19253253, 19253258, 19253341, 19253648, 19253658, 19254248, 19254257, 19254261, 19254273,
+ 19255415, 19255483, 19255486, 19256056, 19256595, 19256596, 19257023, 19257421, 19257656, 19257794, 19257795, 19257825, 19257827,
+ 19257973, 19258287, 19258305, 19259424, 19259426, 19260016, 19260028, 19260034, 19260047, 19260053, 19260136, 19260185, 19260252,
+ 19260535, 19260539, 19263045, 19263046, 19263072, 19263297, 19263547, 19264542, 19264897, 19268898, 19268900, 19268986, 19268990,
+ 19269163, 19269421, 19269423, 19271598, 19271984, 19272062, 19272201, 19272203, 19272401, 19272409, 19272445, 19272449, 19281870,
+ 19281883, 19282504, 19285192, 19285575, 19285576, 19285624, 19301651, 19301652, 19301719, 19301721, 19302758, 19302769, 19302830,
+ 19302832, 19302846, 19304733, 19304737, 19304857, 19304863, 19304956, 19304961, 19305572, 19306684, 19306759, 19306763, 19306795,
+ 19306821, 19306844, 19306849, 19307117, 19307412, 19307778, 19307893, 19308083, 19308148, 19308304, 19314020, 19314021, 19314052,
+ 19314238, 19314253, 19315712, 19316333, 19317997, 19317999, 19318269, 19318271, 19318527, 19318529, 19318536, 19318578, 19318582,
+ 19318880, 19318881, 19319054, 19319328, 19319330, 19319376, 19324587, 19324593, 19324769, 19324771, 19324874, 19324883, 19324952,
+ 19324954, 19325006, 19325007, 19325008, 19325103, 19325184, 19325185, 19325391, 19325392, 19325399, 19325401, 19325570, 19325804,
+ 19326308, 19326329, 19326348, 19326618, 19326756, 19326757, 19326935, 19326944, 19326947, 19327176, 19327529, 19329583, 19329702,
+ 19329703, 19329745, 19329746, 19329754, 19329758, 19330909, 19330912, 19331006, 19331009, 19331094, 19331095, 19331200, 19331224,
+ 19331676, 19331678, 19331729, 19331732, 19332246, 19332827, 19332934, 19332935, 19333061, 19358286, 19358287, 19358310, 19360688,
+ 19360690, 19360794, 19360932, 19361096, 19362472, 19362473, 19362976, 19362979, 19363289, 19363291, 19363391, 19363719, 19364350,
+ 19364366, 19364392, 19364402, 19364936, 19364944, 19365015, 19365017, 19365059, 19365710, 19365714, 19365844, 19366349, 19366686,
+ 19366920, 19366924, 19367057, 19367062, 19367152, 19367158, 19367216, 19367219, 19367501, 19367504, 19368429, 19368434, 19368444,
+ 19368449, 19368461, 19368484, 19368500, 19368501, 19368676, 19368680, 19368783, 19368797, 19368801, 19368942, 19368948, 19368949,
+ 19368955, 19368966, 19369066, 19369075, 19369217, 19369229, 19369302, 19369310, 19369314, 19369341, 19369343, 19369598, 19369600,
+ 19369688, 19369690, 19369879, 19369904, 19369907, 19369914, 19369919, 19369924, 19370031, 19373906, 19373910, 19373914, 19373996,
+ 19374015, 19374165, 19374181, 19374182, 19374198, 19374266, 19374299, 19374800, 19375006, 19375010, 19375171, 19375174, 19375178,
+ 19375183, 19375189, 19375203, 19375209, 19375252, 19375259, 19375260, 19375719, 19375788, 19375789, 19376019, 19376020, 19376061,
+ 19385710, 19385787, 19389326, 19389328, 19389440, 19389442, 19389987, 19390185, 19390188, 19390245, 19390250, 19390286, 19390313,
+ 19390322, 19390345, 19390352, 19390586, 19390710, 19392042, 19392044, 19410405, 19410437, 19410449, 19410488, 19410489, 19410496,
+ 19410497, 19410510, 19410916, 19411000, 19411002, 19411204, 19411937, 19411939, 19411997, 19512944, 19513029, 19513189, 19513202,
+ 19513396, 19513538, 19513695, 19513945, 19513992, 19516059, 19516062, 19516075, 19516084, 19516968, 19517224, 19554953, 19558472,
+ 19609701, 19609719, 19609892, 19609947, 19610025, 19610494, 19610647, 19610652, 19610959, 19611209, 19611291, 19612269, 19612444,
+ 19612566, 19612653, 19612655, 19612784, 19612795, 19612890, 19612895, 19613164, 19613285
+];
+export const PEG_CROSS_BLOCKS_LAST: u32 = 19613285;
diff --git a/projects/subgraph-bean/src/utils/Bean.ts b/projects/subgraph-bean/src/utils/Bean.ts
index 0d1a8c9cbe..cd3c7e70bf 100644
--- a/projects/subgraph-bean/src/utils/Bean.ts
+++ b/projects/subgraph-bean/src/utils/Bean.ts
@@ -1,4 +1,4 @@
-import { BigDecimal, BigInt } from "@graphprotocol/graph-ts";
+import { BigDecimal, BigInt, log } from "@graphprotocol/graph-ts";
import { Bean, BeanDailySnapshot, BeanHourlySnapshot, Pool } from "../../generated/schema";
import {
BEAN_3CRV,
@@ -7,19 +7,25 @@ import {
BEAN_WETH_V1,
BEAN_WETH_CP2_WELL,
BEAN_3CRV_V1,
- BEAN_LUSD_V1
+ BEAN_LUSD_V1,
+ BEANSTALK
} from "../../../subgraph-core/utils/Constants";
import { dayFromTimestamp, hourFromTimestamp } from "../../../subgraph-core/utils/Dates";
-import { toDecimal, ZERO_BD, ZERO_BI } from "../../../subgraph-core/utils/Decimals";
-import { getV1Crosses } from "./Cross";
-import { loadOrCreatePool } from "./Pool";
+import { ONE_BD, toDecimal, ZERO_BD, ZERO_BI } from "../../../subgraph-core/utils/Decimals";
+import { checkBeanCross, getV1Crosses } from "./Cross";
+import { loadOrCreatePool, loadOrCreatePoolHourlySnapshot } from "./Pool";
+import { BeanstalkPrice_try_price, BeanstalkPriceResult } from "./price/BeanstalkPrice";
+import { calcLockedBeans } from "./LockedBeans";
export function loadBean(token: string): Bean {
let bean = Bean.load(token);
if (bean == null) {
bean = new Bean(token);
+ bean.chain = "ethereum";
+ bean.beanstalk = BEANSTALK.toHexString();
bean.supply = ZERO_BI;
bean.marketCap = ZERO_BD;
+ bean.lockedBeans = ZERO_BI;
bean.supplyInPegLP = ZERO_BD;
bean.volume = ZERO_BI;
bean.volumeUSD = ZERO_BD;
@@ -29,13 +35,13 @@ export function loadBean(token: string): Bean {
bean.lastCross = ZERO_BI;
bean.lastSeason = token == BEAN_ERC20.toHexString() ? 6074 : 0;
bean.pools = [];
+ bean.dewhitelistedPools = [];
bean.save();
}
return bean as Bean;
}
export function loadOrCreateBeanHourlySnapshot(token: string, timestamp: BigInt, season: i32): BeanHourlySnapshot {
- let hour = hourFromTimestamp(timestamp);
let id = token + "-" + season.toString();
let snapshot = BeanHourlySnapshot.load(id);
if (snapshot == null) {
@@ -44,13 +50,16 @@ export function loadOrCreateBeanHourlySnapshot(token: string, timestamp: BigInt,
snapshot.bean = bean.id;
snapshot.supply = bean.supply;
snapshot.marketCap = bean.marketCap;
+ snapshot.lockedBeans = bean.lockedBeans;
snapshot.supplyInPegLP = bean.supplyInPegLP;
+ snapshot.instantaneousDeltaB = ZERO_BI;
+ snapshot.twaDeltaB = ZERO_BI;
snapshot.volume = bean.volume;
snapshot.volumeUSD = bean.volumeUSD;
snapshot.liquidityUSD = bean.liquidityUSD;
snapshot.price = bean.price;
+ snapshot.twaPrice = ZERO_BD;
snapshot.crosses = bean.crosses;
- snapshot.deltaBeans = ZERO_BI;
snapshot.deltaVolume = ZERO_BI;
snapshot.deltaVolumeUSD = ZERO_BD;
snapshot.deltaLiquidityUSD = ZERO_BD;
@@ -72,13 +81,16 @@ export function loadOrCreateBeanDailySnapshot(token: string, timestamp: BigInt):
snapshot.bean = bean.id;
snapshot.supply = bean.supply;
snapshot.marketCap = bean.marketCap;
+ snapshot.lockedBeans = bean.lockedBeans;
snapshot.supplyInPegLP = bean.supplyInPegLP;
+ snapshot.instantaneousDeltaB = ZERO_BI;
+ snapshot.twaDeltaB = ZERO_BI;
snapshot.volume = bean.volume;
snapshot.volumeUSD = bean.volumeUSD;
snapshot.liquidityUSD = bean.liquidityUSD;
snapshot.price = bean.price;
+ snapshot.twaPrice = ZERO_BD;
snapshot.crosses = bean.crosses;
- snapshot.deltaBeans = ZERO_BI;
snapshot.deltaVolume = ZERO_BI;
snapshot.deltaVolumeUSD = ZERO_BD;
snapshot.deltaLiquidityUSD = ZERO_BD;
@@ -94,17 +106,16 @@ export function loadOrCreateBeanDailySnapshot(token: string, timestamp: BigInt):
export function updateBeanValues(
token: string,
timestamp: BigInt,
- newPrice: BigDecimal,
+ newPrice: BigDecimal | null,
deltaSupply: BigInt,
deltaVolume: BigInt,
deltaVolumeUSD: BigDecimal,
deltaLiquidityUSD: BigDecimal
): void {
let bean = loadBean(token);
- let beanHourly = loadOrCreateBeanHourlySnapshot(token, timestamp, bean.lastSeason);
- let beanDaily = loadOrCreateBeanDailySnapshot(token, timestamp);
-
- bean.price = newPrice;
+ if (newPrice !== null) {
+ bean.price = newPrice;
+ }
bean.supply = bean.supply.plus(deltaSupply);
bean.marketCap = toDecimal(bean.supply).times(bean.price);
bean.volume = bean.volume.plus(deltaVolume);
@@ -112,12 +123,15 @@ export function updateBeanValues(
bean.liquidityUSD = bean.liquidityUSD.plus(deltaLiquidityUSD);
bean.save();
+ let beanHourly = loadOrCreateBeanHourlySnapshot(token, timestamp, bean.lastSeason);
+ let beanDaily = loadOrCreateBeanDailySnapshot(token, timestamp);
+
beanHourly.volume = bean.volume;
beanHourly.volumeUSD = bean.volumeUSD;
beanHourly.liquidityUSD = bean.liquidityUSD;
- beanHourly.price = bean.price;
beanHourly.supply = bean.supply;
beanHourly.marketCap = bean.marketCap;
+ beanHourly.lockedBeans = bean.lockedBeans;
beanHourly.supplyInPegLP = bean.supplyInPegLP;
beanHourly.deltaVolume = beanHourly.deltaVolume.plus(deltaVolume);
beanHourly.deltaVolumeUSD = beanHourly.deltaVolumeUSD.plus(deltaVolumeUSD);
@@ -127,9 +141,9 @@ export function updateBeanValues(
beanDaily.volume = bean.volume;
beanDaily.volumeUSD = bean.volumeUSD;
beanDaily.liquidityUSD = bean.liquidityUSD;
- beanDaily.price = bean.price;
beanDaily.supply = bean.supply;
beanDaily.marketCap = bean.marketCap;
+ beanDaily.lockedBeans = bean.lockedBeans;
beanDaily.supplyInPegLP = bean.supplyInPegLP;
beanDaily.deltaVolume = beanDaily.deltaVolume.plus(deltaVolume);
beanDaily.deltaVolumeUSD = beanDaily.deltaVolumeUSD.plus(deltaVolumeUSD);
@@ -152,6 +166,26 @@ export function updateBeanSeason(token: string, timestamp: BigInt, season: i32):
beanDaily.save();
}
+// Returns the last stored bean price
+export function getLastBeanPrice(token: string): BigDecimal {
+ let bean = loadBean(token);
+ return bean.price;
+}
+
+// Returns the liquidity-weighted bean price across all of the whitelisted pools.
+export function calcLiquidityWeightedBeanPrice(token: string): BigDecimal {
+ let bean = loadBean(token);
+ let weightedPrice = ZERO_BD;
+ let totalLiquidity = ZERO_BD;
+ for (let i = 0; i < bean.pools.length; ++i) {
+ let pool = Pool.load(bean.pools[i])!;
+ weightedPrice = weightedPrice.plus(pool.lastPrice.times(pool.liquidityUSD));
+ // log.debug("price | liquidity {} | {}", [pool.lastPrice.toString(), pool.liquidityUSD.toString()]);
+ totalLiquidity = totalLiquidity.plus(pool.liquidityUSD);
+ }
+ return weightedPrice.div(totalLiquidity == ZERO_BD ? ONE_BD : totalLiquidity);
+}
+
export function getBeanTokenAddress(blockNumber: BigInt): string {
return blockNumber < BigInt.fromString("15278082") ? BEAN_ERC20_V1.toHexString() : BEAN_ERC20.toHexString();
}
@@ -179,20 +213,88 @@ export function updateBeanSupplyPegPercent(blockNumber: BigInt): void {
bean.supplyInPegLP = lpSupply.div(toDecimal(bean.supply));
bean.save();
} else {
+ let bean = loadBean(BEAN_ERC20.toHexString());
let pegSupply = ZERO_BI;
- let pool = loadOrCreatePool(BEAN_3CRV.toHexString(), blockNumber);
+ for (let i = 0; i < bean.pools.length; ++i) {
+ let pool = loadOrCreatePool(bean.pools[i], blockNumber);
+ // Assumption that beans is in the 0 index for all pools, this may need to be revisited.
+ pegSupply = pegSupply.plus(pool.reserves[0]);
+ }
+ bean.lockedBeans = calcLockedBeans(blockNumber);
+ bean.supplyInPegLP = toDecimal(pegSupply).div(toDecimal(bean.supply.minus(bean.lockedBeans)));
+ bean.save();
+ }
+}
- pegSupply = pegSupply.plus(pool.reserves[0]);
+// Update bean information if the pool is still whitelisted
+export function updateBeanAfterPoolSwap(
+ poolAddress: string,
+ poolPrice: BigDecimal,
+ volumeBean: BigInt,
+ volumeUSD: BigDecimal,
+ deltaLiquidityUSD: BigDecimal,
+ timestamp: BigInt,
+ blockNumber: BigInt,
+ priceContractResult: BeanstalkPriceResult | null = null
+): void {
+ let bean = loadBean(BEAN_ERC20.toHexString());
+ if (bean.pools.indexOf(poolAddress) >= 0) {
+ let oldBeanPrice = bean.price;
+ let beanPrice = poolPrice;
- // Check if the Well has been deployed
- let well = Pool.load(BEAN_WETH_CP2_WELL.toHexString());
- if (well != null) {
- pegSupply = pegSupply.plus(well.reserves[0]);
+ // Get overall price from price contract if a result was not already provided
+ if (priceContractResult === null) {
+ priceContractResult = BeanstalkPrice_try_price(BEAN_ERC20, blockNumber);
+ }
+ if (!priceContractResult.reverted) {
+ beanPrice = toDecimal(priceContractResult.value.price);
}
- let bean = loadBean(BEAN_ERC20.toHexString());
+ updateBeanSupplyPegPercent(blockNumber);
+ updateBeanValues(BEAN_ERC20.toHexString(), timestamp, beanPrice, ZERO_BI, volumeBean, volumeUSD, deltaLiquidityUSD);
+ checkBeanCross(BEAN_ERC20.toHexString(), timestamp, blockNumber, oldBeanPrice, beanPrice);
+ }
+}
- bean.supplyInPegLP = toDecimal(pegSupply).div(toDecimal(bean.supply));
- bean.save();
+export function updateInstDeltaB(token: string, blockNumber: BigInt, timestamp: BigInt): void {
+ let bean = loadBean(token);
+ let beanHourly = loadOrCreateBeanHourlySnapshot(token, timestamp, bean.lastSeason);
+ let beanDaily = loadOrCreateBeanDailySnapshot(token, timestamp);
+
+ let cumulativeDeltaB = ZERO_BI;
+ for (let i = 0; i < bean.pools.length; i++) {
+ let pool = loadOrCreatePool(bean.pools[i], blockNumber);
+ cumulativeDeltaB = cumulativeDeltaB.plus(pool.deltaBeans);
+ }
+
+ beanHourly.instantaneousDeltaB = cumulativeDeltaB;
+ beanDaily.instantaneousDeltaB = cumulativeDeltaB;
+ beanHourly.save();
+ beanDaily.save();
+}
+
+// Update Bean's TWA deltaB and price. Individual pools' values must be computed prior to calling this method.
+export function updateBeanTwa(timestamp: BigInt, blockNumber: BigInt): void {
+ let beanAddress = getBeanTokenAddress(blockNumber);
+ let bean = loadBean(beanAddress);
+ let beanHourly = loadOrCreateBeanHourlySnapshot(beanAddress, timestamp, bean.lastSeason);
+ let beanDaily = loadOrCreateBeanDailySnapshot(beanAddress, timestamp);
+
+ let twaDeltaB = ZERO_BI;
+ let weightedTwaPrice = ZERO_BD;
+ for (let i = 0; i < bean.pools.length; i++) {
+ let poolHourly = loadOrCreatePoolHourlySnapshot(bean.pools[i], timestamp, blockNumber);
+ twaDeltaB = twaDeltaB.plus(poolHourly.twaDeltaBeans);
+ weightedTwaPrice = weightedTwaPrice.plus(poolHourly.twaPrice.times(poolHourly.liquidityUSD));
}
+
+ // Assumption is that total bean liquidity was already summed earlier in the same event's processing
+ const twaPrice = weightedTwaPrice.div(bean.liquidityUSD != ZERO_BD ? bean.liquidityUSD : ONE_BD);
+
+ beanHourly.twaDeltaB = twaDeltaB;
+ beanHourly.twaPrice = twaPrice;
+ beanDaily.twaDeltaB = twaDeltaB;
+ beanDaily.twaPrice = twaPrice;
+ beanHourly.save();
+ beanDaily.save();
}
diff --git a/projects/subgraph-bean/src/utils/BeanWells.ts b/projects/subgraph-bean/src/utils/BeanWells.ts
new file mode 100644
index 0000000000..8c2c7a9949
--- /dev/null
+++ b/projects/subgraph-bean/src/utils/BeanWells.ts
@@ -0,0 +1,20 @@
+import { BigInt, Address } from "@graphprotocol/graph-ts";
+import { BEAN_WETH_CP2_WELL, BEAN_WETH_CP2_WELL_BLOCK } from "../../../subgraph-core/utils/Constants";
+
+export enum WellFunction {
+ ConstantProduct
+}
+
+class BeanWell {
+ address: Address;
+ startBlock: BigInt;
+ wellFunction: WellFunction;
+}
+
+export const BEAN_WELLS: BeanWell[] = [
+ {
+ address: BEAN_WETH_CP2_WELL,
+ startBlock: BEAN_WETH_CP2_WELL_BLOCK,
+ wellFunction: WellFunction.ConstantProduct
+ }
+];
diff --git a/projects/subgraph-bean/src/utils/Cross.ts b/projects/subgraph-bean/src/utils/Cross.ts
index da68b301ed..37ccc43368 100644
--- a/projects/subgraph-bean/src/utils/Cross.ts
+++ b/projects/subgraph-bean/src/utils/Cross.ts
@@ -1,4 +1,4 @@
-import { BigDecimal, BigInt } from "@graphprotocol/graph-ts";
+import { BigDecimal, BigInt, log } from "@graphprotocol/graph-ts";
import { BeanCross, PoolCross } from "../../generated/schema";
import { loadBean, loadOrCreateBeanDailySnapshot, loadOrCreateBeanHourlySnapshot } from "./Bean";
import { dayFromTimestamp, hourFromTimestamp } from "../../../subgraph-core/utils/Dates";
@@ -6,7 +6,7 @@ import { ONE_BD, ZERO_BD, ZERO_BI } from "../../../subgraph-core/utils/Decimals"
import { loadOrCreatePool, loadOrCreatePoolDailySnapshot, loadOrCreatePoolHourlySnapshot } from "./Pool";
import { BEAN_ERC20_V1 } from "../../../subgraph-core/utils/Constants";
-export function loadOrCreateBeanCross(id: i32, bean: string, timestamp: BigInt): BeanCross {
+export function loadOrCreateBeanCross(id: i32, bean: string, blockNumber: BigInt, timestamp: BigInt): BeanCross {
let cross = BeanCross.load(id.toString());
if (cross == null) {
let hour = hourFromTimestamp(timestamp).toString();
@@ -14,6 +14,7 @@ export function loadOrCreateBeanCross(id: i32, bean: string, timestamp: BigInt):
cross = new BeanCross(id.toString());
cross.bean = bean;
cross.price = ZERO_BD;
+ cross.blockNumber = blockNumber;
cross.timestamp = timestamp;
cross.timeSinceLastCross = ZERO_BI;
cross.above = false;
@@ -24,7 +25,7 @@ export function loadOrCreateBeanCross(id: i32, bean: string, timestamp: BigInt):
return cross as BeanCross;
}
-export function loadOrCreatePoolCross(id: i32, pool: string, timestamp: BigInt): PoolCross {
+export function loadOrCreatePoolCross(id: i32, pool: string, blockNumber: BigInt, timestamp: BigInt): PoolCross {
let crossID = pool + "-" + id.toString();
let cross = PoolCross.load(crossID);
if (cross == null) {
@@ -33,6 +34,7 @@ export function loadOrCreatePoolCross(id: i32, pool: string, timestamp: BigInt):
cross = new PoolCross(crossID);
cross.pool = pool;
cross.price = ZERO_BD;
+ cross.blockNumber = blockNumber;
cross.timestamp = timestamp;
cross.timeSinceLastCross = ZERO_BI;
cross.above = false;
@@ -43,15 +45,15 @@ export function loadOrCreatePoolCross(id: i32, pool: string, timestamp: BigInt):
return cross as PoolCross;
}
-export function checkPoolCross(pool: string, timestamp: BigInt, blockNumber: BigInt, oldPrice: BigDecimal, newPrice: BigDecimal): void {
+export function checkPoolCross(pool: string, timestamp: BigInt, blockNumber: BigInt, oldPrice: BigDecimal, newPrice: BigDecimal): boolean {
let poolInfo = loadOrCreatePool(pool, blockNumber);
let token = poolInfo.bean;
let bean = loadBean(token);
- let poolHourly = loadOrCreatePoolHourlySnapshot(pool, timestamp, BigInt.fromI32(bean.lastSeason));
- let poolDaily = loadOrCreatePoolDailySnapshot(pool, timestamp, blockNumber);
+
+ // log.debug("Prev/New well price {} / {}", [oldPrice.toString(), newPrice.toString()]);
if (oldPrice >= ONE_BD && newPrice < ONE_BD) {
- let cross = loadOrCreatePoolCross(poolInfo.crosses, pool, timestamp);
+ let cross = loadOrCreatePoolCross(poolInfo.crosses, pool, blockNumber, timestamp);
cross.price = newPrice;
cross.timeSinceLastCross = timestamp.minus(poolInfo.lastCross);
@@ -62,6 +64,9 @@ export function checkPoolCross(pool: string, timestamp: BigInt, blockNumber: Big
poolInfo.crosses += 1;
poolInfo.save();
+ let poolHourly = loadOrCreatePoolHourlySnapshot(pool, timestamp, BigInt.fromI32(bean.lastSeason));
+ let poolDaily = loadOrCreatePoolDailySnapshot(pool, timestamp, blockNumber);
+
poolHourly.crosses += 1;
poolHourly.deltaCrosses += 1;
poolHourly.save();
@@ -69,8 +74,9 @@ export function checkPoolCross(pool: string, timestamp: BigInt, blockNumber: Big
poolDaily.crosses += 1;
poolDaily.deltaCrosses += 1;
poolDaily.save();
+ return true;
} else if (oldPrice < ONE_BD && newPrice >= ONE_BD) {
- let cross = loadOrCreatePoolCross(poolInfo.crosses, pool, timestamp);
+ let cross = loadOrCreatePoolCross(poolInfo.crosses, pool, blockNumber, timestamp);
cross.price = newPrice;
cross.timeSinceLastCross = timestamp.minus(poolInfo.lastCross);
@@ -81,6 +87,9 @@ export function checkPoolCross(pool: string, timestamp: BigInt, blockNumber: Big
poolInfo.crosses += 1;
poolInfo.save();
+ let poolHourly = loadOrCreatePoolHourlySnapshot(pool, timestamp, BigInt.fromI32(bean.lastSeason));
+ let poolDaily = loadOrCreatePoolDailySnapshot(pool, timestamp, blockNumber);
+
poolHourly.crosses += 1;
poolHourly.deltaCrosses += 1;
poolHourly.save();
@@ -88,16 +97,16 @@ export function checkPoolCross(pool: string, timestamp: BigInt, blockNumber: Big
poolDaily.crosses += 1;
poolDaily.deltaCrosses += 1;
poolDaily.save();
+ return true;
}
+ return false;
}
-export function checkBeanCross(token: string, timestamp: BigInt, blockNumber: BigInt, oldPrice: BigDecimal, newPrice: BigDecimal): void {
+export function checkBeanCross(token: string, timestamp: BigInt, blockNumber: BigInt, oldPrice: BigDecimal, newPrice: BigDecimal): boolean {
let bean = loadBean(token);
- let beanHourly = loadOrCreateBeanHourlySnapshot(token, timestamp, bean.lastSeason);
- let beanDaily = loadOrCreateBeanDailySnapshot(token, timestamp);
if (oldPrice >= ONE_BD && newPrice < ONE_BD) {
- let cross = loadOrCreateBeanCross(bean.crosses, token, timestamp);
+ let cross = loadOrCreateBeanCross(bean.crosses, token, blockNumber, timestamp);
cross.price = newPrice;
cross.timeSinceLastCross = timestamp.minus(bean.lastCross);
@@ -108,6 +117,9 @@ export function checkBeanCross(token: string, timestamp: BigInt, blockNumber: Bi
bean.crosses += 1;
bean.save();
+ let beanHourly = loadOrCreateBeanHourlySnapshot(token, timestamp, bean.lastSeason);
+ let beanDaily = loadOrCreateBeanDailySnapshot(token, timestamp);
+
beanHourly.crosses += 1;
beanHourly.deltaCrosses += 1;
beanHourly.save();
@@ -115,8 +127,9 @@ export function checkBeanCross(token: string, timestamp: BigInt, blockNumber: Bi
beanDaily.crosses += 1;
beanDaily.deltaCrosses += 1;
beanDaily.save();
+ return true;
} else if (oldPrice < ONE_BD && newPrice >= ONE_BD) {
- let cross = loadOrCreateBeanCross(bean.crosses, token, timestamp);
+ let cross = loadOrCreateBeanCross(bean.crosses, token, blockNumber, timestamp);
cross.price = newPrice;
cross.timeSinceLastCross = timestamp.minus(bean.lastCross);
@@ -127,6 +140,9 @@ export function checkBeanCross(token: string, timestamp: BigInt, blockNumber: Bi
bean.crosses += 1;
bean.save();
+ let beanHourly = loadOrCreateBeanHourlySnapshot(token, timestamp, bean.lastSeason);
+ let beanDaily = loadOrCreateBeanDailySnapshot(token, timestamp);
+
beanHourly.crosses += 1;
beanHourly.deltaCrosses += 1;
beanHourly.save();
@@ -134,7 +150,9 @@ export function checkBeanCross(token: string, timestamp: BigInt, blockNumber: Bi
beanDaily.crosses += 1;
beanDaily.deltaCrosses += 1;
beanDaily.save();
+ return true;
}
+ return false;
}
export function getV1Crosses(): i32 {
diff --git a/projects/subgraph-bean/src/utils/LockedBeans.ts b/projects/subgraph-bean/src/utils/LockedBeans.ts
new file mode 100644
index 0000000000..5ba95b6fa0
--- /dev/null
+++ b/projects/subgraph-bean/src/utils/LockedBeans.ts
@@ -0,0 +1,525 @@
+import { BigDecimal, BigInt, Address, log } from "@graphprotocol/graph-ts";
+import {
+ BEAN_3CRV,
+ BEAN_WETH_CP2_WELL,
+ BEAN_WETH_UNRIPE_MIGRATION_BLOCK,
+ BEANSTALK,
+ GAUGE_BIP45_BLOCK,
+ UNRIPE_BEAN,
+ UNRIPE_BEAN_3CRV
+} from "../../../subgraph-core/utils/Constants";
+import { SeedGauge } from "../../generated/Beanstalk/SeedGauge";
+import { ONE_BI, ZERO_BD, ZERO_BI } from "../../../subgraph-core/utils/Decimals";
+import { ERC20 } from "../../generated/Beanstalk/ERC20";
+import { Beanstalk } from "../../generated/Beanstalk/Beanstalk";
+import { loadOrCreatePool } from "./Pool";
+import { loadOrCreateTwaOracle } from "./price/TwaOracle";
+
+export function calcLockedBeans(blockNumber: BigInt): BigInt {
+ // If BIP45 is deployed - return the result from the contract
+ if (blockNumber >= GAUGE_BIP45_BLOCK) {
+ // If we are trying to calculate locked beans on the same block as the sunrise, use the values from the previous hour
+ const twaOracle = loadOrCreateTwaOracle(getUnderlyingUnripe(blockNumber).toHexString());
+ const twaReserves =
+ blockNumber == twaOracle.cumulativeWellReservesBlock ? twaOracle.cumulativeWellReservesPrev : twaOracle.cumulativeWellReserves;
+ const twaTime =
+ blockNumber == twaOracle.cumulativeWellReservesBlock
+ ? twaOracle.cumulativeWellReservesPrevTime
+ : twaOracle.cumulativeWellReservesTime;
+
+ let beanstalkBIP45 = SeedGauge.bind(BEANSTALK);
+ let lockedBeans = beanstalkBIP45.try_getLockedBeansFromTwaReserves(twaReserves, twaTime);
+ if (!lockedBeans.reverted) {
+ return lockedBeans.value;
+ }
+ }
+
+ // Pre-gauge there was no lockedBeans contract function, instead we recreate the same calculation.
+ let beanstalk = Beanstalk.bind(BEANSTALK);
+ const recapPercentResult = beanstalk.try_getRecapPaidPercent();
+ if (recapPercentResult.reverted) {
+ // This function was made available later in the Replant process, for a few hundred blocks it is unavailable
+ return ZERO_BI;
+ }
+
+ const recapPaidPercent = new BigDecimal(recapPercentResult.value).div(BigDecimal.fromString("1000000"));
+ const lockedBeansUrBean = LibLockedUnderlying_getLockedUnderlying(UNRIPE_BEAN, recapPaidPercent);
+ const lockedUnripeLp = LibLockedUnderlying_getLockedUnderlying(UNRIPE_BEAN_3CRV, recapPaidPercent);
+ const underlyingLpPool = getUnderlyingUnripe(blockNumber);
+
+ const poolBeanReserves = loadOrCreatePool(underlyingLpPool.toHexString(), blockNumber).reserves[0];
+ const totalLpTokens = ERC20.bind(getUnderlyingUnripe(blockNumber)).totalSupply();
+ // Simplification here: does not account for twa reserves nor twa lp tokens
+ const lockedBeansUrLP = lockedUnripeLp.times(poolBeanReserves).div(totalLpTokens);
+
+ return lockedBeansUrBean.plus(lockedBeansUrLP);
+}
+
+function getUnderlyingUnripe(blockNumber: BigInt): Address {
+ if (blockNumber < BEAN_WETH_UNRIPE_MIGRATION_BLOCK) {
+ return BEAN_3CRV;
+ } else {
+ return BEAN_WETH_CP2_WELL;
+ }
+}
+
+export function LibLockedUnderlying_getLockedUnderlying(unripeToken: Address, recapPercentPaid: BigDecimal): BigInt {
+ const balanceOfUnderlying = Beanstalk.bind(BEANSTALK).getTotalUnderlying(unripeToken);
+ const percentLocked = LibLockedUnderlying_getPercentLockedUnderlying(unripeToken, recapPercentPaid);
+ return BigInt.fromString(new BigDecimal(balanceOfUnderlying).times(percentLocked).truncate(0).toString());
+}
+
+// Returns a fraction of the underlying token that is locked for the given unripe token at this recap percent
+// Compared to the contract's implementation, the result already has div 1e18 applied.
+export function LibLockedUnderlying_getPercentLockedUnderlying(unripeToken: Address, recapPercentPaid: BigDecimal): BigDecimal {
+ const unripeSupply = ERC20.bind(unripeToken).totalSupply().div(BigInt.fromString("1000000"));
+ if (unripeSupply < BigInt.fromString("1000000")) {
+ return ZERO_BD; // If < 1,000,000 Assume all supply is unlocked.
+ }
+ if (unripeSupply > BigInt.fromString("5000000")) {
+ if (unripeSupply > BigInt.fromString("10000000")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.1")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.21")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.38")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.45")) {
+ return BigDecimal.fromString("0.000106800755371506"); // 90,000,000, 0.9
+ } else {
+ return BigDecimal.fromString("0.019890729697455534"); // 90,000,000, 0.45
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.29")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.33")) {
+ return BigDecimal.fromString("0.038002726385307994"); // 90,000,000 0.38
+ } else {
+ return BigDecimal.fromString("0.05969915165233464"); // 90,000,000 0.33
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.25")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.27")) {
+ return BigDecimal.fromString("0.08520038853809475"); // 90,000,000 0.29
+ } else {
+ return BigDecimal.fromString("0.10160827712172482"); // 90,000,000 0.27
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.23")) {
+ return BigDecimal.fromString("0.1210446758987509"); // 90,000,000 0.25
+ } else {
+ return BigDecimal.fromString("0.14404919400935834"); // 90,000,000 0.23
+ }
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.17")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.19")) {
+ return BigDecimal.fromString("0.17125472579906187"); // 90,000,000, 0.21
+ } else {
+ return BigDecimal.fromString("0.2034031571094802"); // 90,000,000, 0.19
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.14")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.15")) {
+ return BigDecimal.fromString("0.24136365460186238"); // 90,000,000 0.17
+ } else {
+ return BigDecimal.fromString("0.2861539540121635"); // 90,000,000 0.15
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.12")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.13")) {
+ return BigDecimal.fromString("0.3114749615435798"); // 90,000,000 0.14
+ } else {
+ return BigDecimal.fromString("0.3389651289211062"); // 90,000,000 0.13
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.11")) {
+ return BigDecimal.fromString("0.3688051484970447"); // 90,000,000 0.12
+ } else {
+ return BigDecimal.fromString("0.4011903974987394"); // 90,000,000 0.11
+ }
+ }
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.04")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.08")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.09")) {
+ return BigDecimal.fromString("0.4363321054081788"); // 90,000,000, 0.1
+ } else {
+ return BigDecimal.fromString("0.4744586123058411"); // 90,000,000, 0.09
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.06")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.07")) {
+ return BigDecimal.fromString("0.5158167251384363"); // 90,000,000 0.08
+ } else {
+ return BigDecimal.fromString("0.560673179393784"); // 90,000,000 0.07
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.05")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.055")) {
+ return BigDecimal.fromString("0.6093162142284054"); // 90,000,000 0.06
+ } else {
+ return BigDecimal.fromString("0.6351540690346162"); // 90,000,000 0.055
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.045")) {
+ return BigDecimal.fromString("0.6620572696973799"); // 90,000,000 0.05
+ } else {
+ return BigDecimal.fromString("0.6900686713435757"); // 90,000,000 0.045
+ }
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.03")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.035")) {
+ return BigDecimal.fromString("0.7192328153846157"); // 90,000,000, 0.04
+ } else {
+ return BigDecimal.fromString("0.7495959945573412"); // 90,000,000, 0.035
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.02")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.025")) {
+ return BigDecimal.fromString("0.7812063204281795"); // 90,000,000 0.03
+ } else {
+ return BigDecimal.fromString("0.8141137934523504"); // 90,000,000 0.025
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.01")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.015")) {
+ return BigDecimal.fromString("0.8483703756831885"); // 90,000,000 0.02
+ } else {
+ return BigDecimal.fromString("0.8840300662301638"); // 90,000,000 0.015
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.005")) {
+ return BigDecimal.fromString("0.921148979567821"); // 90,000,000 0.01
+ } else {
+ return BigDecimal.fromString("0.9597854268015467"); // 90,000,000 0.005
+ }
+ }
+ }
+ }
+ } else {
+ // > 5,000,000
+ if (recapPercentPaid > BigDecimal.fromString("0.1")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.21")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.38")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.45")) {
+ return BigDecimal.fromString("0.000340444522821781"); // 10,000,000, 0.9
+ } else {
+ return BigDecimal.fromString("0.04023093970853808"); // 10,000,000, 0.45
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.29")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.33")) {
+ return BigDecimal.fromString("0.06954881077191022"); // 10,000,000 0.38
+ } else {
+ return BigDecimal.fromString("0.10145116013499655"); // 10,000,000 0.33
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.25")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.27")) {
+ return BigDecimal.fromString("0.13625887314323348"); // 10,000,000 0.29
+ } else {
+ return BigDecimal.fromString("0.15757224609763754"); // 10,000,000 0.27
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.23")) {
+ return BigDecimal.fromString("0.18197183407669726"); // 10,000,000 0.25
+ } else {
+ return BigDecimal.fromString("0.20987581330872107"); // 10,000,000 0.23
+ }
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.17")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.19")) {
+ return BigDecimal.fromString("0.24175584233885106"); // 10,000,000, 0.21
+ } else {
+ return BigDecimal.fromString("0.27814356260741413"); // 10,000,000, 0.19
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.14")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.15")) {
+ return BigDecimal.fromString("0.3196378540296301"); // 10,000,000 0.17
+ } else {
+ return BigDecimal.fromString("0.36691292973511136"); // 10,000,000 0.15
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.1")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.13")) {
+ return BigDecimal.fromString("0.3929517529835418"); // 10,000,000 0.14
+ } else {
+ return BigDecimal.fromString("0.4207273631610372"); // 10,000,000 0.13
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.11")) {
+ return BigDecimal.fromString("0.450349413795883"); // 10,000,000 0.12
+ } else {
+ return BigDecimal.fromString("0.4819341506654745"); // 10,000,000 0.11
+ }
+ }
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.04")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.08")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.09")) {
+ return BigDecimal.fromString("0.5156047910307769"); // 10,000,000, 0.1
+ } else {
+ return BigDecimal.fromString("0.551491923831086"); // 10,000,000, 0.09
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.06")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.07")) {
+ return BigDecimal.fromString("0.5897339319558434"); // 10,000,000 0.08
+ } else {
+ return BigDecimal.fromString("0.6304774377677631"); // 10,000,000 0.07
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.05")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.055")) {
+ return BigDecimal.fromString("0.6738777731119263"); // 10,000,000 0.06
+ } else {
+ return BigDecimal.fromString("0.6966252960203008"); // 10,000,000 0.055
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.045")) {
+ return BigDecimal.fromString("0.7200994751088836"); // 10,000,000 0.05
+ } else {
+ return BigDecimal.fromString("0.7443224016328813"); // 10,000,000 0.045
+ }
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.03")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.035")) {
+ return BigDecimal.fromString("0.7693168090963867"); // 10,000,000, 0.04
+ } else {
+ return BigDecimal.fromString("0.7951060911805916"); // 10,000,000, 0.035
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.02")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.025")) {
+ return BigDecimal.fromString("0.8217143201541763"); // 10,000,000 0.03
+ } else {
+ return BigDecimal.fromString("0.8491662657783823"); // 10,000,000 0.025
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.01")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.015")) {
+ return BigDecimal.fromString("0.8774874147196358"); // 10,000,000 0.02
+ } else {
+ return BigDecimal.fromString("0.9067039904828691"); // 10,000,000 0.015
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.005")) {
+ return BigDecimal.fromString("0.9368429738790524"); // 10,000,000 0.01
+ } else {
+ return BigDecimal.fromString("0.9679321240407666"); // 10,000,000 0.005
+ }
+ }
+ }
+ }
+ }
+ } else {
+ if (unripeSupply > BigInt.fromString("1000000")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.1")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.21")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.38")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.45")) {
+ return BigDecimal.fromString("0.000946395082480844"); // 3,000,000, 0.9
+ } else {
+ return BigDecimal.fromString("0.06786242725985348"); // 3,000,000, 0.45
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.29")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.33")) {
+ return BigDecimal.fromString("0.10822315472628707"); // 3,000,000 0.38
+ } else {
+ return BigDecimal.fromString("0.14899524306327216"); // 3,000,000 0.33
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.25")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.27")) {
+ return BigDecimal.fromString("0.1910488239684135"); // 3,000,000 0.29
+ } else {
+ return BigDecimal.fromString("0.215863137234529"); // 3,000,000 0.27
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.23")) {
+ return BigDecimal.fromString("0.243564628757033"); // 3,000,000 0.25
+ } else {
+ return BigDecimal.fromString("0.2744582675491247"); // 3,000,000 0.23
+ }
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.17")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.19")) {
+ return BigDecimal.fromString("0.3088786047254358"); // 3,000,000, 0.21
+ } else {
+ return BigDecimal.fromString("0.3471924328319608"); // 3,000,000, 0.19
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.14")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.15")) {
+ return BigDecimal.fromString("0.38980166833777796"); // 3,000,000 0.17
+ } else {
+ return BigDecimal.fromString("0.4371464748698771"); // 3,000,000 0.15
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.12")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.13")) {
+ return BigDecimal.fromString("0.46274355346663876"); // 3,000,000 0.14
+ } else {
+ return BigDecimal.fromString("0.4897086460787351"); // 3,000,000 0.13
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.11")) {
+ return BigDecimal.fromString("0.518109082463349"); // 3,000,000 0.12
+ } else {
+ return BigDecimal.fromString("0.5480152684204499"); // 3,000,000 0.11
+ }
+ }
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.04")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.08")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.09")) {
+ return BigDecimal.fromString("0.5795008171102514"); // 3,000,000, 0.1
+ } else {
+ return BigDecimal.fromString("0.6126426856374751"); // 3,000,000, 0.09
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.06")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.07")) {
+ return BigDecimal.fromString("0.6475213171017626"); // 3,000,000 0.08
+ } else {
+ return BigDecimal.fromString("0.6842207883207123"); // 3,000,000 0.07
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.05")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.055")) {
+ return BigDecimal.fromString("0.7228289634394097"); // 3,000,000 0.06
+ } else {
+ return BigDecimal.fromString("0.742877347280416"); // 3,000,000 0.055
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.045")) {
+ return BigDecimal.fromString("0.7634376536479606"); // 3,000,000 0.05
+ } else {
+ return BigDecimal.fromString("0.784522002909275"); // 3,000,000 0.045
+ }
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.03")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.035")) {
+ return BigDecimal.fromString("0.8061427832364296"); // 3,000,000, 0.04
+ } else {
+ return BigDecimal.fromString("0.8283126561589187"); // 3,000,000, 0.035
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.02")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.025")) {
+ return BigDecimal.fromString("0.8510445622247672"); // 3,000,000 0.03
+ } else {
+ return BigDecimal.fromString("0.8743517267721741"); // 3,000,000 0.025
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.01")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.015")) {
+ return BigDecimal.fromString("0.8982476658137254"); // 3,000,000 0.02
+ } else {
+ return BigDecimal.fromString("0.9227461920352636"); // 3,000,000 0.015
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.005")) {
+ return BigDecimal.fromString("0.9478614209115208"); // 3,000,000 0.01
+ } else {
+ return BigDecimal.fromString("0.9736077769406731"); // 3,000,000 0.005
+ }
+ }
+ }
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.1")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.21")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.38")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.45")) {
+ return BigDecimal.fromString("0.003360632002379016"); // 1,000,000, 0.9
+ } else {
+ return BigDecimal.fromString("0.12071031956650236"); // 1,000,000, 0.45
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.29")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.33")) {
+ return BigDecimal.fromString("0.1752990554517151"); // 1,000,000 0.38
+ } else {
+ return BigDecimal.fromString("0.22598948369141458"); // 1,000,000 0.33
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.25")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.27")) {
+ return BigDecimal.fromString("0.27509697387157794"); // 1,000,000 0.29
+ } else {
+ return BigDecimal.fromString("0.3029091410266461"); // 1,000,000 0.27
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.23")) {
+ return BigDecimal.fromString("0.33311222196618273"); // 1,000,000 0.25
+ } else {
+ return BigDecimal.fromString("0.36588364748950297"); // 1,000,000 0.23
+ }
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.17")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.19")) {
+ return BigDecimal.fromString("0.40141235983370593"); // 1,000,000, 0.21
+ } else {
+ return BigDecimal.fromString("0.43989947169522015"); // 1,000,000, 0.19
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.14")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.15")) {
+ return BigDecimal.fromString("0.4815589587559236"); // 1,000,000 0.17
+ } else {
+ return BigDecimal.fromString("0.5266183872325827"); // 1,000,000 0.15
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.12")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.13")) {
+ return BigDecimal.fromString("0.5504980973828455"); // 1,000,000 0.14
+ } else {
+ return BigDecimal.fromString("0.5753196780298556"); // 1,000,000 0.13
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.11")) {
+ return BigDecimal.fromString("0.6011157438454372"); // 1,000,000 0.12
+ } else {
+ return BigDecimal.fromString("0.6279199091408495"); // 1,000,000 0.11
+ }
+ }
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.04")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.08")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.09")) {
+ return BigDecimal.fromString("0.6557668151543954"); // 1,000,000, 0.1
+ } else {
+ return BigDecimal.fromString("0.6846921580052533"); // 1,000,000, 0.09
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.06")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.07")) {
+ return BigDecimal.fromString("0.7147327173281093"); // 1,000,000 0.08
+ } else {
+ return BigDecimal.fromString("0.745926385603471"); // 1,000,000 0.07
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.05")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.055")) {
+ return BigDecimal.fromString("0.7783121981988174"); // 1,000,000 0.06
+ } else {
+ return BigDecimal.fromString("0.7949646772335068"); // 1,000,000 0.055
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.045")) {
+ return BigDecimal.fromString("0.8119303641360465"); // 1,000,000 0.05
+ } else {
+ return BigDecimal.fromString("0.8292144735871585"); // 1,000,000 0.045
+ }
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.03")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.035")) {
+ return BigDecimal.fromString("0.8468222976009872"); // 1,000,000, 0.04
+ } else {
+ return BigDecimal.fromString("0.8647592065514869"); // 1,000,000, 0.035
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.02")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.025")) {
+ return BigDecimal.fromString("0.8830306502110374"); // 1,000,000 0.03
+ } else {
+ return BigDecimal.fromString("0.9016421588014247"); // 1,000,000 0.025
+ }
+ } else if (recapPercentPaid > BigDecimal.fromString("0.01")) {
+ if (recapPercentPaid > BigDecimal.fromString("0.015")) {
+ return BigDecimal.fromString("0.9205993440573136"); // 1,000,000 0.02
+ } else {
+ return BigDecimal.fromString("0.9399079003023474"); // 1,000,000 0.015
+ }
+ } else {
+ if (recapPercentPaid > BigDecimal.fromString("0.005")) {
+ return BigDecimal.fromString("0.959573605538012"); // 1,000,000 0.01
+ } else {
+ return BigDecimal.fromString("0.9796023225453983"); // 1,000,000 0.005
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/projects/subgraph-bean/src/utils/Pool.ts b/projects/subgraph-bean/src/utils/Pool.ts
index 4664d8959d..1b57b8eccf 100644
--- a/projects/subgraph-bean/src/utils/Pool.ts
+++ b/projects/subgraph-bean/src/utils/Pool.ts
@@ -1,9 +1,12 @@
-import { BigDecimal, BigInt } from "@graphprotocol/graph-ts";
+import { BigDecimal, BigInt, log } from "@graphprotocol/graph-ts";
import { Pool, PoolDailySnapshot, PoolHourlySnapshot } from "../../generated/schema";
import { dayFromTimestamp, hourFromTimestamp } from "../../../subgraph-core/utils/Dates";
import { emptyBigIntArray, ZERO_BD, ZERO_BI } from "../../../subgraph-core/utils/Decimals";
-import { getBeanTokenAddress, loadBean } from "./Bean";
+import { getBeanTokenAddress, loadBean, updateInstDeltaB } from "./Bean";
import { checkPoolCross } from "./Cross";
+import { DeltaBAndPrice } from "./price/Types";
+import { getTokensForPool } from "../constants/PooledTokens";
+import { loadOrCreateToken } from "./Token";
export function loadOrCreatePool(poolAddress: string, blockNumber: BigInt): Pool {
let pool = Pool.load(poolAddress);
@@ -12,6 +15,10 @@ export function loadOrCreatePool(poolAddress: string, blockNumber: BigInt): Pool
let bean = loadBean(beanAddress);
pool = new Pool(poolAddress);
+ pool.tokens = getTokensForPool(poolAddress);
+ for (let i = 0; i < pool.tokens.length; ++i) {
+ loadOrCreateToken(pool.tokens[i]);
+ }
pool.bean = beanAddress;
pool.reserves = emptyBigIntArray(2);
pool.lastSeason = bean.lastSeason;
@@ -43,12 +50,14 @@ export function loadOrCreatePoolHourlySnapshot(pool: string, timestamp: BigInt,
snapshot.pool = pool;
snapshot.reserves = currentPool.reserves;
snapshot.lastPrice = currentPool.lastPrice;
+ snapshot.twaPrice = ZERO_BD;
snapshot.volume = currentPool.volume;
snapshot.volumeUSD = currentPool.volumeUSD;
snapshot.liquidityUSD = currentPool.liquidityUSD;
snapshot.crosses = currentPool.crosses;
snapshot.utilization = ZERO_BD;
snapshot.deltaBeans = ZERO_BI;
+ snapshot.twaDeltaBeans = ZERO_BI;
snapshot.deltaReserves = emptyBigIntArray(2);
snapshot.deltaVolume = ZERO_BI;
snapshot.deltaVolumeUSD = ZERO_BD;
@@ -73,12 +82,14 @@ export function loadOrCreatePoolDailySnapshot(pool: string, timestamp: BigInt, b
snapshot.pool = pool;
snapshot.reserves = currentPool.reserves;
snapshot.lastPrice = currentPool.lastPrice;
+ snapshot.twaPrice = ZERO_BD;
snapshot.volume = currentPool.volume;
snapshot.volumeUSD = currentPool.volumeUSD;
snapshot.liquidityUSD = currentPool.liquidityUSD;
snapshot.crosses = currentPool.crosses;
snapshot.utilization = ZERO_BD;
snapshot.deltaBeans = ZERO_BI;
+ snapshot.twaDeltaBeans = ZERO_BI;
snapshot.deltaReserves = emptyBigIntArray(2);
snapshot.deltaVolume = ZERO_BI;
snapshot.deltaVolumeUSD = ZERO_BD;
@@ -132,6 +143,8 @@ export function updatePoolValues(
poolDaily.utilization = poolDaily.deltaVolumeUSD.div(poolDaily.liquidityUSD);
poolDaily.updatedAt = timestamp;
poolDaily.save();
+
+ updateInstDeltaB(pool.bean, blockNumber, timestamp);
}
export function incrementPoolCross(poolAddress: string, timestamp: BigInt, blockNumber: BigInt): void {
@@ -157,16 +170,21 @@ export function updatePoolSeason(poolAddress: string, timestamp: BigInt, blockNu
let poolDaily = loadOrCreatePoolDailySnapshot(poolAddress, timestamp, blockNumber);
pool.lastSeason = season;
- pool.save();
-
poolHourly.season = season;
- poolHourly.save();
-
poolDaily.season = season;
+
+ pool.save();
+ poolHourly.save();
poolDaily.save();
}
-export function updatePoolPrice(poolAddress: string, timestamp: BigInt, blockNumber: BigInt, price: BigDecimal): void {
+export function updatePoolPrice(
+ poolAddress: string,
+ timestamp: BigInt,
+ blockNumber: BigInt,
+ price: BigDecimal,
+ checkCross: boolean = true
+): void {
let pool = loadOrCreatePool(poolAddress, blockNumber);
let poolHourly = loadOrCreatePoolHourlySnapshot(poolAddress, timestamp, blockNumber);
let poolDaily = loadOrCreatePoolDailySnapshot(poolAddress, timestamp, blockNumber);
@@ -182,26 +200,55 @@ export function updatePoolPrice(poolAddress: string, timestamp: BigInt, blockNum
poolDaily.lastPrice = price;
poolDaily.save();
- checkPoolCross(poolAddress, timestamp, blockNumber, oldPrice, price);
+ if (checkCross) {
+ checkPoolCross(poolAddress, timestamp, blockNumber, oldPrice, price);
+ }
}
-export function updatePoolReserves(poolAddress: string, deltaAmount0: BigInt, deltaAmount1: BigInt, blockNumber: BigInt): void {
- // All pools with BEAN to date are 2 token pools
+export function setPoolReserves(poolAddress: string, reserves: BigInt[], timestamp: BigInt, blockNumber: BigInt): void {
let pool = loadOrCreatePool(poolAddress, blockNumber);
- let reserves = pool.reserves;
- reserves[0] = reserves[0].plus(deltaAmount0);
- reserves[1] = reserves[1].plus(deltaAmount1);
- pool.reserves = reserves;
- pool.save();
-}
+ let poolHourly = loadOrCreatePoolHourlySnapshot(poolAddress, timestamp, blockNumber);
+ let poolDaily = loadOrCreatePoolDailySnapshot(poolAddress, timestamp, blockNumber);
+
+ let deltaReserves: BigInt[] = [];
+ for (let i = 0; i < reserves.length; ++i) {
+ deltaReserves.push(reserves[i].minus(pool.reserves[i]));
+ }
-export function setPoolReserves(poolAddress: string, reserves: BigInt[], blockNumber: BigInt): void {
- let pool = loadOrCreatePool(poolAddress, blockNumber);
pool.reserves = reserves;
+ poolHourly.reserves = reserves;
+ poolDaily.reserves = reserves;
+
+ let newHourlyDelta: BigInt[] = [];
+ let newDailyDelta: BigInt[] = [];
+ for (let i = 0; i < reserves.length; ++i) {
+ newHourlyDelta.push(poolHourly.deltaReserves[i].plus(deltaReserves[i]));
+ newDailyDelta.push(poolDaily.deltaReserves[i].plus(deltaReserves[i]));
+ }
+
+ poolHourly.deltaReserves = newHourlyDelta;
+ poolDaily.deltaReserves = newDailyDelta;
+
pool.save();
+ poolHourly.save();
+ poolDaily.save();
}
export function getPoolLiquidityUSD(poolAddress: string, blockNumber: BigInt): BigDecimal {
let pool = loadOrCreatePool(poolAddress, blockNumber);
return pool.liquidityUSD;
}
+
+export function setPoolTwa(poolAddress: string, twaValues: DeltaBAndPrice, timestamp: BigInt, blockNumber: BigInt): void {
+ let poolHourly = loadOrCreatePoolHourlySnapshot(poolAddress, timestamp, blockNumber);
+ let poolDaily = loadOrCreatePoolDailySnapshot(poolAddress, timestamp, blockNumber);
+ poolHourly.twaDeltaBeans = twaValues.deltaB;
+ poolHourly.twaPrice = twaValues.price;
+ poolHourly.twaToken2Price = twaValues.token2Price;
+ // NOTE: ideally this would be a twa of the entire day
+ poolDaily.twaDeltaBeans = twaValues.deltaB;
+ poolDaily.twaPrice = twaValues.price;
+ poolDaily.twaToken2Price = twaValues.token2Price;
+ poolHourly.save();
+ poolDaily.save();
+}
diff --git a/projects/subgraph-bean/src/utils/Token.ts b/projects/subgraph-bean/src/utils/Token.ts
index ff060c0a3e..a371df1909 100644
--- a/projects/subgraph-bean/src/utils/Token.ts
+++ b/projects/subgraph-bean/src/utils/Token.ts
@@ -1,14 +1,23 @@
-import { BigInt } from "@graphprotocol/graph-ts";
+import { BigDecimal } from "@graphprotocol/graph-ts";
import { Token } from "../../generated/schema";
import { ZERO_BD } from "../../../subgraph-core/utils/Decimals";
+import { getTokenInfo } from "../constants/PooledTokens";
export function loadOrCreateToken(address: string): Token {
let token = Token.load(address);
if (token == null) {
+ const tokenInfo = getTokenInfo(address);
token = new Token(address);
- token.decimals = BigInt.fromString("18");
+ token.name = tokenInfo.name;
+ token.decimals = tokenInfo.decimals;
token.lastPriceUSD = ZERO_BD;
token.save();
}
return token as Token;
}
+
+export function updateTokenPrice(address: string, price: BigDecimal): void {
+ let token = loadOrCreateToken(address);
+ token.lastPriceUSD = price;
+ token.save();
+}
diff --git a/projects/subgraph-bean/src/utils/price/BeanstalkPrice.ts b/projects/subgraph-bean/src/utils/price/BeanstalkPrice.ts
new file mode 100644
index 0000000000..0b76a296ff
--- /dev/null
+++ b/projects/subgraph-bean/src/utils/price/BeanstalkPrice.ts
@@ -0,0 +1,131 @@
+import { Address, BigInt, log } from "@graphprotocol/graph-ts";
+import {
+ BeanstalkPrice,
+ BeanstalkPrice__priceResultPPsStruct,
+ BeanstalkPrice__priceResultPStruct
+} from "../../../generated/Beanstalk/BeanstalkPrice";
+import { loadBean } from "../Bean";
+import { BEANSTALK_PRICE } from "../../../../subgraph-core/utils/Constants";
+import { ZERO_BI } from "../../../../subgraph-core/utils/Decimals";
+
+// Can't use the autogenerated one because the fields need to be updateable
+class PriceOverallStruct {
+ price: BigInt;
+ liquidity: BigInt;
+ deltaB: BigInt;
+ ps: PricePoolStruct[];
+
+ constructor(value: BeanstalkPrice__priceResultPStruct) {
+ this.price = value.price;
+ this.liquidity = value.liquidity;
+ this.deltaB = value.deltaB;
+ this.ps = [];
+ for (let i = 0; i < value.ps.length; ++i) {
+ this.ps.push(new PricePoolStruct(value.ps[i]));
+ }
+ }
+}
+
+class PricePoolStruct {
+ pool: Address;
+ tokens: Address[];
+ balances: BigInt[];
+ price: BigInt;
+ liquidity: BigInt;
+ deltaB: BigInt;
+ lpUsd: BigInt;
+ lpBdv: BigInt;
+
+ constructor(value: BeanstalkPrice__priceResultPPsStruct) {
+ this.pool = value.pool;
+ this.tokens = value.tokens;
+ this.balances = value.balances;
+ this.price = value.price;
+ this.liquidity = value.liquidity;
+ this.deltaB = value.deltaB;
+ this.lpUsd = value.lpUsd;
+ this.lpBdv = value.lpBdv;
+ }
+}
+
+export class BeanstalkPriceResult {
+ private _value: PriceOverallStruct | null = null;
+ private _dewhitelistedPools: Array = [];
+
+ constructor(value: BeanstalkPrice__priceResultPStruct | null, whitelistedPools: string[]) {
+ if (value !== null) {
+ this._value = new PriceOverallStruct(value);
+ let anyDewhitelisted = false;
+ for (let i = 0; i < this._value!.ps.length; ++i) {
+ const index = whitelistedPools.indexOf(this._value!.ps[i].pool.toHexString());
+ if (index == -1) {
+ // The pool was dewhitelisted
+ this._dewhitelistedPools.push(this._value!.ps.splice(i--, 1)[0]);
+ anyDewhitelisted = true;
+ }
+ }
+
+ // Recalculate overall price/liquidity/delta
+ if (anyDewhitelisted) {
+ this._value!.price = ZERO_BI;
+ this._value!.liquidity = ZERO_BI;
+ this._value!.deltaB = ZERO_BI;
+ for (let i = 0; i < this._value!.ps.length; ++i) {
+ this._value!.price = this._value!.price.plus(this._value!.ps[i].price.times(this._value!.ps[i].liquidity));
+ this._value!.liquidity = this._value!.liquidity.plus(this._value!.ps[i].liquidity);
+ this._value!.deltaB = this._value!.deltaB.plus(this._value!.ps[i].deltaB);
+ }
+ this._value!.price = this._value!.price.div(this._value!.liquidity);
+ }
+ }
+ }
+
+ get reverted(): boolean {
+ return this._value == null;
+ }
+
+ get value(): PriceOverallStruct {
+ assert(!this.reverted, "accessed value of a reverted call, please check the `reverted` field before accessing the `value` field");
+ return this._value!;
+ }
+
+ // Dewhitelsited pools are remvoed from value struct and placed here.
+ get dewhitelistedPools(): Array {
+ assert(!this.reverted, "accessed value of a reverted call, please check the `reverted` field before accessing the `value` field");
+ return this._dewhitelistedPools;
+ }
+}
+
+// Wrapper for BeanstalkPrice contract that handles a few things:
+// (1) Only including whitelisted tokens in the final price calculation and the prices list
+// (2) Which contract to call (in anticipation of new BeanstalkPrice contract deployments)
+export function BeanstalkPrice_try_price(beanAddr: Address, blockNumber: BigInt): BeanstalkPriceResult {
+ let beanstalkPrice = BeanstalkPrice.bind(BEANSTALK_PRICE);
+ let beanPrice = beanstalkPrice.try_price();
+
+ if (beanPrice.reverted) {
+ return new BeanstalkPriceResult(null, []);
+ }
+
+ let bean = loadBean(beanAddr.toHexString());
+
+ // changetype is necessary as there are identical responses from different generated contract objects.
+ // If the response structure changes in the future, this will need to be revisited.
+ return new BeanstalkPriceResult(changetype(beanPrice.value), bean.pools);
+}
+
+// Extracts the pool price from the larger result
+export function getPoolPrice(priceResult: BeanstalkPriceResult, pool: Address): PricePoolStruct | null {
+ for (let i = 0; i < priceResult.value.ps.length; ++i) {
+ if (priceResult.value.ps[i].pool == pool) {
+ return priceResult.value.ps[i];
+ }
+ }
+
+ for (let i = 0; i < priceResult.dewhitelistedPools.length; ++i) {
+ if (priceResult.dewhitelistedPools[i].pool == pool) {
+ return priceResult.dewhitelistedPools[i];
+ }
+ }
+ return null;
+}
diff --git a/projects/subgraph-bean/src/utils/price/CurvePrice.ts b/projects/subgraph-bean/src/utils/price/CurvePrice.ts
new file mode 100644
index 0000000000..dcc4d248a0
--- /dev/null
+++ b/projects/subgraph-bean/src/utils/price/CurvePrice.ts
@@ -0,0 +1,247 @@
+import { Address, BigDecimal, BigInt, log } from "@graphprotocol/graph-ts";
+import { Bean3CRV } from "../../../generated/Bean3CRV-V1/Bean3CRV";
+import { BD_10, BI_10, ONE_BI, toDecimal, ZERO_BD, ZERO_BI } from "../../../../subgraph-core/utils/Decimals";
+import {
+ BEAN_3CRV_V1,
+ BEAN_LUSD_V1,
+ CALCULATIONS_CURVE,
+ CRV3_POOL,
+ CRV3_TOKEN,
+ LUSD,
+ LUSD_3POOL
+} from "../../../../subgraph-core/utils/Constants";
+import { CalculationsCurve } from "../../../generated/Bean3CRV-V1/CalculationsCurve";
+import { ERC20 } from "../../../generated/Bean3CRV-V1/ERC20";
+import { DeltaBAndPrice, DeltaBPriceLiquidity, TWAType } from "./Types";
+import { Pool } from "../../../generated/schema";
+import { getTWAPrices, loadOrCreateTwaOracle } from "./TwaOracle";
+import { setPoolTwa } from "../Pool";
+
+// Note that the Bean3CRV type applies to any curve pool (including lusd)
+
+// get_dy method returns the price with the fee already applied, divide by this value to unapply the fee
+const amountAfterFee = BigDecimal.fromString("0.9996");
+
+// Returns [beanPrice, lpValue] of the requested curve pool
+export function curvePriceAndLp(pool: Address): BigDecimal[] {
+ // Get Curve Price Details
+ let curveCalc = CalculationsCurve.bind(CALCULATIONS_CURVE);
+ let metapoolPrice = toDecimal(curveCalc.getCurvePriceUsdc(CRV3_TOKEN));
+
+ let lpContract = Bean3CRV.bind(pool);
+ let beanCrvPrice = ZERO_BD;
+
+ let lpValue = ZERO_BD;
+ if (pool == BEAN_3CRV_V1) {
+ beanCrvPrice = toDecimal(lpContract.get_dy(ZERO_BI, BigInt.fromI32(1), BigInt.fromI32(1000000)), 18).div(amountAfterFee);
+
+ let crv3Contract = ERC20.bind(CRV3_TOKEN);
+ let crvHolding = toDecimal(crv3Contract.balanceOf(pool), 18);
+ lpValue = crvHolding.times(metapoolPrice);
+ } else if (pool == BEAN_LUSD_V1) {
+ // price in LUSD
+ let priceInLusd = toDecimal(lpContract.get_dy(ZERO_BI, BigInt.fromI32(1), BigInt.fromI32(1000000)), 18).div(amountAfterFee);
+
+ let lusdContract = ERC20.bind(LUSD);
+ let lusd3PoolContract = Bean3CRV.bind(LUSD_3POOL);
+ let lusd3crvPrice = toDecimal(lusd3PoolContract.get_dy(ZERO_BI, BigInt.fromI32(1), BigInt.fromString("1000000000000000000")), 18).div(
+ amountAfterFee
+ );
+ beanCrvPrice = priceInLusd.times(lusd3crvPrice);
+
+ let lusdHolding = toDecimal(lusdContract.balanceOf(pool), 18);
+ lpValue = lusdHolding.times(lusd3crvPrice).times(metapoolPrice);
+ }
+
+ let beanPrice = metapoolPrice.times(beanCrvPrice);
+
+ return [beanPrice, lpValue];
+}
+
+export function calcCurveInst(pool: Pool): DeltaBPriceLiquidity {
+ const priceAndLp = curvePriceAndLp(Address.fromString(pool.id));
+ return {
+ price: priceAndLp[0],
+ liquidity: priceAndLp[1],
+ deltaB: curveDeltaBUsingVPrice(Address.fromString(pool.id), pool.reserves[0])
+ };
+}
+
+// Returns the deltaB in the given curve pool using virtual_price.
+export function curveDeltaBUsingVPrice(pool: Address, beanReserves: BigInt): BigInt {
+ let lpContract = Bean3CRV.bind(pool);
+ // D = vprice * total lp tokens
+ // vprice: 12 decimals, tokens: 18 decimals
+ const D = lpContract.get_virtual_price().times(lpContract.totalSupply()).div(BI_10.pow(30));
+ // D / 2 - beanReserves
+ const deltaB = D.div(BigInt.fromU32(2)).minus(beanReserves);
+ return deltaB;
+}
+
+// Calculates and sets the TWA on the pool hourly/daily snapshots
+export function setCurveTwa(poolAddress: string, timestamp: BigInt, blockNumber: BigInt): void {
+ const twaBalances = getTWAPrices(poolAddress, TWAType.CURVE, timestamp);
+ const beanPool = Address.fromString(poolAddress);
+ const otherPool = beanPool == BEAN_LUSD_V1 ? LUSD_3POOL : CRV3_POOL;
+ const twaResult = curveTwaDeltaBAndPrice(twaBalances, beanPool, otherPool);
+
+ setPoolTwa(poolAddress, twaResult, timestamp, blockNumber);
+}
+
+export function curveCumulativePrices(pool: Address, timestamp: BigInt): BigInt[] {
+ let cumulativeLast: BigInt[];
+ let currentBalances: BigInt[];
+ let lastTimestamp: BigInt;
+ if (pool == BEAN_3CRV_V1) {
+ let curve = Bean3CRV.bind(pool);
+ cumulativeLast = curve.get_price_cumulative_last();
+ currentBalances = curve.get_balances();
+ lastTimestamp = curve.block_timestamp_last();
+ } else {
+ // if (pool == BEAN_LUSD_V1) {
+ // BEANLUSD does not have the above functions, uses manual calculation
+ // BEAN_3CRV(_V2) uses this also, oracle values are updated from MetapoolOracle event.
+ let twaOracle = loadOrCreateTwaOracle(pool.toHexString());
+ cumulativeLast = twaOracle.priceCumulativeLast;
+ currentBalances = twaOracle.lastBalances;
+ lastTimestamp = twaOracle.lastUpdated;
+ }
+
+ const deltaLastTimestamp = timestamp.minus(lastTimestamp);
+ const cumulativeBalances = [
+ cumulativeLast[0].plus(currentBalances[0].times(deltaLastTimestamp)),
+ cumulativeLast[1].plus(currentBalances[1].times(deltaLastTimestamp))
+ ];
+ return cumulativeBalances;
+}
+
+// beanPool is the pool with beans trading against otherPool's tokens.
+// otherPool is needed to get the virtual price of that token beans are trading against.
+export function curveTwaDeltaBAndPrice(twaBalances: BigInt[], beanPool: Address, otherPool: Address): DeltaBAndPrice {
+ const bean_A = getBean_A(beanPool);
+ let otherCurve = Bean3CRV.bind(otherPool);
+ const other_virtual_price = otherCurve.get_virtual_price();
+
+ const xp = [twaBalances[0].times(BI_10.pow(12)), twaBalances[1].times(other_virtual_price).div(BI_10.pow(18))];
+
+ const D = getD(xp, bean_A);
+ const y = getY(xp[0].plus(BI_10.pow(12)), xp, bean_A, D);
+
+ // log.debug("curve bean_A {}", [bean_A.toString()]);
+ // log.debug("curve other_virtual_price {}", [other_virtual_price.toString()]);
+ // log.debug("curve D {}", [D.toString()]);
+ // log.debug("curve y {}", [y.toString()]);
+ // log.debug("curve deltaB calculated {}", [D.div(BigInt.fromU32(2)).div(BI_10.pow(12)).minus(twaBalances[0]).toString()]);
+ // log.debug("curve deltaB simple {}", [curveDeltaBUsingVPrice(beanPool, twaBalances[0]).toString()]);
+ // log.debug("curve xp[0] {}", [xp[0].toString()]);
+ // log.debug("curve xp[1] {}", [xp[1].toString()]);
+
+ return {
+ deltaB: deltaFromD(D, twaBalances[0]),
+ price: priceFromY(y, xp[1]),
+ token2Price: null
+ };
+}
+
+export function deltaFromD(D: BigInt, beanBalance: BigInt): BigInt {
+ return D.div(BigInt.fromU32(2)).div(BI_10.pow(12)).minus(beanBalance);
+}
+
+export function priceFromY(y: BigInt, nonBeanXp: BigInt): BigDecimal {
+ return BigDecimal.fromString(nonBeanXp.minus(y).minus(ONE_BI).toString()).div(BigDecimal.fromString("1000000000000"));
+}
+
+// In practice we can hardcode and avoid an unnecessary call since there was no ramping in our pools
+function getBean_A(beanPool: Address): BigInt {
+ // let beanCurve = Bean3CRV.bind(beanPool);
+ // const bean_A = beanCurve.A_precise();
+ if (beanPool == BEAN_3CRV_V1) {
+ return BigInt.fromU32(1000);
+ } else if (beanPool == BEAN_LUSD_V1) {
+ return BigInt.fromU32(10000);
+ } else {
+ // BEAN3CRV
+ return BigInt.fromU32(100);
+ }
+}
+
+// These are the same for both the 3crv and lusd pools
+const A_PRECISION = BigInt.fromU32(100);
+const N_COINS = BigInt.fromU32(2);
+
+// Generated from functions in LibCurve.sol
+export function getD(xp: BigInt[], a: BigInt): BigInt {
+ let S: BigInt = BigInt.fromString("0");
+ let Dprev: BigInt;
+ let D: BigInt = BigInt.fromString("0");
+
+ // Summing elements in the array
+ for (let i = 0; i < xp.length; ++i) {
+ S = S.plus(xp[i]);
+ }
+ if (S.toString() == "0") return BigInt.fromString("0");
+
+ D = S;
+ let Ann: BigInt = a.times(N_COINS);
+
+ for (let i = 0; i < 256; ++i) {
+ let D_P: BigInt = D;
+ for (let j = 0; j < xp.length; ++j) {
+ D_P = D_P.times(D).div(xp[j].times(N_COINS));
+ }
+ Dprev = D;
+ let num: BigInt = Ann.times(S).div(A_PRECISION).plus(D_P.times(N_COINS)).times(D);
+ let denom: BigInt = Ann.minus(A_PRECISION).times(D).div(A_PRECISION).plus(N_COINS.plus(ONE_BI).times(D_P));
+ D = num.div(denom);
+
+ // Check convergence
+ if (D == Dprev || D.minus(Dprev) == ONE_BI || Dprev.minus(D) == ONE_BI) {
+ return D;
+ }
+ }
+ log.debug("curve_error xp[0] {}", [xp[0].toString()]);
+ log.debug("curve_error xp[1] {}", [xp[1].toString()]);
+ log.debug("curve_error a {}", [a.toString()]);
+ throw new Error("Price: Convergence failed");
+}
+
+const i = 0;
+const j = 1;
+
+export function getY(x: BigInt, xp: BigInt[], a: BigInt, D: BigInt): BigInt {
+ let S_: BigInt = BigInt.fromString("0");
+ let _x: BigInt = BigInt.fromString("0");
+ let y_prev: BigInt;
+ let y: BigInt = D;
+ let c: BigInt = D;
+ let Ann: BigInt = a.times(N_COINS);
+
+ // Calculate c considering each element in xp
+ for (let _i = 0; _i < N_COINS.toI32(); ++_i) {
+ if (_i == i) _x = x;
+ else if (_i != j) _x = xp[i];
+ else continue;
+ S_ = S_.plus(_x);
+ c = c.times(D).div(_x.times(N_COINS));
+ }
+
+ c = c.times(D).times(A_PRECISION).div(Ann.times(N_COINS));
+ let b: BigInt = S_.plus(D.times(A_PRECISION).div(Ann));
+
+ for (let _i = 0; _i < 255; ++_i) {
+ y_prev = y;
+ y = y
+ .times(y)
+ .plus(c)
+ .div(y.times(BigInt.fromString("2")).plus(b).minus(D));
+ if (y == y_prev || y.minus(y_prev) == ONE_BI || y_prev.minus(y) == ONE_BI) {
+ return y;
+ }
+ }
+ log.debug("curve_error x {}", [x.toString()]);
+ log.debug("curve_error xp[0] {}", [xp[0].toString()]);
+ log.debug("curve_error xp[1] {}", [xp[1].toString()]);
+ log.debug("curve_error a {}", [a.toString()]);
+ log.debug("curve_error D {}", [D.toString()]);
+ throw new Error("Price: Convergence failed");
+}
diff --git a/projects/subgraph-bean/src/utils/price/TwaOracle.ts b/projects/subgraph-bean/src/utils/price/TwaOracle.ts
new file mode 100644
index 0000000000..3eb4ba9ccc
--- /dev/null
+++ b/projects/subgraph-bean/src/utils/price/TwaOracle.ts
@@ -0,0 +1,107 @@
+import { BigInt, Address, BigDecimal, Bytes, log } from "@graphprotocol/graph-ts";
+import { TwaOracle } from "../../../generated/schema";
+import { BI_10, emptyBigIntArray, ONE_BI, ZERO_BI } from "../../../../subgraph-core/utils/Decimals";
+import { uniswapCumulativePrice } from "./UniswapPrice";
+import { WETH_USDC_PAIR } from "../../../../subgraph-core/utils/Constants";
+import { curveCumulativePrices } from "./CurvePrice";
+import { TWAType } from "./Types";
+import { wellCumulativePrices, wellTwaReserves } from "./WellPrice";
+import { WellOracle } from "../../../generated/TWAPOracles/BIP37";
+
+export function loadOrCreateTwaOracle(poolAddress: string): TwaOracle {
+ let twaOracle = TwaOracle.load(poolAddress);
+ if (twaOracle == null) {
+ twaOracle = new TwaOracle(poolAddress);
+ twaOracle.pool = poolAddress;
+ twaOracle.priceCumulativeSun = emptyBigIntArray(2);
+ twaOracle.lastSun = ZERO_BI;
+ twaOracle.priceCumulativeLast = emptyBigIntArray(2);
+ twaOracle.lastBalances = emptyBigIntArray(2);
+ twaOracle.lastUpdated = ZERO_BI;
+ twaOracle.cumulativeWellReserves = Bytes.empty();
+ twaOracle.cumulativeWellReservesTime = ZERO_BI;
+ twaOracle.cumulativeWellReservesBlock = ZERO_BI;
+ twaOracle.cumulativeWellReservesPrev = Bytes.empty();
+ twaOracle.cumulativeWellReservesPrevTime = ZERO_BI;
+ twaOracle.cumulativeWellReservesPrevBlock = ZERO_BI;
+ twaOracle.save();
+ }
+ return twaOracle as TwaOracle;
+}
+
+export function manualTwa(poolAddress: string, newReserves: BigInt[], timestamp: BigInt): void {
+ let twaOracle = loadOrCreateTwaOracle(poolAddress);
+ const elapsedTime = timestamp.minus(twaOracle.lastUpdated);
+ const newPriceCumulative = [
+ twaOracle.priceCumulativeLast[0].plus(twaOracle.lastBalances[0].times(elapsedTime)),
+ twaOracle.priceCumulativeLast[1].plus(twaOracle.lastBalances[1].times(elapsedTime))
+ ];
+ twaOracle.priceCumulativeLast = newPriceCumulative;
+ twaOracle.lastBalances = newReserves;
+ twaOracle.lastUpdated = timestamp;
+ twaOracle.save();
+}
+
+export function setTwaLast(poolAddress: string, newCumulative: BigInt[], timestamp: BigInt): void {
+ let twaOracle = loadOrCreateTwaOracle(poolAddress);
+ twaOracle.priceCumulativeLast = newCumulative;
+ twaOracle.lastUpdated = timestamp;
+ twaOracle.save();
+}
+
+export function setRawWellReserves(event: WellOracle): void {
+ let twaOracle = loadOrCreateTwaOracle(event.params.well.toHexString());
+ twaOracle.cumulativeWellReservesPrev = twaOracle.cumulativeWellReserves;
+ twaOracle.cumulativeWellReservesPrevTime = twaOracle.cumulativeWellReservesTime;
+ twaOracle.cumulativeWellReservesPrevBlock = twaOracle.cumulativeWellReservesBlock;
+ twaOracle.cumulativeWellReserves = event.params.cumulativeReserves;
+ twaOracle.cumulativeWellReservesTime = event.block.timestamp;
+ twaOracle.cumulativeWellReservesBlock = event.block.number;
+ twaOracle.save();
+}
+
+// Returns the current TWA prices (balances) since the previous TwaOracle update
+export function getTWAPrices(poolAddress: string, type: TWAType, timestamp: BigInt): BigInt[] {
+ let twaOracle = loadOrCreateTwaOracle(poolAddress);
+ const initialized = twaOracle.lastSun != ZERO_BI;
+
+ let newPriceCumulative: BigInt[] = [];
+ let twaPrices: BigInt[] = [];
+
+ const timeElapsed = timestamp.minus(twaOracle.lastSun);
+ if (type == TWAType.UNISWAP) {
+ const beanPrice = uniswapCumulativePrice(Address.fromString(poolAddress), 1, timestamp);
+ const pegPrice = uniswapCumulativePrice(WETH_USDC_PAIR, 0, timestamp);
+ newPriceCumulative = [beanPrice, pegPrice];
+
+ twaPrices = [
+ // (priceCumulative - s.o.cumulative) / timeElapsed / 1e12 -> Decimal.ratio() which does * 1e18 / (1 << 112).
+ newPriceCumulative[0].minus(twaOracle.priceCumulativeSun[0]).div(timeElapsed).times(BI_10.pow(6)).div(ONE_BI.leftShift(112)),
+ newPriceCumulative[1].minus(twaOracle.priceCumulativeSun[1]).div(timeElapsed).times(BI_10.pow(6)).div(ONE_BI.leftShift(112))
+ ];
+ } else if (type == TWAType.CURVE) {
+ // Curve
+ newPriceCumulative = curveCumulativePrices(Address.fromString(poolAddress), timestamp);
+ twaPrices = [
+ newPriceCumulative[0].minus(twaOracle.priceCumulativeSun[0]).div(timeElapsed),
+ newPriceCumulative[1].minus(twaOracle.priceCumulativeSun[1]).div(timeElapsed)
+ ];
+ } else if (type == TWAType.WELL_PUMP) {
+ newPriceCumulative = wellCumulativePrices(Address.fromString(poolAddress), timestamp);
+ twaPrices = wellTwaReserves(newPriceCumulative, twaOracle.priceCumulativeSun, new BigDecimal(timeElapsed));
+ }
+
+ // log.debug("twa prices {} | {}", [twaPrices[0].toString(), twaPrices[1].toString()]);
+
+ twaOracle.priceCumulativeSun = newPriceCumulative;
+ twaOracle.lastSun = timestamp;
+ twaOracle.save();
+ if (initialized) {
+ return twaPrices;
+ } else if (type == TWAType.UNISWAP) {
+ return [BI_10.pow(18), BI_10.pow(18)];
+ } else if (type == TWAType.CURVE || type == TWAType.WELL_PUMP) {
+ return [BI_10.pow(6), BI_10.pow(18)];
+ }
+ throw new Error("[getTWAPrices] TWAType missing case");
+}
diff --git a/projects/subgraph-bean/src/utils/price/Types.ts b/projects/subgraph-bean/src/utils/price/Types.ts
new file mode 100644
index 0000000000..2fb5797a4d
--- /dev/null
+++ b/projects/subgraph-bean/src/utils/price/Types.ts
@@ -0,0 +1,19 @@
+import { BigDecimal, BigInt } from "@graphprotocol/graph-ts";
+
+export enum TWAType {
+ UNISWAP,
+ CURVE,
+ WELL_PUMP
+}
+
+export class DeltaBAndPrice {
+ deltaB: BigInt;
+ price: BigDecimal;
+ token2Price: BigDecimal | null;
+}
+
+export class DeltaBPriceLiquidity {
+ deltaB: BigInt;
+ price: BigDecimal;
+ liquidity: BigDecimal;
+}
diff --git a/projects/subgraph-bean/src/utils/price/UniswapPrice.ts b/projects/subgraph-bean/src/utils/price/UniswapPrice.ts
new file mode 100644
index 0000000000..c01e3986f5
--- /dev/null
+++ b/projects/subgraph-bean/src/utils/price/UniswapPrice.ts
@@ -0,0 +1,182 @@
+import { Address, BigDecimal, BigInt, log } from "@graphprotocol/graph-ts";
+import { BD_10, BI_10, ONE_BI, pow, sqrt, toDecimal, ZERO_BD, ZERO_BI } from "../../../../subgraph-core/utils/Decimals";
+import { Pool, Token } from "../../../generated/schema";
+import { loadOrCreateToken } from "../Token";
+import { UniswapV2Pair } from "../../../generated/BeanUniswapV2Pair/UniswapV2Pair";
+import { BEANSTALK, WETH, WETH_USDC_PAIR } from "../../../../subgraph-core/utils/Constants";
+import { PreReplant } from "../../../generated/Beanstalk/PreReplant";
+import { DeltaBAndPrice, DeltaBPriceLiquidity, TWAType } from "./Types";
+import { setPoolTwa } from "../Pool";
+import { getTWAPrices } from "./TwaOracle";
+
+export function updatePreReplantPriceETH(): BigDecimal {
+ let token = loadOrCreateToken(WETH.toHexString());
+ let price = getPreReplantPriceETH();
+ if (price.lt(ZERO_BD)) {
+ return token.lastPriceUSD;
+ }
+
+ token.lastPriceUSD = price;
+ token.save();
+ return token.lastPriceUSD;
+}
+
+export function getPreReplantPriceETH(): BigDecimal {
+ let reserves = uniswapV2Reserves(WETH_USDC_PAIR);
+ if (reserves.length == 0) {
+ return BigDecimal.fromString("-1");
+ }
+ // Token 0 is USDC and Token 1 is WETH
+ return toDecimal(reserves[0]).div(toDecimal(reserves[1], 18));
+}
+
+export function calcUniswapV2Inst(pool: Pool): DeltaBPriceLiquidity {
+ const wethPrice = updatePreReplantPriceETH();
+ const weth_bd = toDecimal(pool.reserves[0], 18);
+ const bean_bd = toDecimal(pool.reserves[1]);
+ return calcUniswapV2Inst_2(bean_bd, weth_bd, wethPrice);
+}
+
+export function calcUniswapV2Inst_2(beanReserves: BigDecimal, token2Reserves: BigDecimal, token2Price: BigDecimal): DeltaBPriceLiquidity {
+ return {
+ price: constantProductPrice(beanReserves, token2Reserves, token2Price),
+ liquidity: token2Reserves.times(token2Price).times(BigDecimal.fromString("2")),
+ deltaB: uniswapV2DeltaB(beanReserves, token2Reserves, token2Price)
+ };
+}
+
+// For our single uniswapv2 pool, token 0 is WETH and token 1 is BEAN
+export function uniswapV2Reserves(pool: Address): BigInt[] {
+ let pair = UniswapV2Pair.bind(pool);
+
+ let reserves = pair.try_getReserves();
+ if (reserves.reverted) {
+ return [];
+ }
+ return [reserves.value.value0, reserves.value.value1];
+}
+
+// Returns the current price of beans in a uniswapv2 constant product pool
+export function constantProductPrice(beanReserves: BigDecimal, token2Reserves: BigDecimal, token2Price: BigDecimal): BigDecimal {
+ return token2Reserves.times(token2Price).div(beanReserves);
+}
+
+// Returns the deltaB in a uniswapv2 constant product pool
+export function uniswapV2DeltaB(beanReserves: BigDecimal, token2Reserves: BigDecimal, token2Price: BigDecimal): BigInt {
+ if (beanReserves == ZERO_BD) {
+ return ZERO_BI;
+ }
+ const constantProduct = beanReserves.times(token2Reserves);
+ const beansAfterSwap = sqrt(constantProduct.times(token2Price));
+ const deltaB = beansAfterSwap.minus(beanReserves);
+ return BigInt.fromString(deltaB.times(pow(BD_10, 6)).truncate(0).toString());
+}
+
+// Calculates and sets the TWA on the pool hourly/daily snapshots
+export function setUniswapV2Twa(poolAddress: string, timestamp: BigInt, blockNumber: BigInt): void {
+ const twaPrices = getTWAPrices(poolAddress, TWAType.UNISWAP, timestamp);
+ const twaResult = uniswapTwaDeltaBAndPrice(twaPrices, blockNumber);
+
+ setPoolTwa(poolAddress, twaResult, timestamp, blockNumber);
+}
+
+export function uniswapCumulativePrice(pool: Address, tokenIndex: u32, timestamp: BigInt): BigInt {
+ const pair = UniswapV2Pair.bind(pool);
+ let cumulativeNow = tokenIndex == 0 ? pair.price0CumulativeLast() : pair.price1CumulativeLast();
+ const reserves = pair.getReserves();
+ const effectiveTimestamp = u32Timestamp(timestamp);
+ const timeElapsed = effectiveTimestamp.minus(reserves.value2);
+ if (timeElapsed != ZERO_BI) {
+ if (tokenIndex == 0) {
+ cumulativeNow = cumulativeNow.plus(fraction(reserves.value1, reserves.value0).times(timeElapsed));
+ } else {
+ cumulativeNow = cumulativeNow.plus(fraction(reserves.value0, reserves.value1).times(timeElapsed));
+ }
+ }
+ return cumulativeNow;
+}
+
+export function uniswapTwaDeltaBAndPrice(prices: BigInt[], blockNumber: BigInt): DeltaBAndPrice {
+ let beanstalk = PreReplant.bind(BEANSTALK);
+ let reserves: BigInt[];
+ // After BIP-9, reserves calculation changes
+ if (blockNumber.lt(BigInt.fromU64(13953949))) {
+ const result = beanstalk.reserves();
+ reserves = [result.value0, result.value1];
+ } else {
+ const result = beanstalk.lockedReserves();
+ reserves = [result.value0, result.value1];
+ }
+
+ const mulReserves = reserves[0].times(reserves[1]).times(BI_10.pow(6));
+ const currentBeans = mulReserves.div(prices[0]).sqrt();
+ const targetBeans = mulReserves.div(prices[1]).sqrt();
+ const deltaB = targetBeans.minus(currentBeans);
+ const twaPrice = BigDecimal.fromString(prices[0].toString()).div(BigDecimal.fromString(prices[1].toString()));
+
+ // log.debug("deltab reserves[0] {}", [reserves[0].toString()]);
+ // log.debug("deltab reserves[1] {}", [reserves[1].toString()]);
+ // log.debug("deltab mulReserves {}", [mulReserves.toString()]);
+ // log.debug("deltab prices[0] {}", [prices[0].toString()]);
+ // log.debug("deltab prices[1] {}", [prices[1].toString()]);
+ // log.debug("deltab currentBeans {}", [currentBeans.toString()]);
+ // log.debug("deltab targetBeans {}", [targetBeans.toString()]);
+ // log.debug("deltab deltaB {}", [deltaB.toString()]);
+
+ return {
+ deltaB: deltaB,
+ price: twaPrice,
+ token2Price: null
+ };
+}
+
+function u32Timestamp(timestamp: BigInt): BigInt {
+ return timestamp.mod(ONE_BI.leftShift(32));
+}
+
+// Generated functions from here. Needed in calculating cumulative price
+// https://github.com/Uniswap/solidity-lib/blob/master/contracts/libraries/FixedPoint.sol
+// https://github.com/Uniswap/solidity-lib/blob/master/contracts/libraries/FullMath.sol
+function fraction(numerator: BigInt, denominator: BigInt): BigInt {
+ if (denominator == ZERO_BI) {
+ throw new Error("division by zero");
+ }
+ if (numerator == ZERO_BI) {
+ return ZERO_BI;
+ }
+
+ const Q112 = BigInt.fromU32(2).pow(112);
+
+ if (numerator < BigInt.fromU32(2).pow(144).minus(ONE_BI)) {
+ let result = numerator.leftShift(112).div(denominator);
+ if (result > BigInt.fromU32(2).pow(224).minus(ONE_BI)) {
+ throw new Error("overflow");
+ }
+ return result;
+ } else {
+ let result = mulDiv(numerator, Q112, denominator);
+ if (result > BigInt.fromU32(2).pow(224).minus(ONE_BI)) {
+ throw new Error("overflow");
+ }
+ return result;
+ }
+}
+
+function mulDiv(x: BigInt, y: BigInt, d: BigInt): BigInt {
+ if (d == ZERO_BI) {
+ throw new Error("division by zero");
+ }
+
+ let l = x.times(y);
+ let mm = l.mod(d);
+ if (mm > l) {
+ throw new Error("FullMath: overflow in mulDiv");
+ }
+
+ l = l.minus(mm);
+
+ if (d < l) {
+ throw new Error("FullMath: FULLDIV_OVERFLOW");
+ }
+ return l.div(d);
+}
diff --git a/projects/subgraph-bean/src/utils/price/WellPrice.ts b/projects/subgraph-bean/src/utils/price/WellPrice.ts
new file mode 100644
index 0000000000..5c9798b3bf
--- /dev/null
+++ b/projects/subgraph-bean/src/utils/price/WellPrice.ts
@@ -0,0 +1,75 @@
+import { Bytes, BigInt, Address, BigDecimal, log } from "@graphprotocol/graph-ts";
+import { getTWAPrices, loadOrCreateTwaOracle } from "./TwaOracle";
+import { ABDK_toUInt, pow2toX } from "../../../../subgraph-core/utils/ABDKMathQuad";
+import { DeltaBAndPrice, TWAType } from "./Types";
+import { setPoolTwa } from "../Pool";
+import { constantProductPrice } from "./UniswapPrice";
+import { ONE_BI, pow, toDecimal, ZERO_BD, ZERO_BI } from "../../../../subgraph-core/utils/Decimals";
+
+// Cumulative Well reserves are abi encoded as a bytes16[]. This decodes into BigInt[] in uint format
+export function decodeCumulativeWellReserves(data: Bytes): BigInt[] {
+ let dataString = data.toHexString().substring(2);
+
+ let dataStartOffset = parseInt(dataString.substring(0, 64), 16) * 2;
+ let arrayLength =