{
className={"no-margin"}
style={{ marginBottom: "0.5em" }}
>
- Welcome to Fluidity's Airdrop Event!
+ Airdrop V2: Arbitrum's Space Expedition.
Fluidify your assets, transact them, and boost your rewards
@@ -973,7 +968,7 @@ const Airdrop = () => {
seeBottlesDetails={() => setCurrentModal("bottles-details")}
seeLeaderboardMobile={() => setCurrentModal("leaderboard")}
epochMax={epochDaysTotal}
- epochDays={epochDays}
+ epochDays={epochDaysElapsed}
activatedReferrals={numActiveReferrerReferrals}
totalBottles={bottlesCount}
network={network}
@@ -1169,16 +1164,16 @@ const MultiplierTasks = () => {
const [tasks, setTasks] = useState<"1x" | "6x">("6x");
const providerLinks: { provider: Provider; link: string }[] = [
- { provider: "Uniswap", link: "https://app.uniswap.org/#/swap" },
+ { provider: "Jumper", link: "https://app.uniswap.org/#/swap" },
{
- provider: "Sushiswap",
- link: "https://www.sushi.com/swap?fromChainId=42161&fromCurrency=0x4CFA50B7Ce747e2D61724fcAc57f24B748FF2b2A&toChainId=42161&toCurrency=NATIVE&amount=",
+ provider: "Uniswap",
+ link: "https://app.uniswap.org/#/swap",
},
- { provider: "Camelot", link: "https://app.camelot.exchange/" },
- { provider: "Saddle", link: "https://saddle.exchange/#/" },
- { provider: "Chronos", link: "https://app.chronos.exchange/" },
+ { provider: "Trader Joe", link: "https://app.camelot.exchange/" },
+ { provider: "Camelot", link: "https://saddle.exchange/#/" },
+ { provider: "Sushiswap", link: "https://app.chronos.exchange/" },
{
- provider: "Kyber",
+ provider: "Ramses",
link: "https://kyberswap.com/swap/arbitrum/fusdc-to-usdc",
},
];
@@ -1190,7 +1185,7 @@ const MultiplierTasks = () => {
Multiplier Tasks
- Perform displayed tasks to earn the respective multipliers.
+ Transact fUSDC on listed platforms to earn more!
{
- const sumLiquidityMultiplier = stakes.reduce(
- (sum, { fluidAmount, baseAmount, durationDays, depositDate }) => {
- const fluidDecimals = 6;
- const fluidUsd = getUsdFromTokenAmount(
- fluidAmount,
- fluidDecimals,
- usdcPrice
- );
-
- const wethDecimals = 18;
- const usdcDecimals = 6;
-
- // If converting base amount by weth decimals (18) is smaller than $0.01,
- // then tentatively assume Token amount is USDC
- // A false hit would be a USDC deposit >= $100,000
- const baseUsd =
- getUsdFromTokenAmount(baseAmount, wethDecimals, wethPrice) < 0.01
- ? getUsdFromTokenAmount(baseAmount, usdcDecimals, usdcPrice)
- : getUsdFromTokenAmount(baseAmount, wethDecimals, wethPrice);
-
- const stakedDays = dayDifference(new Date(), new Date(depositDate));
-
- const multiplier = stakingLiquidityMultiplierEq(stakedDays, durationDays);
-
- return sum + (fluidUsd + baseUsd) * multiplier;
- },
- 0
- );
-
- // if there are no stakes, this renders an empty stake on the dashboard which is A PART OF THE DESIGN SPEC
- if (stakes.length === 0)
- stakes = [
- {
- fluidAmount: new BN(0),
- baseAmount: new BN(0),
- durationDays: 0,
- depositDate: new Date(),
- },
- ];
-
return (
)}
-
- MY TOTAL LIQUIDITY MULTIPLIER}
- >
-
- {toSignificantDecimals(sumLiquidityMultiplier, 1)}x
-
-
-
}
layout="after"
@@ -1357,112 +1297,16 @@ const MyMultiplier = ({
handleClick={seeMyStakingStats}
id="mx-see-my-staking-stats"
>
- MY STAKING STATS
+ MY EPOCH 1 STAKING STATS
- {!isMobile && (
-
- {stakes
- .map((stake) => {
- const { fluidAmount, baseAmount, durationDays, depositDate } =
- stake;
-
- const stakedDays = dayDifference(
- new Date(),
- new Date(depositDate)
- );
- const multiplier = stakingLiquidityMultiplierEq(
- stakedDays,
- durationDays
- );
-
- const fluidDecimals = 6;
- const fluidUsd = getUsdFromTokenAmount(
- fluidAmount,
- fluidDecimals,
- usdcPrice
- );
-
- const wethDecimals = 18;
- const usdcDecimals = 6;
-
- // If converting base amount by weth decimals (18) is smaller than $0.01,
- // then tentatively assume Token amount is USDC
- // A false hit would be a USDC deposit >= $100,000
- const baseUsd =
- getUsdFromTokenAmount(baseAmount, wethDecimals, wethPrice) <
- 0.01
- ? getUsdFromTokenAmount(baseAmount, usdcDecimals, usdcPrice)
- : getUsdFromTokenAmount(baseAmount, wethDecimals, wethPrice);
-
- return {
- stake,
- stakedDays,
- multiplier,
- fluidUsd,
- baseUsd,
- };
- })
- .sort((a, b) => {
- const stakeAVal = (a.fluidUsd + a.baseUsd) * a.multiplier;
- const stakeBVal = (b.fluidUsd + b.baseUsd) * b.multiplier;
-
- // Sort Descending
- return stakeBVal > stakeAVal
- ? 1
- : stakeBVal === stakeAVal
- ? 0
- : -1;
- })
- .slice(0, 3)
- .map(({ stake, multiplier, fluidUsd, baseUsd }) => {
- const { durationDays } = stake;
-
- return (
- <>
-
-
- {numberToMonetaryString(fluidUsd + baseUsd)} FOR{" "}
- {Math.floor(durationDays)} DAYS
-
-
-
-
-
- {toSignificantDecimals(multiplier, 1)}X
-
-
-
- );
- })}
+
+
+
+ Provide $fUSDC Liquidity to earn $ARB and Multipliers!
+
- )}
-
: undefined}
- layout={"after"}
- buttontype="text"
- size="medium"
- version="primary"
- handleClick={seeStakeNow}
- id="mx-stake-now-button"
- disabled={true}
- >
- STAKE NOW
-
+
+
);
};
@@ -1472,7 +1316,7 @@ const airdropRankRow = (
isMobile = false
): IRow => {
const { address } = useContext(FluidityFacadeContext);
- const { user, rank, referralCount, liquidityMultiplier, bottles } = data;
+ const { user, rank, referralCount, fusdcEarned, arbEarned, bottles } = data;
return {
className: `airdrop-row ${isMobile ? "airdrop-mobile" : ""} ${
@@ -1538,7 +1382,24 @@ const airdropRankRow = (
);
- case "STAKING MULTIPLIER":
+ case "$fUSDC EARNED":
+ return (
+
+
+ {fusdcEarned}
+
+ |
+ );
+ case "$ARB EARNED":
return (
- {toSignificantDecimals(liquidityMultiplier, 1)}x
+ {arbEarned}
|
);
@@ -1609,6 +1470,8 @@ const Leaderboard = ({
liquidityMultiplier: 0,
bottles: 0,
highestRewardTier: 0,
+ fusdcEarned: 0,
+ arbEarned: 0,
};
data.push(userEntry);
@@ -1671,7 +1534,8 @@ const Leaderboard = ({
{ name: "RANK" },
{ name: "USER" },
{ name: "BOTTLES" },
- { name: "STAKING MULTIPLIER" },
+ { name: "$fUSDC EARNED" },
+ { name: "$ARB EARNED" },
{ name: "REFERRALS" },
]}
pagination={{
diff --git a/web/app.fluidity.money/app/routes/$network/dashboard/home.tsx b/web/app.fluidity.money/app/routes/$network/dashboard/home.tsx
index f4add9655..0539d1cba 100644
--- a/web/app.fluidity.money/app/routes/$network/dashboard/home.tsx
+++ b/web/app.fluidity.money/app/routes/$network/dashboard/home.tsx
@@ -21,6 +21,7 @@ import {
TabButton,
toDecimalPlaces,
ProviderIcon,
+ LootBottle,
TokenIcon,
} from "@fluidity-money/surfing";
import { useState, useContext, useEffect, useMemo } from "react";
@@ -262,6 +263,7 @@ export default function Home() {
{ name: "VALUE" },
{ name: "FLUID REWARDS", show: width >= 500 },
{ name: "$UTILITY REWARDS", show: width >= 500 },
+ { name: "BOTTLES EARNED", show: width >= 500 },
{ name: "ACCOUNT", show: width >= 375 },
{ name: "TIME", show: width >= 850, alignRight: true },
];
@@ -375,6 +377,8 @@ export default function Home() {
logo,
utilityTokens,
application,
+ rewardTier,
+ lootboxCount,
} = data;
const appProviderName = getProviderDisplayName(application);
@@ -454,12 +458,33 @@ export default function Home() {
)}
);
+ case "BOTTLES EARNED":
+ return (
+
+ {lootboxCount ? (
+
+
+
+ ) : (
+ -
+ )}{" "}
+ |
+ );
case "ACCOUNT":
return (
{sender === MintAddress
diff --git a/web/app.fluidity.money/app/routes/$network/dashboard/rewards/index.tsx b/web/app.fluidity.money/app/routes/$network/dashboard/rewards/index.tsx
index 64f00566d..a9d1ab7a5 100644
--- a/web/app.fluidity.money/app/routes/$network/dashboard/rewards/index.tsx
+++ b/web/app.fluidity.money/app/routes/$network/dashboard/rewards/index.tsx
@@ -38,6 +38,7 @@ import {
WalletIcon,
TabButton,
toDecimalPlaces,
+ LootBottle,
} from "@fluidity-money/surfing";
import { useContext, useEffect, useState, useMemo } from "react";
import { ToolTipContent, useToolTip, UtilityToken } from "~/components";
@@ -257,6 +258,7 @@ export default function Rewards() {
{ name: "VALUE" },
{ name: "FLUID REWARDS", show: width >= 500 },
{ name: "$UTILITY REWARDS", show: width >= 500 },
+ { name: "BOTTLES EARNED", show: width >= 500 },
{ name: "WINNER", show: width >= 850 },
{ name: "REWARDED TIME", show: width >= 850, alignRight: true },
];
@@ -432,6 +434,8 @@ export default function Rewards() {
currency,
utilityTokens,
application,
+ lootboxCount,
+ rewardTier,
} = data;
const toolTip = useToolTip();
@@ -537,6 +541,25 @@ export default function Rewards() {
)}
|
);
+ case "BOTTLES EARNED":
+ return (
+
+ {lootboxCount ? (
+
+
+
+ ) : (
+ -
+ )}{" "}
+ |
+ );
case "WINNER":
return (
@@ -628,23 +651,23 @@ export default function Rewards() {
Swap To Earn
{!isMobile && Swap Fluid Assets to generate yield.}
diff --git a/web/app.fluidity.money/app/routes/$network/query/dashboard/airdrop.tsx b/web/app.fluidity.money/app/routes/$network/query/dashboard/airdrop.tsx
index c46ae93df..5a0685b79 100644
--- a/web/app.fluidity.money/app/routes/$network/query/dashboard/airdrop.tsx
+++ b/web/app.fluidity.money/app/routes/$network/query/dashboard/airdrop.tsx
@@ -4,7 +4,7 @@ import { JsonRpcProvider } from "@ethersproject/providers";
import { LoaderFunction, json } from "@remix-run/node";
import { captureException } from "@sentry/react";
import { useAirdropStatsByAddress } from "~/queries/useAirdropStats";
-import { useStakingDataByAddress } from "~/queries/useStakingData";
+import { useLootboxConfig } from "~/queries";
import { getWethUsdPrice } from "~/util/chainUtils/ethereum/transaction";
import EACAggregatorProxyAbi from "~/util/chainUtils/ethereum/EACAggregatorProxy.json";
import config from "~/webapp.config.server";
@@ -29,17 +29,19 @@ export type AirdropLoaderData = {
bottleTiers: BottleTiers;
bottlesCount: number;
liquidityMultiplier: number;
- stakes: Array;
wethPrice: number;
usdcPrice: number;
- loaded: boolean;
referralCode?: string;
+ programBegin: Date;
+ programEnd: Date;
+ epochDaysTotal: number;
+ epochDaysElapsed: number;
+ epochIdentifier: string;
+ ethereumApplication: string;
+ epochFound: boolean;
+ loaded: boolean;
};
-const EPOCH_DAYS_TOTAL = 31;
-// temp: april 19th, 2023
-const EPOCH_START_DATE = new Date(2023, 3, 20);
-
const MAINNET_ID = 0;
const dayDifference = (date1: Date, date2: Date) =>
@@ -50,13 +52,57 @@ export const loader: LoaderFunction = async ({ params, request }) => {
const url = new URL(request.url);
const address_ = url.searchParams.get("address");
+ const epochIdentifier = url.searchParams.get("epoch") ?? "";
const address = address_?.toLowerCase();
- if (!address || !network) throw new Error("Invalid Request");
+ if (!address || !network || !epochIdentifier)
+ throw new Error("Invalid Request");
+
+ const { data, errors } = await useLootboxConfig({
+ identifier: epochIdentifier,
+ shouldFind: false,
+ });
+
+ if (errors) {
+ captureException(errors, {
+ tags: {
+ section: "airdrop",
+ },
+ });
+
+ return new Error("Server could not fulfill request");
+ }
+
+ if (!data) {
+ // return defaults
+ return null;
+ }
+
+ const { lootboxConfig: configs } = data;
+
+ // if we didn't find anything, then we need to return the defaults
+
+ if (configs.length != 1) {
+ return null;
+ }
- const daysElapsed =
- dayDifference(new Date(), EPOCH_START_DATE) % EPOCH_DAYS_TOTAL;
+ const {
+ programBegin: programBegin_,
+ programEnd: programEnd_,
+ ethereumApplication,
+ found: epochFound,
+ } = configs[0];
+
+ const programBegin = new Date(programBegin_);
+ const programEnd = new Date(programEnd_);
+
+ const epochDaysTotal = Math.round(
+ (programEnd.valueOf() - programBegin.valueOf()) / (1000 * 60 * 60 * 24)
+ );
+
+ const epochDaysElapsed =
+ dayDifference(new Date(), programBegin) % epochDaysTotal;
const infuraRpc = config.drivers[network][MAINNET_ID].rpc.http;
const provider = new JsonRpcProvider(infuraRpc);
@@ -65,18 +111,17 @@ export const loader: LoaderFunction = async ({ params, request }) => {
config.contract.eac_aggregator_proxy[network as Chain];
try {
- const [
- { data: airdropStatsData, errors: airdropStatsErrors },
- { data: stakingData, errors: stakingErrors },
- wethPrice,
- ] = await Promise.all([
- useAirdropStatsByAddress(address),
- useStakingDataByAddress(address, daysElapsed),
- getWethUsdPrice(provider, eacAggregatorProxyAddr, EACAggregatorProxyAbi),
- ]);
+ const [{ data: airdropStatsData, errors: airdropStatsErrors }, wethPrice] =
+ await Promise.all([
+ useAirdropStatsByAddress(address, epochIdentifier),
+ getWethUsdPrice(
+ provider,
+ eacAggregatorProxyAddr,
+ EACAggregatorProxyAbi
+ ),
+ ]);
if (airdropStatsErrors || !airdropStatsData) throw airdropStatsErrors;
- if (stakingErrors || !stakingData) throw stakingErrors;
const {
lootboxCounts: [bottleTiers_],
@@ -86,15 +131,6 @@ export const loader: LoaderFunction = async ({ params, request }) => {
},
} = airdropStatsData;
- const stakes = stakingData.stakes.map(
- ({ multiplier, durationSecs, amount, ...stake }) => ({
- ...stake,
- amountUsd: amount / 1e6,
- durationDays: durationSecs / 60 / 60 / 24,
- multiplier: multiplier[0].result,
- })
- );
-
const bottleTiers = bottleTiers_ || {
[Rarity.Common]: 0,
[Rarity.Uncommon]: 0,
@@ -111,10 +147,16 @@ export const loader: LoaderFunction = async ({ params, request }) => {
(sum: number, quantity: number) => sum + quantity,
0
),
- stakes,
wethPrice,
usdcPrice: 1,
loaded: true,
+ programBegin,
+ programEnd,
+ epochDaysTotal,
+ epochDaysElapsed,
+ epochIdentifier,
+ epochFound,
+ ethereumApplication,
} satisfies AirdropLoaderData);
} catch (err) {
captureException(new Error(`Could not fetch airdrop data: ${err}`), {
diff --git a/web/app.fluidity.money/app/routes/$network/query/dashboard/airdropLeaderboard.tsx b/web/app.fluidity.money/app/routes/$network/query/dashboard/airdropLeaderboard.tsx
index f7836405e..044c8fff0 100644
--- a/web/app.fluidity.money/app/routes/$network/query/dashboard/airdropLeaderboard.tsx
+++ b/web/app.fluidity.money/app/routes/$network/query/dashboard/airdropLeaderboard.tsx
@@ -22,6 +22,11 @@ export const loader: LoaderFunction = async ({ params, request }) => {
const { network } = params;
const url = new URL(request.url);
+
+ const epoch = url.searchParams.get("epoch");
+
+ if (!epoch) throw new Error("Invalid Request");
+
const address = url.searchParams.get("address") ?? "";
const period = url.searchParams.get("period") ?? "";
const provider_ = url.searchParams.get("provider") ?? "";
@@ -38,15 +43,17 @@ export const loader: LoaderFunction = async ({ params, request }) => {
switch (true) {
case useAll: {
return [
- useAirdropLeaderboardAllTime,
- useAirdropLeaderboardByUserAllTime,
+ () => useAirdropLeaderboardAllTime(epoch),
+ (address: string) =>
+ useAirdropLeaderboardByUserAllTime(epoch, address),
];
}
case use24Hours && !!provider: {
return [
- () => useAirdropLeaderboardByApplication24Hours(provider),
+ () => useAirdropLeaderboardByApplication24Hours(epoch, provider),
(address: string) =>
useAirdropLeaderboardByUserByApplication24Hours(
+ epoch,
address,
provider
),
@@ -55,8 +62,9 @@ export const loader: LoaderFunction = async ({ params, request }) => {
case use24Hours && !provider:
default: {
return [
- useAirdropLeaderboard24Hours,
- useAirdropLeaderboardByUser24Hours,
+ () => useAirdropLeaderboard24Hours(epoch),
+ (address: string) =>
+ useAirdropLeaderboardByUser24Hours(epoch, address),
];
}
}
@@ -105,6 +113,8 @@ export const loader: LoaderFunction = async ({ params, request }) => {
referralCount: 0,
bottles: 0,
highestRewardTier: 0,
+ fusdcEarned: 0,
+ arbEarned: 0,
} satisfies AirdropLeaderboardEntry,
]
).concat(leaderboard);
diff --git a/web/app.fluidity.money/app/routes/$network/query/dashboard/prizePool.tsx b/web/app.fluidity.money/app/routes/$network/query/dashboard/prizePool.tsx
index 182786e8d..30fcbda26 100644
--- a/web/app.fluidity.money/app/routes/$network/query/dashboard/prizePool.tsx
+++ b/web/app.fluidity.money/app/routes/$network/query/dashboard/prizePool.tsx
@@ -25,6 +25,7 @@ export async function loader() {
},
].map(({ network, abi, getPrizePool }) => {
const infuraRpc = config.drivers[network][mainnetId].rpc.http;
+ console.log("infura rpc", infuraRpc);
const provider = new JsonRpcProvider(infuraRpc);
const rewardPoolAddr = config.contract.prize_pool[network as Chain];
diff --git a/web/app.fluidity.money/app/routes/$network/query/referralBottles.tsx b/web/app.fluidity.money/app/routes/$network/query/referralBottles.tsx
index 07a50c3b0..d6c89b4c3 100644
--- a/web/app.fluidity.money/app/routes/$network/query/referralBottles.tsx
+++ b/web/app.fluidity.money/app/routes/$network/query/referralBottles.tsx
@@ -15,15 +15,14 @@ export const loader: LoaderFunction = async ({ request }) => {
const url = new URL(request.url);
const address_ = url.searchParams.get("address") ?? "";
+ const epoch = url.searchParams.get("epoch");
const address = address_.toLocaleLowerCase();
- if (!address) {
- throw new Error("Invalid Request");
- }
+ if (!address || !epoch) throw new Error("Invalid Request");
const { data: referralBottleCountData, errors: referralBottleCountErr } =
- await useReferralLootboxesByAddress(address);
+ await useReferralLootboxesByAddress(epoch, address);
if (referralBottleCountErr || !referralBottleCountData) {
throw new Error("Could not fetch Referral Bottles");
diff --git a/web/app.fluidity.money/app/routes/$network/query/userTransactions.tsx b/web/app.fluidity.money/app/routes/$network/query/userTransactions.tsx
index 4085cecbb..2000c80a1 100644
--- a/web/app.fluidity.money/app/routes/$network/query/userTransactions.tsx
+++ b/web/app.fluidity.money/app/routes/$network/query/userTransactions.tsx
@@ -38,6 +38,8 @@ type UserTransaction = {
value: number;
currency: string;
application: string;
+ rewardTier: number;
+ lootboxCount: number;
};
export type TransactionsLoaderData = {
@@ -117,6 +119,8 @@ export const loader: LoaderFunction = async ({ params, request }) => {
utility_amount,
type,
swap_in,
+ rewardTier,
+ lootboxCount,
}) => {
const utilityName = utility_name?.match(ALPHA_NUMERIC)?.[0];
@@ -142,14 +146,17 @@ export const loader: LoaderFunction = async ({ params, request }) => {
// convert to JS timestamp
timestamp: new Date(timestamp + "Z").getTime(),
value,
- currency: 'f' + currency,
+ currency: "f" + currency,
application,
swapType,
provider: application ?? "Fluidity",
logo: tokenLogoMap[currency] || defaultLogo,
- utilityTokens: utilityName && utility_amount > 0
- ? { [utilityName]: utility_amount }
- : undefined,
+ utilityTokens:
+ utilityName && utility_amount > 0
+ ? { [utilityName]: utility_amount }
+ : undefined,
+ rewardTier,
+ lootboxCount,
};
}
);
@@ -351,6 +358,8 @@ export const loader: LoaderFunction = async ({ params, request }) => {
amount: value,
currency: { symbol: currency },
application,
+ lootboxCount,
+ rewardTier,
} = transaction;
return {
@@ -367,6 +376,8 @@ export const loader: LoaderFunction = async ({ params, request }) => {
: value,
currency,
application,
+ lootboxCount,
+ rewardTier,
};
}
);
@@ -408,6 +419,8 @@ export const loader: LoaderFunction = async ({ params, request }) => {
swapType,
utilityTokens: winner?.utility,
application: tx.application,
+ rewardTier: tx.rewardTier,
+ lootboxCount: tx.lootboxCount,
};
});
diff --git a/web/app.fluidity.money/app/routes/$network/query/winningUserTransactions.tsx b/web/app.fluidity.money/app/routes/$network/query/winningUserTransactions.tsx
index 71520113b..7380b3d3e 100644
--- a/web/app.fluidity.money/app/routes/$network/query/winningUserTransactions.tsx
+++ b/web/app.fluidity.money/app/routes/$network/query/winningUserTransactions.tsx
@@ -26,6 +26,8 @@ type UserTransaction = {
value: number;
currency: string;
application: string;
+ lootboxCount: number;
+ rewardTier: number;
};
export type TransactionsLoaderData = {
@@ -206,6 +208,8 @@ export const loader: LoaderFunction = async ({ params, request }) => {
amount: value,
currency: { symbol: currency },
application,
+ lootboxCount,
+ rewardTier,
} = transaction;
return {
@@ -222,6 +226,8 @@ export const loader: LoaderFunction = async ({ params, request }) => {
: value,
currency,
application,
+ lootboxCount,
+ rewardTier,
};
}
);
@@ -286,6 +292,8 @@ export const loader: LoaderFunction = async ({ params, request }) => {
swapType,
utilityTokens: winner.utility,
application: tx.application,
+ lootboxCount: tx.lootboxCount,
+ rewardTier: tx.rewardTier,
};
});
diff --git a/web/app.fluidity.money/app/routes/arbitrum/index.tsx b/web/app.fluidity.money/app/routes/arbitrum/index.tsx
new file mode 100644
index 000000000..36f70df78
--- /dev/null
+++ b/web/app.fluidity.money/app/routes/arbitrum/index.tsx
@@ -0,0 +1,5 @@
+import { LoaderFunction, redirect } from "@remix-run/node";
+
+export const loader: LoaderFunction = async () => {
+ return redirect(`/arbitrum/dashboard/home`);
+};
diff --git a/web/app.fluidity.money/app/routes/arbitrum/query/dashboard/home.tsx b/web/app.fluidity.money/app/routes/arbitrum/query/dashboard/home.tsx
index f7e2b4375..6d7d10076 100644
--- a/web/app.fluidity.money/app/routes/arbitrum/query/dashboard/home.tsx
+++ b/web/app.fluidity.money/app/routes/arbitrum/query/dashboard/home.tsx
@@ -49,10 +49,12 @@ export const loader: LoaderFunction = async ({ request }) => {
}
if (rewardsErr || !rewardsData) {
- throw new Error("Could not fetch rewards data");
+ console.log("Could not fetch rewards data", rewardsErr);
+ throw new Error(`Could not fetch rewards data: ${rewardsErr}`);
}
if (graphErr || !graphData) {
+ console.log("Could not fetch graph data", graphErr);
throw new Error("Could not fetch graph data");
}
diff --git a/web/app.fluidity.money/app/routes/polygon_zk/index.tsx b/web/app.fluidity.money/app/routes/polygon_zk/index.tsx
new file mode 100644
index 000000000..b83703f40
--- /dev/null
+++ b/web/app.fluidity.money/app/routes/polygon_zk/index.tsx
@@ -0,0 +1,5 @@
+import { LoaderFunction, redirect } from "@remix-run/node";
+
+export const loader: LoaderFunction = async () => {
+ return redirect(`/polygon_zk/dashboard/home`);
+};
diff --git a/web/app.fluidity.money/app/routes/solana/index.tsx b/web/app.fluidity.money/app/routes/solana/index.tsx
new file mode 100644
index 000000000..8d02d7a2a
--- /dev/null
+++ b/web/app.fluidity.money/app/routes/solana/index.tsx
@@ -0,0 +1,5 @@
+import { LoaderFunction, redirect } from "@remix-run/node";
+
+export const loader: LoaderFunction = async () => {
+ return redirect(`/solana/dashboard/home`);
+};
diff --git a/web/app.fluidity.money/app/styles/dashboard.css b/web/app.fluidity.money/app/styles/dashboard.css
index f5c50dbf0..7d3166ba0 100644
--- a/web/app.fluidity.money/app/styles/dashboard.css
+++ b/web/app.fluidity.money/app/styles/dashboard.css
@@ -943,4 +943,9 @@ ul.sidebar-nav li div.active {
stroke: currentColor;
}
+.fluidify-button-dashboard {
+ background-color: white;
+ color: black;
+}
+
/*# sourceMappingURL=dashboard.css.map */
diff --git a/web/app.fluidity.money/app/styles/dashboard.scss b/web/app.fluidity.money/app/styles/dashboard.scss
index f143136b5..423e58c21 100644
--- a/web/app.fluidity.money/app/styles/dashboard.scss
+++ b/web/app.fluidity.money/app/styles/dashboard.scss
@@ -1007,3 +1007,8 @@ ul.sidebar-nav {
}
}
}
+
+.fluidify-button-dashboard {
+ background-color: white;
+ color: black;
+}
diff --git a/web/app.fluidity.money/app/styles/dashboard/airdrop.css b/web/app.fluidity.money/app/styles/dashboard/airdrop.css
index a75578573..4e0b8e444 100644
--- a/web/app.fluidity.money/app/styles/dashboard/airdrop.css
+++ b/web/app.fluidity.money/app/styles/dashboard/airdrop.css
@@ -391,9 +391,6 @@
.airdrop-my-multiplier {
position: relative;
- display: grid;
- grid-template-columns: 1fr 1fr;
- gap: 2em;
}
.airdrop-my-multiplier svg,
.airdrop-my-multiplier path {
@@ -426,9 +423,6 @@
}
.airdrop-my-multiplier #mx-see-my-staking-stats {
width: 100%;
- grid-area: 2/1;
- box-sizing: border-box;
- align-self: end;
}
.airdrop-my-multiplier #mx-my-stakes {
display: grid;
@@ -982,4 +976,21 @@
aspect-ratio: 1/1;
}
+#tutorial,
+#staking-stats,
+#bottles-details,
+#testnet-rewards {
+ position: fixed;
+}
+
+.airdrop-arb-multipliers-container {
+ display: flex;
+ padding-top: 20px;
+}
+
+.airdrop-arb-multipliers-container > * {
+ margin-left: auto;
+ margin-right: auto;
+}
+
/*# sourceMappingURL=airdrop.css.map */
diff --git a/web/app.fluidity.money/app/styles/dashboard/airdrop.scss b/web/app.fluidity.money/app/styles/dashboard/airdrop.scss
index bb43ffe2e..f76b7cfbf 100644
--- a/web/app.fluidity.money/app/styles/dashboard/airdrop.scss
+++ b/web/app.fluidity.money/app/styles/dashboard/airdrop.scss
@@ -400,9 +400,6 @@ $holo: linear-gradient(
.airdrop-my-multiplier {
position: relative;
- display: grid;
- grid-template-columns: 1fr 1fr;
- gap: 2em;
svg,
path {
@@ -442,9 +439,6 @@ $holo: linear-gradient(
#mx-see-my-staking-stats {
width: 100%;
- grid-area: 2 / 1;
- box-sizing: border-box;
- align-self: end;
}
#mx-my-stakes {
@@ -1066,3 +1060,20 @@ $holo: linear-gradient(
}
}
}
+
+#tutorial,
+#staking-stats,
+#bottles-details,
+#testnet-rewards {
+ position: fixed;
+}
+
+.airdrop-arb-multipliers-container {
+ display: flex;
+ padding-top: 20px;
+}
+
+.airdrop-arb-multipliers-container > * {
+ margin-left: auto;
+ margin-right: auto;
+}
diff --git a/web/app.fluidity.money/app/types/Transaction.ts b/web/app.fluidity.money/app/types/Transaction.ts
index 98583c11c..47597bc68 100644
--- a/web/app.fluidity.money/app/types/Transaction.ts
+++ b/web/app.fluidity.money/app/types/Transaction.ts
@@ -14,6 +14,8 @@ type Transaction = {
swapType?: "in" | "out";
utilityTokens?: { [tokens: string]: number };
application: string;
+ rewardTier: number;
+ lootboxCount: number;
};
export default Transaction;
diff --git a/web/app.fluidity.money/app/util/api/graphql.ts b/web/app.fluidity.money/app/util/api/graphql.ts
index 59a11e4ea..d112f9b87 100644
--- a/web/app.fluidity.money/app/util/api/graphql.ts
+++ b/web/app.fluidity.money/app/util/api/graphql.ts
@@ -11,6 +11,8 @@ type GqlEndpoint = {
type GqlBackend = "hasura";
+const HasuraUrl = "https://fluidity.hasura.app/v1/graphql";
+
export const networkGqlBackend = (network: string): GqlBackend | null => {
switch (network) {
case "solana":
@@ -26,7 +28,7 @@ export const fetchGqlEndpoint = (network: string): GqlEndpoint | null => {
switch (networkGqlBackend(network)) {
case "hasura":
return {
- url: "https://fluidity.hasura.app/v1/graphql",
+ url: HasuraUrl,
headers: {
"x-hasura-admin-secret": process.env.FLU_HASURA_SECRET ?? "",
},
@@ -37,7 +39,7 @@ export const fetchGqlEndpoint = (network: string): GqlEndpoint | null => {
};
export const fetchInternalEndpoint = (): GqlEndpoint => ({
- url: "https://fluidity.hasura.app/v1/graphql",
+ url: HasuraUrl,
headers:
typeof process.env.FLU_HASURA_SECRET === "string"
? {
diff --git a/web/app.fluidity.money/app/util/chainUtils/ethereum/transaction.ts b/web/app.fluidity.money/app/util/chainUtils/ethereum/transaction.ts
index 545721d1d..428a89178 100644
--- a/web/app.fluidity.money/app/util/chainUtils/ethereum/transaction.ts
+++ b/web/app.fluidity.money/app/util/chainUtils/ethereum/transaction.ts
@@ -628,10 +628,10 @@ export const handleContractErrors = async (
if (metaMaskError?.value.code === -32603) {
throw new Error(
- `Failed to make swap. Please reset your Metamask account (settings -> advanced -> reset account)`
+ `RPC error. Please reset your Metamask account (settings -> advanced -> reset account)`
);
} else if (metaMaskError?.value.code === -32000) {
- throw new Error(`Failed to make swap. Gas limit too low.`);
+ throw new Error(`RPC error. Gas limit too low.`);
}
// otherwise, check for a 'non intrinsic' gas error (gas exhausted)
@@ -640,12 +640,12 @@ export const handleContractErrors = async (
// found revert opcode, assume it's a gas error since we can't call this with an insufficient balance within the application
if (receipt?.status === 0) {
throw new Error(
- `Failed to make swap. Gas limit of ${receipt?.gasUsed?.toNumber()} exhausted!`
+ `RPC error. Gas limit of ${receipt?.gasUsed?.toNumber()} exhausted!`
);
}
} catch (e) {
// otherwise, use a generic error
- throw new Error(`Failed to make swap. ${msg}`);
+ throw new Error(`RPC error. ${msg}`);
}
};
diff --git a/web/app.fluidity.money/app/util/provider.ts b/web/app.fluidity.money/app/util/provider.ts
index 6f01ff400..cc92159f8 100644
--- a/web/app.fluidity.money/app/util/provider.ts
+++ b/web/app.fluidity.money/app/util/provider.ts
@@ -69,8 +69,12 @@ export const getProviderDisplayName = (name?: string): Provider => {
return "Lifinity";
case "mercurial":
return "Mercurial";
+ case "ramses":
+ return "Ramses";
case "trader_joe":
return "Trader Joe";
+ case "jumper":
+ return "Jumper";
case "meteora":
return "Meteora";
case "fluidity":
diff --git a/web/app.fluidity.money/public/images/epoch2AirdropBanner.png b/web/app.fluidity.money/public/images/epoch2AirdropBanner.png
new file mode 100644
index 000000000..eb7a4eb31
--- /dev/null
+++ b/web/app.fluidity.money/public/images/epoch2AirdropBanner.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72209eaa5f613befc0b8fcc53d66b42693d48fa565404b028dcab5034a9fe1fc
+size 170872
diff --git a/web/app.fluidity.money/public/images/hero/common.png b/web/app.fluidity.money/public/images/hero/common.png
index afb7e2da1..9651b6b77 100644
--- a/web/app.fluidity.money/public/images/hero/common.png
+++ b/web/app.fluidity.money/public/images/hero/common.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cf873fc5dbc6f6493a8729e240d33026022a45def8c53c5d847873b1bb01bd5c
-size 267816
+oid sha256:fbfdf8c12d6b02bad36eca229eadffb462b819d39b0a8385de3b864a85f83814
+size 167937
diff --git a/web/app.fluidity.money/public/images/hero/legendary.png b/web/app.fluidity.money/public/images/hero/legendary.png
index 06fb62a20..a38f1a1f6 100644
--- a/web/app.fluidity.money/public/images/hero/legendary.png
+++ b/web/app.fluidity.money/public/images/hero/legendary.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:252ea1e42636e41520a4e003056825f11e77ecf39f0766f93b6d2b6005eedfd3
-size 882592
+oid sha256:cfb9fdce40d47bd56d85f36f53f890113c97d48b52f35cf3a1772077c95132f4
+size 216190
diff --git a/web/app.fluidity.money/public/images/hero/rare.png b/web/app.fluidity.money/public/images/hero/rare.png
index 282a12a3c..8b80c9ea0 100644
--- a/web/app.fluidity.money/public/images/hero/rare.png
+++ b/web/app.fluidity.money/public/images/hero/rare.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:246725e96442ac0ac7e5aeafd33415937c1984eed2b83a6cb839dcf8e0dce6d6
-size 209084
+oid sha256:60677247e65f4ce979c7b4a709e51d310285f5bc6a971f753710e7cddc301439
+size 157634
diff --git a/web/app.fluidity.money/public/images/hero/ultra_rare.png b/web/app.fluidity.money/public/images/hero/ultra_rare.png
index c90a7c963..96c422d32 100644
--- a/web/app.fluidity.money/public/images/hero/ultra_rare.png
+++ b/web/app.fluidity.money/public/images/hero/ultra_rare.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:872c19d8fa54a4f59c7d11ba9dd3f84870f6955e817b8c8c91d1d866dbd49265
-size 241863
+oid sha256:576235a66a879f45a55773b95591a0a78c022b15aa82a41c7674471e6284bd76
+size 169854
diff --git a/web/app.fluidity.money/public/images/hero/uncommon.png b/web/app.fluidity.money/public/images/hero/uncommon.png
index ad5d7c2fa..0010e8234 100644
--- a/web/app.fluidity.money/public/images/hero/uncommon.png
+++ b/web/app.fluidity.money/public/images/hero/uncommon.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:238e51be54c715fbb00d8233d809cd6d4ff6e6a05fdd581d95c28a5c6344dabe
-size 259633
+oid sha256:c2e149ca67b2f012270d78c53bbf2f052de5cc41c799c73a5698cebd16bb8649
+size 177534
diff --git a/web/app.fluidity.money/public/images/joe-farmlands.png b/web/app.fluidity.money/public/images/joe-farmlands.png
new file mode 100644
index 000000000..4a1b50dbd
--- /dev/null
+++ b/web/app.fluidity.money/public/images/joe-farmlands.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2395663fa922328621ea843e25ca3ad697d61c2414bb6a18b3bb57c2c577140d
+size 248359
diff --git a/web/app.fluidity.money/public/images/kingdom-of-camelot.png b/web/app.fluidity.money/public/images/kingdom-of-camelot.png
new file mode 100644
index 000000000..5e33cf3f3
--- /dev/null
+++ b/web/app.fluidity.money/public/images/kingdom-of-camelot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e623e4cabc261485889e786d0624b00466829912c28b43b8e2678b59df78ffb4
+size 131162
diff --git a/web/app.fluidity.money/public/images/providers/Jumper.svg b/web/app.fluidity.money/public/images/providers/Jumper.svg
new file mode 100644
index 000000000..d7f19b72e
--- /dev/null
+++ b/web/app.fluidity.money/public/images/providers/Jumper.svg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60185b2e2158d5c994f8665081a708e721849bc038e4decdc36bbb64bf171446
+size 1180
diff --git a/web/app.fluidity.money/public/images/providers/Ramses.svg b/web/app.fluidity.money/public/images/providers/Ramses.svg
new file mode 100644
index 000000000..492f06864
--- /dev/null
+++ b/web/app.fluidity.money/public/images/providers/Ramses.svg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3519ca5687a2779d0ad4af62ffbff2bf2eeb5ec2f5ff6ca53593254a3ec9e00e
+size 2668
diff --git a/web/fluidity.money/Dockerfile.frontend b/web/fluidity.money/Dockerfile.frontend
index 1706b1d9d..161cb8c98 100644
--- a/web/fluidity.money/Dockerfile.frontend
+++ b/web/fluidity.money/Dockerfile.frontend
@@ -11,6 +11,8 @@ ARG GITHUB_TOKEN
ARG NEXT_PUBLIC_FLU_ETH_RPC_HTTP
+ARG NEXT_PUBLIC_FLU_HASURA_URL
+
ENV CI $CI
ENV PATH /app/node_modules.bin:$PATH
diff --git a/web/surfing/src/types/provider.ts b/web/surfing/src/types/provider.ts
index f45511be6..ad579fe80 100644
--- a/web/surfing/src/types/provider.ts
+++ b/web/surfing/src/types/provider.ts
@@ -30,4 +30,6 @@ export type Provider =
| "Trader Joe"
| "Uniswap"
| "XY Finance"
+ | "Ramses"
+ | "Jumper"
| "Meteora";
diff --git a/web/surfing/src/util/liquidityProviders/providers.ts b/web/surfing/src/util/liquidityProviders/providers.ts
index dd553245f..0715ca022 100644
--- a/web/surfing/src/util/liquidityProviders/providers.ts
+++ b/web/surfing/src/util/liquidityProviders/providers.ts
@@ -17,6 +17,7 @@ const providerImgNames: { [K in Provider]: string } = {
Curve: "curve.png",
Dodo: "DODO.png",
Fluidity: "logoMetallic.png",
+ Jumper: "Jumper.svg",
Jupiter: "Jupiter.svg",
Kyber: "Kyber.svg",
Lemniscap: "Lemniscap.png",
@@ -29,6 +30,7 @@ const providerImgNames: { [K in Provider]: string } = {
Oneinch: "1inch.svg",
Orca: "Orca.svg",
Polygon: "Polygon.svg",
+ Ramses: "Ramses.svg",
Raydium: "raydium.png",
Saber: "Saber.svg",
Saddle: "Saddle.svg",
| 
+
+
+ 
+
+ 
;
case "sushi":
return 
;
- case "trader":
+ case "trader_joe":
+ return 
;
+ case "ramses":
+ return 
;
+ case "jumper":
+ return 
;
case "arb":
return 
;
default:
diff --git a/web/app.fluidity.money/app/components/index.ts b/web/app.fluidity.money/app/components/index.ts
index df7ea69c4..268d18965 100644
--- a/web/app.fluidity.money/app/components/index.ts
+++ b/web/app.fluidity.money/app/components/index.ts
@@ -6,3 +6,4 @@ export {
ToolTipContent,
} from "./ToolTip";
export { UtilityToken } from "./UtilityToken";
+export { JoeFarmlandsOrCamelotKingdomLinks } from "./JoeFarmlandsOrCamelotKingdom";
diff --git a/web/app.fluidity.money/app/queries/addReferral.ts b/web/app.fluidity.money/app/queries/addReferral.ts
index aaf284901..2222c90c3 100644
--- a/web/app.fluidity.money/app/queries/addReferral.ts
+++ b/web/app.fluidity.money/app/queries/addReferral.ts
@@ -40,8 +40,10 @@ const addReferral = (referrer: string, referee: string) => {
variables,
};
+ const url = "https://fluidity.hasura.app/v1/graphql";
+
return jsonPost
+