Compare v2 WIP to production

.env.example

@@ -15,13 +15,18 @@ STRIPE_API_KEY=
 STRIPE_SECRET=
 TOGGL_API_KEY=
 BTCPAYSERVER_API_KEY=
+BTCPAYSERVER_API_ROOT=
 BTCPAYSERVER_STORE_ID=
+BTCPAYSERVER_WALLET_ID=
 BTCPAYSERVER_SECRET=
+OAUTH_REDIRECT_NEW_USERS=
+OAUTH_REDIRECT_EXISTING_USERS=
 
 # Frontend environment variables (/src)
 # require `REACT_APP_` prefix
 REACT_APP_API_URL=localhost:6001
 REACT_APP_SITE_URL=localhost:6002
+REACT_APP_TEMP_AUTHORIZED_SUPERUSER_ID=
 
 # Required only for running tests
 TESTCAFE_ROLE_GITHUB_EMAIL=

.eslintrc.js

@@ -89,6 +89,7 @@ module.exports = {
         'react/no-danger': ['off'],
         'react/no-did-update-set-state': ['off'],
         'react/no-unescaped-entities': ['off'],
+        "react/no-unknown-property": ['off'],
         'react/no-did-mount-set-state': ['off'],
         'react/prop-types': 'off',
         'react/prefer-stateless-function': 'off',

.gitignore

@@ -114,6 +114,7 @@ dist
 
 # production
 /build
+/build-v1
 
 # misc
 .DS_Store

api/config/constants.js

@@ -1,6 +1,7 @@
 require('dotenv').config()
 
 module.exports = {
+    TEMP_AUTHORIZED_SUPERUSER_ID: process.env.REACT_APP_TEMP_AUTHORIZED_SUPERUSER_ID,
     GITHUB_OAUTH_URL: 'https://github.com/login/oauth/access_token',
     INVOICELY_CSV_PATH: `${process.env.INVOICELY_CSV_PATH}`,
     SITE_ROOT: process.env.NODE_ENV == 'production'
@@ -35,5 +36,4 @@ module.exports = {
         'MXN',
         'EUR'
     ],
-    BTCPAYSERVER_API_ROOT: 'https://btcpayserver.setlife.tech/api/v1'
 }

api/config/credentials.js

@@ -28,7 +28,9 @@ module.exports = {
     },
     BTCPAYSERVER: {
         API_KEY: process.env.BTCPAYSERVER_API_KEY,
+        API_ROOT: process.env.BTCPAYSERVER_API_ROOT,
         STORE_ID: process.env.BTCPAYSERVER_STORE_ID,
-        SECRET: process.env.BTCPAYSERVER_SECRET
+        SECRET: process.env.BTCPAYSERVER_SECRET,
+        WALLET_ID: process.env.BTCPAYSERVER_WALLET_ID
     }
 };

api/handlers/btcPayServer.js

@@ -2,12 +2,13 @@ const axios = require('axios')
 const {
     BTCPAYSERVER
 } = require('../config/credentials')
-const { BTCPAYSERVER_API_ROOT } = require('../config/constants')
 const crypto = require('crypto')
 
-const BTCPAYSERVER_API_KEY = BTCPAYSERVER.API_KEY;
-const BTCPAYSERVER_STORE_ID = BTCPAYSERVER.STORE_ID;
-const BTCPAYSERVER_SECRET = BTCPAYSERVER.SECRET;
+const BTCPAYSERVER_API_KEY = BTCPAYSERVER.API_KEY
+const BTCPAYSERVER_API_ROOT = BTCPAYSERVER.API_ROOT
+const BTCPAYSERVER_STORE_ID = BTCPAYSERVER.STORE_ID
+const BTCPAYSERVER_SECRET = BTCPAYSERVER.SECRET
+const BTCPAYSERVER_WALLET_ID = BTCPAYSERVER.WALLET_ID
 
 let config = {
     headers: {
@@ -75,9 +76,75 @@ const webhookSignatureIsValid = (body, signature) => {
     return false
 }
 
+const getNodeInfo = async () => {
+    const response = await axios.get(
+        `${BTCPAYSERVER_API_ROOT}/server/lightning/BTC/info`, 
+        config
+    )
+
+    return response.data
+}
+
+const getFee = async () => {
+    const response = await axios.get(
+        `${BTCPAYSERVER_API_ROOT}/stores/${BTCPAYSERVER_STORE_ID}/payment-methods/onchain/BTC/wallet/feerate`, 
+        config
+    )
+
+    return response.data
+}
+
+const createOnChainTransaction = async (walletAddress, amount) => {
+    const fee = await getFee()
+    const body = {
+        destinations: [
+            {
+                destination: walletAddress,
+                amount: amount,
+            }
+        ],
+        feerate: fee.feeRate,
+        proceedWithPayjoin: true,
+        proceedWithBroadcast: true,
+        noChange: false,
+        rbf: true,
+        excludeUnconfirmed: false,
+    }
+    const response = await axios.post(
+        `${BTCPAYSERVER_API_ROOT}/stores/${BTCPAYSERVER_STORE_ID}/payment-methods/onchain/BTC/wallet/transactions`,
+        body, 
+        config
+    )
+
+    return response.data
+}
+
+// This function depends on a BTCPAYSERVER_WALLET_ID which is a LNBank
+// wallet set up within the BTCPS dashboard (plugin required) and is meant
+// to serve as a partitioned source wallet so that you don't have to grant
+// full canuseinternallightningnode permissions to this app
+// any payment_request passed to this function will be paid from the funds
+// in that LN Bank Wallet
+const payLightningInvoice = async (payment_request) => {
+    const body = {
+        destination: payment_request
+    }
+    const response = await axios.post(
+        `${BTCPAYSERVER_API_ROOT}/lnbank/wallets/${BTCPAYSERVER_WALLET_ID}/send`,
+        body, 
+        config
+    )
+
+    return response.data
+}
+
 module.exports = { 
     createBitcoinInvoice, 
     getAllInvoices, 
     getInvoiceById,
-    webhookSignatureIsValid
-};
+    webhookSignatureIsValid,
+    getNodeInfo,
+    createOnChainTransaction,
+    getFee,
+    payLightningInvoice
+};

api/handlers/lnd.js

@@ -0,0 +1,82 @@
+const axios = require('axios')
+
+const sendPayment = async (host, port, macaroon, payment_request) => {
+    const options = {
+        httpsAgent: new (require('https').Agent)({ rejectUnauthorized: false }),
+        headers: {
+            'Grpc-Metadata-macaroon': macaroon,
+        }
+    }
+
+    const body = {
+        payment_request: payment_request
+    }
+
+    response = await axios.post(
+        `https://${host}:${port}/v1/channels/transactions`,
+        body, 
+        options
+    )
+
+    return response.data
+}
+
+const addInvoice = async (host, port, macaroon, value) => {
+    const options = {
+        httpsAgent: new (require('https').Agent)({ rejectUnauthorized: false }),
+        headers: {
+            'Grpc-Metadata-macaroon': macaroon,
+        }
+    }
+
+    const body = {
+        value: value,
+    }
+
+    response = await axios.post(
+        `https://${host}:${port}/v1/invoices`,
+        body,
+        options
+    )
+
+    return response.data
+}
+
+const decodePaymentRequest = async (host, port, macaroon, payment_request) => {
+    const options = {
+        httpsAgent: new (require('https').Agent)({ rejectUnauthorized: false }),
+        headers: {
+            'Grpc-Metadata-macaroon': macaroon,
+        }
+    }
+
+    response = await axios.get(
+        `https://${host}:${port}/v1/payreq/${payment_request}`,
+        options
+    )
+
+    return response.data
+}
+
+const listPayments = async (host, port, macaroon) => {
+    const options = {
+        httpsAgent: new (require('https').Agent)({ rejectUnauthorized: false }),
+        headers: {
+            'Grpc-Metadata-macaroon': macaroon,
+        }
+    }
+
+    response = await axios.get(
+        `https://${host}:${port}/v1/payments`,
+        options
+    )
+
+    return response.data
+}
+
+module.exports = {
+    sendPayment,
+    addInvoice,
+    decodePaymentRequest,
+    listPayments
+}

api/migrations/20221110030519-addProposedByContributorIdToAllocation.js

@@ -0,0 +1,27 @@
+const moment = require('moment')
+
+module.exports = {
+    up: async (queryInterface, Sequelize) => {
+        return queryInterface.sequelize.transaction(t => {
+            return Promise.all([
+                queryInterface.addColumn('Allocations', 'proposed_by_contributor_id', {
+                    type: Sequelize.DataTypes.INTEGER(11),
+                    allowNull: false,
+                    references: {
+                        model: 'Contributors',
+                        key: 'id'
+                    }
+                }, { transaction: t })
+            ])
+        })
+    },
+
+    down: async (queryInterface, Sequelize) => {
+        return queryInterface.sequelize.transaction(t => {
+            return Promise.all([
+                queryInterface.removeColumn('Allocations', 'proposed_by_contributor_id',
+                    { transaction: t })
+            ])
+        })
+    }
+};

api/migrations/20221110033428-addStatusToAllocation.js

@@ -0,0 +1,23 @@
+const moment = require('moment')
+
+module.exports = {
+    up: async (queryInterface, Sequelize) => {
+        return queryInterface.sequelize.transaction(t => {
+            return Promise.all([
+                queryInterface.addColumn('Allocations', 'status', {
+                    type: Sequelize.DataTypes.STRING,
+                    allowNull: false,
+                }, { transaction: t })
+            ])
+        })
+    },
+
+    down: async (queryInterface, Sequelize) => {
+        return queryInterface.sequelize.transaction(t => {
+            return Promise.all([
+                queryInterface.removeColumn('Allocations', 'status',
+                    { transaction: t })
+            ])
+        })
+    }
+};

api/migrations/20221110034434-addExpectedBudgetCurrencyToProjects.js

@@ -0,0 +1,22 @@
+const moment = require('moment')
+
+module.exports = {
+    up: async (queryInterface, Sequelize) => {
+        return queryInterface.sequelize.transaction(t => {
+            return Promise.all([
+                queryInterface.addColumn('Projects', 'expected_budget_currency', {
+                    type: Sequelize.DataTypes.STRING,
+                }, { transaction: t })
+            ])
+        })
+    },
+
+    down: async (queryInterface, Sequelize) => {
+        return queryInterface.sequelize.transaction(t => {
+            return Promise.all([
+                queryInterface.removeColumn('Projects', 'expected_budget_currency',
+                    { transaction: t })
+            ])
+        })
+    }
+};

api/migrations/20221110045636-addProjectIdToPayment.js

@@ -0,0 +1,27 @@
+const moment = require('moment')
+
+module.exports = {
+    up: async (queryInterface, Sequelize) => {
+        return queryInterface.sequelize.transaction(t => {
+            return Promise.all([
+                queryInterface.addColumn('Payments', 'project_id', {
+                    type: Sequelize.DataTypes.INTEGER,
+                    allowNull: true,
+                    references: {
+                        model: 'Projects',
+                        key: 'id'
+                    }
+                }, { transaction: t })
+            ])
+        })
+    },
+
+    down: async (queryInterface, Sequelize) => {
+        return queryInterface.sequelize.transaction(t => {
+            return Promise.all([
+                queryInterface.removeColumn('Payments', 'project_id',
+                    { transaction: t }),
+            ])
+        })
+    }
+};

api/migrations/20221115165557-removeNotNullConstraintsToProjects.js

@@ -0,0 +1,37 @@
+module.exports = {
+    async up (queryInterface, Sequelize) {
+        return queryInterface.sequelize.transaction(t => {
+            return Promise.all([
+                queryInterface.changeColumn('Projects', 'expected_budget', {
+                    type: Sequelize.DataTypes.INTEGER,
+                    allowNull: true
+                }, { transaction: t }),
+                queryInterface.changeColumn('Projects', 'client_id', {
+                    type: Sequelize.DataTypes.INTEGER,
+                    allowNull: true
+                }, { transaction: t }),
+                queryInterface.changeColumn('Projects', 'date', {
+                    type: Sequelize.DataTypes.INTEGER,
+                    allowNull: true
+                }, { transaction: t })
+            ])
+        })
+    },
+
+    async down (queryInterface, Sequelize) {
+        return Promise.all([
+            queryInterface.changeColumn('Projects', 'expected_budget', {
+                type: Sequelize.DataTypes.INTEGER,
+                allowNull: false
+            }, { transaction: t }),
+            queryInterface.changeColumn('Projects', 'client_id', {
+                type: Sequelize.DataTypes.INTEGER,
+                allowNull: false
+            }, { transaction: t }),
+            queryInterface.changeColumn('Projects', 'date', {
+                type: Sequelize.DataTypes.INTEGER,
+                allowNull: false
+            }, { transaction: t })
+        ])
+    }
+};