add min fee to frontend

README.md

@@ -1,25 +1,153 @@
-# Lightning DEX
+# Zap
 
-The smart contract is currently deployed to Arbitrum at the address: 
+Zap is a cross-chain crypto swap protocol. It specializes in supporting native tokens with no counterparty risk such as ETH, BTC, and SOL. 
 
+This document provides an overview of how to interact with the protocol. 
+
+## Base URLs
+
+* Mainnet: https://api.zap.zigzag.exchange
+* Testnet: https://api.zap.zigzag.exchange/testnet
+
+## Currencies
+
+The following currencies are supported by the API: 
+
+* BTC: Bitcoin
+* ETH: Ethereum
+* SOL: Solana
+
+## Swaps
+
+The following swaps are supported by the API: 
+
+* ETH-SOL
+* ETH-BTC
+
+## Pricing
+
+There is an endpoint `GET /prices` that you can use to see the price the protocol is offering. The prices are determined by the average of the top 3 exchanges by volume for a given currency. 
+
+All swaps are conducted at market price when the depositing transaction hits finality. Finality is determined as follows for the following chains. 
+
+* ETH: 3 confirmations (~45 seconds)
+* BTC: 1 confirmation (~10 minutes)
+* SOL: 1 confirmation (~5 seconds)
+
+There is a possibility, especially on BTC, that the market price moves significantly between when you send the transaction and when the transaction finalizes. This is the risk you choose to take when you interact with the protocol. 
+
+# Fees
+
+A variable network fee, plus a 0.2% trading fee, is charged on each swap.
+
+The network fees are calculated as follows: 
+
+SOL: essentially 0
+ETH: (Current base fee for a simple ETH transfer) * 2
+BTC: (1-block confirmation fee-rate) * (400 vB)
+
+## Testnets
+
+We use the Goerli Testnet for ETH, Solana Devnet for SOL, and Bitcoin Testnet for BTC. 
+
+Your funds can be irrevecably lost if you use the mainnet improperly. Please verify your code on testnet before implementing it on mainnet.  
+
+## Smart Contracts
+
+Swapping from ETH to SOL or BTC is done via a smart contract. The verified code and ABI for each contract is available on Etherscan. 
+
+To send ETH, call the `depositETH` function on the appropriate contract with the requested ETH `value`, `out_chain`, and `out_address`. The `out_chain` must be `SOL` on the ETH-SOL contract and `BTC` on the ETH-BTC contract. 
+
+* ETH-BTC (mainnet): [0x64Ca3FCa3B43c98F12A9E9509f9cF8AB18abc208](https://etherscan.io/address/0x64Ca3FCa3B43c98F12A9E9509f9cF8AB18abc208) 
+* ETH-SOL (mainnet): [0xd484ed3cdF6f34d9Cca869240107E1E8a03BaE96](https://etherscan.io/address/0xd484ed3cdF6f34d9Cca869240107E1E8a03BaE96)
+
+The contracts are avaiable on Goerli Testnet for testing as well. 
+
+* ETH-BTC (testnet): [0xC7F355DE8cC7ec65d275f6Bc3349787c9FB48ACD](https://goerli.etherscan.io/address/0xC7F355DE8cC7ec65d275f6Bc3349787c9FB48ACD)
+* ETH-SOL (testnet): [0x43b2FF69196a1b9641C1fCBaB6A869B4e256Fb12](https://goerli.etherscan.io/address/0x43b2FF69196a1b9641C1fCBaB6A869B4e256Fb12)
+
+## Deposit Addresses
+
+Swapping from BTC or SOL to ETH is supported via deposit addresses. Please see the endpoints for more detail. 
+
+## Endpoints
+
+### GET /btc_deposit
+
+Generate a deposit address to swap BTC for ETH. Every outgoing address will have a unique deposit address. Make sure you double check the address you enter. If you enter the wrong `outgoing_address` your ETH will be lost forever and we will not refund you. 
+
+Example Request:
+
+https://api.zap.zigzag.exchange/btc_deposit?outgoing_currency=ETH&outgoing_address=0xE4ADed7c6515c73B83f6aC4C01930c8A40A1c43E
+
+Response:
+
+```
+{
+  "deposit_currency":"BTC",
+  "deposit_address":"tb1qjylf9cscuj89gucm7tkackx4qsxh7ungsmzuxq",
+  "outgoing_currency":"ETH",
+  "outgoing_address":"0xE4ADed7c6515c73B83f6aC4C01930c8A40A1c43E"
+}
 ```
-0x7F6678cdBC715F15501342ecFB34ABCC903cBF6F
+
+### GET /sol_deposit
+
+Generate a deposit address to swap SOL for ETH. SOL deposit addresses are one time use and expire at the specified time. Duplicate deposits or deposits sent after the expiry will not be processed. 
+
+Example Request:
+
+https://api.zap.zigzag.exchange/sol_deposit?outgoing_currency=ETH&outgoing_address=0xE4ADed7c6515c73B83f6aC4C01930c8A40A1c43E
+
+Response:
+
 ```
+{
+  "deposit_address":"F5E9kwLLPQ2P4RAeQLGGSrDrbVuaSsaXHcXSDCHiWFn8",
+  "expires_at":1686263061
+}
+```
+
+
 
-You can view it on Arbiscan: https://arbiscan.io/address/0x7F6678cdBC715F15501342ecFB34ABCC903cBF6F
+### GET /history/:address
 
-The backend is deployed to https://api.bitcoin.zigzag.exchange
+Get an account's bridging history. 
 
-The frontend is currently deployed to https://lightning-dex.vercel.app/ but should be used with great caution.  
+Example Request:
 
-We have a public Lightning node. You can connect to us at: 
+https://api.zap.zigzag.exchange/history/0xE4ADed7c6515c73B83f6aC4C01930c8A40A1c43E
+
+Response:
 
-Mainnet: 
 ```
-02572fcd9ca25472108ff62b975dff47f5625e57abcf0f354065c9586db8dbd632@34.214.120.115:9735
+[  
+  {
+    "deposit_currency": "BTC",
+    "deposit_address": "bc1qdknckpa5h5kl2wedhsjw6n85ddkytf9dmfrz2u",
+    "deposit_amount": "0.01",
+    "deposit_txid": "0cd7c085eda7431c6d634afed0c681cb2bf2fa998ac9a2b3137172e37ed272d8",
+    "deposit_timestamp": "2023-06-01T19:40:33.786Z",
+    "outgoing_currency": "ETH",
+    "outgoing_address": "0xE4ADed7c6515c73B83f6aC4C01930c8A40A1c43E",
+    "outgoing_amount": "0.1405146142799961",
+    "outgoing_txid": "0x670b46ec75934ea2bfb3d98d3ea1b0038ded6447604a2dd891517ad83e3f865a",
+    "outgoing_timestamp": "2023-06-01T19:40:49.590Z",
+    "paid": true
+  }
+]
 ```
+### GET /prices
+
+Example Request:
+
+https://api.zap.zigzag.exchange/prices
 
-Testnet: 
+Response
 ```
-03289786c1fd9c2ddb4936186958636a2d2cbf9ef2fdd43a342ad72377711ae326@34.214.120.115:19735
+{
+    "btc_usd": 26690.19,
+    "eth_usd": 1853.5622852385998,
+    "sol_usd": 18.873888749272282
+}
 ```

backend/app.js

@@ -5,30 +5,32 @@ const { Pool } = require('pg');
 const crypto = require('crypto');
 const nodeChildProcess = require('node:child_process');
 const util = require('node:util');
+const dotenv = require('dotenv');
+const { ethers } = require('ethers');
+const solana = require('@solana/web3.js')
+const {v4: uuid} = require('uuid')
+const axios = require('axios')
+const bs58 = require('bs58')
+const BigNumber = require('bignumber.js')
 
-const exec = util.promisify(nodeChildProcess.exec);
+dotenv.config();
 
-const db = new Pool({
-  connectionString: process.env.DATABASE_URL,
-  ssl: { rejectUnauthorized: false },
-})
+const solanaConnection = new solana.Connection(process.env.SOLANA_CONNECTION_URL)
+const ethersProvider = new ethers.InfuraProvider(
+  process.env.ETH_NETWORK,
+  process.env.INFURA_PROJECT_ID,
+);
 
-async function runDbMigration () {
-  await db.query(`
-    CREATE TABLE IF NOT EXISTS hashes (
-      hash TEXT PRIMARY KEY,
-      invoice TEXT
-    )
-  `);
-  await db.query(`
-    CREATE TABLE IF NOT EXISTS invoice_requests (
-      id SERIAL PRIMARY KEY,
-      amount NUMERIC
-    )
-  `);
-}
 
-runDbMigration();
+const exec = util.promisify(nodeChildProcess.exec);
+
+const db = new Pool({
+  host: 'localhost',
+  port: 5432,
+  database: process.env.POSTGRES_DB,
+  user: 'postgres',
+  password: 'postgres'
+});
 
 // CORS
 app.use('/', (req, res, next) => {
@@ -43,48 +45,127 @@ app.use('/', (req, res, next) => {
 
 app.use(express.json());
 
-app.post('/invoice', async (req, res, next) => {
-  const invoice = req.body.invoice;
-  let decodedInvoice;
-  try {
-    decodedInvoice = LNInvoice.decode(invoice);
-  } catch (e) {
-    return next("Bad invoice: " + e.message);
-  }
-  const now = Math.floor(Date.now() / 1000)
-  const unix_expiry = decodedInvoice.timestamp + decodedInvoice.expiry;
-  if (unix_expiry < now + 600) {
-    return next("Bad expiry. Expires in less than 10 min");
+app.get('/btc_deposit', async (req, res, next) => {
+  const outgoing_currency = req.query.outgoing_currency;
+  const outgoing_address = req.query.outgoing_address;
+
+  const valid_outgoing_currencies = ["ETH"];
+  if (!valid_outgoing_currencies.includes(outgoing_currency)) return next("Bad outgoing_currency")
+  if (!outgoing_address) return next("Must set outgoing_address")
+  if (!ethers.isAddress(outgoing_address)) return next("Invalid outgoing_address")
+
+  const deposit_address = await db.query("SELECT * FROM deposit_addresses WHERE deposit_currency=$1 AND outgoing_currency=$2 AND outgoing_address=$3 LIMIT 1", ["BTC", outgoing_currency, outgoing_address]);
+
+  if (deposit_address.rows.length > 0) return res.status(200).json(deposit_address.rows[0]);
+  else {
+    const addressgen = await exec(`${process.env.BITCOIN_CLI_PREFIX} getnewaddress`);
+    const deposit_address = addressgen.stdout.trim();
+    try {
+      await db.query("INSERT INTO deposit_addresses (deposit_currency, deposit_address, outgoing_currency, outgoing_address) VALUES ($1,$2,$3,$4)", ["BTC", deposit_address, outgoing_currency, outgoing_address]);
+    } catch (e) {
+      return next(e);
+    }
+    return res.status(200).json({ deposit_address, outgoing_currency, outgoing_address });
   }
-  const hash = decodedInvoice.paymentHash.toString('hex');
+});
+
+app.get("/history/:address", async (req, res, next) => {
+    if (!req.params.address) return next("GET /history/:address. Missing address");
+    try {
+      const bridges = await db.query("SELECT * FROM bridges WHERE LOWER(deposit_address)=$1 OR LOWER(outgoing_address)=$1", [req.params.address.toLowerCase()]);
+      return res.status(200).json(bridges.rows);
+    } catch (e) {
+      return next(e);
+    }
+});
+
+function deriveSolanaDepositAddress (depositId) {
+  const masterPrivateKey = Buffer.from(process.env.SOL_LIQUIDITY_ACCOUNT_PRIV_KEY_BASE58, 'utf-8')
+  const seed = crypto.createHash('sha256').update(masterPrivateKey).update(depositId).digest()
+  return solana.Keypair.fromSeed(seed).publicKey.toString()
+}
+
+const SOL_DEPOSIT_EXPIRY_PERIOD = 3600 // 1 hour
+
+app.get('/sol_deposit', async (req, res, next) => {
+  const outgoingCurrency = req.query.outgoing_currency
+  const outgoingAddress = req.query.outgoing_address
+
+  if (outgoingCurrency !== 'ETH') return next('Only eth bridges supported')
+  if (!ethers.isAddress(outgoingAddress)) return next("Invalid outgoing_address")
+
+  const depositId = uuid()
+  const depositAddress = deriveSolanaDepositAddress(depositId)
+  const expiry = Math.floor(new Date().getTime() / 1000) + SOL_DEPOSIT_EXPIRY_PERIOD
+  await db.query('INSERT INTO sol_deposits (id, deposit_address, outgoing_currency, outgoing_address, expiry) VALUES ($1,$2,$3,$4,to_timestamp($5))', [depositId, depositAddress, outgoingCurrency, outgoingAddress, expiry])
+  return res.status(200).json({
+    deposit_address: depositAddress,
+    expires_at: expiry
+  })
+})
+
+app.get('/prices', async (_, res) => {
+  let gmxPrices;
+  let coinCapPrices;
   try {
-    await db.query("INSERT INTO hashes VALUES ($1, $2)", [hash, invoice]);
-  }
-  catch (e) {
-    return next(e.detail);
+    gmxPrices = await axios.get('https://api.gmx.io/prices').then(({ data })=> ({
+      btc_usd: data['0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f'] / 1e30,
+      eth_usd: data['0x82aF49447D8a07e3bd95BD0d56f35241523fBab1'] / 1e30 
+    }))
+    coinCapPrices = await axios.get('https://api.coincap.io/v2/assets', {
+      headers: {
+        'Authorization': `Bearer ${process.env.COIN_CAP_API_KEY}`
+      }
+    }).then(({data}) => ({
+      sol_usd: Number(data.data.find(asset => asset.id === 'solana').priceUsd)
+    }))
+  } catch (e) {
+    return next("Failed to get prices");
   }
-  res.status(200).json({"success": true });
+
+  return res.status(200).json({
+    ...gmxPrices,
+    ...coinCapPrices
+  })
 })
 
-app.get('/hash/:hash', async (req, res, next) => {
-  const hashes = await db.query("SELECT * FROM hashes WHERE hash=$1", [req.params.hash]);
-  if (hashes.rows.length > 0) res.status(200).json(hashes.rows[0]);
-  else next("Hash not found");
+app.get('/available_liquidity', async (_, res) => {
+  const balances = await Promise.all([
+    getSolanaBalance(),
+    getEthereumBalance(process.env.ETH_SOL_LIQUIDITY_ADDRESS),
+    getEthereumBalance(process.env.ETH_BTC_LIQUIDITY_ADDRESS),
+    getBitcoinBalace()
+  ]);
+
+  return res.status(200).json({
+    sol: balances[0], 
+    eth_sol: balances[1], 
+    eth_btc: balances[2], 
+    btc: balances[3], 
+  })
 })
 
-app.get('/invoice/request/:amount', async (req, res, next) => {
-  const amount = parseInt(req.params.amount);
-  if (isNaN(amount)) return next("Invalid amount");
-  if (amount < 2000) return next("Min amount is 2000");
-  const invoicegen = await exec(`lncli addinvoice --amt ${amount}`);
-  const invoice = JSON.parse(invoicegen.stdout)
+async function getSolanaBalance () {
+  const decoded = bs58.decode(process.env.SOL_LIQUIDITY_ACCOUNT_PRIV_KEY_BASE58)
+  const liqudityKeyPair =  solana.Keypair.fromSecretKey(decoded)
+  const solanaBalance = await solanaConnection.getBalance(liqudityKeyPair.publicKey)
+  return solanaBalance / solana.LAMPORTS_PER_SOL
+}
+
+async function getEthereumBalance (address) {
+  const balance = await ethersProvider.getBalance(address);
+  return new BigNumber(balance.toString()).div(1e18).toNumber()
+}
 
-  res.status(200).json(invoice);
-});
+async function getBitcoinBalace () {
+  const balanceCheck = await exec(`${process.env.BITCOIN_CLI_PREFIX} getwalletinfo`);
+  const walletInfo = JSON.parse(balanceCheck.stdout);
+  return walletInfo.balance
+}
 
 app.use((err, req, res, next) => {
   console.error(err);
   res.status(500).json({ err })
 })
 
-module.exports = { app, db, runDbMigration }
+module.exports = { app, db }