Details
-
+
Your quote ({exchangeRate})
diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx
index 8e0b97e1..6a0b4989 100644
--- a/src/components/Navbar/index.tsx
+++ b/src/components/Navbar/index.tsx
@@ -82,12 +82,12 @@ const MobileMenuList: FC = ({ showMenu, closeMenu }) => (
const Links = () => (
-
{links.map((link) => (
-
- +
-
{link.title}
@@ -103,10 +103,6 @@ export const Navbar = () => {
return (
- -
- Alpha - diff --git a/src/components/NetworkSelector/index.tsx b/src/components/NetworkSelector/index.tsx index c8c4e9da..e909d5d3 100644 --- a/src/components/NetworkSelector/index.tsx +++ b/src/components/NetworkSelector/index.tsx @@ -15,7 +15,7 @@ interface NetworkButtonProps { const NetworkButton = ({ selectedNetwork, isOpen, onClick, disabled }: NetworkButtonProps) => (
( + ++); + +const ImageList = ({ images }: { images: ImageProps[] }) => ( ++ {comingSoon && ( +
Coming soon+ )} ++ {images.map((img) => ( ++); export function PoweredBy() { return ( -+ ))} + -+Powered by
- -- -
+ ); } diff --git a/src/components/TrustedBy/index.tsx b/src/components/TrustedBy/index.tsx index 1e22ed97..0e829c36 100644 --- a/src/components/TrustedBy/index.tsx +++ b/src/components/TrustedBy/index.tsx @@ -3,10 +3,7 @@ import POLKADOT from '../../assets/trustedby/polkadot.svg'; import STELLAR from '../../assets/trustedby/stellar.svg'; import NABLA from '../../assets/trustedby/nabla.svg'; import WEB3 from '../../assets/trustedby/web3.svg'; - -import MASTERCARD from '../../assets/payments/mastercard.svg'; -import SEPA from '../../assets/payments/sepa.svg'; -import VISA from '../../assets/payments/visa.svg'; +import { motion } from 'framer-motion'; interface ImageProps { src: string; @@ -16,15 +13,32 @@ interface ImageProps { const Image = ({ src, alt, comingSoon }: ImageProps) => (+ ++Powered by
++ + + A
+-); const ImageList = ({ images }: { images: ImageProps[] }) => ({comingSoon && Coming soon}- {images.map((img) => ( -); @@ -38,18 +52,11 @@ export const TrustedBy = () => { { src: WEB3, alt: 'Web3 Foundation logo' }, ]; - const paymentImages = [ - { src: SEPA, alt: 'SEPA logo' }, - { src: MASTERCARD, alt: 'Mastercard logo', comingSoon: true }, - { src: VISA, alt: 'Visa logo', comingSoon: true }, - ]; - return ( -+ {images.map((img, index) => ( + + ))}+ - Trusted by
++ ); diff --git a/src/components/UserBalance/index.tsx b/src/components/UserBalance/index.tsx index f9fe9248..9d293d6d 100644 --- a/src/components/UserBalance/index.tsx +++ b/src/components/UserBalance/index.tsx @@ -1,7 +1,7 @@ import { InputTokenDetails } from '../../constants/tokenConfig'; import { useInputTokenBalance } from '../../hooks/useInputTokenBalance'; import { useVortexAccount } from '../../hooks/useVortexAccount'; -import wallet from '../../assets/wallet.svg'; +import wallet from '../../assets/wallet-bifold-outline.svg'; interface UserBalanceProps { token: InputTokenDetails; @@ -13,30 +13,26 @@ export const UserBalance = ({ token, onClick }: UserBalanceProps) => { const inputTokenBalance = useInputTokenBalance({ fromToken: token }); if (isDisconnected || inputTokenBalance === undefined) { - return <>; + return ; } const showMaxButton = Number(inputTokenBalance) !== 0; return ( -Trusted by - - <> -
-- - +- - {inputTokenBalance} {token.assetSymbol} - - {showMaxButton && ( - - )} -
+); }; diff --git a/src/components/WhyVortex/index.tsx b/src/components/WhyVortex/index.tsx index 1a4fda8e..13286022 100644 --- a/src/components/WhyVortex/index.tsx +++ b/src/components/WhyVortex/index.tsx @@ -13,7 +13,7 @@ const features: Feature[] = [ { icon: DOLLAR, title: 'Lower Fees', - description: 'Offramping fees at just 0.5%, well below market average.', + description: 'Offramping fees as low as 0.25%.', subtext: 'Keep more of what you earn.', }, { diff --git a/src/components/buttons/AssetButton/index.tsx b/src/components/buttons/AssetButton/index.tsx index e33f38de..36666fcf 100644 --- a/src/components/buttons/AssetButton/index.tsx +++ b/src/components/buttons/AssetButton/index.tsx @@ -12,12 +12,12 @@ export function AssetButton({ assetIcon, tokenSymbol, onClick }: AssetButtonProp return (+ {inputTokenBalance} {token.assetSymbol} +
+ {showMaxButton && ( + + )} +
- + {showCompareFees && fromToken && fromAmount && toToken && ( { + this.processEvents(event, this.pendingIssueEvents); + this.processEvents(event, this.pendingRedeemEvents); + this.processEvents(event, this.pendingXcmSentEvents); + }); + } +} + +async function getEventsFromBlock(api: ApiPromise, blockHash: string) { + const at = await api.at(blockHash); + const events = await at.query.system.events(); + return events; +} +// Tests for EventListener's filters and parseEvent functions, specifically: Redeem.ExecuteRedeem and PolkadotXcm.Sent events. +// Request redeem event parser is tested in spacewalk.test.tsx. +describe('EventListener Tests', () => { + it('should detect successful polkadotXcm.Sent event', async () => { + const XCM_SENT_EVENT_BLOCK_HASH = '0xbac62e758e09f7e51fae2c74a8766c7e5e57a224d4a9ca8828e782ed9754340e'; + const ORIGIN_XCM_ACCOUNT = '5DqTNJsGp6UayR5iHAZvH4zquY6ni6j35ZXLtJA6bXwsfixg'; + + const provider = new WsProvider(ASSETHUB_WSS); + const api = await ApiPromise.create({ provider }); + + const events = await getEventsFromBlock(api, XCM_SENT_EVENT_BLOCK_HASH); + + const listener = new TestableEventListener(api); + + const promise = listener.waitForXcmSentEvent(ORIGIN_XCM_ACCOUNT, 50000000); // We're not testing for timeout, so we set a high value. + + // Bypass subscription and directly process the events + listener.processEventsForTest(events); + + await expect(promise).resolves.toMatchObject({ + originAddress: ORIGIN_XCM_ACCOUNT, + }); + }); + + it('should detect successful ExecuteRedeem Event', async () => { + const EXECUTE_REDEEM_EVENT_BLOCK_HASH = '0x8c8dc97201be2fdc3aa050218a866e809aa0f2770a5e6dc413e41966c37d493a'; + const REDEEM_ID = '0xa6c042f8816aaddd148fb2d24176312ca9a65bb331617fdfd33f8573a20e921e'; + const REDEEMER = '6g7GLX4eBUCswt8ZaU3qkwntcu1NxkALZbyB4t1oU2WeKDFk'; + const VAULT_ID = { + accountId: '6bE2vjpLRkRNoVDqDtzokxE34QdSJC2fz7c87R9yCVFFDNWs', + currencies: { + collateral: { + XCM: 10, + }, + wrapped: { + Stellar: { + AlphaNum4: { + code: hexToString('0x41525300'), + issuer: stellarHexToPublic('0xb04f8bff207a0b001aec7b7659a8d106e54e659cdf9533528f468e079628fba1'), + }, + }, + }, + }, + }; + const AMOUNT = 538780000000000; + const ASSET = { + Stellar: { + AlphaNum4: { + code: hexToString('0x41525300'), + issuer: stellarHexToPublic('0xb04f8bff207a0b001aec7b7659a8d106e54e659cdf9533528f468e079628fba1'), + }, + }, + }; + const FEE = 0; + const TRANSFER_FEE = 0; + + const provider = new WsProvider(PENDULUM_WSS); + const api = await ApiPromise.create({ provider }); + + const events = await getEventsFromBlock(api, EXECUTE_REDEEM_EVENT_BLOCK_HASH); + + const listener = new TestableEventListener(api); + + const promise = listener.waitForRedeemExecuteEvent(REDEEM_ID, 50000000); + + listener.processEventsForTest(events); + await expect(promise).resolves.toMatchObject({ + redeemId: REDEEM_ID, + redeemer: REDEEMER, + vaultId: VAULT_ID, + amount: AMOUNT, + asset: ASSET, + fee: FEE, + transferFee: TRANSFER_FEE, + }); + }); +}); diff --git a/src/services/phases/polkadot/assethub.ts b/src/services/phases/polkadot/assethub.ts index 83cac673..7b9a78b1 100644 --- a/src/services/phases/polkadot/assethub.ts +++ b/src/services/phases/polkadot/assethub.ts @@ -7,6 +7,7 @@ import Big from 'big.js'; import { ExecutionContext, OfframpingState } from '../../offrampingFlow'; import { waitUntilTrue } from '../../../helpers/function'; import { getRawInputBalance } from './ephemeral'; +import { EventListener } from './eventListener'; export function createAssethubAssetTransfer(assethubApi: ApiPromise, receiverAddress: string, rawAmount: string) { const receiverId = u8aToHex(decodeAddress(receiverAddress)); @@ -33,6 +34,10 @@ export async function executeAssetHubXCM(state: OfframpingState, context: Execut const { assetHubNode, walletAccount, setOfframpSigningPhase } = context; const { pendulumEphemeralAddress } = state; + // We wait for up to 1 minute. XCM event should appear on the same block. + const maxWaitingTimeMinutes = 1; + const maxWaitingTimeMs = maxWaitingTimeMinutes * 60 * 1000; + if (!walletAccount) { throw new Error('Wallet account not available'); } @@ -51,8 +56,16 @@ export async function executeAssetHubXCM(state: OfframpingState, context: Execut if (assetHubXcmTransactionHash === undefined) { const tx = createAssethubAssetTransfer(assetHubNode.api, pendulumEphemeralAddress, inputAmount.raw); context.setOfframpSigningPhase('started'); + + const eventListener = EventListener.getEventListener(assetHubNode.api); + const xcmSentEventPromise = eventListener.waitForXcmSentEvent(walletAccount.address, maxWaitingTimeMs); + const { hash } = await tx.signAndSend(walletAccount.address, { signer: walletAccount.signer as Signer }); setOfframpSigningPhase?.('finished'); + + await xcmSentEventPromise; + eventListener.unsubscribe(); + return { ...state, assetHubXcmTransactionHash: hash.toString() }; } diff --git a/src/services/phases/polkadot/eventListener.tsx b/src/services/phases/polkadot/eventListener.tsx index 5c7066ee..e876f547 100644 --- a/src/services/phases/polkadot/eventListener.tsx +++ b/src/services/phases/polkadot/eventListener.tsx @@ -3,7 +3,7 @@ import { ApiPromise } from '@polkadot/api'; -import { parseEventRedeemExecution } from './eventParsers'; +import { parseEventRedeemExecution, parseEventXcmSent } from './eventParsers'; interface IPendingEvent { filter: any; @@ -13,8 +13,11 @@ interface IPendingEvent { export class EventListener { static eventListeners = new Map