Session Token Testnet Faucet #12
Conversation
Aerilym
added
enhancement
…it button is not rendered
apps/staking/app/faucet/actions.ts
Outdated
| const transaction = db.transaction((discordExport: Array<DiscordIdExport>) => { | ||
| for (const { id } of discordExport) { | ||
| insert.run(BigInt(id).toString()); | ||
| } | ||
| }); |
There was a problem hiding this comment.
just had a quick look if batch insert could be a good idea, but I don't think it makes much of a difference if the inserts are already in a transaction, so all good
apps/staking/app/faucet/actions.ts
Outdated
| const transaction = db.transaction((telegramExport: Array<TelegramIdExport>) => { | ||
| for (const { id } of telegramExport) { | ||
| insert.run(BigInt(id).toString()); | ||
| } | ||
| }); | ||
|
|
||
| const faucetGasWarning = 0.01; | ||
| const faucetSENTWarning = 20000; | ||
| transaction(telegramExport); | ||
|
|
||
| db.close(); |
There was a problem hiding this comment.
not sure how to read this, but maybe the db.close should be in a finally ?
https://github.com/WiseLibs/better-sqlite3/blob/master/docs/api.md#transactionfunction---function
it seems that transaction will rollback and then rethrow. Not sure
There was a problem hiding this comment.
I see, I've made changes to all the import functions to handle this
|
|
||
| if (!operatorTableTimestampCutoff) return false; | ||
|
|
||
| const lastUpdate = db |
There was a problem hiding this comment.
where do you update this OPERATOR_LAST_UPDATE field? By hand?
There was a problem hiding this comment.
do you not need that commented code at all?
There was a problem hiding this comment.
so i added this so we could use an endpoint to update this, but that endpoint doesnt exist yet
apps/staking/app/faucet/actions.ts
Outdated
| const hoursBetweenTransactions = process.env.FAUCET_HOURS_BETWEEN_USES; | ||
| const lastTransactionCutoff = hoursBetweenTransactions | ||
| ? Date.now() - parseInt(hoursBetweenTransactions) * 60 * 60 * 1000 | ||
| : 0; |
There was a problem hiding this comment.
I think parseInt returns Nan if process.env.FAUCET_HOURS_BETWEEN_USES is not a number, maybe you should check for that
apps/staking/app/faucet/actions.ts
Outdated
| * @returns A boolean indicating whether a recent transaction exists. | ||
| */ | ||
| function hasRecentTransaction({ db, source, id }: IdTableParams) { | ||
| const hoursBetweenTransactions = process.env.FAUCET_HOURS_BETWEEN_USES; |
There was a problem hiding this comment.
same comment, maybe check that parseInt doesn't return Nan
There was a problem hiding this comment.
you should actually parse it on app start to a const , or throw
apps/staking/app/faucet/actions.ts
Outdated
| async function updateNodeOperatorTable({ db }: { db: BetterSql3.Database }) { | ||
| const nodeOperatorRes = await fetch('/oxen-swap'); | ||
|
|
||
| if (!nodeOperatorRes.ok) { | ||
| console.error('Failed to fetch node operator data'); | ||
| return; | ||
| } | ||
|
|
||
| const { wallets } = (await nodeOperatorRes.json()) as NodeOperatorScoreResponse; | ||
|
|
||
| const walletAddresses = Object.keys(wallets); | ||
|
|
||
| const insert = db.prepare(`INSERT INTO ${TABLE.OPERATOR} (${OPERATOR_TABLE.ID}) VALUES (?)`); | ||
|
|
||
| const transaction = db.transaction((walletAddresses: Array<string>) => { | ||
| for (const address of walletAddresses) { | ||
| insert.run(address); | ||
| } | ||
| }); | ||
|
|
||
| transaction(walletAddresses); | ||
| } | ||
| */ |
There was a problem hiding this comment.
I didn't review this code, let me know if we want it reviewed.
apps/staking/app/faucet/actions.ts
Outdated
| /** | ||
| * If the user has provided a Discord ID they must be in the approved list of Discord IDs and not have used the faucet recently. | ||
| */ | ||
| if (discordId) { |
There was a problem hiding this comment.
if I read this right, those could be elseif
apps/staking/app/faucet/actions.ts
Outdated
| /** | ||
| * If the user has provided a Telegram ID they must be in the approved list of Telegram IDs and not have used the faucet recently. | ||
| */ | ||
| if (telegramId) { |
There was a problem hiding this comment.
same comment
if I read this right, those could be elseif
|
|
||
| if (hasRecentTransaction({ db, source: TRANSACTIONS_TABLE.DISCORD, id: discordId })) { | ||
| throw new FaucetError( | ||
| FAUCET_ERROR.ALREADY_USED_SERVICE, |
There was a problem hiding this comment.
you will be able to use this service a few times right (like every 24h or whatever). So maybe that string ALREADY_USED is misleading (as it seems like a one shot)
There was a problem hiding this comment.
so this is actually a way to identify the error thrown on the frontend so we can render a link in a localised error, so when we allow for x per hour we can just update the string. this error if you look in the network tab shows the full string and this short code.
apps/staking/app/faucet/actions.ts
Outdated
| const transaction = db.transaction((telegramExport: Array<TelegramIdExport>) => { | ||
| for (const { id } of telegramExport) { | ||
| insert.run(BigInt(id).toString()); | ||
| } | ||
| }); | ||
|
|
||
| const faucetGasWarning = 0.01; | ||
| const faucetSENTWarning = 20000; | ||
| transaction(telegramExport); | ||
|
|
||
| db.close(); |
There was a problem hiding this comment.
I see, I've made changes to all the import functions to handle this
|
|
||
| if (hasRecentTransaction({ db, source: TRANSACTIONS_TABLE.DISCORD, id: discordId })) { | ||
| throw new FaucetError( | ||
| FAUCET_ERROR.ALREADY_USED_SERVICE, |
There was a problem hiding this comment.
so this is actually a way to identify the error thrown on the frontend so we can render a link in a localised error, so when we allow for x per hour we can just update the string. this error if you look in the network tab shows the full string and this short code.
apps/staking/app/faucet/actions.ts
Outdated
| /** | ||
| * If the user has provided a Telegram ID they must be in the approved list of Telegram IDs and not have used the faucet recently. | ||
| */ | ||
| if (telegramId) { |
apps/staking/app/faucet/actions.ts
Outdated
| /** | ||
| * If the user has provided a Discord ID they must be in the approved list of Discord IDs and not have used the faucet recently. | ||
| */ | ||
| if (discordId) { |
apps/staking/app/faucet/actions.ts
Outdated
| source: TRANSACTIONS_TABLE.DISCORD | TRANSACTIONS_TABLE.TELEGRAM | TRANSACTIONS_TABLE.OPERATOR; | ||
| id: string; | ||
| }; | ||
|
|
||
| /** | ||
| * Checks if the given ID exists in the specified table of the database. | ||
| * | ||
| * @param db The database instance. | ||
| * @param source The name of the table to search in. | ||
| * @param id The ID to check for existence. | ||
| * @returns A boolean indicating whether the ID exists in the table. | ||
| */ | ||
| function idIsInTable({ db, source, id }: IdTableParams) { | ||
| const field = 'id'; | ||
| const row = db | ||
| .prepare<string>(`SELECT count(${field}) FROM ${source} WHERE ${field} = ?`) | ||
| .get(id) as CountType<typeof field>; |
There was a problem hiding this comment.
Ah good spot ive change it.
Yeah i wanted it to be generic as they do the same thing but i see your point. when we make changes to the faucet for the next stage of testnet I think im going to extract the database logic out of this file and then i can make specific calls for each table so we can make sure we have the right indexes
apps/staking/app/faucet/actions.ts
Outdated
| * @returns A boolean indicating whether a recent transaction exists. | ||
| */ | ||
| function hasRecentTransaction({ db, source, id }: IdTableParams) { | ||
| const hoursBetweenTransactions = process.env.FAUCET_HOURS_BETWEEN_USES; |
apps/staking/app/faucet/actions.ts
Outdated
| const hoursBetweenTransactions = process.env.FAUCET_HOURS_BETWEEN_USES; | ||
| const lastTransactionCutoff = hoursBetweenTransactions | ||
| ? Date.now() - parseInt(hoursBetweenTransactions) * 60 * 60 * 1000 | ||
| : 0; |
|
|
||
| if (!operatorTableTimestampCutoff) return false; | ||
|
|
||
| const lastUpdate = db |
There was a problem hiding this comment.
so i added this so we could use an endpoint to update this, but that endpoint doesnt exist yet
apps/staking/app/faucet/actions.ts
Outdated
| async function updateNodeOperatorTable({ db }: { db: BetterSql3.Database }) { | ||
| const nodeOperatorRes = await fetch('/oxen-swap'); | ||
|
|
||
| if (!nodeOperatorRes.ok) { | ||
| console.error('Failed to fetch node operator data'); | ||
| return; | ||
| } | ||
|
|
||
| const { wallets } = (await nodeOperatorRes.json()) as NodeOperatorScoreResponse; | ||
|
|
||
| const walletAddresses = Object.keys(wallets); | ||
|
|
||
| const insert = db.prepare(`INSERT INTO ${TABLE.OPERATOR} (${OPERATOR_TABLE.ID}) VALUES (?)`); | ||
|
|
||
| const transaction = db.transaction((walletAddresses: Array<string>) => { | ||
| for (const address of walletAddresses) { | ||
| insert.run(address); | ||
| } | ||
| }); | ||
|
|
||
| transaction(walletAddresses); | ||
| } | ||
| */ |
Co-authored-by: Audric Ackermann <[email protected]>
|
|
||
| const minTargetEthBalance = BigInt(FAUCET.MIN_ETH_BALANCE * Math.pow(10, ETH_DECIMALS)); | ||
|
|
||
| const hoursBetweenTransactions = parseInt(process.env.FAUCET_HOURS_BETWEEN_USES ?? 0); |
There was a problem hiding this comment.
I guess this works except if FAUCET_HOURS_BETWEEN_USES is set, but not a number.
No description provided.