From baf13975f2bd92ee7f0aaa0679bea88919ab9f10 Mon Sep 17 00:00:00 2001 From: Spacebean Date: Tue, 30 Jul 2024 22:16:11 +0200 Subject: [PATCH] merge: resolve merge commits --- PROPOSALS.md | 6 - .../dex-ui/src/components/Frame/Frame.tsx | 10 - .../src/components/Liquidity/AddLiquidity.tsx | 8 - .../components/Well/Table/WellDetailRow.tsx | 7 - projects/dex-ui/src/pages/Home.tsx | 4 - projects/dex-ui/src/pages/Wells.tsx | 84 --- projects/dex-ui/src/settings/index.ts | 4 - .../dex-ui/src/tokens/useAllTokenBalance.tsx | 31 - .../dex-ui/src/tokens/useTokenBalance.tsx | 11 - projects/dex-ui/src/types.tsx | 14 - projects/dex-ui/src/wells/useBasinStats.ts | 10 - .../src/wells/useMultiFlowPumpTWAReserves.tsx | 4 - projects/sdk/src/lib/silo/utils.ts | 3 - projects/sdk/src/lib/tokens.ts | 4 - projects/ui/codegen-individual.yml | 21 - .../components/Governance/Proposal/index.tsx | 4 - .../src/components/Silo/Actions/Deposits.tsx | 8 +- projects/ui/src/components/Silo/Whitelist.tsx | 20 - .../ui/src/components/Swap/Actions/Swap.tsx | 14 - .../src/components/Swap/Actions/Transfer.tsx | 41 -- projects/ui/src/graph/endpoints.ts | 8 +- projects/ui/src/graph/graphql.schema.json | 27 - projects/ui/src/graph/schema-bean.graphql | 459 ++++++++----- projects/ui/src/graph/schema-beanft.graphql | 36 +- .../ui/src/graph/schema-beanstalk.graphql | 613 ------------------ .../ui/src/graph/schema-snapshot1.graphql | 22 - projects/ui/src/state/bean/unripe/updater.ts | 6 - projects/ui/src/util/Actions.ts | 3 - 28 files changed, 330 insertions(+), 1152 deletions(-) diff --git a/PROPOSALS.md b/PROPOSALS.md index a0d16b0aa6..738e545652 100644 --- a/PROPOSALS.md +++ b/PROPOSALS.md @@ -52,13 +52,10 @@ You can read more about BIPs [here](https://docs.bean.money/almanac/governance/p * [BIP-41](https://bean.money/bip-41): Immunefi Program Update * [BIP-42](https://bean.money/bip-42): Seed Gauge System * [BIP-43](https://bean.money/bip-43): Hypernative -<<<<<<< HEAD -======= * [BIP-44](https://bean.money/bip-44): Seed Gauge System * [BIP-45](https://bean.money/bip-45): Seed Gauge System * [BIP-46](https://bean.money/bip-46): Hypernative * [BIP-47](https://bean.money/bip-47): Adjust Quorum ->>>>>>> master ## Emergency Beanstalk Improvement Proposal (EBIP) @@ -81,11 +78,8 @@ You can read about the BCM's Emergency Response Procedures [here](https://docs.b * [EBIP-12](https://bean.money/ebip-12): Remove Convert * [EBIP-13](https://bean.money/ebip-13): Re-Add Convert * [EBIP-14](https://bean.money/ebip-14): Remove Vesting Period -<<<<<<< HEAD -======= * [EBIP-15](https://bean.money/ebip-15): Seed Gauge System Fixes * [EBIP-16](https://bean.money/ebip-16): Fix Germinating Earned Bean Deposits ->>>>>>> master ## Beanstalk Operations Proposal (BOP) diff --git a/projects/dex-ui/src/components/Frame/Frame.tsx b/projects/dex-ui/src/components/Frame/Frame.tsx index 4559a0e706..6f3067cc96 100644 --- a/projects/dex-ui/src/components/Frame/Frame.tsx +++ b/projects/dex-ui/src/components/Frame/Frame.tsx @@ -11,12 +11,6 @@ import swapIcon from "src/assets/images/navbar/swap.svg"; import wellsIcon from "src/assets/images/navbar/wells.svg"; import { LinksNav } from "../Typography"; import { BurgerMenuIcon, Discord, Github, Logo, Twitter, X, BeanstalkLogoBlack } from "../Icons"; -<<<<<<< HEAD -import { size } from "src/breakpoints"; -import { useAccount } from "wagmi"; -import { Title } from "../PageComponents/Title"; -======= ->>>>>>> master import { TokenMarquee } from "./TokenMarquee"; import { WalletButton } from "src/components/Wallet"; import { theme } from "src/utils/ui/theme"; @@ -25,11 +19,7 @@ import { useChainId } from "wagmi"; export const Frame: FC<{}> = ({ children }) => { const isNotProd = !Settings.PRODUCTION; const [mobileMenuOpen, setMobileMenuOpen] = useState(false); -<<<<<<< HEAD - const { chain } = useAccount(); -======= const chain = useChainId(); ->>>>>>> master return ( diff --git a/projects/dex-ui/src/components/Liquidity/AddLiquidity.tsx b/projects/dex-ui/src/components/Liquidity/AddLiquidity.tsx index 34e1576bda..7030c6a68a 100644 --- a/projects/dex-ui/src/components/Liquidity/AddLiquidity.tsx +++ b/projects/dex-ui/src/components/Liquidity/AddLiquidity.tsx @@ -211,16 +211,8 @@ const AddLiquidityContent = ({ const { data: quote } = useQuery({ queryKey: ["wells", "quote", "addliquidity", address, amounts, allTokensHaveMinAllowance], -<<<<<<< HEAD - const { data: quote } = useQuery({ - queryKey: ["wells", "quote", "addliquidity", address, amounts, allTokensHaveMinAllowance], - - queryFn: async () => { - if (!atLeastOneAmountNonZero) { -======= queryFn: async () => { if ((someWellReservesEmpty && areSomeInputsZero) || !atLeastOneAmountNonZero) { ->>>>>>> master setShowQuoteDetails(false); return null; } diff --git a/projects/dex-ui/src/components/Well/Table/WellDetailRow.tsx b/projects/dex-ui/src/components/Well/Table/WellDetailRow.tsx index c2157d5375..6b1cc5c364 100644 --- a/projects/dex-ui/src/components/Well/Table/WellDetailRow.tsx +++ b/projects/dex-ui/src/components/Well/Table/WellDetailRow.tsx @@ -67,11 +67,7 @@ export const WellDetailRow: FC<{ ${liquidity ? liquidity.toHuman("short") : "-.--"} -<<<<<<< HEAD - ${price ? price.toHuman("short") : "-.--"} -======= ${price && price.gt(0) ? price.toHuman("short") : "-.--"} ->>>>>>> master ${volume ? volume.toHuman("short") : "-.--"} @@ -168,8 +164,6 @@ const DesktopContainer = styled(Td)` display: none; } } -<<<<<<< HEAD -======= :nth-child(3) { @media (max-width: ${size.tablet}) { @@ -177,7 +171,6 @@ const DesktopContainer = styled(Td)` } } ->>>>>>> master @media (max-width: ${size.mobile}) { display: none; } diff --git a/projects/dex-ui/src/pages/Home.tsx b/projects/dex-ui/src/pages/Home.tsx index 2d6364b0fb..b6ecf9a1bf 100644 --- a/projects/dex-ui/src/pages/Home.tsx +++ b/projects/dex-ui/src/pages/Home.tsx @@ -41,15 +41,11 @@ export const Home = () => { used by the BEAN:WETH Well. -<<<<<<< HEAD - -======= ->>>>>>> master Read the whitepaper → diff --git a/projects/dex-ui/src/pages/Wells.tsx b/projects/dex-ui/src/pages/Wells.tsx index 9e3f144f0c..5b8bbbffee 100644 --- a/projects/dex-ui/src/pages/Wells.tsx +++ b/projects/dex-ui/src/pages/Wells.tsx @@ -21,17 +21,6 @@ import { import { useBeanstalkSiloAPYs } from "src/wells/useBeanstalkSiloAPYs"; import { useLagLoading } from "src/utils/ui/useLagLoading"; import useBasinStats from "src/wells/useBasinStats"; -<<<<<<< HEAD - -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 [wellTokenPrices, setWellTokenPrices] = useState<(TokenValue | null)[][]>([]); -======= import { useTokenPrices } from "src/utils/price/useTokenPrices"; import { useWellFunctionNames } from "src/wells/wellFunction/useWellFunctionNames"; import { BasinAPIResponse } from "src/types"; @@ -44,47 +33,11 @@ export const Wells = () => { const { data: wellStats = [] } = useBasinStats(); const sdk = useSdk(); ->>>>>>> master const [tab, showTab] = useState(0); const { data: lpTokenPrices, isLoading: lpTokenPricesLoading } = useWellLPTokenPrice(wells); const { hasPositions, getPositionWithWell, isLoading: positionsLoading } = useLPPositionSummary(); const { isLoading: apysLoading } = useBeanstalkSiloAPYs(); -<<<<<<< HEAD - // const [isLoadingWellData, setIsLoadingWellData] = useState(true); - - useMemo(() => { - const run = async () => { - if (!wells || !wells.length) return; - let _wellsLiquidityUSD = []; - let _wellsTokenPrices = []; - 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))); - _wellsTokenPrices[i] = _tokenPrices; - 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); - setWellTokenPrices(_wellsTokenPrices); - - 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); - // setIsLoadingWellData(false); - }; - - run(); - }, [sdk, wells]); -======= const { data: tokenPrices, isLoading: tokenPricesLoading } = useTokenPrices(wells); const { data: wellFnNames, isLoading: wellNamesLoading } = useWellFunctionNames(wells); @@ -101,9 +54,6 @@ export const Wells = () => { tokenPricesLoading || wellNamesLoading ); ->>>>>>> master - - const loading = useLagLoading(isLoading || apysLoading || positionsLoading); if (error) { return ; @@ -174,25 +124,6 @@ export const Wells = () => { ) : ( -<<<<<<< HEAD - wells?.map((well, index) => { - let price = undefined; - let volume = undefined; - if (wellStats && well.tokens && wellTokenPrices[index]) { - price = well.tokens[1].fromHuman(wellStats[index].last_price).mul(wellTokenPrices[index][1] as TokenValue); - volume = well.tokens[1].fromHuman(wellStats[index].target_volume).mul(wellTokenPrices[index][1] as TokenValue); - }; - return tab === 0 ? ( - - ) : ( -======= tableData?.map(({ well, baseTokenPrice, liquidityUSD, targetVolume }, index) => { if (tab === 0) { const priceFnName = @@ -211,7 +142,6 @@ export const Wells = () => { } return ( ->>>>>>> master >>>>>> master :nth-child(5) { @media (max-width: ${size.desktop}) { display: none; @@ -387,15 +306,12 @@ const DesktopHeader = styled(Th)` display: none; } } -<<<<<<< HEAD -======= :nth-child(3) { @media (max-width: ${size.tablet}) { display: none; } } ->>>>>>> master @media (max-width: ${size.mobile}) { display: none; } diff --git a/projects/dex-ui/src/settings/index.ts b/projects/dex-ui/src/settings/index.ts index cdb0609856..1eff6a01ee 100644 --- a/projects/dex-ui/src/settings/index.ts +++ b/projects/dex-ui/src/settings/index.ts @@ -19,11 +19,7 @@ export type DexSettings = { NETLIFY_BUILD_ID?: string; }; -<<<<<<< HEAD -const temp = netlifyContext === "production" || "deploy-preview" ? ProdSettings : DevSettings; -======= const temp = netlifyContext === "production" || netlifyContext === "deploy-preview" ? ProdSettings : DevSettings; ->>>>>>> master export const Settings = { ...temp, diff --git a/projects/dex-ui/src/tokens/useAllTokenBalance.tsx b/projects/dex-ui/src/tokens/useAllTokenBalance.tsx index 4e8ac4065d..91624a98e0 100644 --- a/projects/dex-ui/src/tokens/useAllTokenBalance.tsx +++ b/projects/dex-ui/src/tokens/useAllTokenBalance.tsx @@ -7,11 +7,8 @@ import { useAccount } from "wagmi"; import { useTokens } from "./TokenProvider"; import { Log } from "src/utils/logger"; import { config } from "src/utils/wagmi/config"; -<<<<<<< HEAD -======= import { ContractFunctionParameters } from "viem"; import { queryKeys } from "src/utils/query/queryKeys"; ->>>>>>> master const TokenBalanceABI = [ { @@ -61,16 +58,6 @@ export const useAllTokensBalance = () => { }, [address, tokensToLoad.map((t) => t.symbol).join()]); const { data, isLoading, error, refetch, isFetching } = useQuery({ -<<<<<<< HEAD - queryKey: ["token", "balance"], - - queryFn: async () => { - if (!address) return {}; - const res = (await multicall(config, { - contracts: calls, - allowFailure: false - })) as unknown as BigNumber[]; -======= queryKey: queryKeys.tokenBalancesAll, queryFn: async () => { if (!address) return {}; @@ -85,7 +72,6 @@ export const useAllTokensBalance = () => { ]); const res = results.flat(); ->>>>>>> master const balances: Record = {}; if (ethBalance) { @@ -100,31 +86,14 @@ export const useAllTokensBalance = () => { balances[token.symbol] = token.fromBlockchain(value); // set the balance in the query cache too -<<<<<<< HEAD - 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] }); ->>>>>>> master } return balances; }, -<<<<<<< HEAD - -======= enabled: !!address && !!tokensToLoad.length, ->>>>>>> master staleTime: 1000 * 30, refetchInterval: 1000 * 30 }); diff --git a/projects/dex-ui/src/tokens/useTokenBalance.tsx b/projects/dex-ui/src/tokens/useTokenBalance.tsx index d01a5d4963..f0221083a3 100644 --- a/projects/dex-ui/src/tokens/useTokenBalance.tsx +++ b/projects/dex-ui/src/tokens/useTokenBalance.tsx @@ -15,13 +15,6 @@ export const useTokenBalance = (token: Token | undefined) => { queryFn: async () => { if (!token) return; -<<<<<<< HEAD - const { data, isLoading, error, refetch, isFetching } = useQuery({ - queryKey: key, - - queryFn: async () => { -======= ->>>>>>> master let balance: TokenValue; if (!address) { balance = TokenValue.ZERO; @@ -42,11 +35,7 @@ export const useTokenBalance = (token: Token | undefined) => { return result; }, -<<<<<<< HEAD - -======= enabled: !!token, ->>>>>>> master staleTime: 1000 * 15, refetchInterval: 1000 * 15, refetchIntervalInBackground: false, diff --git a/projects/dex-ui/src/types.tsx b/projects/dex-ui/src/types.tsx index 81989c4a11..eb277adeff 100644 --- a/projects/dex-ui/src/types.tsx +++ b/projects/dex-ui/src/types.tsx @@ -5,19 +5,6 @@ export type FC = React.FC>; export type Address = `0x${string}`; export type BasinAPIResponse = { -<<<<<<< HEAD - 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, -}; -======= ticker_id: `${Address}_${Address}`; base_currency: Address; target_currency: Address; @@ -47,4 +34,3 @@ export type TokenMetadataMap = AddressMap<{ displayDecimals?: number; }>; ->>>>>>> master diff --git a/projects/dex-ui/src/wells/useBasinStats.ts b/projects/dex-ui/src/wells/useBasinStats.ts index 663e2d7779..458bab5b78 100644 --- a/projects/dex-ui/src/wells/useBasinStats.ts +++ b/projects/dex-ui/src/wells/useBasinStats.ts @@ -10,15 +10,6 @@ const useBasinStats = () => { queryFn: async () => { let output: BasinAPIResponse[] = []; try { -<<<<<<< HEAD - const apiQuery = await fetch('https://api.bean.money/basin/tickers', { - headers: { - 'accept': 'application/json' - } - }) - - output = await apiQuery.json() as BasinAPIResponse[]; -======= const apiQuery = await fetch("https://api.bean.money/basin/tickers", { headers: { accept: "application/json" } }); @@ -31,7 +22,6 @@ const useBasinStats = () => { throw new Error(result); } } ->>>>>>> master } catch (e) { Log.module("useBasinStats").error("Failed to fetch data from Basin API :", e) }; diff --git a/projects/dex-ui/src/wells/useMultiFlowPumpTWAReserves.tsx b/projects/dex-ui/src/wells/useMultiFlowPumpTWAReserves.tsx index dd930a3875..88c1dfa7ae 100644 --- a/projects/dex-ui/src/wells/useMultiFlowPumpTWAReserves.tsx +++ b/projects/dex-ui/src/wells/useMultiFlowPumpTWAReserves.tsx @@ -19,11 +19,7 @@ export const useMultiFlowPumpTWAReserves = () => { queryKey: ["wells", "multiFlowPumpTWAReserves"], queryFn: async () => { -<<<<<<< HEAD - const whitelistedWells = (wells || []).filter((well) => getIsMultiPumpWell(well)); -======= const whitelistedWells = (wells || []).filter((well) => getIsMultiPumpWell(well) && getIsWhitelisted(well) ); ->>>>>>> master const [{ timestamp: seasonTimestamp }, ...wellOracleSnapshots] = await Promise.all([ sdk.contracts.beanstalk.time(), diff --git a/projects/sdk/src/lib/silo/utils.ts b/projects/sdk/src/lib/silo/utils.ts index a92b14cea8..e29a68ec70 100644 --- a/projects/sdk/src/lib/silo/utils.ts +++ b/projects/sdk/src/lib/silo/utils.ts @@ -142,15 +142,12 @@ export function makeDepositObject(token: Token, stemTipForToken: ethers.BigNumbe let stem const amount = token.fromBlockchain(data.amount.toString()); const bdv = Silo.sdk.tokens.BEAN.fromBlockchain(data.bdv.toString()); // Hack -<<<<<<< HEAD -======= // 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); }; ->>>>>>> master const isGerminating = stem.gte(data.germinatingStem); // Stalk diff --git a/projects/sdk/src/lib/tokens.ts b/projects/sdk/src/lib/tokens.ts index dc5447c920..449803c363 100644 --- a/projects/sdk/src/lib/tokens.ts +++ b/projects/sdk/src/lib/tokens.ts @@ -168,11 +168,7 @@ export class Tokens { providerOrSigner ); this.UNRIPE_BEAN.rewards = { -<<<<<<< HEAD - stalk: this.STALK.amount(0), -======= stalk: this.STALK.amount(1), ->>>>>>> master seeds: TokenValue.ZERO }; this.UNRIPE_BEAN.isUnripe = true; diff --git a/projects/ui/codegen-individual.yml b/projects/ui/codegen-individual.yml index f0d46d8a99..d28f591471 100644 --- a/projects/ui/codegen-individual.yml +++ b/projects/ui/codegen-individual.yml @@ -3,18 +3,6 @@ # A more optimal solution would involve generating a different schema for each entry in src/graph.endpoints.ts. overwrite: true generates: -<<<<<<< HEAD - ./src/graph/schema-beanstalk.graphql: - schema: - - https://graph.node.bean.money/subgraphs/name/beanstalk - plugins: - - "schema-ast" - #./src/graph/schema-bean.graphql: - # schema: - # - https://graph.node.bean.money/subgraphs/name/bean - # plugins: - # - "schema-ast" -======= # ./src/graph/schema-beanstalk.graphql: # schema: # - https://graph.node.bean.money/subgraphs/name/beanstalk-dev @@ -25,25 +13,16 @@ generates: - https://graph.node.bean.money/subgraphs/name/bean plugins: - "schema-ast" ->>>>>>> master ./src/graph/schema-snapshot1.graphql: schema: - https://hub.snapshot.org/graphql plugins: - "schema-ast" -<<<<<<< HEAD - ./src/graph/schema-snapshot2.graphql: - schema: - - https://api.thegraph.com/subgraphs/name/snapshot-labs/snapshot - plugins: - - "schema-ast" -======= #./src/graph/schema-snapshot2.graphql: # schema: # - https://api.thegraph.com/subgraphs/name/snapshot-labs/snapshot # plugins: # - "schema-ast" ->>>>>>> master ./src/graph/schema-beanft.graphql: schema: - https://graph.node.bean.money/subgraphs/name/beanft diff --git a/projects/ui/src/components/Governance/Proposal/index.tsx b/projects/ui/src/components/Governance/Proposal/index.tsx index 9a7265b99b..055cc48c81 100644 --- a/projects/ui/src/components/Governance/Proposal/index.tsx +++ b/projects/ui/src/components/Governance/Proposal/index.tsx @@ -68,11 +68,7 @@ const ProposalContent: FC<{ fontSize: FontSize.xs, }} > -<<<<<<< HEAD - {parseInt(Math.min(pctOfQuorum * 100, 100).toString(), 10)}% -======= {quorumBNToFixed.toString()}% ->>>>>>> master diff --git a/projects/ui/src/components/Silo/Actions/Deposits.tsx b/projects/ui/src/components/Silo/Actions/Deposits.tsx index f14bd586d2..162bbc9706 100644 --- a/projects/ui/src/components/Silo/Actions/Deposits.tsx +++ b/projects/ui/src/components/Silo/Actions/Deposits.tsx @@ -40,13 +40,7 @@ const Deposits: FC< () => siloBalance?.deposited.crates.map((deposit) => ({ id: deposit.stem?.toString(), - mowableStalk: deposit.bdv - ?.multipliedBy(deltaStem) -<<<<<<< HEAD - .shiftedBy(decimalShift), -======= - .div(10000), ->>>>>>> master + mowableStalk: deposit.bdv?.multipliedBy(deltaStem).div(10000), ...deposit, })) || [], [siloBalance?.deposited.crates, deltaStem] diff --git a/projects/ui/src/components/Silo/Whitelist.tsx b/projects/ui/src/components/Silo/Whitelist.tsx index 0f25be1d0b..7270d9d8fa 100644 --- a/projects/ui/src/components/Silo/Whitelist.tsx +++ b/projects/ui/src/components/Silo/Whitelist.tsx @@ -44,10 +44,7 @@ import stalkIcon from '~/img/beanstalk/stalk-icon.svg'; import logo from '~/img/tokens/bean-logo.svg'; import { FC } from '~/types'; import { useIsTokenDeprecated } from '~/hooks/beanstalk/useWhitelist'; -<<<<<<< HEAD -======= import { roundWithDecimals } from '~/util/UI'; ->>>>>>> master import SiloAssetApyChip from './SiloAssetApyChip'; import StatHorizontal from '../Common/StatHorizontal'; import BeanProgressIcon from '../Common/BeanProgressIcon'; @@ -209,11 +206,8 @@ const Whitelist: FC<{ {config.whitelist.map((token) => { const deposited = farmerSilo.balances[token.address]?.deposited; const isUnripe = token === urBean || token === urBeanWeth; -<<<<<<< HEAD -======= const isUnripeLP = isUnripe && token.address === UNRIPE_BEAN_WETH[1].address; ->>>>>>> master const isDeprecated = checkIfDeprecated(token.address); // Unripe data @@ -322,12 +316,6 @@ const Whitelist: FC<{ - 1 {token.symbol} = {displayFullBN(getBDV(token))}{' '} - BDV - -======= 1 {token.symbol} = {displayFullBN(getBDV(token))}{' '} BDV @@ -345,7 +333,6 @@ const Whitelist: FC<{ ->>>>>>> master } > @@ -359,14 +346,7 @@ const Whitelist: FC<{ -<<<<<<< HEAD - {Math.round( - (token.rewards?.seeds || 0 + Number.EPSILON) * - 100 - ) / 100} -======= {roundWithDecimals(token.rewards?.seeds, 3)} ->>>>>>> master diff --git a/projects/ui/src/components/Swap/Actions/Swap.tsx b/projects/ui/src/components/Swap/Actions/Swap.tsx index bf3e268b10..9da44a274d 100644 --- a/projects/ui/src/components/Swap/Actions/Swap.tsx +++ b/projects/ui/src/components/Swap/Actions/Swap.tsx @@ -132,11 +132,7 @@ const SwapForm: FC< const [balanceFromOut, setBalanceFromOut] = useState( BalanceFrom.EXTERNAL ); -<<<<<<< HEAD - // This tracks whether this is an exact input or an exact output swap -======= // This tracks whether this is an exact input or an exact output swap ->>>>>>> master const [userInputMode, setUserInputMode] = useState(''); /// Derived values @@ -420,9 +416,6 @@ const SwapForm: FC< }); setFieldValue('tokenOut.token', tokenIn); } -<<<<<<< HEAD - }, [modeIn, modeOut, setFieldValue, tokenIn, tokenOut, amountOut, tokensMatch]); -======= }, [ modeIn, modeOut, @@ -432,7 +425,6 @@ const SwapForm: FC< amountOut, tokensMatch, ]); ->>>>>>> master // if tokenIn && tokenOut are equal and no balances are found, reverse positions. // This prevents setting of internal balance of given token when there is none @@ -469,15 +461,9 @@ const SwapForm: FC< getAmountOut(tokenIn, amountIn); } else if (userInputMode === 'exact-output' && amountOut) { getMinAmountIn(tokenOut, amountOut); -<<<<<<< HEAD - }; - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [tokenIn, tokenOut]) -======= } // eslint-disable-next-line react-hooks/exhaustive-deps }, [tokenIn, tokenOut]); ->>>>>>> master const handleMax = useCallback(() => { setFieldValue('tokensIn.0.amount', balanceInMax); diff --git a/projects/ui/src/components/Swap/Actions/Transfer.tsx b/projects/ui/src/components/Swap/Actions/Transfer.tsx index 8611ed109b..96f0cfc77d 100644 --- a/projects/ui/src/components/Swap/Actions/Transfer.tsx +++ b/projects/ui/src/components/Swap/Actions/Transfer.tsx @@ -21,9 +21,6 @@ import FarmModeField from '~/components/Common/Form/FarmModeField'; import Token, { ERC20Token, NativeToken } from '~/classes/Token'; import { Beanstalk } from '~/generated/index'; import { ZERO_BN } from '~/constants'; -<<<<<<< HEAD -import { BEAN, BEAN_CRV3_LP, BEAN_ETH_WELL_LP, CRV3, DAI, USDC, USDT, WETH, ETH } from '~/constants/tokens'; -======= import { BEAN, BEAN_CRV3_LP, @@ -35,7 +32,6 @@ import { WETH, ETH, } from '~/constants/tokens'; ->>>>>>> master import { useBeanstalkContract } from '~/hooks/ledger/useContract'; import useFarmerBalances from '~/hooks/farmer/useFarmerBalances'; import useTokenMap from '~/hooks/chain/useTokenMap'; @@ -281,14 +277,9 @@ const TransferForm: FC< const internalExternalCheck = fromMode === FarmFromMode.INTERNAL_EXTERNAL; const ethTransferCheck = tokenIn.address === 'eth'; -<<<<<<< HEAD - - const ethTransferModeCheck = ethTransferCheck && toMode === FarmToMode.EXTERNAL; -======= const ethTransferModeCheck = ethTransferCheck && toMode === FarmToMode.EXTERNAL; ->>>>>>> master const isValid = amountsCheck && @@ -381,13 +372,7 @@ const TransferForm: FC< ) : null} {sameAddressCheck && ethTransferCheck ? ( -<<<<<<< HEAD - - You cannot send ETH to yourself. - -======= You cannot send ETH to yourself. ->>>>>>> master ) : toMode === FarmToMode.INTERNAL && ethTransferCheck ? ( ETH can only be delivered to a Circulating Balance. @@ -396,19 +381,12 @@ const TransferForm: FC< You cannot use Combined Balance when transferring to yourself. -<<<<<<< HEAD - ) : amount?.gt(balanceInMax) && ( - - {`Transfer amount higher than your ${copy.MODES[values.fromMode]}.`} - -======= ) : ( amount?.gt(balanceInMax) && ( {`Transfer amount higher than your ${copy.MODES[values.fromMode]}.`} ) ->>>>>>> master )} {toMode === FarmToMode.INTERNAL && !ethTransferCheck && ( @@ -442,9 +420,6 @@ const TransferForm: FC< // --------------------------------------------------- -<<<<<<< HEAD -const SUPPORTED_TOKENS = [BEAN, ETH, WETH, BEAN_ETH_WELL_LP, BEAN_CRV3_LP, CRV3, DAI, USDC, USDT]; -======= const SUPPORTED_TOKENS = [ BEAN, ETH, @@ -456,7 +431,6 @@ const SUPPORTED_TOKENS = [ USDC, USDT, ]; ->>>>>>> master const Transfer: FC<{}> = () => { /// Ledger @@ -522,11 +496,7 @@ const Transfer: FC<{}> = () => { if (!tokenAmount) throw new Error('No input amount set.'); if (!account) throw new Error('Connect a wallet first.'); if (!recipient) throw new Error('Enter an address to transfer to.'); -<<<<<<< HEAD - if (!signer) throw new Error('Signer not found.') -======= if (!signer) throw new Error('Signer not found.'); ->>>>>>> master if (approving) return; txToast = new TransactionToast({ @@ -535,17 +505,10 @@ const Transfer: FC<{}> = () => { }); let txn; -<<<<<<< HEAD - if (tokenAddress === "eth") { - txn = await signer.sendTransaction({ - to: recipient, - value: amount -======= if (tokenAddress === 'eth') { txn = await signer.sendTransaction({ to: recipient, value: amount, ->>>>>>> master }); } else { txn = await beanstalk.transferToken( @@ -555,11 +518,7 @@ const Transfer: FC<{}> = () => { fromMode, toMode ); -<<<<<<< HEAD - }; -======= } ->>>>>>> master txToast.confirming(txn); const receipt = await txn.wait(); diff --git a/projects/ui/src/graph/endpoints.ts b/projects/ui/src/graph/endpoints.ts index 22412bc771..309d045732 100644 --- a/projects/ui/src/graph/endpoints.ts +++ b/projects/ui/src/graph/endpoints.ts @@ -20,16 +20,10 @@ export const SUBGRAPH_ENVIRONMENTS: Record = { name: 'Beanstalk Farms / Production', subgraphs: { beanstalk: 'https://graph.node.bean.money/subgraphs/name/beanstalk', -<<<<<<< HEAD - bean: `https://gateway-arbitrum.network.thegraph.com/api/${ - import.meta.env.VITE_THEGRAPH_API_KEY - }/subgraphs/id/Hqtmas8CJUHXwFf7acS2sjaTw6tvdNQM3kaz2CqtYM3V`, -======= - bean: `https://graph.node.bean.money/subgraphs/name/bean`, + bean: `https://graph.node.bean.money/subgraphs/name/bean`, // https://gateway-arbitrum.network.thegraph.com/api/${ // import.meta.env.VITE_THEGRAPH_API_KEY // }/subgraphs/id/Hqtmas8CJUHXwFf7acS2sjaTw6tvdNQM3kaz2CqtYM3V`, ->>>>>>> master beanft: 'https://graph.node.bean.money/subgraphs/name/beanft', }, }, diff --git a/projects/ui/src/graph/graphql.schema.json b/projects/ui/src/graph/graphql.schema.json index 6efa3656c5..c89b7f4da9 100644 --- a/projects/ui/src/graph/graphql.schema.json +++ b/projects/ui/src/graph/graphql.schema.json @@ -39885,8 +39885,6 @@ "description": null, "fields": [ { -<<<<<<< HEAD -======= "name": "address", "description": "Address of the token or account which is germinating", "args": [], @@ -39903,7 +39901,6 @@ "deprecationReason": null }, { ->>>>>>> master "name": "bdv", "description": "Germinating bdv. This only applies to a Token address", "args": [], @@ -39936,8 +39933,6 @@ "deprecationReason": null }, { -<<<<<<< HEAD -======= "name": "isFarmer", "description": "True when the address is a farmer account", "args": [], @@ -39954,7 +39949,6 @@ "deprecationReason": null }, { ->>>>>>> master "name": "season", "description": "The season in which the germination started", "args": [], @@ -40001,8 +39995,6 @@ }, "isDeprecated": false, "deprecationReason": null -<<<<<<< HEAD -======= }, { "name": "type", @@ -40019,7 +40011,6 @@ }, "isDeprecated": false, "deprecationReason": null ->>>>>>> master } ], "inputFields": null, @@ -40046,8 +40037,6 @@ "deprecationReason": null }, { -<<<<<<< HEAD -======= "name": "address", "description": null, "type": { @@ -40304,7 +40293,6 @@ "deprecationReason": null }, { ->>>>>>> master "name": "and", "description": null, "type": { @@ -40545,8 +40533,6 @@ "deprecationReason": null }, { -<<<<<<< HEAD -======= "name": "isFarmer", "description": null, "type": { @@ -40611,7 +40597,6 @@ "deprecationReason": null }, { ->>>>>>> master "name": "or", "description": null, "type": { @@ -40962,8 +40947,6 @@ "defaultValue": null, "isDeprecated": false, "deprecationReason": null -<<<<<<< HEAD -======= }, { "name": "type", @@ -41220,7 +41203,6 @@ "defaultValue": null, "isDeprecated": false, "deprecationReason": null ->>>>>>> master } ], "interfaces": null, @@ -41236,15 +41218,12 @@ "interfaces": null, "enumValues": [ { -<<<<<<< HEAD -======= "name": "address", "description": null, "isDeprecated": false, "deprecationReason": null }, { ->>>>>>> master "name": "bdv", "description": null, "isDeprecated": false, @@ -41257,15 +41236,12 @@ "deprecationReason": null }, { -<<<<<<< HEAD -======= "name": "isFarmer", "description": null, "isDeprecated": false, "deprecationReason": null }, { ->>>>>>> master "name": "season", "description": null, "isDeprecated": false, @@ -41282,15 +41258,12 @@ "description": null, "isDeprecated": false, "deprecationReason": null -<<<<<<< HEAD -======= }, { "name": "type", "description": null, "isDeprecated": false, "deprecationReason": null ->>>>>>> master } ], "possibleTypes": null diff --git a/projects/ui/src/graph/schema-bean.graphql b/projects/ui/src/graph/schema-bean.graphql index 0dfc84ec7c..3fdbac0475 100644 --- a/projects/ui/src/graph/schema-bean.graphql +++ b/projects/ui/src/graph/schema-bean.graphql @@ -11,50 +11,89 @@ directive @entity on OBJECT """Defined a Subgraph ID for an object type""" directive @subgraphId(id: String!) on OBJECT -<<<<<<< HEAD -type Bean { -======= enum Aggregation_interval { day hour } type Bean { - """Smart contract address of the Beanstalk this Bean is associated with""" + """ + Smart contract address of the Beanstalk this Bean is associated with + """ beanstalk: String! - """Which chain this Bean is from""" + """ + Which chain this Bean is from + """ chain: String! ->>>>>>> master - """Detailed cross events during this snapshot""" - crossEvents(first: Int = 100, orderBy: BeanCross_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: BeanCross_filter): [BeanCross!]! + """ + Detailed cross events during this snapshot + """ + crossEvents( + first: Int = 100 + orderBy: BeanCross_orderBy + orderDirection: OrderDirection + skip: Int = 0 + where: BeanCross_filter + ): [BeanCross!]! - """Cumulative number of crosses""" + """ + Cumulative number of crosses + """ crosses: Int! - """Daily snapshot of Bean data""" - dailySnapshot(first: Int = 100, orderBy: BeanDailySnapshot_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: BeanDailySnapshot_filter): [BeanDailySnapshot!]! + """ + Daily snapshot of Bean data + """ + dailySnapshot( + first: Int = 100 + orderBy: BeanDailySnapshot_orderBy + orderDirection: OrderDirection + skip: Int = 0 + where: BeanDailySnapshot_filter + ): [BeanDailySnapshot!]! -<<<<<<< HEAD -======= - """Dewhitelisted pools that include this Bean""" - dewhitelistedPools(first: Int = 100, orderBy: Pool_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: Pool_filter): [Pool!]! + """ + Dewhitelisted pools that include this Bean + """ + dewhitelistedPools( + first: Int = 100 + orderBy: Pool_orderBy + orderDirection: OrderDirection + skip: Int = 0 + where: Pool_filter + ): [Pool!]! ->>>>>>> master - """Hourly snapshot of Bean data""" - hourlySnapshot(first: Int = 100, orderBy: BeanHourlySnapshot_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: BeanHourlySnapshot_filter): [BeanHourlySnapshot!]! + """ + Hourly snapshot of Bean data + """ + hourlySnapshot( + first: Int = 100 + orderBy: BeanHourlySnapshot_orderBy + orderDirection: OrderDirection + skip: Int = 0 + where: BeanHourlySnapshot_filter + ): [BeanHourlySnapshot!]! - """Contract address of the Bean token""" + """ + Contract address of the Bean token + """ id: ID! - """Last timestamp a cross was seen""" + """ + Last timestamp a cross was seen + """ lastCross: BigInt! - """Last season seen from Beanstalk""" + """ + Last season seen from Beanstalk + """ lastSeason: Int! - """Current liquidity in USD value""" + """ + Current liquidity in USD value + """ liquidityUSD: BigDecimal! """ @@ -62,25 +101,45 @@ type Bean { """ lockedBeans: BigInt! - """Current market cap""" + """ + Current market cap + """ marketCap: BigDecimal! - """Pools that include this Bean""" - pools(first: Int = 100, orderBy: Pool_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: Pool_filter): [Pool!]! + """ + Pools that include this Bean + """ + pools( + first: Int = 100 + orderBy: Pool_orderBy + orderDirection: OrderDirection + skip: Int = 0 + where: Pool_filter + ): [Pool!]! - """Latest price seen""" + """ + Latest price seen + """ price: BigDecimal! - """Current supply""" + """ + Current supply + """ supply: BigInt! - """Percent of supply in LP used for peg maintenance""" + """ + Percent of supply in LP used for peg maintenance + """ supplyInPegLP: BigDecimal! - """Cumulative volume of beans traded""" + """ + Cumulative volume of beans traded + """ volume: BigInt! - """Cumulative volume in USD value""" + """ + Cumulative volume in USD value + """ volumeUSD: BigDecimal! } @@ -97,7 +156,9 @@ type BeanCross { } input BeanCross_filter { - """Filter for the block changed event.""" + """ + Filter for the block changed event. + """ _change_block: BlockChangedFilter above: Boolean above_in: [Boolean!] @@ -213,11 +274,8 @@ input BeanCross_filter { enum BeanCross_orderBy { above bean -<<<<<<< HEAD -======= bean__beanstalk bean__chain ->>>>>>> master bean__crosses bean__id bean__lastCross @@ -282,7 +340,13 @@ enum BeanCross_orderBy { type BeanDailySnapshot { bean: Bean! blockNumber: BigInt! - crossEvents(first: Int = 100, orderBy: BeanCross_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: BeanCross_filter): [BeanCross!]! + crossEvents( + first: Int = 100 + orderBy: BeanCross_orderBy + orderDirection: OrderDirection + skip: Int = 0 + where: BeanCross_filter + ): [BeanCross!]! crosses: Int! deltaCrosses: Int! deltaLiquidityUSD: BigDecimal! @@ -290,7 +354,9 @@ type BeanDailySnapshot { deltaVolumeUSD: BigDecimal! id: ID! - """Instantaneous deltaB across all whitelisted pools""" + """ + Instantaneous deltaB across all whitelisted pools + """ instantaneousDeltaB: BigInt! liquidityUSD: BigDecimal! @@ -303,21 +369,29 @@ type BeanDailySnapshot { season: Int! supply: BigInt! - """Percent of supply in LP used for peg maintenance""" + """ + Percent of supply in LP used for peg maintenance + """ supplyInPegLP: BigDecimal! timestamp: BigInt! - """Time-Weighted deltaB in whitelisted pools over the previous season""" + """ + Time-Weighted deltaB in whitelisted pools over the previous season + """ twaDeltaB: BigInt! - """Time-Weighted price over the previous season""" + """ + Time-Weighted price over the previous season + """ twaPrice: BigDecimal! volume: BigInt! volumeUSD: BigDecimal! } input BeanDailySnapshot_filter { - """Filter for the block changed event.""" + """ + Filter for the block changed event. + """ _change_block: BlockChangedFilter and: [BeanDailySnapshot_filter] bean: String @@ -507,11 +581,8 @@ input BeanDailySnapshot_filter { enum BeanDailySnapshot_orderBy { bean -<<<<<<< HEAD -======= bean__beanstalk bean__chain ->>>>>>> master bean__crosses bean__id bean__lastCross @@ -548,37 +619,65 @@ enum BeanDailySnapshot_orderBy { } type BeanHourlySnapshot { - """Bean token address""" + """ + Bean token address + """ bean: Bean! - """Block number this snapshot was updated""" + """ + Block number this snapshot was updated + """ blockNumber: BigInt! - """Detailed cross events during this snapshot""" - crossEvents(first: Int = 100, orderBy: BeanCross_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: BeanCross_filter): [BeanCross!]! + """ + Detailed cross events during this snapshot + """ + crossEvents( + first: Int = 100 + orderBy: BeanCross_orderBy + orderDirection: OrderDirection + skip: Int = 0 + where: BeanCross_filter + ): [BeanCross!]! - """Cumulative number of crosses""" + """ + Cumulative number of crosses + """ crosses: Int! - """Crosses occuring in this snapshot""" + """ + Crosses occuring in this snapshot + """ deltaCrosses: Int! - """Difference in liquidity for this snapshot""" + """ + Difference in liquidity for this snapshot + """ deltaLiquidityUSD: BigDecimal! - """Volume in BEAN for this snapshot""" + """ + Volume in BEAN for this snapshot + """ deltaVolume: BigInt! - """Volume in USD for this snapshot""" + """ + Volume in USD for this snapshot + """ deltaVolumeUSD: BigDecimal! - """{Token address}-{Season}""" + """ + {Token address}-{Season} + """ id: ID! - """Instantaneous deltaB across all whitelisted pools""" + """ + Instantaneous deltaB across all whitelisted pools + """ instantaneousDeltaB: BigInt! - """Current liquidity in USD""" + """ + Current liquidity in USD + """ liquidityUSD: BigDecimal! """ @@ -586,39 +685,61 @@ type BeanHourlySnapshot { """ lockedBeans: BigInt! - """Current market cap""" + """ + Current market cap + """ marketCap: BigDecimal! - """Current USD price""" + """ + Current USD price + """ price: BigDecimal! - """Season associated with this snapshot""" + """ + Season associated with this snapshot + """ season: Int! - """Current supply""" + """ + Current supply + """ supply: BigInt! - """Percent of supply in LP used for peg maintenance""" + """ + Percent of supply in LP used for peg maintenance + """ supplyInPegLP: BigDecimal! - """Timestamp this snapshot was updated""" + """ + Timestamp this snapshot was updated + """ timestamp: BigInt! - """Time-Weighted deltaB in whitelisted pools over the previous season""" + """ + Time-Weighted deltaB in whitelisted pools over the previous season + """ twaDeltaB: BigInt! - """Time-Weighted price over the previous season""" + """ + Time-Weighted price over the previous season + """ twaPrice: BigDecimal! - """Cumulative volume in BEAN""" + """ + Cumulative volume in BEAN + """ volume: BigInt! - """Cumulative volume in USD""" + """ + Cumulative volume in USD + """ volumeUSD: BigDecimal! } input BeanHourlySnapshot_filter { - """Filter for the block changed event.""" + """ + Filter for the block changed event. + """ _change_block: BlockChangedFilter and: [BeanHourlySnapshot_filter] bean: String @@ -808,11 +929,8 @@ input BeanHourlySnapshot_filter { enum BeanHourlySnapshot_orderBy { bean -<<<<<<< HEAD -======= bean__beanstalk bean__chain ->>>>>>> master bean__crosses bean__id bean__lastCross @@ -849,11 +967,11 @@ enum BeanHourlySnapshot_orderBy { } input Bean_filter { - """Filter for the block changed event.""" + """ + Filter for the block changed event. + """ _change_block: BlockChangedFilter and: [Bean_filter] -<<<<<<< HEAD -======= beanstalk: String beanstalk_contains: String beanstalk_contains_nocase: String @@ -894,7 +1012,6 @@ input Bean_filter { chain_not_starts_with_nocase: String chain_starts_with: String chain_starts_with_nocase: String ->>>>>>> master crossEvents_: BeanCross_filter crosses: Int crosses_gt: Int @@ -905,8 +1022,6 @@ input Bean_filter { crosses_not: Int crosses_not_in: [Int!] dailySnapshot_: BeanDailySnapshot_filter -<<<<<<< HEAD -======= dewhitelistedPools: [String!] dewhitelistedPools_: Pool_filter dewhitelistedPools_contains: [String!] @@ -914,7 +1029,6 @@ input Bean_filter { dewhitelistedPools_not: [String!] dewhitelistedPools_not_contains: [String!] dewhitelistedPools_not_contains_nocase: [String!] ->>>>>>> master hourlySnapshot_: BeanHourlySnapshot_filter id: ID id_gt: ID @@ -1015,18 +1129,12 @@ input Bean_filter { } enum Bean_orderBy { -<<<<<<< HEAD - crossEvents - crosses - dailySnapshot -======= beanstalk chain crossEvents crosses dailySnapshot dewhitelistedPools ->>>>>>> master hourlySnapshot id lastCross @@ -1058,45 +1166,70 @@ input Block_height { scalar Bytes -<<<<<<< HEAD -======= "8 bytes signed integer\n" scalar Int8 ->>>>>>> master -"""Defines the order direction, either ascending or descending""" +""" +Defines the order direction, either ascending or descending +""" enum OrderDirection { asc desc } type Pool { -<<<<<<< HEAD -======= - """The Bean token that is in this pool""" ->>>>>>> master + """ + The Bean token that is in this pool + """ bean: Bean! - crossEvents(first: Int = 100, orderBy: PoolCross_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: PoolCross_filter): [PoolCross!]! + crossEvents( + first: Int = 100 + orderBy: PoolCross_orderBy + orderDirection: OrderDirection + skip: Int = 0 + where: PoolCross_filter + ): [PoolCross!]! crosses: Int! - dailySnapshot(first: Int = 100, orderBy: PoolDailySnapshot_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: PoolDailySnapshot_filter): [PoolDailySnapshot!]! + dailySnapshot( + first: Int = 100 + orderBy: PoolDailySnapshot_orderBy + orderDirection: OrderDirection + skip: Int = 0 + where: PoolDailySnapshot_filter + ): [PoolDailySnapshot!]! - """Instantaneous deltaB""" + """ + Instantaneous deltaB + """ deltaBeans: BigInt! - hourlySnapshot(first: Int = 100, orderBy: PoolHourlySnapshot_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: PoolHourlySnapshot_filter): [PoolHourlySnapshot!]! + hourlySnapshot( + first: Int = 100 + orderBy: PoolHourlySnapshot_orderBy + orderDirection: OrderDirection + skip: Int = 0 + where: PoolHourlySnapshot_filter + ): [PoolHourlySnapshot!]! id: ID! - """Last timestamp a cross was seen for this pool""" + """ + Last timestamp a cross was seen for this pool + """ lastCross: BigInt! lastPrice: BigDecimal! lastSeason: Int! liquidityUSD: BigDecimal! reserves: [BigInt!]! -<<<<<<< HEAD -======= - """All tokens in this pool""" - tokens(first: Int = 100, orderBy: Token_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: Token_filter): [Token!]! ->>>>>>> master + """ + All tokens in this pool + """ + tokens( + first: Int = 100 + orderBy: Token_orderBy + orderDirection: OrderDirection + skip: Int = 0 + where: Token_filter + ): [Token!]! volume: BigInt! volumeUSD: BigDecimal! } @@ -1114,7 +1247,9 @@ type PoolCross { } input PoolCross_filter { - """Filter for the block changed event.""" + """ + Filter for the block changed event. + """ _change_block: BlockChangedFilter above: Boolean above_in: [Boolean!] @@ -1286,10 +1421,18 @@ enum PoolCross_orderBy { type PoolDailySnapshot { createdAt: BigInt! - crossEvents(first: Int = 100, orderBy: PoolCross_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: PoolCross_filter): [PoolCross!]! + crossEvents( + first: Int = 100 + orderBy: PoolCross_orderBy + orderDirection: OrderDirection + skip: Int = 0 + where: PoolCross_filter + ): [PoolCross!]! crosses: Int! - """Instantaneous deltaB""" + """ + Instantaneous deltaB + """ deltaBeans: BigInt! deltaCrosses: Int! deltaLiquidityUSD: BigDecimal! @@ -1303,10 +1446,14 @@ type PoolDailySnapshot { reserves: [BigInt!]! season: Int! - """Time-Weighted deltaB over the previous season""" + """ + Time-Weighted deltaB over the previous season + """ twaDeltaBeans: BigInt! - """Time-Weighted price over the previous season""" + """ + Time-Weighted price over the previous season + """ twaPrice: BigDecimal! """ @@ -1320,7 +1467,9 @@ type PoolDailySnapshot { } input PoolDailySnapshot_filter { - """Filter for the block changed event.""" + """ + Filter for the block changed event. + """ _change_block: BlockChangedFilter and: [PoolDailySnapshot_filter] createdAt: BigInt @@ -1540,10 +1689,18 @@ enum PoolDailySnapshot_orderBy { type PoolHourlySnapshot { createdAt: BigInt! - crossEvents(first: Int = 100, orderBy: PoolCross_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: PoolCross_filter): [PoolCross!]! + crossEvents( + first: Int = 100 + orderBy: PoolCross_orderBy + orderDirection: OrderDirection + skip: Int = 0 + where: PoolCross_filter + ): [PoolCross!]! crosses: Int! - """Instantaneous deltaB""" + """ + Instantaneous deltaB + """ deltaBeans: BigInt! deltaCrosses: Int! deltaLiquidityUSD: BigDecimal! @@ -1557,10 +1714,14 @@ type PoolHourlySnapshot { reserves: [BigInt!]! season: Int! - """Time-Weighted deltaB over the previous season""" + """ + Time-Weighted deltaB over the previous season + """ twaDeltaBeans: BigInt! - """Time-Weighted bean price over the previous season""" + """ + Time-Weighted bean price over the previous season + """ twaPrice: BigDecimal! """ @@ -1574,7 +1735,9 @@ type PoolHourlySnapshot { } input PoolHourlySnapshot_filter { - """Filter for the block changed event.""" + """ + Filter for the block changed event. + """ _change_block: BlockChangedFilter and: [PoolHourlySnapshot_filter] createdAt: BigInt @@ -1793,7 +1956,9 @@ enum PoolHourlySnapshot_orderBy { } input Pool_filter { - """Filter for the block changed event.""" + """ + Filter for the block changed event. + """ _change_block: BlockChangedFilter and: [Pool_filter] bean: String @@ -1883,8 +2048,6 @@ input Pool_filter { reserves_not: [BigInt!] reserves_not_contains: [BigInt!] reserves_not_contains_nocase: [BigInt!] -<<<<<<< HEAD -======= tokens: [String!] tokens_: Token_filter tokens_contains: [String!] @@ -1892,7 +2055,6 @@ input Pool_filter { tokens_not: [String!] tokens_not_contains: [String!] tokens_not_contains_nocase: [String!] ->>>>>>> master volume: BigInt volumeUSD: BigDecimal volumeUSD_gt: BigDecimal @@ -1913,11 +2075,8 @@ input Pool_filter { enum Pool_orderBy { bean -<<<<<<< HEAD -======= bean__beanstalk bean__chain ->>>>>>> master bean__crosses bean__id bean__lastCross @@ -1941,16 +2100,15 @@ enum Pool_orderBy { lastSeason liquidityUSD reserves -<<<<<<< HEAD -======= tokens ->>>>>>> master volume volumeUSD } type Query { - """Access to subgraph metadata""" + """ + Access to subgraph metadata + """ _meta(block: Block_height): _Meta_ bean( """ @@ -2235,7 +2393,9 @@ type Query { } type Subscription { - """Access to subgraph metadata""" + """ + Access to subgraph metadata + """ _meta(block: Block_height): _Meta_ bean( """ @@ -2519,35 +2679,35 @@ type Subscription { ): [TwaOracle!]! } -<<<<<<< HEAD -======= "A string representation of microseconds UNIX timestamp (16 digits)\n" scalar Timestamp ->>>>>>> master type Token { - """Number of decimals""" + """ + Number of decimals + """ decimals: BigInt! - """Smart contract address of the token""" + """ + Smart contract address of the token + """ id: ID! -<<<<<<< HEAD - """Last USD price calculated""" - lastPriceUSD: BigDecimal! -======= """ Last USD price calculated. Isn't calculated for all tokens, in those cases will be zero. """ lastPriceUSD: BigDecimal! - """Name of the token, i.e. BEAN, WETH""" + """ + Name of the token, i.e. BEAN, WETH + """ name: String! ->>>>>>> master } input Token_filter { - """Filter for the block changed event.""" + """ + Filter for the block changed event. + """ _change_block: BlockChangedFilter and: [Token_filter] decimals: BigInt @@ -2574,8 +2734,6 @@ input Token_filter { lastPriceUSD_lte: BigDecimal lastPriceUSD_not: BigDecimal lastPriceUSD_not_in: [BigDecimal!] -<<<<<<< HEAD -======= name: String name_contains: String name_contains_nocase: String @@ -2596,7 +2754,6 @@ input Token_filter { name_not_starts_with_nocase: String name_starts_with: String name_starts_with_nocase: String ->>>>>>> master or: [Token_filter] } @@ -2604,10 +2761,7 @@ enum Token_orderBy { decimals id lastPriceUSD -<<<<<<< HEAD -======= name ->>>>>>> master } type TwaOracle { @@ -2627,7 +2781,9 @@ type TwaOracle { } input TwaOracle_filter { - """Filter for the block changed event.""" + """ + Filter for the block changed event. + """ _change_block: BlockChangedFilter and: [TwaOracle_filter] cumulativeWellReserves: Bytes @@ -2774,19 +2930,24 @@ enum TwaOracle_orderBy { } type _Block_ { - """The hash of the block""" + """ + The hash of the block + """ hash: Bytes - """The block number""" + """ + The block number + """ number: Int! -<<<<<<< HEAD -======= - """The hash of the parent block""" + """ + The hash of the parent block + """ parentHash: Bytes ->>>>>>> master - """Integer representation of the timestamp stored in blocks for the chain""" + """ + Integer representation of the timestamp stored in blocks for the chain + """ timestamp: Int } diff --git a/projects/ui/src/graph/schema-beanft.graphql b/projects/ui/src/graph/schema-beanft.graphql index dc113e84d5..783bc53146 100644 --- a/projects/ui/src/graph/schema-beanft.graphql +++ b/projects/ui/src/graph/schema-beanft.graphql @@ -11,14 +11,11 @@ directive @entity on OBJECT """Defined a Subgraph ID for an object type""" directive @subgraphId(id: String!) on OBJECT -<<<<<<< HEAD -======= enum Aggregation_interval { day hour } ->>>>>>> master type BeaNFTUser { barnRaise: [Int!] basin: [Int!] @@ -28,7 +25,9 @@ type BeaNFTUser { } input BeaNFTUser_filter { - """Filter for the block changed event.""" + """ + Filter for the block changed event. + """ _change_block: BlockChangedFilter and: [BeaNFTUser_filter] barnRaise: [Int!] @@ -96,7 +95,9 @@ type CollectionData { } input CollectionData_filter { - """Filter for the block changed event.""" + """ + Filter for the block changed event. + """ _change_block: BlockChangedFilter and: [CollectionData_filter] id: ID @@ -121,12 +122,9 @@ enum CollectionData_orderBy { minted } -<<<<<<< HEAD -======= "8 bytes signed integer\n" scalar Int8 ->>>>>>> master """Defines the order direction, either ascending or descending""" enum OrderDirection { asc @@ -255,26 +253,28 @@ type Subscription { ): [CollectionData!]! } -<<<<<<< HEAD -======= "A string representation of microseconds UNIX timestamp (16 digits)\n" scalar Timestamp ->>>>>>> master type _Block_ { - """The hash of the block""" + """ + The hash of the block + """ hash: Bytes - """The block number""" + """ + The block number + """ number: Int! -<<<<<<< HEAD -======= - """The hash of the parent block""" + """ + The hash of the parent block + """ parentHash: Bytes ->>>>>>> master - """Integer representation of the timestamp stored in blocks for the chain""" + """ + Integer representation of the timestamp stored in blocks for the chain + """ timestamp: Int } diff --git a/projects/ui/src/graph/schema-beanstalk.graphql b/projects/ui/src/graph/schema-beanstalk.graphql index 16d487f863..7ff74429fc 100644 --- a/projects/ui/src/graph/schema-beanstalk.graphql +++ b/projects/ui/src/graph/schema-beanstalk.graphql @@ -225,14 +225,11 @@ enum AddDeposit_orderBy { token } -<<<<<<< HEAD -======= enum Aggregation_interval { day hour } ->>>>>>> master type Beanstalk { """ Array of the addresses for all active farmers in the silo """ activeFarmers: [String!]! @@ -2301,24 +2298,18 @@ enum Field_orderBy { } type Germinating { -<<<<<<< HEAD -======= """Address of the token or account which is germinating""" address: String! ->>>>>>> master """Germinating bdv. This only applies to a Token address""" bdv: BigInt! """Address-(EVEN|ODD)""" id: ID! -<<<<<<< HEAD -======= """True when the address is a farmer account""" isFarmer: Boolean! ->>>>>>> master """The season in which the germination started""" season: Int! @@ -2327,19 +2318,14 @@ type Germinating { """Germinating tokens. This only applies to a Token address""" tokenAmount: BigInt! -<<<<<<< HEAD -======= """EVEN or ODD""" type: String! ->>>>>>> master } input Germinating_filter { """Filter for the block changed event.""" _change_block: BlockChangedFilter -<<<<<<< HEAD -======= address: String address_contains: String address_contains_nocase: String @@ -2360,7 +2346,6 @@ input Germinating_filter { address_not_starts_with_nocase: String address_starts_with: String address_starts_with_nocase: String ->>>>>>> master and: [Germinating_filter] bdv: BigInt bdv_gt: BigInt @@ -2378,13 +2363,10 @@ input Germinating_filter { id_lte: ID id_not: ID id_not_in: [ID!] -<<<<<<< HEAD -======= isFarmer: Boolean isFarmer_in: [Boolean!] isFarmer_not: Boolean isFarmer_not_in: [Boolean!] ->>>>>>> master or: [Germinating_filter] season: Int season_gt: Int @@ -2410,16 +2392,6 @@ input Germinating_filter { tokenAmount_lte: BigInt tokenAmount_not: BigInt tokenAmount_not_in: [BigInt!] -<<<<<<< HEAD -} - -enum Germinating_orderBy { - bdv - id - season - stalk - tokenAmount -======= type: String type_contains: String type_contains_nocase: String @@ -2451,7 +2423,6 @@ enum Germinating_orderBy { stalk tokenAmount type ->>>>>>> master } type Harvest implements FieldEvent { @@ -2772,12 +2743,9 @@ enum Incentive_orderBy { protocol__subgraphVersion } -<<<<<<< HEAD -======= "8 bytes signed integer\n" scalar Int8 ->>>>>>> master enum MarketStatus { ACTIVE CANCELLED @@ -3078,24 +3046,15 @@ enum OrderDirection { } type Plot { -<<<<<<< HEAD - """Beans used to sow, if any""" - beans: BigInt! -======= """ Number of beans spent for each pod, whether through sowing or on the marketplace """ beansPerPod: BigInt! ->>>>>>> master """Timestamp of creation""" createdAt: BigInt! -<<<<<<< HEAD - """Creation transaction hash""" -======= """Transaction hash of when this plot entity was created""" ->>>>>>> master creationHash: String! """Farmer who owns this plot""" @@ -3128,23 +3087,6 @@ type Plot { """Season when created""" season: Int! -<<<<<<< HEAD - """Transaction source for this plot""" - source: PlotSource! - - """Total pods that were sown, if any""" - sownPods: BigInt! - - """Temperature when the plot was sown""" - temperature: Int! - - """Timestamp when updated""" - updatedAt: BigInt! -} - -enum PlotSource { - HARVEST -======= """ Transaction source for this plot. Not the same as creationHash which can include plots splitting from transfer or harvest without the owner changing """ @@ -3162,7 +3104,6 @@ enum PlotSource { enum PlotSource { MARKET ->>>>>>> master SOW TRANSFER } @@ -3171,16 +3112,6 @@ input Plot_filter { """Filter for the block changed event.""" _change_block: BlockChangedFilter and: [Plot_filter] -<<<<<<< HEAD - beans: BigInt - beans_gt: BigInt - beans_gte: BigInt - beans_in: [BigInt!] - beans_lt: BigInt - beans_lte: BigInt - beans_not: BigInt - beans_not_in: [BigInt!] -======= beansPerPod: BigInt beansPerPod_gt: BigInt beansPerPod_gte: BigInt @@ -3189,7 +3120,6 @@ input Plot_filter { beansPerPod_lte: BigInt beansPerPod_not: BigInt beansPerPod_not_in: [BigInt!] ->>>>>>> master createdAt: BigInt createdAt_gt: BigInt createdAt_gte: BigInt @@ -3335,28 +3265,6 @@ input Plot_filter { season_not: Int season_not_in: [Int!] source: PlotSource -<<<<<<< HEAD - source_in: [PlotSource!] - source_not: PlotSource - source_not_in: [PlotSource!] - sownPods: BigInt - sownPods_gt: BigInt - sownPods_gte: BigInt - sownPods_in: [BigInt!] - sownPods_lt: BigInt - sownPods_lte: BigInt - sownPods_not: BigInt - sownPods_not_in: [BigInt!] - temperature: Int - temperature_gt: Int - temperature_gte: Int - temperature_in: [Int!] - temperature_lt: Int - temperature_lte: Int - temperature_not: Int - temperature_not_in: [Int!] - updatedAt: BigInt -======= sourceHash: String sourceHash_contains: String sourceHash_contains_nocase: String @@ -3389,7 +3297,6 @@ input Plot_filter { updatedAtBlock_lte: BigInt updatedAtBlock_not: BigInt updatedAtBlock_not_in: [BigInt!] ->>>>>>> master updatedAt_gt: BigInt updatedAt_gte: BigInt updatedAt_in: [BigInt!] @@ -3400,11 +3307,7 @@ input Plot_filter { } enum Plot_orderBy { -<<<<<<< HEAD - beans -======= beansPerPod ->>>>>>> master createdAt creationHash farmer @@ -3430,10 +3333,6 @@ enum Plot_orderBy { index listing listing__amount -<<<<<<< HEAD - listing__cancelledAmount -======= ->>>>>>> master listing__createdAt listing__creationHash listing__filled @@ -3456,15 +3355,9 @@ enum Plot_orderBy { pods season source -<<<<<<< HEAD - sownPods - temperature - updatedAt -======= sourceHash updatedAt updatedAtBlock ->>>>>>> master } type PodFill { @@ -3472,20 +3365,12 @@ type PodFill { amount: BigInt! """Total beans used to fill listing/order""" -<<<<<<< HEAD - costInBeans: BigInt -======= costInBeans: BigInt! ->>>>>>> master """Creation timestamp""" createdAt: BigInt! -<<<<<<< HEAD - """Account fulfilling the order""" -======= """Account that is sending pods""" ->>>>>>> master from: String! """Beanstalk address - Order/Listing index - transaction hash""" @@ -3500,23 +3385,16 @@ type PodFill { """Associated order, if any""" order: PodOrder -<<<<<<< HEAD -======= """Where these pods were in line when filled""" placeInLine: BigInt! ->>>>>>> master """Marketplace associated with this fill""" podMarketplace: PodMarketplace! """Start of plot transferred""" start: BigInt! -<<<<<<< HEAD - """Account filling the order""" -======= """Account that is receiving pods""" ->>>>>>> master to: Farmer! } @@ -3627,8 +3505,6 @@ input PodFill_filter { order_not_starts_with_nocase: String order_starts_with: String order_starts_with_nocase: String -<<<<<<< HEAD -======= placeInLine: BigInt placeInLine_gt: BigInt placeInLine_gte: BigInt @@ -3637,7 +3513,6 @@ input PodFill_filter { placeInLine_lte: BigInt placeInLine_not: BigInt placeInLine_not_in: [BigInt!] ->>>>>>> master podMarketplace: String podMarketplace_: PodMarketplace_filter podMarketplace_contains: String @@ -3699,10 +3574,6 @@ enum PodFill_orderBy { index listing listing__amount -<<<<<<< HEAD - listing__cancelledAmount -======= ->>>>>>> master listing__createdAt listing__creationHash listing__filled @@ -3731,29 +3602,12 @@ enum PodFill_orderBy { order__id order__maxPlaceInLine order__minFillAmount -<<<<<<< HEAD - order__podAmount -======= ->>>>>>> master order__podAmountFilled order__pricePerPod order__pricingFunction order__pricingType order__status order__updatedAt -<<<<<<< HEAD - podMarketplace - podMarketplace__availableListedPods - podMarketplace__beanVolume - podMarketplace__cancelledListedPods - podMarketplace__cancelledOrderedPods - podMarketplace__expiredListedPods - podMarketplace__filledListedPods - podMarketplace__filledOrderedPods - podMarketplace__id - podMarketplace__listedPods - podMarketplace__orderedPods -======= placeInLine podMarketplace podMarketplace__availableListedPods @@ -3768,7 +3622,6 @@ enum PodFill_orderBy { podMarketplace__id podMarketplace__listedPods podMarketplace__orderBeans ->>>>>>> master podMarketplace__podVolume podMarketplace__season start @@ -3780,12 +3633,6 @@ type PodListing { "The maximum amount of Pods remaining to be sold by *this* PodListing.\n\nWhen this PodListing is Filled or Cancelled, `amount` does NOT change.\n" amount: BigInt! -<<<<<<< HEAD - "The number of Pods that were remaining in *this* PodListing when it was Cancelled.\n" - cancelledAmount: BigInt! - -======= ->>>>>>> master """Timestamp of PodListing creation.""" createdAt: BigInt! @@ -3884,12 +3731,9 @@ type PodListingCancelled implements MarketplaceEvent { """ logIndex: Int! -<<<<<<< HEAD -======= """Where these pods were in line when cancelled""" placeInLine: BigInt! ->>>>>>> master """ The protocol this transaction belongs to """ protocol: Beanstalk! } @@ -3999,8 +3843,6 @@ input PodListingCancelled_filter { logIndex_not: Int logIndex_not_in: [Int!] or: [PodListingCancelled_filter] -<<<<<<< HEAD -======= placeInLine: BigInt placeInLine_gt: BigInt placeInLine_gte: BigInt @@ -4009,7 +3851,6 @@ input PodListingCancelled_filter { placeInLine_lte: BigInt placeInLine_not: BigInt placeInLine_not_in: [BigInt!] ->>>>>>> master protocol: String protocol_: Beanstalk_filter protocol_contains: String @@ -4042,10 +3883,7 @@ enum PodListingCancelled_orderBy { id index logIndex -<<<<<<< HEAD -======= placeInLine ->>>>>>> master protocol protocol__id protocol__lastSeason @@ -4095,12 +3933,9 @@ type PodListingCreated implements MarketplaceEvent { """Claim to location""" mode: Int! -<<<<<<< HEAD -======= """Where these pods were in line when listed""" placeInLine: BigInt! ->>>>>>> master """Price per pod""" pricePerPod: Int! @@ -4254,8 +4089,6 @@ input PodListingCreated_filter { mode_not: Int mode_not_in: [Int!] or: [PodListingCreated_filter] -<<<<<<< HEAD -======= placeInLine: BigInt placeInLine_gt: BigInt placeInLine_gte: BigInt @@ -4264,7 +4097,6 @@ input PodListingCreated_filter { placeInLine_lte: BigInt placeInLine_not: BigInt placeInLine_not_in: [BigInt!] ->>>>>>> master pricePerPod: Int pricePerPod_gt: Int pricePerPod_gte: Int @@ -4335,10 +4167,7 @@ enum PodListingCreated_orderBy { maxHarvestableIndex minFillAmount mode -<<<<<<< HEAD -======= placeInLine ->>>>>>> master pricePerPod pricingFunction pricingType @@ -4386,12 +4215,9 @@ type PodListingFilled implements MarketplaceEvent { """ logIndex: Int! -<<<<<<< HEAD -======= """Where these pods were in line when filled""" placeInLine: BigInt! ->>>>>>> master """ The protocol this transaction belongs to """ protocol: Beanstalk! @@ -4523,8 +4349,6 @@ input PodListingFilled_filter { logIndex_not: Int logIndex_not_in: [Int!] or: [PodListingFilled_filter] -<<<<<<< HEAD -======= placeInLine: BigInt placeInLine_gt: BigInt placeInLine_gte: BigInt @@ -4533,7 +4357,6 @@ input PodListingFilled_filter { placeInLine_lte: BigInt placeInLine_not: BigInt placeInLine_not_in: [BigInt!] ->>>>>>> master protocol: String protocol_: Beanstalk_filter protocol_contains: String @@ -4596,10 +4419,7 @@ enum PodListingFilled_orderBy { id index logIndex -<<<<<<< HEAD -======= placeInLine ->>>>>>> master protocol protocol__id protocol__lastSeason @@ -4625,17 +4445,6 @@ input PodListing_filter { amount_not: BigInt amount_not_in: [BigInt!] and: [PodListing_filter] -<<<<<<< HEAD - cancelledAmount: BigInt - cancelledAmount_gt: BigInt - cancelledAmount_gte: BigInt - cancelledAmount_in: [BigInt!] - cancelledAmount_lt: BigInt - cancelledAmount_lte: BigInt - cancelledAmount_not: BigInt - cancelledAmount_not_in: [BigInt!] -======= ->>>>>>> master createdAt: BigInt createdAt_gt: BigInt createdAt_gte: BigInt @@ -4899,10 +4708,6 @@ input PodListing_filter { enum PodListing_orderBy { amount -<<<<<<< HEAD - cancelledAmount -======= ->>>>>>> master createdAt creationHash farmer @@ -4914,10 +4719,7 @@ enum PodListing_orderBy { fill__from fill__id fill__index -<<<<<<< HEAD -======= fill__placeInLine ->>>>>>> master fill__start filled filledAmount @@ -4930,11 +4732,7 @@ enum PodListing_orderBy { originalAmount originalIndex plot -<<<<<<< HEAD - plot__beans -======= plot__beansPerPod ->>>>>>> master plot__createdAt plot__creationHash plot__fullyHarvested @@ -4945,22 +4743,6 @@ enum PodListing_orderBy { plot__pods plot__season plot__source -<<<<<<< HEAD - plot__sownPods - plot__temperature - plot__updatedAt - podMarketplace - podMarketplace__availableListedPods - podMarketplace__beanVolume - podMarketplace__cancelledListedPods - podMarketplace__cancelledOrderedPods - podMarketplace__expiredListedPods - podMarketplace__filledListedPods - podMarketplace__filledOrderedPods - podMarketplace__id - podMarketplace__listedPods - podMarketplace__orderedPods -======= plot__sourceHash plot__updatedAt plot__updatedAtBlock @@ -4977,7 +4759,6 @@ enum PodListing_orderBy { podMarketplace__id podMarketplace__listedPods podMarketplace__orderBeans ->>>>>>> master podMarketplace__podVolume podMarketplace__season pricePerPod @@ -4990,8 +4771,6 @@ enum PodListing_orderBy { } type PodMarketplace { -<<<<<<< HEAD -======= """ Information about the active pod listings. Each entry of the form 'account-index-expiry' """ @@ -5002,7 +4781,6 @@ type PodMarketplace { """ activeOrders: [String!]! ->>>>>>> master """All historical listings""" allListings(first: Int = 100, orderBy: PodListing_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: PodListing_filter): [PodListing!]! @@ -5012,25 +4790,17 @@ type PodMarketplace { """Current amount of total pods listed""" availableListedPods: BigInt! -<<<<<<< HEAD -======= """Current amount of total beans in pod orders""" availableOrderBeans: BigInt! ->>>>>>> master """Cumulative bean volume between listings and orders""" beanVolume: BigInt! """Current cumulative pod listings that were cancelled""" cancelledListedPods: BigInt! -<<<<<<< HEAD - """Current cumulative pod orders cancelled""" - cancelledOrderedPods: BigInt! -======= """Current cumulative beans in pod orders cancelled""" cancelledOrderBeans: BigInt! ->>>>>>> master """Link to daily snapshot data""" dailySnapshots(first: Int = 100, orderBy: PodMarketplaceDailySnapshot_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: PodMarketplaceDailySnapshot_filter): [PodMarketplaceDailySnapshot!]! @@ -5041,12 +4811,9 @@ type PodMarketplace { """Current cumulative pod listings filled""" filledListedPods: BigInt! -<<<<<<< HEAD -======= """Current cumulative filled beans in pod orders""" filledOrderBeans: BigInt! ->>>>>>> master """Current cumulative pod orders filled""" filledOrderedPods: BigInt! @@ -5062,19 +4829,8 @@ type PodMarketplace { """Current cumulative pods listed for sale""" listedPods: BigInt! -<<<<<<< HEAD - """Indexes of actively listed plots""" - listingIndexes: [BigInt!]! - - """Current cumulative pod orders created""" - orderedPods: BigInt! - - """Active pod order IDs""" - orders(first: Int = 100, orderBy: PodOrder_orderBy, orderDirection: OrderDirection, skip: Int = 0, where: PodOrder_filter): [PodOrder!]! -======= """Current cumulative beans in pod orders created""" orderBeans: BigInt! ->>>>>>> master """Cumulative pod volume between listings and orders""" podVolume: BigInt! @@ -5087,12 +4843,9 @@ type PodMarketplaceDailySnapshot { """Point in time current amount of total pods listed""" availableListedPods: BigInt! -<<<<<<< HEAD -======= """Current amount of total beans in pod orders""" availableOrderBeans: BigInt! ->>>>>>> master """ Point in time current cumulative bean volume between listings and orders """ @@ -5101,13 +4854,8 @@ type PodMarketplaceDailySnapshot { """Point in time current cumulative pod listings that were cancelled""" cancelledListedPods: BigInt! -<<<<<<< HEAD - """Point in time current cumulative pod orders cancelled""" - cancelledOrderedPods: BigInt! -======= """Current cumulative beans in pod orders cancelled""" cancelledOrderBeans: BigInt! ->>>>>>> master """Timestamp of initial snapshot creation""" createdAt: BigInt! @@ -5115,25 +4863,17 @@ type PodMarketplaceDailySnapshot { """Point in time current delta of total pods listed""" deltaAvailableListedPods: BigInt! -<<<<<<< HEAD -======= """Point in time current delta available ordered beans in pod orders""" deltaAvailableOrderBeans: BigInt! ->>>>>>> master """Point in time current delta bean volume between listings and orders""" deltaBeanVolume: BigInt! """Point in time current delta pod listings that were cancelled""" deltaCancelledListedPods: BigInt! -<<<<<<< HEAD - """Point in time current delta pod orders cancelled""" - deltaCancelledOrderedPods: BigInt! -======= """Point in time current delta cancelled ordered beans in pod orders""" deltaCancelledOrderBeans: BigInt! ->>>>>>> master """Point in time current delta pod listings that expired""" deltaExpiredListedPods: BigInt! @@ -5141,25 +4881,17 @@ type PodMarketplaceDailySnapshot { """Point in time current delta pod listings filled""" deltaFilledListedPods: BigInt! -<<<<<<< HEAD -======= """Point in time current delta filled ordered beans in pod orders""" deltaFilledOrderBeans: BigInt! ->>>>>>> master """Point in time current delta pod orders filled""" deltaFilledOrderedPods: BigInt! """Point in time current delta pods listed for sale""" deltaListedPods: BigInt! -<<<<<<< HEAD - """Point in time current delta pod orders created""" - deltaOrderedPods: BigInt! -======= """Point in time current delta ordered beans in pod orders created""" deltaOrderBeans: BigInt! ->>>>>>> master """Point in time current delta pod volume between listings and orders""" deltaPodVolume: BigInt! @@ -5170,14 +4902,10 @@ type PodMarketplaceDailySnapshot { """Point in time current cumulative pod listings filled""" filledListedPods: BigInt! -<<<<<<< HEAD - """Point in time current cumulative pod orders filled""" -======= """Current cumulative filled beans in pod orders""" filledOrderBeans: BigInt! """Current cumulative pod orders filled""" ->>>>>>> master filledOrderedPods: BigInt! """Marketplace ID - Unix Timestamp""" @@ -5186,13 +4914,8 @@ type PodMarketplaceDailySnapshot { """Point in time current cumulative pods listed for sale""" listedPods: BigInt! -<<<<<<< HEAD - """Point in time current cumulative pod orders created""" - orderedPods: BigInt! -======= """Current cumulative beans in pod orders created""" orderBeans: BigInt! ->>>>>>> master """Marketplace associated with snapshot""" podMarketplace: PodMarketplace! @@ -5221,8 +4944,6 @@ input PodMarketplaceDailySnapshot_filter { availableListedPods_lte: BigInt availableListedPods_not: BigInt availableListedPods_not_in: [BigInt!] -<<<<<<< HEAD -======= availableOrderBeans: BigInt availableOrderBeans_gt: BigInt availableOrderBeans_gte: BigInt @@ -5231,7 +4952,6 @@ input PodMarketplaceDailySnapshot_filter { availableOrderBeans_lte: BigInt availableOrderBeans_not: BigInt availableOrderBeans_not_in: [BigInt!] ->>>>>>> master beanVolume: BigInt beanVolume_gt: BigInt beanVolume_gte: BigInt @@ -5248,16 +4968,6 @@ input PodMarketplaceDailySnapshot_filter { cancelledListedPods_lte: BigInt cancelledListedPods_not: BigInt cancelledListedPods_not_in: [BigInt!] -<<<<<<< HEAD - cancelledOrderedPods: BigInt - cancelledOrderedPods_gt: BigInt - cancelledOrderedPods_gte: BigInt - cancelledOrderedPods_in: [BigInt!] - cancelledOrderedPods_lt: BigInt - cancelledOrderedPods_lte: BigInt - cancelledOrderedPods_not: BigInt - cancelledOrderedPods_not_in: [BigInt!] -======= cancelledOrderBeans: BigInt cancelledOrderBeans_gt: BigInt cancelledOrderBeans_gte: BigInt @@ -5266,7 +4976,6 @@ input PodMarketplaceDailySnapshot_filter { cancelledOrderBeans_lte: BigInt cancelledOrderBeans_not: BigInt cancelledOrderBeans_not_in: [BigInt!] ->>>>>>> master createdAt: BigInt createdAt_gt: BigInt createdAt_gte: BigInt @@ -5283,8 +4992,6 @@ input PodMarketplaceDailySnapshot_filter { deltaAvailableListedPods_lte: BigInt deltaAvailableListedPods_not: BigInt deltaAvailableListedPods_not_in: [BigInt!] -<<<<<<< HEAD -======= deltaAvailableOrderBeans: BigInt deltaAvailableOrderBeans_gt: BigInt deltaAvailableOrderBeans_gte: BigInt @@ -5293,7 +5000,6 @@ input PodMarketplaceDailySnapshot_filter { deltaAvailableOrderBeans_lte: BigInt deltaAvailableOrderBeans_not: BigInt deltaAvailableOrderBeans_not_in: [BigInt!] ->>>>>>> master deltaBeanVolume: BigInt deltaBeanVolume_gt: BigInt deltaBeanVolume_gte: BigInt @@ -5310,16 +5016,6 @@ input PodMarketplaceDailySnapshot_filter { deltaCancelledListedPods_lte: BigInt deltaCancelledListedPods_not: BigInt deltaCancelledListedPods_not_in: [BigInt!] -<<<<<<< HEAD - deltaCancelledOrderedPods: BigInt - deltaCancelledOrderedPods_gt: BigInt - deltaCancelledOrderedPods_gte: BigInt - deltaCancelledOrderedPods_in: [BigInt!] - deltaCancelledOrderedPods_lt: BigInt - deltaCancelledOrderedPods_lte: BigInt - deltaCancelledOrderedPods_not: BigInt - deltaCancelledOrderedPods_not_in: [BigInt!] -======= deltaCancelledOrderBeans: BigInt deltaCancelledOrderBeans_gt: BigInt deltaCancelledOrderBeans_gte: BigInt @@ -5328,7 +5024,6 @@ input PodMarketplaceDailySnapshot_filter { deltaCancelledOrderBeans_lte: BigInt deltaCancelledOrderBeans_not: BigInt deltaCancelledOrderBeans_not_in: [BigInt!] ->>>>>>> master deltaExpiredListedPods: BigInt deltaExpiredListedPods_gt: BigInt deltaExpiredListedPods_gte: BigInt @@ -5345,8 +5040,6 @@ input PodMarketplaceDailySnapshot_filter { deltaFilledListedPods_lte: BigInt deltaFilledListedPods_not: BigInt deltaFilledListedPods_not_in: [BigInt!] -<<<<<<< HEAD -======= deltaFilledOrderBeans: BigInt deltaFilledOrderBeans_gt: BigInt deltaFilledOrderBeans_gte: BigInt @@ -5355,7 +5048,6 @@ input PodMarketplaceDailySnapshot_filter { deltaFilledOrderBeans_lte: BigInt deltaFilledOrderBeans_not: BigInt deltaFilledOrderBeans_not_in: [BigInt!] ->>>>>>> master deltaFilledOrderedPods: BigInt deltaFilledOrderedPods_gt: BigInt deltaFilledOrderedPods_gte: BigInt @@ -5372,16 +5064,6 @@ input PodMarketplaceDailySnapshot_filter { deltaListedPods_lte: BigInt deltaListedPods_not: BigInt deltaListedPods_not_in: [BigInt!] -<<<<<<< HEAD - deltaOrderedPods: BigInt - deltaOrderedPods_gt: BigInt - deltaOrderedPods_gte: BigInt - deltaOrderedPods_in: [BigInt!] - deltaOrderedPods_lt: BigInt - deltaOrderedPods_lte: BigInt - deltaOrderedPods_not: BigInt - deltaOrderedPods_not_in: [BigInt!] -======= deltaOrderBeans: BigInt deltaOrderBeans_gt: BigInt deltaOrderBeans_gte: BigInt @@ -5390,7 +5072,6 @@ input PodMarketplaceDailySnapshot_filter { deltaOrderBeans_lte: BigInt deltaOrderBeans_not: BigInt deltaOrderBeans_not_in: [BigInt!] ->>>>>>> master deltaPodVolume: BigInt deltaPodVolume_gt: BigInt deltaPodVolume_gte: BigInt @@ -5415,8 +5096,6 @@ input PodMarketplaceDailySnapshot_filter { filledListedPods_lte: BigInt filledListedPods_not: BigInt filledListedPods_not_in: [BigInt!] -<<<<<<< HEAD -======= filledOrderBeans: BigInt filledOrderBeans_gt: BigInt filledOrderBeans_gte: BigInt @@ -5425,7 +5104,6 @@ input PodMarketplaceDailySnapshot_filter { filledOrderBeans_lte: BigInt filledOrderBeans_not: BigInt filledOrderBeans_not_in: [BigInt!] ->>>>>>> master filledOrderedPods: BigInt filledOrderedPods_gt: BigInt filledOrderedPods_gte: BigInt @@ -5451,16 +5129,6 @@ input PodMarketplaceDailySnapshot_filter { listedPods_not: BigInt listedPods_not_in: [BigInt!] or: [PodMarketplaceDailySnapshot_filter] -<<<<<<< HEAD - orderedPods: BigInt - orderedPods_gt: BigInt - orderedPods_gte: BigInt - orderedPods_in: [BigInt!] - orderedPods_lt: BigInt - orderedPods_lte: BigInt - orderedPods_not: BigInt - orderedPods_not_in: [BigInt!] -======= orderBeans: BigInt orderBeans_gt: BigInt orderBeans_gte: BigInt @@ -5469,7 +5137,6 @@ input PodMarketplaceDailySnapshot_filter { orderBeans_lte: BigInt orderBeans_not: BigInt orderBeans_not_in: [BigInt!] ->>>>>>> master podMarketplace: String podMarketplace_: PodMarketplace_filter podMarketplace_contains: String @@ -5519,39 +5186,6 @@ input PodMarketplaceDailySnapshot_filter { enum PodMarketplaceDailySnapshot_orderBy { availableListedPods -<<<<<<< HEAD - beanVolume - cancelledListedPods - cancelledOrderedPods - createdAt - deltaAvailableListedPods - deltaBeanVolume - deltaCancelledListedPods - deltaCancelledOrderedPods - deltaExpiredListedPods - deltaFilledListedPods - deltaFilledOrderedPods - deltaListedPods - deltaOrderedPods - deltaPodVolume - expiredListedPods - filledListedPods - filledOrderedPods - id - listedPods - orderedPods - podMarketplace - podMarketplace__availableListedPods - podMarketplace__beanVolume - podMarketplace__cancelledListedPods - podMarketplace__cancelledOrderedPods - podMarketplace__expiredListedPods - podMarketplace__filledListedPods - podMarketplace__filledOrderedPods - podMarketplace__id - podMarketplace__listedPods - podMarketplace__orderedPods -======= availableOrderBeans beanVolume cancelledListedPods @@ -5589,7 +5223,6 @@ enum PodMarketplaceDailySnapshot_orderBy { podMarketplace__id podMarketplace__listedPods podMarketplace__orderBeans ->>>>>>> master podMarketplace__podVolume podMarketplace__season podVolume @@ -5601,12 +5234,9 @@ type PodMarketplaceHourlySnapshot { """Point in time current amount of total pods listed""" availableListedPods: BigInt! -<<<<<<< HEAD -======= """Current amount of total beans in pod orders""" availableOrderBeans: BigInt! ->>>>>>> master """ Point in time current cumulative bean volume between listings and orders """ @@ -5615,13 +5245,8 @@ type PodMarketplaceHourlySnapshot { """Point in time current cumulative pod listings that were cancelled""" cancelledListedPods: BigInt! -<<<<<<< HEAD - """Point in time current cumulative pod orders cancelled""" - cancelledOrderedPods: BigInt! -======= """Current cumulative beans in pod orders cancelled""" cancelledOrderBeans: BigInt! ->>>>>>> master """Timestamp of initial snapshot creation""" createdAt: BigInt! @@ -5629,25 +5254,17 @@ type PodMarketplaceHourlySnapshot { """Point in time current delta of total pods listed""" deltaAvailableListedPods: BigInt! -<<<<<<< HEAD -======= """Point in time current delta available ordered beans in pod orders""" deltaAvailableOrderBeans: BigInt! ->>>>>>> master """Point in time current delta bean volume between listings and orders""" deltaBeanVolume: BigInt! """Point in time current delta pod listings that were cancelled""" deltaCancelledListedPods: BigInt! -<<<<<<< HEAD - """Point in time current delta pod orders cancelled""" - deltaCancelledOrderedPods: BigInt! -======= """Point in time current delta cancelled ordered beans in pod orders""" deltaCancelledOrderBeans: BigInt! ->>>>>>> master """Point in time current delta pod listings that expired""" deltaExpiredListedPods: BigInt! @@ -5655,25 +5272,17 @@ type PodMarketplaceHourlySnapshot { """Point in time current delta pod listings filled""" deltaFilledListedPods: BigInt! -<<<<<<< HEAD -======= """Point in time current delta filled ordered beans in pod orders""" deltaFilledOrderBeans: BigInt! ->>>>>>> master """Point in time current delta pod orders filled""" deltaFilledOrderedPods: BigInt! """Point in time current delta pods listed for sale""" deltaListedPods: BigInt! -<<<<<<< HEAD - """Point in time current delta pod orders created""" - deltaOrderedPods: BigInt! -======= """Point in time current delta ordered beans in pod orders created""" deltaOrderBeans: BigInt! ->>>>>>> master """Point in time current delta pod volume between listings and orders""" deltaPodVolume: BigInt! @@ -5684,14 +5293,10 @@ type PodMarketplaceHourlySnapshot { """Point in time current cumulative pod listings filled""" filledListedPods: BigInt! -<<<<<<< HEAD - """Point in time current cumulative pod orders filled""" -======= """Current cumulative filled beans in pod orders""" filledOrderBeans: BigInt! """Current cumulative pod orders filled""" ->>>>>>> master filledOrderedPods: BigInt! """Marketplace ID - Unix Timestamp""" @@ -5700,13 +5305,8 @@ type PodMarketplaceHourlySnapshot { """Point in time current cumulative pods listed for sale""" listedPods: BigInt! -<<<<<<< HEAD - """Point in time current cumulative pod orders created""" - orderedPods: BigInt! -======= """Current cumulative beans in pod orders created""" orderBeans: BigInt! ->>>>>>> master """Marketplace associated with snapshot""" podMarketplace: PodMarketplace! @@ -5735,8 +5335,6 @@ input PodMarketplaceHourlySnapshot_filter { availableListedPods_lte: BigInt availableListedPods_not: BigInt availableListedPods_not_in: [BigInt!] -<<<<<<< HEAD -======= availableOrderBeans: BigInt availableOrderBeans_gt: BigInt availableOrderBeans_gte: BigInt @@ -5745,7 +5343,6 @@ input PodMarketplaceHourlySnapshot_filter { availableOrderBeans_lte: BigInt availableOrderBeans_not: BigInt availableOrderBeans_not_in: [BigInt!] ->>>>>>> master beanVolume: BigInt beanVolume_gt: BigInt beanVolume_gte: BigInt @@ -5762,16 +5359,6 @@ input PodMarketplaceHourlySnapshot_filter { cancelledListedPods_lte: BigInt cancelledListedPods_not: BigInt cancelledListedPods_not_in: [BigInt!] -<<<<<<< HEAD - cancelledOrderedPods: BigInt - cancelledOrderedPods_gt: BigInt - cancelledOrderedPods_gte: BigInt - cancelledOrderedPods_in: [BigInt!] - cancelledOrderedPods_lt: BigInt - cancelledOrderedPods_lte: BigInt - cancelledOrderedPods_not: BigInt - cancelledOrderedPods_not_in: [BigInt!] -======= cancelledOrderBeans: BigInt cancelledOrderBeans_gt: BigInt cancelledOrderBeans_gte: BigInt @@ -5780,7 +5367,6 @@ input PodMarketplaceHourlySnapshot_filter { cancelledOrderBeans_lte: BigInt cancelledOrderBeans_not: BigInt cancelledOrderBeans_not_in: [BigInt!] ->>>>>>> master createdAt: BigInt createdAt_gt: BigInt createdAt_gte: BigInt @@ -5797,8 +5383,6 @@ input PodMarketplaceHourlySnapshot_filter { deltaAvailableListedPods_lte: BigInt deltaAvailableListedPods_not: BigInt deltaAvailableListedPods_not_in: [BigInt!] -<<<<<<< HEAD -======= deltaAvailableOrderBeans: BigInt deltaAvailableOrderBeans_gt: BigInt deltaAvailableOrderBeans_gte: BigInt @@ -5807,7 +5391,6 @@ input PodMarketplaceHourlySnapshot_filter { deltaAvailableOrderBeans_lte: BigInt deltaAvailableOrderBeans_not: BigInt deltaAvailableOrderBeans_not_in: [BigInt!] ->>>>>>> master deltaBeanVolume: BigInt deltaBeanVolume_gt: BigInt deltaBeanVolume_gte: BigInt @@ -5824,16 +5407,6 @@ input PodMarketplaceHourlySnapshot_filter { deltaCancelledListedPods_lte: BigInt deltaCancelledListedPods_not: BigInt deltaCancelledListedPods_not_in: [BigInt!] -<<<<<<< HEAD - deltaCancelledOrderedPods: BigInt - deltaCancelledOrderedPods_gt: BigInt - deltaCancelledOrderedPods_gte: BigInt - deltaCancelledOrderedPods_in: [BigInt!] - deltaCancelledOrderedPods_lt: BigInt - deltaCancelledOrderedPods_lte: BigInt - deltaCancelledOrderedPods_not: BigInt - deltaCancelledOrderedPods_not_in: [BigInt!] -======= deltaCancelledOrderBeans: BigInt deltaCancelledOrderBeans_gt: BigInt deltaCancelledOrderBeans_gte: BigInt @@ -5842,7 +5415,6 @@ input PodMarketplaceHourlySnapshot_filter { deltaCancelledOrderBeans_lte: BigInt deltaCancelledOrderBeans_not: BigInt deltaCancelledOrderBeans_not_in: [BigInt!] ->>>>>>> master deltaExpiredListedPods: BigInt deltaExpiredListedPods_gt: BigInt deltaExpiredListedPods_gte: BigInt @@ -5859,8 +5431,6 @@ input PodMarketplaceHourlySnapshot_filter { deltaFilledListedPods_lte: BigInt deltaFilledListedPods_not: BigInt deltaFilledListedPods_not_in: [BigInt!] -<<<<<<< HEAD -======= deltaFilledOrderBeans: BigInt deltaFilledOrderBeans_gt: BigInt deltaFilledOrderBeans_gte: BigInt @@ -5869,7 +5439,6 @@ input PodMarketplaceHourlySnapshot_filter { deltaFilledOrderBeans_lte: BigInt deltaFilledOrderBeans_not: BigInt deltaFilledOrderBeans_not_in: [BigInt!] ->>>>>>> master deltaFilledOrderedPods: BigInt deltaFilledOrderedPods_gt: BigInt deltaFilledOrderedPods_gte: BigInt @@ -5886,16 +5455,6 @@ input PodMarketplaceHourlySnapshot_filter { deltaListedPods_lte: BigInt deltaListedPods_not: BigInt deltaListedPods_not_in: [BigInt!] -<<<<<<< HEAD - deltaOrderedPods: BigInt - deltaOrderedPods_gt: BigInt - deltaOrderedPods_gte: BigInt - deltaOrderedPods_in: [BigInt!] - deltaOrderedPods_lt: BigInt - deltaOrderedPods_lte: BigInt - deltaOrderedPods_not: BigInt - deltaOrderedPods_not_in: [BigInt!] -======= deltaOrderBeans: BigInt deltaOrderBeans_gt: BigInt deltaOrderBeans_gte: BigInt @@ -5904,7 +5463,6 @@ input PodMarketplaceHourlySnapshot_filter { deltaOrderBeans_lte: BigInt deltaOrderBeans_not: BigInt deltaOrderBeans_not_in: [BigInt!] ->>>>>>> master deltaPodVolume: BigInt deltaPodVolume_gt: BigInt deltaPodVolume_gte: BigInt @@ -5929,8 +5487,6 @@ input PodMarketplaceHourlySnapshot_filter { filledListedPods_lte: BigInt filledListedPods_not: BigInt filledListedPods_not_in: [BigInt!] -<<<<<<< HEAD -======= filledOrderBeans: BigInt filledOrderBeans_gt: BigInt filledOrderBeans_gte: BigInt @@ -5939,7 +5495,6 @@ input PodMarketplaceHourlySnapshot_filter { filledOrderBeans_lte: BigInt filledOrderBeans_not: BigInt filledOrderBeans_not_in: [BigInt!] ->>>>>>> master filledOrderedPods: BigInt filledOrderedPods_gt: BigInt filledOrderedPods_gte: BigInt @@ -5965,16 +5520,6 @@ input PodMarketplaceHourlySnapshot_filter { listedPods_not: BigInt listedPods_not_in: [BigInt!] or: [PodMarketplaceHourlySnapshot_filter] -<<<<<<< HEAD - orderedPods: BigInt - orderedPods_gt: BigInt - orderedPods_gte: BigInt - orderedPods_in: [BigInt!] - orderedPods_lt: BigInt - orderedPods_lte: BigInt - orderedPods_not: BigInt - orderedPods_not_in: [BigInt!] -======= orderBeans: BigInt orderBeans_gt: BigInt orderBeans_gte: BigInt @@ -5983,7 +5528,6 @@ input PodMarketplaceHourlySnapshot_filter { orderBeans_lte: BigInt orderBeans_not: BigInt orderBeans_not_in: [BigInt!] ->>>>>>> master podMarketplace: String podMarketplace_: PodMarketplace_filter podMarketplace_contains: String @@ -6033,39 +5577,6 @@ input PodMarketplaceHourlySnapshot_filter { enum PodMarketplaceHourlySnapshot_orderBy { availableListedPods -<<<<<<< HEAD - beanVolume - cancelledListedPods - cancelledOrderedPods - createdAt - deltaAvailableListedPods - deltaBeanVolume - deltaCancelledListedPods - deltaCancelledOrderedPods - deltaExpiredListedPods - deltaFilledListedPods - deltaFilledOrderedPods - deltaListedPods - deltaOrderedPods - deltaPodVolume - expiredListedPods - filledListedPods - filledOrderedPods - id - listedPods - orderedPods - podMarketplace - podMarketplace__availableListedPods - podMarketplace__beanVolume - podMarketplace__cancelledListedPods - podMarketplace__cancelledOrderedPods - podMarketplace__expiredListedPods - podMarketplace__filledListedPods - podMarketplace__filledOrderedPods - podMarketplace__id - podMarketplace__listedPods - podMarketplace__orderedPods -======= availableOrderBeans beanVolume cancelledListedPods @@ -6103,7 +5614,6 @@ enum PodMarketplaceHourlySnapshot_orderBy { podMarketplace__id podMarketplace__listedPods podMarketplace__orderBeans ->>>>>>> master podMarketplace__podVolume podMarketplace__season podVolume @@ -6114,8 +5624,6 @@ enum PodMarketplaceHourlySnapshot_orderBy { input PodMarketplace_filter { """Filter for the block changed event.""" _change_block: BlockChangedFilter -<<<<<<< HEAD -======= activeListings: [String!] activeListings_contains: [String!] activeListings_contains_nocase: [String!] @@ -6128,7 +5636,6 @@ input PodMarketplace_filter { activeOrders_not: [String!] activeOrders_not_contains: [String!] activeOrders_not_contains_nocase: [String!] ->>>>>>> master allListings_: PodListing_filter allOrders_: PodOrder_filter and: [PodMarketplace_filter] @@ -6140,8 +5647,6 @@ input PodMarketplace_filter { availableListedPods_lte: BigInt availableListedPods_not: BigInt availableListedPods_not_in: [BigInt!] -<<<<<<< HEAD -======= availableOrderBeans: BigInt availableOrderBeans_gt: BigInt availableOrderBeans_gte: BigInt @@ -6150,7 +5655,6 @@ input PodMarketplace_filter { availableOrderBeans_lte: BigInt availableOrderBeans_not: BigInt availableOrderBeans_not_in: [BigInt!] ->>>>>>> master beanVolume: BigInt beanVolume_gt: BigInt beanVolume_gte: BigInt @@ -6167,16 +5671,6 @@ input PodMarketplace_filter { cancelledListedPods_lte: BigInt cancelledListedPods_not: BigInt cancelledListedPods_not_in: [BigInt!] -<<<<<<< HEAD - cancelledOrderedPods: BigInt - cancelledOrderedPods_gt: BigInt - cancelledOrderedPods_gte: BigInt - cancelledOrderedPods_in: [BigInt!] - cancelledOrderedPods_lt: BigInt - cancelledOrderedPods_lte: BigInt - cancelledOrderedPods_not: BigInt - cancelledOrderedPods_not_in: [BigInt!] -======= cancelledOrderBeans: BigInt cancelledOrderBeans_gt: BigInt cancelledOrderBeans_gte: BigInt @@ -6185,7 +5679,6 @@ input PodMarketplace_filter { cancelledOrderBeans_lte: BigInt cancelledOrderBeans_not: BigInt cancelledOrderBeans_not_in: [BigInt!] ->>>>>>> master dailySnapshots_: PodMarketplaceDailySnapshot_filter expiredListedPods: BigInt expiredListedPods_gt: BigInt @@ -6203,8 +5696,6 @@ input PodMarketplace_filter { filledListedPods_lte: BigInt filledListedPods_not: BigInt filledListedPods_not_in: [BigInt!] -<<<<<<< HEAD -======= filledOrderBeans: BigInt filledOrderBeans_gt: BigInt filledOrderBeans_gte: BigInt @@ -6213,7 +5704,6 @@ input PodMarketplace_filter { filledOrderBeans_lte: BigInt filledOrderBeans_not: BigInt filledOrderBeans_not_in: [BigInt!] ->>>>>>> master filledOrderedPods: BigInt filledOrderedPods_gt: BigInt filledOrderedPods_gte: BigInt @@ -6240,30 +5730,6 @@ input PodMarketplace_filter { listedPods_lte: BigInt listedPods_not: BigInt listedPods_not_in: [BigInt!] -<<<<<<< HEAD - listingIndexes: [BigInt!] - listingIndexes_contains: [BigInt!] - listingIndexes_contains_nocase: [BigInt!] - listingIndexes_not: [BigInt!] - listingIndexes_not_contains: [BigInt!] - listingIndexes_not_contains_nocase: [BigInt!] - or: [PodMarketplace_filter] - orderedPods: BigInt - orderedPods_gt: BigInt - orderedPods_gte: BigInt - orderedPods_in: [BigInt!] - orderedPods_lt: BigInt - orderedPods_lte: BigInt - orderedPods_not: BigInt - orderedPods_not_in: [BigInt!] - orders: [String!] - orders_: PodOrder_filter - orders_contains: [String!] - orders_contains_nocase: [String!] - orders_not: [String!] - orders_not_contains: [String!] - orders_not_contains_nocase: [String!] -======= or: [PodMarketplace_filter] orderBeans: BigInt orderBeans_gt: BigInt @@ -6273,7 +5739,6 @@ input PodMarketplace_filter { orderBeans_lte: BigInt orderBeans_not: BigInt orderBeans_not_in: [BigInt!] ->>>>>>> master podVolume: BigInt podVolume_gt: BigInt podVolume_gte: BigInt @@ -6293,17 +5758,6 @@ input PodMarketplace_filter { } enum PodMarketplace_orderBy { -<<<<<<< HEAD - allListings - allOrders - availableListedPods - beanVolume - cancelledListedPods - cancelledOrderedPods - dailySnapshots - expiredListedPods - filledListedPods -======= activeListings activeOrders allListings @@ -6317,19 +5771,12 @@ enum PodMarketplace_orderBy { expiredListedPods filledListedPods filledOrderBeans ->>>>>>> master filledOrderedPods fills hourlySnapshots id listedPods -<<<<<<< HEAD - listingIndexes - orderedPods - orders -======= orderBeans ->>>>>>> master podVolume season } @@ -6365,12 +5812,6 @@ type PodOrder { """Minimum number of Pods required to perform a Fill.""" minFillAmount: BigInt! -<<<<<<< HEAD - "The original number of Pods requested by this PodOrder.\n\nDoes NOT change as Fills occur.\nNot deterministic for PodOrders with pricingType = DYNAMIC.\n\nIf pricingType = FIXED:\n Set to the number of Pods which can be purchased by the Order.\n If FIXED (V1): `amount` field emitted in PodOrderCreated.\n If FIXED (V2): `amount / pricePerPod` fields emitted in PodOrderCreated.\n\nIf pricingType = DYNAMIC:\n Set to `0`. The number of Pods that will be provided is unknown, since\n the price is calculated based on the place in line of supplied Pods.\n" - podAmount: BigInt! - -======= ->>>>>>> master "The current number of Pods that have been purchased by this PodOrder.\n\nIncreases during each subsequent Fill.\nIf pricingType = FIXED: `0 <= podAmountFilled <= podAmount`\nIf pricingType = DYNAMIC: No constraint, since `podAmount` is unknown.\n\nUpon PodOrder cancellation, this value is locked.\n" podAmountFilled: BigInt! @@ -6869,12 +6310,9 @@ type PodOrderFilled implements MarketplaceEvent { """ logIndex: Int! -<<<<<<< HEAD -======= """Where these pods were in line when filled""" placeInLine: BigInt! ->>>>>>> master """ The protocol this transaction belongs to """ protocol: Beanstalk! @@ -7006,8 +6444,6 @@ input PodOrderFilled_filter { logIndex_not: Int logIndex_not_in: [Int!] or: [PodOrderFilled_filter] -<<<<<<< HEAD -======= placeInLine: BigInt placeInLine_gt: BigInt placeInLine_gte: BigInt @@ -7016,7 +6452,6 @@ input PodOrderFilled_filter { placeInLine_lte: BigInt placeInLine_not: BigInt placeInLine_not_in: [BigInt!] ->>>>>>> master protocol: String protocol_: Beanstalk_filter protocol_contains: String @@ -7079,10 +6514,7 @@ enum PodOrderFilled_orderBy { id index logIndex -<<<<<<< HEAD -======= placeInLine ->>>>>>> master protocol protocol__id protocol__lastSeason @@ -7217,10 +6649,6 @@ input PodOrder_filter { minFillAmount_not: BigInt minFillAmount_not_in: [BigInt!] or: [PodOrder_filter] -<<<<<<< HEAD - podAmount: BigInt -======= ->>>>>>> master podAmountFilled: BigInt podAmountFilled_gt: BigInt podAmountFilled_gte: BigInt @@ -7229,16 +6657,6 @@ input PodOrder_filter { podAmountFilled_lte: BigInt podAmountFilled_not: BigInt podAmountFilled_not_in: [BigInt!] -<<<<<<< HEAD - podAmount_gt: BigInt - podAmount_gte: BigInt - podAmount_in: [BigInt!] - podAmount_lt: BigInt - podAmount_lte: BigInt - podAmount_not: BigInt - podAmount_not_in: [BigInt!] -======= ->>>>>>> master podMarketplace: String podMarketplace_: PodMarketplace_filter podMarketplace_contains: String @@ -7312,21 +6730,6 @@ enum PodOrder_orderBy { id maxPlaceInLine minFillAmount -<<<<<<< HEAD - podAmount - podAmountFilled - podMarketplace - podMarketplace__availableListedPods - podMarketplace__beanVolume - podMarketplace__cancelledListedPods - podMarketplace__cancelledOrderedPods - podMarketplace__expiredListedPods - podMarketplace__filledListedPods - podMarketplace__filledOrderedPods - podMarketplace__id - podMarketplace__listedPods - podMarketplace__orderedPods -======= podAmountFilled podMarketplace podMarketplace__availableListedPods @@ -7341,7 +6744,6 @@ enum PodOrder_orderBy { podMarketplace__id podMarketplace__listedPods podMarketplace__orderBeans ->>>>>>> master podMarketplace__podVolume podMarketplace__season pricePerPod @@ -9446,12 +8848,9 @@ type Season { """ Season number in Int form for sorting """ season: Int! -<<<<<<< HEAD -======= """ Block in which the season start was triggered by the sunrise call """ sunriseBlock: BigInt! ->>>>>>> master } input Season_filter { @@ -9568,8 +8967,6 @@ input Season_filter { season_lte: Int season_not: Int season_not_in: [Int!] -<<<<<<< HEAD -======= sunriseBlock: BigInt sunriseBlock_gt: BigInt sunriseBlock_gte: BigInt @@ -9578,7 +8975,6 @@ input Season_filter { sunriseBlock_lte: BigInt sunriseBlock_not: BigInt sunriseBlock_not_in: [BigInt!] ->>>>>>> master } enum Season_orderBy { @@ -9602,10 +8998,7 @@ enum Season_orderBy { price rewardBeans season -<<<<<<< HEAD -======= sunriseBlock ->>>>>>> master } type SeedChange implements SiloEvent { @@ -13399,12 +12792,9 @@ type Subscription { ): [WhitelistToken!]! } -<<<<<<< HEAD -======= "A string representation of microseconds UNIX timestamp (16 digits)\n" scalar Timestamp ->>>>>>> master type TokenYield { """Bean APY for season""" beanAPY: BigDecimal! @@ -14446,12 +13836,9 @@ type _Block_ { """The block number""" number: Int! -<<<<<<< HEAD -======= """The hash of the parent block""" parentHash: Bytes ->>>>>>> master """Integer representation of the timestamp stored in blocks for the chain""" timestamp: Int } diff --git a/projects/ui/src/graph/schema-snapshot1.graphql b/projects/ui/src/graph/schema-snapshot1.graphql index 45adc86b90..f13316c534 100644 --- a/projects/ui/src/graph/schema-snapshot1.graphql +++ b/projects/ui/src/graph/schema-snapshot1.graphql @@ -235,11 +235,6 @@ type RankingObject { input RankingWhere { category: String -<<<<<<< HEAD - id: String - id_in: [String] -======= ->>>>>>> master network: String plugin: String search: String @@ -322,10 +317,7 @@ type SpaceVoting { } input SpaceWhere { -<<<<<<< HEAD -======= controller: String ->>>>>>> master created: Int created_gt: Int created_gte: Int @@ -342,12 +334,6 @@ type Statement { about: String created: Int! delegate: String -<<<<<<< HEAD - id: String! - ipfs: String! - space: String! - statement: String -======= discourse: String id: String! ipfs: String! @@ -355,7 +341,6 @@ type Statement { space: String! statement: String status: String ->>>>>>> master updated: Int! } @@ -426,12 +411,6 @@ type Treasury { type User { about: String avatar: String -<<<<<<< HEAD - created: Int! - id: String! - ipfs: String - name: String -======= cover: String created: Int! farcaster: String @@ -441,7 +420,6 @@ type User { lens: String name: String twitter: String ->>>>>>> master } input UsersWhere { diff --git a/projects/ui/src/state/bean/unripe/updater.ts b/projects/ui/src/state/bean/unripe/updater.ts index dc46fd26d9..813d8cb925 100644 --- a/projects/ui/src/state/bean/unripe/updater.ts +++ b/projects/ui/src/state/bean/unripe/updater.ts @@ -5,16 +5,10 @@ import useChainId from '~/hooks/chain/useChainId'; import useTokenMap from '~/hooks/chain/useTokenMap'; import { tokenResult } from '~/util'; import { AddressMap, ONE_BN } from '~/constants'; -<<<<<<< HEAD -import { UNRIPE_TOKENS } from '~/constants/tokens'; -import { UnripeToken } from '~/state/bean/unripe'; -import useUnripeUnderlyingMap from '~/hooks/beanstalk/useUnripeUnderlying'; -======= import { UNRIPE_BEAN_WETH, UNRIPE_TOKENS } from '~/constants/tokens'; import { UnripeToken } from '~/state/bean/unripe'; import useUnripeUnderlyingMap from '~/hooks/beanstalk/useUnripeUnderlying'; import BigNumber from 'bignumber.js'; ->>>>>>> master import { resetUnripe, updateUnripe } from './actions'; export const useUnripe = () => { diff --git a/projects/ui/src/util/Actions.ts b/projects/ui/src/util/Actions.ts index 6a4a19c8a0..5ba293b6d9 100644 --- a/projects/ui/src/util/Actions.ts +++ b/projects/ui/src/util/Actions.ts @@ -302,8 +302,6 @@ export const parseActionMessage = (a: Action) => { a.tokenOut.symbol !== CRV3[1].symbol && !a.tokenOut.isUnripe ) { -<<<<<<< HEAD -======= const bySource = a.amountsBySource; const amtOutDisplay = displayTokenAmount(a.amountOut, a.tokenOut); @@ -317,7 +315,6 @@ export const parseActionMessage = (a: Action) => { return `Add ${amountsBySourceDisplay.combined} for ${amtOutDisplay}.`; } ->>>>>>> master return `Add ${displayTokenAmount( a.amountIn, a.tokenIn