mirror of
https://github.com/aljazceru/hypergolic.git
synced 2025-12-17 05:24:21 +01:00
problem: not clear which rockets are testnet at /buymerits
resolve https://github.com/nostrocket/hypergolic/issues/82
This commit is contained in:
Bob
89
src/components/BuyAMRCard.svelte
Normal file
89
src/components/BuyAMRCard.svelte
Normal file
@@ -0,0 +1,89 @@
|
||||
<script lang="ts">
|
||||
import { ndk } from '@/ndk';
|
||||
import type { AMRAuction, Rocket } from '@/event_helpers/rockets';
|
||||
import { bitcoinTip, txs } from '@/stores/bitcoin';
|
||||
|
||||
import BuyAmr from './BuyAMR.svelte';
|
||||
import Heading from './Heading.svelte';
|
||||
import { Avatar } from '@nostr-dev-kit/ndk-svelte-components';
|
||||
import * as Table from '@/components/ui/table';
|
||||
import * as Card from '@/components/ui/card';
|
||||
import { Badge } from '@/components/ui/badge';
|
||||
|
||||
export let rocket: Rocket;
|
||||
export let amr: AMRAuction[];
|
||||
export let transactions: Map<string, txs>;
|
||||
|
||||
let dev = false;
|
||||
|
||||
function getRocketClass(rocket: Rocket): string {
|
||||
return rocket.Testnet() ? 'dark:border-red-600 mb-2' : 'mb-2';
|
||||
}
|
||||
</script>
|
||||
|
||||
<Card.Root class={getRocketClass(rocket)}>
|
||||
<Card.CardHeader>
|
||||
<div class="flex flex-nowrap place-items-stretch">
|
||||
<h3 class=" mr-auto text-nowrap text-2xl">
|
||||
{`ROCKET: ${rocket.Name().toUpperCase()}`}
|
||||
</h3>
|
||||
{#if rocket.Testnet()}<Badge
|
||||
variant="destructive"
|
||||
class="flex h-8 shrink-0 items-center justify-center rounded-sm"
|
||||
>
|
||||
<span
|
||||
on:click={() => {
|
||||
dev = true;
|
||||
alert(
|
||||
'dev mode enabled, refresh page if this was unintentional or you may lose sats'
|
||||
);
|
||||
}}>TESTNET</span
|
||||
>
|
||||
</Badge>{/if}
|
||||
</div>
|
||||
<Heading></Heading>
|
||||
<Table.Root>
|
||||
<Table.Header>
|
||||
<Table.Row>
|
||||
<Table.Head class="w-[10px]">Seller</Table.Head>
|
||||
<Table.Head class="w-[10px]">AMR</Table.Head>
|
||||
<Table.Head class="w-[10px]">Merits</Table.Head>
|
||||
<Table.Head class="w-[150px] text-right">Current Price (sats)</Table.Head>
|
||||
<Table.Head>Status</Table.Head>
|
||||
<Table.Head>Receiving Address</Table.Head>
|
||||
<Table.Head></Table.Head>
|
||||
</Table.Row>
|
||||
</Table.Header>
|
||||
<Table.Body>
|
||||
{#each amr as p (p.AMRIDs)}
|
||||
<Table.Row>
|
||||
<Table.Cell
|
||||
><Avatar
|
||||
ndk={$ndk}
|
||||
pubkey={p.Owner}
|
||||
class="aspect-square w-10 flex-none rounded-full object-cover"
|
||||
/></Table.Cell
|
||||
>
|
||||
<Table.Cell
|
||||
>{p.AMRIDs.length > 1 ? 'multiple' : p.AMRIDs[0].substring(0, 12)}</Table.Cell
|
||||
>
|
||||
<Table.Cell>{p.Merits}</Table.Cell>
|
||||
<Table.Cell class="text-right">{p.Merits}</Table.Cell>
|
||||
<Table.Cell
|
||||
>{p.Status(rocket, $bitcoinTip.height, transactions.get(p.RxAddress))}</Table.Cell
|
||||
>
|
||||
<Table.Cell
|
||||
on:click={() => {
|
||||
console.log(transactions.get(p.RxAddress)?.From());
|
||||
}}>{p.RxAddress}</Table.Cell
|
||||
>
|
||||
<Table.Cell
|
||||
>{#if p.Status(rocket, $bitcoinTip.height, transactions.get(p.RxAddress)) == 'OPEN' && (!rocket.Testnet() || dev)}
|
||||
<BuyAmr auction={p} />{/if}</Table.Cell
|
||||
>
|
||||
</Table.Row>
|
||||
{/each}
|
||||
</Table.Body>
|
||||
</Table.Root>
|
||||
</Card.CardHeader>
|
||||
</Card.Root>
|
||||
@@ -1,29 +1,25 @@
|
||||
<script lang="ts">
|
||||
import * as Table from '@/components/ui/table';
|
||||
import { AMRAuction, MeritPurchase, Rocket } from '@/event_helpers/rockets';
|
||||
import { ndk } from '@/ndk';
|
||||
import { bitcoinTip, getIncomingTransactions, txs } from '@/stores/bitcoin';
|
||||
import { currentUser } from '@/stores/session';
|
||||
import { NDKEvent } from '@nostr-dev-kit/ndk';
|
||||
import { Avatar } from '@nostr-dev-kit/ndk-svelte-components';
|
||||
import { onDestroy } from 'svelte';
|
||||
import { derived } from 'svelte/store';
|
||||
import AssociateBitcoinAddress from '../../components/AssociateBitcoinAddress.svelte';
|
||||
import Heading from '../../components/Heading.svelte';
|
||||
import BuyAmrCard from '../../components/BuyAMRCard.svelte';
|
||||
import Login from '../../components/Login.svelte';
|
||||
import MeritAuctions from '../../stateupdaters/MeritAuctions.svelte';
|
||||
import BuyAmr from '../../components/BuyAMR.svelte';
|
||||
import { goto } from '$app/navigation';
|
||||
import { base } from '$app/paths';
|
||||
import * as Card from '@/components/ui/card';
|
||||
import { Badge } from '@/components/ui/badge';
|
||||
import * as Tabs from '$lib/components/ui/tabs/index.js';
|
||||
|
||||
let rocketEvents = $ndk.storeSubscribe([{ kinds: [31108 as number] }], { subId: 'all_rockets' });
|
||||
|
||||
onDestroy(() => {
|
||||
rocketEvents?.unsubscribe();
|
||||
});
|
||||
|
||||
let dev = false;
|
||||
|
||||
let rockets = derived(rocketEvents, ($rocketEvents) => {
|
||||
let m = new Map<string, NDKEvent>();
|
||||
for (let e of $rocketEvents) {
|
||||
@@ -40,39 +36,47 @@
|
||||
});
|
||||
|
||||
let pendingSales = derived(rockets, ($rockets) => {
|
||||
let merits = new Map<Rocket, AMRAuction[]>();
|
||||
let mainnetMerits = new Map<Rocket, AMRAuction[]>();
|
||||
let testnetMerits = new Map<Rocket, AMRAuction[]>();
|
||||
|
||||
for (let r of $rockets) {
|
||||
let _auctions: AMRAuction[] = r.PendingAMRAuctions();
|
||||
merits.set(r, _auctions);
|
||||
if (r.Testnet()) {
|
||||
testnetMerits.set(r, _auctions);
|
||||
} else {
|
||||
mainnetMerits.set(r, _auctions);
|
||||
}
|
||||
}
|
||||
|
||||
return merits;
|
||||
return { mainnet: mainnetMerits, testnet: testnetMerits };
|
||||
});
|
||||
|
||||
let _transactions = new Map<string, txs>();
|
||||
let transactions = derived(pendingSales, ($pendingSales) => {
|
||||
for (let [r, s] of $pendingSales) {
|
||||
for (let amr of s) {
|
||||
if (!_transactions.get(amr.RxAddress)) {
|
||||
_transactions.set(amr.RxAddress, new txs(amr.RxAddress));
|
||||
}
|
||||
let existing = _transactions.get(amr.RxAddress)!;
|
||||
if (Math.floor(new Date().getTime() / 1000) > existing.LastAttempt + 10000) {
|
||||
existing.LastAttempt = Math.floor(new Date().getTime() / 1000);
|
||||
getIncomingTransactions(amr.RxAddress)
|
||||
.then((result) => {
|
||||
if (result) {
|
||||
existing.LastUpdate = Math.floor(new Date().getTime() / 1000);
|
||||
}
|
||||
if (result.length > 0) {
|
||||
existing.Data = result;
|
||||
_transactions.set(amr.RxAddress, existing);
|
||||
_transactions = _transactions;
|
||||
}
|
||||
})
|
||||
.catch((c) => {
|
||||
console.log(c);
|
||||
});
|
||||
for (let network of ['mainnet', 'testnet'] as const) {
|
||||
for (let [r, s] of $pendingSales[network]) {
|
||||
for (let amr of s) {
|
||||
if (!_transactions.get(amr.RxAddress)) {
|
||||
_transactions.set(amr.RxAddress, new txs(amr.RxAddress));
|
||||
}
|
||||
let existing = _transactions.get(amr.RxAddress)!;
|
||||
if (Math.floor(new Date().getTime() / 1000) > existing.LastAttempt + 10000) {
|
||||
existing.LastAttempt = Math.floor(new Date().getTime() / 1000);
|
||||
getIncomingTransactions(amr.RxAddress)
|
||||
.then((result) => {
|
||||
if (result) {
|
||||
existing.LastUpdate = Math.floor(new Date().getTime() / 1000);
|
||||
}
|
||||
if (result.length > 0) {
|
||||
existing.Data = result;
|
||||
_transactions.set(amr.RxAddress, existing);
|
||||
_transactions = _transactions;
|
||||
}
|
||||
})
|
||||
.catch((c) => {
|
||||
console.log(c);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -83,19 +87,24 @@
|
||||
[pendingSales, transactions, bitcoinTip, currentUser],
|
||||
([$pendingSales, $transactions, $bitcoinTip, $currentUser]) => {
|
||||
if ($currentUser) {
|
||||
for (let [r, p] of $pendingSales) {
|
||||
if (r.VotePowerForPubkey($currentUser.pubkey) > 0) {
|
||||
for (let amrAuction of p) {
|
||||
if (
|
||||
amrAuction.Status(r, $bitcoinTip.height, $transactions.get(amrAuction.RxAddress)) ==
|
||||
'SOLD & PENDING RATIFICATION'
|
||||
) {
|
||||
let txs = $transactions.get(amrAuction.RxAddress);
|
||||
if (txs) {
|
||||
for (let [address, txo] of txs.From()) {
|
||||
for (let [_, ba] of r.BitcoinAssociations()) {
|
||||
if (ba.Address == txo.From) {
|
||||
return new MeritPurchase(r, amrAuction, ba.Pubkey, txo);
|
||||
for (let network of ['mainnet', 'testnet'] as const) {
|
||||
for (let [r, p] of $pendingSales[network]) {
|
||||
if (r.VotePowerForPubkey($currentUser.pubkey) > 0) {
|
||||
for (let amrAuction of p) {
|
||||
if (
|
||||
amrAuction.Status(
|
||||
r,
|
||||
$bitcoinTip.height,
|
||||
$transactions.get(amrAuction.RxAddress)
|
||||
) == 'SOLD & PENDING RATIFICATION'
|
||||
) {
|
||||
let txs = $transactions.get(amrAuction.RxAddress);
|
||||
if (txs) {
|
||||
for (let [address, txo] of txs.From()) {
|
||||
for (let [_, ba] of r.BitcoinAssociations()) {
|
||||
if (ba.Address == txo.From) {
|
||||
return new MeritPurchase(r, amrAuction, ba.Pubkey, txo);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -138,90 +147,32 @@
|
||||
});
|
||||
|
||||
transactions.subscribe((t) => {});
|
||||
|
||||
function getRocketClass(rocket: Rocket): string {
|
||||
return rocket.Testnet() ? 'dark:border-red-600' : '';
|
||||
}
|
||||
</script>
|
||||
|
||||
{#if $nostrocket}<AssociateBitcoinAddress rocket={$nostrocket} />
|
||||
{#if $nostrocket}
|
||||
<AssociateBitcoinAddress rocket={$nostrocket} />
|
||||
{/if}
|
||||
|
||||
{#if $currentUser}
|
||||
{#each $pendingSales as [rocket, amr] (rocket.Event.id)}
|
||||
{#if amr.length > 0}
|
||||
<Card.Root class={getRocketClass(rocket)}>
|
||||
<Card.CardHeader>
|
||||
<div class="flex flex-nowrap place-items-stretch">
|
||||
<h3 class=" mr-auto text-nowrap text-2xl">
|
||||
{`ROCKET: ${rocket.Name().toUpperCase()}`}
|
||||
</h3>
|
||||
{#if rocket.Testnet()}<Badge
|
||||
variant="destructive"
|
||||
class="flex h-8 shrink-0 items-center justify-center rounded-sm"
|
||||
>
|
||||
<span
|
||||
on:click={() => {
|
||||
dev = true;
|
||||
alert(
|
||||
'dev mode enabled, refresh page if this was unintentional or you may lose sats'
|
||||
);
|
||||
}}>TESTNET</span
|
||||
>
|
||||
</Badge>{/if}
|
||||
</div>
|
||||
<Heading></Heading>
|
||||
<Table.Root>
|
||||
<Table.Header>
|
||||
<Table.Row>
|
||||
<Table.Head class="w-[10px]">Seller</Table.Head>
|
||||
<Table.Head class="w-[10px]">AMR</Table.Head>
|
||||
<Table.Head class="w-[10px]">Merits</Table.Head>
|
||||
<Table.Head class="w-[150px] text-right">Current Price (sats)</Table.Head>
|
||||
<Table.Head>Status</Table.Head>
|
||||
<Table.Head>Receiving Address</Table.Head>
|
||||
<Table.Head></Table.Head>
|
||||
</Table.Row>
|
||||
</Table.Header>
|
||||
<Table.Body>
|
||||
{#each amr as p (p.AMRIDs)}
|
||||
<Table.Row>
|
||||
<Table.Cell
|
||||
><Avatar
|
||||
ndk={$ndk}
|
||||
pubkey={p.Owner}
|
||||
class="aspect-square w-10 flex-none rounded-full object-cover"
|
||||
/></Table.Cell
|
||||
>
|
||||
<Table.Cell
|
||||
>{p.AMRIDs.length > 1 ? 'multiple' : p.AMRIDs[0].substring(0, 12)}</Table.Cell
|
||||
>
|
||||
<Table.Cell>{p.Merits}</Table.Cell>
|
||||
<Table.Cell class="text-right">{p.Merits}</Table.Cell>
|
||||
<Table.Cell
|
||||
>{p.Status(
|
||||
rocket,
|
||||
$bitcoinTip.height,
|
||||
$transactions.get(p.RxAddress)
|
||||
)}</Table.Cell
|
||||
>
|
||||
<Table.Cell
|
||||
on:click={() => {
|
||||
console.log($transactions.get(p.RxAddress)?.From());
|
||||
}}>{p.RxAddress}</Table.Cell
|
||||
>
|
||||
<Table.Cell
|
||||
>{#if p.Status(rocket, $bitcoinTip.height, $transactions.get(p.RxAddress)) == 'OPEN' && (!rocket.Testnet() || dev)}<BuyAmr
|
||||
auction={p}
|
||||
/>{/if}</Table.Cell
|
||||
>
|
||||
</Table.Row>
|
||||
{/each}
|
||||
</Table.Body>
|
||||
</Table.Root>
|
||||
</Card.CardHeader>
|
||||
</Card.Root>
|
||||
{/if}
|
||||
{/each}
|
||||
<Tabs.Root value="mainnet">
|
||||
<Tabs.List>
|
||||
<Tabs.Trigger value="mainnet">Mainnet</Tabs.Trigger>
|
||||
<Tabs.Trigger value="testnet">Testnet</Tabs.Trigger>
|
||||
</Tabs.List>
|
||||
<Tabs.Content value="mainnet">
|
||||
{#each $pendingSales.mainnet as [rocket, amr] (rocket.Event.id)}
|
||||
{#if amr.length > 0}
|
||||
<BuyAmrCard {rocket} {amr} transactions={$transactions} />
|
||||
{/if}
|
||||
{/each}
|
||||
</Tabs.Content>
|
||||
<Tabs.Content value="testnet">
|
||||
{#each $pendingSales.testnet as [rocket, amr] (rocket.Event.id)}
|
||||
{#if amr.length > 0}
|
||||
<BuyAmrCard {rocket} {amr} transactions={$transactions} />
|
||||
{/if}
|
||||
{/each}
|
||||
</Tabs.Content>
|
||||
</Tabs.Root>
|
||||
{:else}<Login />{/if}
|
||||
<MeritAuctions {rockets} />
|
||||
|
||||
Reference in New Issue
Block a user