Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
PUBLIC_WALLET_CONNECT_PROJECT_ID=
PUBLIC_ROUTEMESH_API_KEY=
PRIVATE_POLYMER_MAINNET_ZONE_API_KEY=
PRIVATE_POLYMER_TESTNET_ZONE_API_KEY=
30 changes: 2 additions & 28 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@base-org/account": "^2.5.1",
"@coinbase/wallet-sdk": "^4.3.6",
"@electric-sql/pglite": "^0.3.15",
"@lifi/intent": "file:../intent.ts",
"@lifi/intent": "0.1.6",
"@metamask/sdk": "^0.34.0",
"@safe-global/safe-apps-provider": "~0.18.6",
"@safe-global/safe-apps-sdk": "^9.1.0",
Expand Down
52 changes: 52 additions & 0 deletions src/app.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,58 @@ declare global {
interface BigInt {
toJSON(): string;
}

interface TronWebDefaultAddress {
base58: string;
hex: string;
}

interface TronWebContract {
at(address: string): Promise<TronWebContractInstance>;
}

interface TronWebContractFactory {
(): TronWebContract;
(abi: Record<string, unknown>[], address: string): Promise<TronWebContractInstance>;
}

interface TronWebContractInstance {
[method: string]: (...args: unknown[]) => {
send: (opts?: Record<string, unknown>) => Promise<string>;
call: (opts?: Record<string, unknown>) => Promise<unknown>;
};
}

interface TronWeb {
ready: boolean;
defaultAddress: TronWebDefaultAddress;
trx: {
getBalance(address: string): Promise<number>;
getTransactionInfo(txId: string): Promise<Record<string, unknown>>;
getTransaction(txId: string): Promise<Record<string, unknown>>;
getBlock(blockNumber: number): Promise<{
block_header: { raw_data: { timestamp: number | string } };
}>;
sign(message: string): Promise<string>;
};
contract: TronWebContractFactory;
toHex(value: string): string;
address: {
fromHex(hex: string): string;
toHex(base58: string): string;
};
}

interface TronLink {
ready: boolean;
request(args: { method: string }): Promise<{ code: number; message?: string }>;
tronWeb: TronWeb;
}

interface Window {
tronWeb?: TronWeb;
tronLink?: TronLink;
}
}

export {};
100 changes: 100 additions & 0 deletions src/lib/components/WalletStatus.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<script lang="ts">
import store from "$lib/state.svelte";
import { connectWith, listWalletConnectors, disconnectWallet } from "$lib/utils/wagmi";
import { isTronLinkAvailable, connectTronLink } from "$lib/utils/tronlink";

let connectingEvm = $state(false);
let connectingTron = $state(false);
let showEvmDropdown = $state(false);

const connectors = listWalletConnectors();

async function onConnectEvm(connectorId: string) {
try {
connectingEvm = true;
showEvmDropdown = false;
await connectWith(connectorId);
} catch (error) {
console.warn("EVM connect failed", error);
} finally {
connectingEvm = false;
}
}

async function onConnectTron() {
try {
connectingTron = true;
const connection = await connectTronLink();
store.tronWalletConnection = connection;
} catch (error) {
console.warn("TronLink connect failed", error);
} finally {
connectingTron = false;
}
}

function truncate(addr: string, len = 4): string {
if (addr.length <= len * 2 + 2) return addr;
return `${addr.slice(0, len + 2)}...${addr.slice(-len)}`;
}
</script>

<div class="flex flex-wrap items-center justify-center gap-2 text-xs">
{#if store.connectedAccount}
<span class="rounded bg-green-50 px-2 py-0.5 text-green-700">
EVM: {truncate(store.connectedAccount.address)}
</span>
{:else}
<div class="relative">
{#if connectors.length === 1}
<button
class="cursor-pointer rounded bg-sky-50 px-2 py-0.5 text-sky-700 hover:bg-sky-100 disabled:cursor-not-allowed disabled:opacity-50"
disabled={connectingEvm}
onclick={() => onConnectEvm(connectors[0].id)}
>
{connectingEvm ? "Connecting..." : "Connect EVM"}
</button>
{:else}
<button
class="cursor-pointer rounded bg-sky-50 px-2 py-0.5 text-sky-700 hover:bg-sky-100 disabled:cursor-not-allowed disabled:opacity-50"
disabled={connectingEvm}
onclick={() => (showEvmDropdown = !showEvmDropdown)}
>
{connectingEvm ? "Connecting..." : "Connect EVM"}
</button>
{#if showEvmDropdown}
<div
class="absolute top-full left-0 z-50 mt-1 rounded border border-gray-200 bg-white shadow-md"
>
{#each connectors as connector (connector.id)}
<button
class="block w-full cursor-pointer px-3 py-1.5 text-left text-xs text-gray-700 hover:bg-sky-50"
onclick={() => onConnectEvm(connector.id)}
>
{connector.name}
</button>
{/each}
</div>
{/if}
{/if}
</div>
{/if}

<span class="text-gray-300">|</span>

{#if store.tronConnectedAccount}
<span class="rounded bg-green-50 px-2 py-0.5 text-green-700">
Tron: {truncate(store.tronConnectedAccount.base58Address)}
</span>
{:else if isTronLinkAvailable()}
<button
class="cursor-pointer rounded bg-sky-50 px-2 py-0.5 text-sky-700 hover:bg-sky-100 disabled:cursor-not-allowed disabled:opacity-50"
disabled={connectingTron}
onclick={onConnectTron}
>
{connectingTron ? "Connecting..." : "Connect Tron"}
</button>
{:else}
<span class="rounded bg-gray-50 px-2 py-0.5 text-gray-400"> Tron: No wallet </span>
{/if}
</div>
6 changes: 3 additions & 3 deletions src/lib/components/ui/FlowStepTracker.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
selectedOrder;
selectedOutputFillHashSignature;

if (!store.connectedAccount || !store.walletClient || !selectedOrder) {
if (!store.anyWalletConnected || !selectedOrder) {
flowChecks = {
allFilled: false,
allValidated: false,
Expand All @@ -74,7 +74,7 @@
});

const progressSteps = $derived.by(() => {
const connected = !!store.connectedAccount && !!store.walletClient;
const connected = store.anyWalletConnected;
if (!connected) {
return [
{
Expand Down Expand Up @@ -216,7 +216,7 @@
});

const progressConnectorPosition = $derived.by(() => {
if (!store.connectedAccount || !store.walletClient) return 0;
if (!store.anyWalletConnected) return 0;
const maxIndex = Math.max(progressSteps.length - 1, 0);
return Math.max(0, Math.min(scrollStepProgress, maxIndex));
});
Expand Down
Loading
Loading