.gitignore

@@ -56,6 +56,3 @@ docker-compose.*.yml
 
 # nostr wallet connect
 scripts/nwc-keys.json
-
-# lnbits
-docker/lnbits/data

api/resolvers/wallet.js

@@ -647,21 +647,14 @@ async function upsertWallet (
   }
 
   const { id, ...walletData } = data
-  const {
+  const { autoWithdrawThreshold, autoWithdrawMaxFeePercent, enabled, priority } = settings
-    autoWithdrawThreshold,
-    autoWithdrawMaxFeePercent,
-    autoWithdrawMaxFeeTotal,
-    enabled,
-    priority
-  } = settings
 
   const txs = [
     models.user.update({
       where: { id: me.id },
       data: {
         autoWithdrawMaxFeePercent,
-        autoWithdrawThreshold,
+        autoWithdrawThreshold
-        autoWithdrawMaxFeeTotal
       }
     })
   ]

api/typeDefs/user.js

@@ -182,7 +182,6 @@ export default gql`
     withdrawMaxFeeDefault: Int!
     autoWithdrawThreshold: Int
     autoWithdrawMaxFeePercent: Float
-    autoWithdrawMaxFeeTotal: Int
   }
 
   type UserOptional {

api/typeDefs/wallet.js

@@ -91,7 +91,6 @@ const typeDefs = `
   input AutowithdrawSettings {
     autoWithdrawThreshold: Int!
     autoWithdrawMaxFeePercent: Float!
-    autoWithdrawMaxFeeTotal: Int!
     priority: Int
     enabled: Boolean
   }

awards.csv

@@ -135,5 +135,3 @@ toyota-corolla0,pr,#1449,,good-first-issue,,,,20k,toyota_corolla0@stacker.news,2
 toyota-corolla0,pr,#1455,#1437,good-first-issue,,,,20k,toyota_corolla0@stacker.news,2024-10-02
 SouthKoreaLN,issue,#1436,,easy,,,,10k,south_korea_ln@stacker.news,2024-10-02
 TonyGiorgio,issue,#1462,,easy,urgent,,,30k,TonyGiorgio@stacker.news,2024-10-07
-hkarani,issue,#1369,#1458,good-first-issue,,,,2k,asterisk32@stacker.news,2024-10-21
-toyota-corolla0,pr,#1369,#1458,good-first-issue,,,,20k,toyota_corolla0@stacker.news,2024-10-20

components/autowithdraw-shared.js

@@ -4,7 +4,6 @@ import { useMe } from './me'
 import { useEffect, useState } from 'react'
 import { isNumber } from '@/lib/validate'
 import { useIsClient } from './use-client'
-import Link from 'next/link'
 
 function autoWithdrawThreshold ({ me }) {
   return isNumber(me?.privates?.autoWithdrawThreshold) ? me?.privates?.autoWithdrawThreshold : 10000
@@ -13,8 +12,7 @@ function autoWithdrawThreshold ({ me }) {
 export function autowithdrawInitial ({ me }) {
   return {
     autoWithdrawThreshold: autoWithdrawThreshold({ me }),
-    autoWithdrawMaxFeePercent: isNumber(me?.privates?.autoWithdrawMaxFeePercent) ? me?.privates?.autoWithdrawMaxFeePercent : 1,
+    autoWithdrawMaxFeePercent: isNumber(me?.privates?.autoWithdrawMaxFeePercent) ? me?.privates?.autoWithdrawMaxFeePercent : 1
-    autoWithdrawMaxFeeTotal: isNumber(me?.privates?.autoWithdrawMaxFeeTotal) ? me?.privates?.autoWithdrawMaxFeeTotal : 1
   }
 }
 
@@ -53,30 +51,13 @@ export function AutowithdrawSettings ({ wallet }) {
             append={<InputGroup.Text className='text-monospace'>sats</InputGroup.Text>}
             required
           />
-          <h3 className='text-center text-muted pt-3'>network fees</h3>
-          <h6 className='text-center pb-3'>
-            we'll use whichever setting is higher during{' '}
-            <Link
-              target='_blank'
-              href='https://docs.lightning.engineering/the-lightning-network/pathfinding'
-              rel='noreferrer'
-            >pathfinding
-            </Link>
-          </h6>
           <Input
-            label='max fee rate'
+            label='max fee'
             name='autoWithdrawMaxFeePercent'
             hint='max fee as percent of withdrawal amount'
             append={<InputGroup.Text>%</InputGroup.Text>}
             required
           />
-          <Input
-            label='max fee total'
-            name='autoWithdrawMaxFeeTotal'
-            hint='max fee for any withdrawal amount'
-            append={<InputGroup.Text className='text-monospace'>sats</InputGroup.Text>}
-            required
-          />
         </div>
       </div>
     </>

docker-compose.yml

@@ -586,8 +586,7 @@ services:
       - 'keys-file.json'
     cpu_shares: "${CPU_SHARES_LOW}"
   lnbits:
-    build:
+    image: lnbits/lnbits:0.12.5
-      context: ./docker/lnbits
     container_name: lnbits
     profiles:
       - wallets
@@ -597,7 +596,6 @@ services:
     depends_on:
       - stacker_lnd
     environment:
-      - LNBITS_ADMIN_UI=true
       - LNBITS_BACKEND_WALLET_CLASS=LndWallet
       - LND_GRPC_ENDPOINT=stacker_lnd
       - LND_GRPC_PORT=10009

docker/lnbits/Dockerfile

@@ -1,5 +0,0 @@
-FROM lnbits/lnbits:0.12.5
-
-
-COPY ["./data/database.sqlite3", "/app/data/database.sqlite3"]
-COPY ["./data/.super_user", "/app/data/.super_user"]

docker/lnbits/data/.super_user

@@ -1 +0,0 @@
-e46288268b67457399a5fca81809573e

fragments/users.js

@@ -27,7 +27,6 @@ ${STREAK_FIELDS}
       noReferralLinks
       fiatCurrency
       autoWithdrawMaxFeePercent
-      autoWithdrawMaxFeeTotal
       autoWithdrawThreshold
       withdrawMaxFeeDefault
       satsFilter

lib/validate.js

@@ -366,8 +366,7 @@ export function advSchema (args) {
 export const autowithdrawSchemaMembers = {
   enabled: boolean(),
   autoWithdrawThreshold: intValidator.required('required').min(0, 'must be at least 0').max(msatsToSats(BALANCE_LIMIT_MSATS), `must be at most ${abbrNum(msatsToSats(BALANCE_LIMIT_MSATS))}`),
-  autoWithdrawMaxFeePercent: floatValidator.required('required').min(0, 'must be at least 0').max(50, 'must not exceed 50'),
+  autoWithdrawMaxFeePercent: floatValidator.required('required').min(0, 'must be at least 0').max(50, 'must not exceed 50')
-  autoWithdrawMaxFeeTotal: intValidator.required('required').min(0, 'must be at least 0').max(1_000, 'must not exceed 1000')
 }
 
 export const lnAddrAutowithdrawSchema = object({

package-lock.json

@@ -7057,9 +7057,9 @@
       }
     },
     "node_modules/bitcore-lib": {
-      "version": "8.25.47",
+      "version": "8.25.40",
-      "resolved": "https://registry.npmjs.org/bitcore-lib/-/bitcore-lib-8.25.47.tgz",
+      "resolved": "https://registry.npmjs.org/bitcore-lib/-/bitcore-lib-8.25.40.tgz",
-      "integrity": "sha512-qDZr42HuP4P02I8kMGZUx/vvwuDsz8X3rQxXLfM0BtKzlQBcbSM7ycDkDN99Xc5jzpd4fxNQyyFXOmc6owUsrQ==",
+      "integrity": "sha512-mb6kvfhoiIdoyFsDlhIFVst3HpeGjGYBf0XDxTdZ+H07EC4JuiViA3bnQ5uZbZjHFngEl0GTPaoK1Zaolutw4A==",
       "dependencies": {
         "bech32": "=2.0.0",
         "bip-schnorr": "=0.6.4",
@@ -15626,9 +15626,9 @@
       "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ=="
     },
     "node_modules/node-addon-api": {
-      "version": "5.1.0",
+      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz",
-      "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA=="
+      "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA=="
     },
     "node_modules/node-fetch": {
       "version": "2.7.0",
@@ -18038,17 +18038,17 @@
       "integrity": "sha512-d7wDPgDV3DDiqulJjKiV2865wKsJ34YI+NDREbm+FySq6WuKOikwyNQcm+doLAZ1O6ltdO0SeKle2xMpN3Brgw=="
     },
     "node_modules/secp256k1": {
-      "version": "4.0.4",
+      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.3.tgz",
-      "integrity": "sha512-6JfvwvjUOn8F/jUoBY2Q1v5WY5XS+rj8qSe0v8Y4ezH4InLgTEeOOPQsRll9OV429Pvo6BCHGavIyJfr3TAhsw==",
+      "integrity": "sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA==",
       "hasInstallScript": true,
       "dependencies": {
-        "elliptic": "^6.5.7",
+        "elliptic": "^6.5.4",
-        "node-addon-api": "^5.0.0",
+        "node-addon-api": "^2.0.0",
         "node-gyp-build": "^4.2.0"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=10.0.0"
       }
     },
     "node_modules/secure-json-parse": {

prisma/migrations/20241018160708_max_fee_total/migration.sql

@@ -1,8 +0,0 @@
--- AlterTable
-ALTER TABLE "users" ADD COLUMN     "autoWithdrawMaxFeeTotal" INTEGER;
-
--- set max total fee for users with autowithdrawals enabled to not interfere with them.
--- we set it to 0 instead of 1 because that preserves old behavior.
-UPDATE "users"
-SET "autoWithdrawMaxFeeTotal" = 0
-WHERE "autoWithdrawMaxFeePercent" IS NOT NULL;

prisma/schema.prisma

@@ -118,7 +118,6 @@ model User {
   lnAddr                    String?
   autoWithdrawMaxFeePercent Float?
   autoWithdrawThreshold     Int?
-  autoWithdrawMaxFeeTotal   Int?
   muters                    Mute[]               @relation("muter")
   muteds                    Mute[]               @relation("muted")
   ArcOut                    Arc[]                @relation("fromUser")

wallets/index.js

@@ -201,7 +201,6 @@ function useConfig (wallet) {
         }
         // these are stored on the server
         delete newClientConfig.autoWithdrawMaxFeePercent
-        delete newClientConfig.autoWithdrawThreshold
         delete newClientConfig.autoWithdrawMaxFeeTotal
       } catch {
         valid = false
@@ -297,7 +296,6 @@ function useServerConfig (wallet) {
   const saveConfig = useCallback(async ({
     autoWithdrawThreshold,
     autoWithdrawMaxFeePercent,
-    autoWithdrawMaxFeeTotal,
     priority,
     enabled,
     ...config
@@ -312,7 +310,6 @@ function useServerConfig (wallet) {
           settings: {
             autoWithdrawThreshold: Number(autoWithdrawThreshold),
             autoWithdrawMaxFeePercent: Number(autoWithdrawMaxFeePercent),
-            autoWithdrawMaxFeeTotal: Number(autoWithdrawMaxFeeTotal),
             priority,
             enabled
           },

wallets/lnbits/ATTACH.md

@@ -1,24 +1,27 @@
-LNbits' database is seeded with a superuser (see https://docs.lnbits.org/guide/admin_ui.html).
+For testing LNbits, you need to create a LNbits account first via the web interface.
 
-The following credentials were used:
+By default, you can access it at `localhost:5001` (see `LNBITS_WEB_PORT` in .env.development).
 
-- username: `stackernews`
+After you created a wallet, you should find the invoice and admin key under `Node URL, API keys and API docs`.
-- password: `stackernews`
 
-To get access to the superuser, you need to visit the admin UI:
+> [!IMPORTANT]
-
+>
-http://localhost:5001/wallet?usr=e46288268b67457399a5fca81809573e
+> Since your browser is running on your host machine but the server is running inside a docker container, the server will not be able to reach LNbits with `localhost:5001` to create invoices. This makes it hard to test send+receive at the same time.
-
+>
-After that, the cookies will be set to access this wallet:
+> For now, you need to patch the `_createInvoice` function in wallets/lnbits/server.js to always use `lnbits:5000` as the URL:
-
+>
-http://localhost:5001/wallet?&wal=15ffe06c74cc4082a91f528d016d9028
+> ```diff
-
+> diff --git a/wallets/lnbits/server.js b/wallets/lnbits/server.js
-Or simply copy the keys from here:
+> index 39949775..e3605c45 100644
-
+> --- a/wallets/lnbits/server.js
-* admin key: `640cc7b031eb427c891eeaa4d9c34180`
+> +++ b/wallets/lnbits/server.js
-
+> @@ -11,6 +11,7 @@ async function _createInvoice ({ url, invoiceKey, amount, expiry }, { me }) {
-* invoice key: `5deed7cd634e4306bb5e696f4a03cdac`
+>    const memo = me.hideInvoiceDesc ? undefined : 'autowithdraw to LNbits from SN'
-
+>    const body = JSON.stringify({ amount, unit: 'sat', expiry, memo, out: false })
-( These keys can be found under `Node URL, API keys and API docs`. )
+>
-
+> +  url = 'http://lnbits:5000'
-To use the same URL to connect to LNbits in the browser and server during local development, `localhost:<port>` is mapped to `lnbits:5000` on the server.
+>    const res = await fetch(url + path, { method: 'POST', headers, body })
+>    if (!res.ok) {
+>      const errBody = await res.json()
+> ```
+>

wallets/lnbits/server.js

@@ -28,14 +28,9 @@ export async function createInvoice (
     out: false
   })
 
-  let hostname = url.replace(/^https?:\/\//, '')
+  const hostname = url.replace(/^https?:\/\//, '')
   const agent = getAgent({ hostname })
 
-  if (process.env.NODE_ENV !== 'production' && hostname.startsWith('localhost:')) {
-    // to make it possible to attach LNbits for receives during local dev
-    hostname = 'lnbits:5000'
-  }
-
   const res = await fetch(`${agent.protocol}//${hostname}${path}`, {
     method: 'POST',
     headers,

worker/autowithdraw.js

@@ -4,10 +4,7 @@ import { createInvoice } from 'wallets/server'
 
 export async function autoWithdraw ({ data: { id }, models, lnd }) {
   const user = await models.user.findUnique({ where: { id } })
-  if (
+  if (user.autoWithdrawThreshold === null || user.autoWithdrawMaxFeePercent === null) return
-    user.autoWithdrawThreshold === null ||
-    user.autoWithdrawMaxFeePercent === null ||
-    user.autoWithdrawMaxFeeTotal === null) return
 
   const threshold = satsToMsats(user.autoWithdrawThreshold)
   const excess = Number(user.msats - threshold)
@@ -16,10 +13,7 @@ export async function autoWithdraw ({ data: { id }, models, lnd }) {
   if (excess < Number(threshold) * 0.1) return
 
   // floor fee to nearest sat but still denominated in msats
-  const maxFeeMsats = msatsSatsFloor(Math.max(
+  const maxFeeMsats = msatsSatsFloor(Math.ceil(excess * (user.autoWithdrawMaxFeePercent / 100.0)))
-    Math.ceil(excess * (user.autoWithdrawMaxFeePercent / 100.0)),
-    Number(satsToMsats(user.autoWithdrawMaxFeeTotal))
-  ))
   // msats will be floored by createInvoice if it needs to be
   const msats = BigInt(excess) - maxFeeMsats