- bitcoin++ is a developer-focused conference series.
-
Join us in Austin May 1-4 for a deep dive into bitcoin script.
+ rewards are sponsored by ... we are hiring
diff --git a/pages/~/index.js b/pages/~/index.js
index dcd9c913..b2b5162b 100644
--- a/pages/~/index.js
+++ b/pages/~/index.js
@@ -7,7 +7,6 @@ import Snl from '@/components/snl'
import { useQuery } from '@apollo/client'
import PageLoading from '@/components/page-loading'
import TerritoryHeader from '@/components/territory-header'
-import Link from 'next/link'
export const getServerSideProps = getGetServerSideProps({
query: SUB_ITEMS,
@@ -30,14 +29,6 @@ export default function Sub ({ ssrData }) {
<>
)}
-
-
- Million Sat Madness
- is sponsored by{' '}
-
- the Bitcoin++ Conference in Austin May 1-4
-
-
)
diff --git a/prisma/migrations/20240501141206_daily_earn_job/migration.sql b/prisma/migrations/20240501141206_daily_earn_job/migration.sql
new file mode 100644
index 00000000..d80ec3f0
--- /dev/null
+++ b/prisma/migrations/20240501141206_daily_earn_job/migration.sql
@@ -0,0 +1,15 @@
+CREATE OR REPLACE FUNCTION reschedule_earn_job()
+RETURNS INTEGER
+LANGUAGE plpgsql
+AS $$
+DECLARE
+BEGIN
+ UPDATE pgboss.schedule set cron = '0 0 * * *' WHERE name = 'earn';
+ return 0;
+EXCEPTION WHEN OTHERS THEN
+ return 0;
+END;
+$$;
+
+SELECT reschedule_earn_job();
+DROP FUNCTION IF EXISTS reschedule_earn_job;
\ No newline at end of file
diff --git a/worker/earn.js b/worker/earn.js
index 1ac27b4b..85c73333 100644
--- a/worker/earn.js
+++ b/worker/earn.js
@@ -4,18 +4,17 @@ import { PrismaClient } from '@prisma/client'
import { proportions } from '@/lib/madness.js'
import { SN_NO_REWARDS_IDS } from '@/lib/constants.js'
-const TOTAL_UPPER_BOUND_MSATS = 10000000000
+const TOTAL_UPPER_BOUND_MSATS = 1_000_000_000
export async function earn ({ name }) {
// grab a greedy connection
const models = new PrismaClient()
try {
- // compute how much sn earned got the month
+ // compute how much sn earned yesterday
const [{ sum: sumDecimal }] = await models.$queryRaw`
- SELECT coalesce(sum(total), 0) as sum
- FROM rewards_days
- WHERE date_trunc('month', rewards_days.t) = date_trunc('month', (now() AT TIME ZONE 'America/Chicago' - interval '1 month'))`
+ SELECT total as sum
+ FROM rewards(now() AT TIME ZONE 'America/Chicago' - interval '1 day', now() AT TIME ZONE 'America/Chicago' - interval '1 day', '1 day'::INTERVAL, 'day')`
// XXX primsa will return a Decimal (https://mikemcl.github.io/decimal.js)
// because sum of a BIGINT returns a NUMERIC type (https://www.postgresql.org/docs/13/functions-aggregate.html)
@@ -52,11 +51,9 @@ export async function earn ({ name }) {
// get earners { userId, id, type, rank, proportion }
const earners = await models.$queryRaw`
- SELECT id AS "userId", sum(proportion) as proportion, ROW_NUMBER() OVER (ORDER BY sum(proportion) DESC) as rank
- FROM user_values_days
- WHERE date_trunc('month', user_values_days.t) = date_trunc('month', (now() AT TIME ZONE 'America/Chicago' - interval '1 month'))
- AND NOT (id = ANY (${SN_NO_REWARDS_IDS}))
- GROUP BY id
+ SELECT id AS "userId", proportion, ROW_NUMBER() OVER (ORDER BY proportion DESC) as rank
+ FROM user_values_days(now() AT TIME ZONE 'America/Chicago' - interval '1 day', now() AT TIME ZONE 'America/Chicago' - interval '1 day', '1 day'::INTERVAL, 'day')
+ WHERE NOT (id = ANY (${SN_NO_REWARDS_IDS}))
ORDER BY proportion DESC
LIMIT 100`
@@ -69,14 +66,7 @@ export async function earn ({ name }) {
const notifications = {}
for (const [i, earner] of earners.entries()) {
- let earnings = 0
- if (i === 0) {
- // top earner gets 1m sats
- earnings = 1_000_000_000
- } else {
- // everyone else gets a proportion of the total
- earnings = Math.floor(parseFloat(proportions[i - 1] * (sum - 1_000_000_000)))
- }
+ const earnings = Math.floor(parseFloat(proportions[i] * sum))
total += earnings
if (total > sum) {
console.log(name, 'total exceeds sum', total, '>', sum)