Removed unused/buggy accountReserve

2025-11-04 11:55:50 +00:00 · 2023-08-07 12:14:52 +02:00
parent da186bd2d6
commit b7cf61d02b
18 changed files with 13 additions and 64 deletions
--- a/content/_code-samples/build-a-wallet/desktop-js/3-account/index.js
+++ b/content/_code-samples/build-a-wallet/desktop-js/3-account/index.js
@@ -1,12 +1,10 @@
 const { app, BrowserWindow, ipcMain} = require('electron')
 const path = require('path')
 const xrpl = require("xrpl")
-const { prepareReserve, prepareAccountData, prepareLedgerData} = require('../library/3_helpers')
+const { prepareAccountData, prepareLedgerData} = require('../library/3_helpers')

 const TESTNET_URL = "wss://s.altnet.rippletest.net:51233"

-let reserveBaseXrp = null, reserveIncrementXrp = null
-
 const createWindow = () => {

    const appWindow = new BrowserWindow({
@@ -27,8 +25,6 @@ const main = async () => {

    ipcMain.on('address-entered', async (event, address) =>  {

-        let reserve = null
-
        const client = new xrpl.Client(TESTNET_URL)

        await client.connect()
@@ -42,7 +38,6 @@ const main = async () => {

        // Reference: https://xrpl.org/subscribe.html#ledger-stream
        client.on("ledgerClosed", async (rawLedgerData) => {
-            reserve = prepareReserve(rawLedgerData)
            const ledger = prepareLedgerData(rawLedgerData)
            appWindow.webContents.send('update-ledger-data', ledger)
        })
@@ -64,7 +59,7 @@ const main = async () => {
                "ledger_index": transaction.ledger_index
            }
            const accountInfoResponse = await client.request(accountInfoRequest)
-            const accountData = prepareAccountData(accountInfoResponse.result.account_data, reserve)
+            const accountData = prepareAccountData(accountInfoResponse.result.account_data)
            appWindow.webContents.send('update-account-data', accountData)
        })

--- a/content/_code-samples/build-a-wallet/desktop-js/3-account/view/renderer.js
+++ b/content/_code-samples/build-a-wallet/desktop-js/3-account/view/renderer.js
@@ -29,11 +29,9 @@ window.electronAPI.onUpdateLedgerData((_event, ledger) => {
 const accountAddressClassicEl = document.getElementById('account-address-classic')
 const accountAddressXEl = document.getElementById('account-address-x')
 const accountBalanceEl = document.getElementById('account-balance')
-const accountReserveEl = document.getElementById('account-reserve')

 window.electronAPI.onUpdateAccountData((_event, value) => {
    accountAddressClassicEl.innerText = value.classicAddress
    accountAddressXEl.innerText = value.xAddress
    accountBalanceEl.innerText = value.xrpBalance
-    accountReserveEl.innerText = value.xrpReserve
 })
--- a/content/_code-samples/build-a-wallet/desktop-js/3-account/view/template.html
+++ b/content/_code-samples/build-a-wallet/desktop-js/3-account/view/template.html
@@ -17,7 +17,6 @@
        Classic Address: <strong id="account-address-classic"></strong><br/>
        X-Address: <strong id="account-address-x"></strong><br/>
        XRP Balance: <strong id="account-balance"></strong><br/>
-        XRP Reserved: <strong id="account-reserve"></strong><br/>
    </fieldset>

    <fieldset>
--- a/content/_code-samples/build-a-wallet/desktop-js/4-tx-history/index.js
+++ b/content/_code-samples/build-a-wallet/desktop-js/4-tx-history/index.js
@@ -1,7 +1,7 @@
 const {app, BrowserWindow, ipcMain} = require('electron')
 const path = require('path')
 const xrpl = require("xrpl")
-const { prepareReserve, prepareAccountData, prepareLedgerData} = require('../library/3_helpers')
+const { prepareAccountData, prepareLedgerData} = require('../library/3_helpers')
 const { prepareTxData } = require('../library/4_helpers')

 const TESTNET_URL = "wss://s.altnet.rippletest.net:51233"
@@ -26,8 +26,6 @@ const main = async () => {

    ipcMain.on('address-entered', async (event, address) => {

-        let reserve = null
-
        const client = new xrpl.Client(TESTNET_URL)

        await client.connect()
@@ -41,7 +39,6 @@ const main = async () => {

        // Reference: https://xrpl.org/subscribe.html#ledger-stream
        client.on("ledgerClosed", async (rawLedgerData) => {
-            reserve = prepareReserve(rawLedgerData)
            const ledger = prepareLedgerData(rawLedgerData)
            appWindow.webContents.send('update-ledger-data', ledger)
        })
@@ -56,7 +53,7 @@ const main = async () => {
            }

            const accountInfoResponse = await client.request(accountInfoRequest)
-            const accountData = prepareAccountData(accountInfoResponse.result.account_data, reserve)
+            const accountData = prepareAccountData(accountInfoResponse.result.account_data)
            appWindow.webContents.send('update-account-data', accountData)

            const transactions = prepareTxData([{tx: transaction.transaction}])
--- a/content/_code-samples/build-a-wallet/desktop-js/4-tx-history/view/renderer.js
+++ b/content/_code-samples/build-a-wallet/desktop-js/4-tx-history/view/renderer.js
@@ -29,13 +29,11 @@ window.electronAPI.onUpdateLedgerData((_event, ledger) => {
 const accountAddressClassicEl = document.getElementById('account-address-classic')
 const accountAddressXEl = document.getElementById('account-address-x')
 const accountBalanceEl = document.getElementById('account-balance')
-const accountReserveEl = document.getElementById('account-reserve')

 window.electronAPI.onUpdateAccountData((_event, value) => {
    accountAddressClassicEl.innerText = value.classicAddress
    accountAddressXEl.innerText = value.xAddress
    accountBalanceEl.innerText = value.xrpBalance
-    accountReserveEl.innerText = value.xrpReserve
 })

 // Step 4 code additions - start
--- a/content/_code-samples/build-a-wallet/desktop-js/4-tx-history/view/template.html
+++ b/content/_code-samples/build-a-wallet/desktop-js/4-tx-history/view/template.html
@@ -16,7 +16,6 @@
        Classic Address: <strong id="account-address-classic"></strong><br/>
        X-Address: <strong id="account-address-x"></strong><br/>
        XRP Balance: <strong id="account-balance"></strong><br/>
-        XRP Reserved: <strong id="account-reserve"></strong><br/>
    </fieldset>

    <fieldset>
--- a/content/_code-samples/build-a-wallet/desktop-js/5-password/view/renderer.js
+++ b/content/_code-samples/build-a-wallet/desktop-js/5-password/view/renderer.js
@@ -47,13 +47,11 @@ window.electronAPI.onUpdateLedgerData((_eventledger, ledger) => {
 const accountAddressClassicEl = document.getElementById('account-address-classic')
 const accountAddressXEl = document.getElementById('account-address-x')
 const accountBalanceEl = document.getElementById('account-balance')
-const accountReserveEl = document.getElementById('account-reserve')

 window.electronAPI.onUpdateAccountData((_event, value) => {
    accountAddressClassicEl.innerText = value.classicAddress
    accountAddressXEl.innerText = value.xAddress
    accountBalanceEl.innerText = value.xrpBalance
-    accountReserveEl.innerText = value.xrpReserve
 })

 const txTableBodyEl = document.getElementById('tx-table').tBodies[0]
--- a/content/_code-samples/build-a-wallet/desktop-js/5-password/view/template.html
+++ b/content/_code-samples/build-a-wallet/desktop-js/5-password/view/template.html
@@ -16,7 +16,6 @@
        Classic Address: <strong id="account-address-classic"></strong><br/>
        X-Address: <strong id="account-address-x"></strong><br/>
        XRP Balance: <strong id="account-balance"></strong><br/>
-        XRP Reserved: <strong id="account-reserve"></strong><br/>
    </fieldset>

    <fieldset>
--- a/content/_code-samples/build-a-wallet/desktop-js/6-styling/view/renderer.js
+++ b/content/_code-samples/build-a-wallet/desktop-js/6-styling/view/renderer.js
@@ -47,13 +47,11 @@ window.electronAPI.onUpdateLedgerData((_eventledger, ledger) => {
 const accountAddressClassicEl = document.getElementById('account-address-classic')
 const accountAddressXEl = document.getElementById('account-address-x')
 const accountBalanceEl = document.getElementById('account-balance')
-const accountReserveEl = document.getElementById('account-reserve')

 window.electronAPI.onUpdateAccountData((_event, value) => {
    accountAddressClassicEl.innerText = value.classicAddress
    accountAddressXEl.innerText = value.xAddress
    accountBalanceEl.innerText = value.xrpBalance
-    accountReserveEl.innerText = value.xrpReserve
 })

 const txTableBodyEl = document.getElementById('tx-table').tBodies[0]
--- a/content/_code-samples/build-a-wallet/desktop-js/6-styling/view/template.html
+++ b/content/_code-samples/build-a-wallet/desktop-js/6-styling/view/template.html
@@ -52,7 +52,6 @@
                    <li class="list-group-item">Classic Address: <strong id="account-address-classic"></strong></li>
                    <li class="list-group-item">X-Address: <strong id="account-address-x"></strong></li>
                    <li class="list-group-item">XRP Balance: <strong id="account-balance"></strong></li>
-                    <li class="list-group-item">XRP Reserved: <strong id="account-reserve"></strong></li>
                </ul>
                <div class="spacer"></div>
                <h3>
--- a/content/_code-samples/build-a-wallet/desktop-js/7-send-xrp/view/renderer.js
+++ b/content/_code-samples/build-a-wallet/desktop-js/7-send-xrp/view/renderer.js
@@ -45,13 +45,11 @@ window.electronAPI.onUpdateLedgerData((_event, ledger) => {
 const accountAddressClassicEl = document.getElementById('account-address-classic')
 const accountAddressXEl = document.getElementById('account-address-x')
 const accountBalanceEl = document.getElementById('account-balance')
-const accountReserveEl = document.getElementById('account-reserve')

 window.electronAPI.onUpdateAccountData((_event, value) => {
    accountAddressClassicEl.innerText = value.classicAddress
    accountAddressXEl.innerText = value.xAddress
    accountBalanceEl.innerText = value.xrpBalance
-    accountReserveEl.innerText = value.xrpReserve
 })

 const txTableBodyEl = document.getElementById('tx-table').tBodies[0]
--- a/content/_code-samples/build-a-wallet/desktop-js/7-send-xrp/view/template.html
+++ b/content/_code-samples/build-a-wallet/desktop-js/7-send-xrp/view/template.html
@@ -56,7 +56,6 @@
                    <li class="list-group-item">Classic Address: <strong id="account-address-classic"></strong></li>
                    <li class="list-group-item">X-Address: <strong id="account-address-x"></strong></li>
                    <li class="list-group-item">XRP Balance: <strong id="account-balance"></strong></li>
-                    <li class="list-group-item">XRP Reserved: <strong id="account-reserve"></strong></li>
                </ul>
                <div class="spacer"></div>
                <h3>
--- a/content/_code-samples/build-a-wallet/desktop-js/8-domain-verification/view/renderer.js
+++ b/content/_code-samples/build-a-wallet/desktop-js/8-domain-verification/view/renderer.js
@@ -45,13 +45,11 @@ window.electronAPI.onUpdateLedgerData((_event, ledger) => {
 const accountAddressClassicEl = document.getElementById('account-address-classic')
 const accountAddressXEl = document.getElementById('account-address-x')
 const accountBalanceEl = document.getElementById('account-balance')
-const accountReserveEl = document.getElementById('account-reserve')

 window.electronAPI.onUpdateAccountData((_event, value) => {
    accountAddressClassicEl.innerText = value.classicAddress
    accountAddressXEl.innerText = value.xAddress
    accountBalanceEl.innerText = value.xrpBalance
-    accountReserveEl.innerText = value.xrpReserve
 })

 const txTableBodyEl = document.getElementById('tx-table').tBodies[0]
--- a/content/_code-samples/build-a-wallet/desktop-js/8-domain-verification/view/template.html
+++ b/content/_code-samples/build-a-wallet/desktop-js/8-domain-verification/view/template.html
@@ -56,7 +56,6 @@
                    <li class="list-group-item">Classic Address: <strong id="account-address-classic"></strong></li>
                    <li class="list-group-item">X-Address: <strong id="account-address-x"></strong></li>
                    <li class="list-group-item">XRP Balance: <strong id="account-balance"></strong></li>
-                    <li class="list-group-item">XRP Reserved: <strong id="account-reserve"></strong></li>
                </ul>
                <div class="spacer"></div>
                <h3>
--- a/content/_code-samples/build-a-wallet/desktop-js/library/3_helpers.js
+++ b/content/_code-samples/build-a-wallet/desktop-js/library/3_helpers.js
@@ -6,20 +6,11 @@ const xrpl = require("xrpl");
 // Reference: https://xrpl.org/basic-data-types.html
 const RIPPLE_EPOCH = 946684800;

-const prepareAccountData = (rawAccountData, reserve) => {
-    const numOwners = rawAccountData.OwnerCount || 0
-
-    let xrpReserve = null
-    if (reserve) {
-        //TODO: Decimal?
-        xrpReserve = reserve.reserveBaseXrp + (reserve.reserveIncrementXrp * numOwners)
-    }
-
+const prepareAccountData = (rawAccountData) => {
    return {
        classicAddress: rawAccountData.Account,
        xAddress: xrpl.classicAddressToXAddress(rawAccountData.Account, false, true),
-        xrpBalance: xrpl.dropsToXrp(rawAccountData.Balance),
-        xrpReserve: xrpReserve
+        xrpBalance: xrpl.dropsToXrp(rawAccountData.Balance)
    }
 }

@@ -35,11 +26,4 @@ const prepareLedgerData = (rawLedgerData) => {
    }
 }

-const prepareReserve = (ledger) => {
-    const reserveBaseXrp = xrpl.dropsToXrp(ledger.reserve_base)
-    const reserveIncrementXrp = xrpl.dropsToXrp(ledger.reserve_inc)
-
-    return { reserveBaseXrp, reserveIncrementXrp }
-}
-
-module.exports = { prepareAccountData, prepareLedgerData, prepareReserve }
+module.exports = { prepareAccountData, prepareLedgerData }
--- a/content/_code-samples/build-a-wallet/desktop-js/library/5_helpers.js
+++ b/content/_code-samples/build-a-wallet/desktop-js/library/5_helpers.js
@@ -1,4 +1,4 @@
-const {prepareReserve, prepareAccountData, prepareLedgerData} = require("./3_helpers");
+const {prepareAccountData, prepareLedgerData} = require("./3_helpers");
 const {prepareTxData} = require("./4_helpers");
 const crypto = require("crypto");
 const fs = require("fs");
@@ -42,8 +42,6 @@ const initialize = async (client, wallet, appWindow) => {
 */
 const subscribe = async (client, wallet, appWindow) => {

-    let reserve = null
-
    // Reference: https://xrpl.org/subscribe.html
    await client.request({
        "command": "subscribe",
@@ -53,7 +51,6 @@ const subscribe = async (client, wallet, appWindow) => {

    // Reference: https://xrpl.org/subscribe.html#ledger-stream
    client.on("ledgerClosed", async (rawLedgerData) => {
-        reserve = prepareReserve(rawLedgerData)
        const ledger = prepareLedgerData(rawLedgerData)
        appWindow.webContents.send('update-ledger-data', ledger)
    })
--- a/content/_code-samples/build-a-wallet/desktop-js/package.json
+++ b/content/_code-samples/build-a-wallet/desktop-js/package.json
@@ -6,7 +6,7 @@
    "hello": "electron 0-hello/index.js",
    "ledger-index": "electron 1-ledger-index/index.js",
    "async": "electron 2-async/index.js",
-    "account": "electron 3-account/index..js",
+    "account": "electron 3-account/index.js",
    "tx-history": "electron 4-tx-history/index.js",
    "password": "electron 5-password/index.js",
    "styling": "electron 6-styling/index.js",
--- a/content/tutorials/build-apps/build-a-desktop-wallet-in-javascript.md
+++ b/content/tutorials/build-apps/build-a-desktop-wallet-in-javascript.md
@@ -45,7 +45,6 @@ The application we are going to build here will be capable of the following:

 - Showing updates to the XRP Ledger in real-time.
 - Viewing any XRP Ledger account's activity "read-only" including showing how much XRP was delivered by each transaction.
- Showing how much XRP is set aside for the account's [reserve requirement](reserves.html).
 - Sending [direct XRP payments](direct-xrp-payments.html), and providing feedback about the intended destination address, including:
    - Whether the intended destination already exists in the XRP Ledger, or the payment would have to fund its creation.
    - If the address doesn't want to receive XRP ([`DisallowXRP` flag](become-an-xrp-ledger-gateway.html#disallow-xrp) enabled).
@@ -467,7 +466,7 @@ const { app, BrowserWindow, ipcMain} = require('electron')
 const path = require('path')
 const xrpl = require("xrpl")
 // Step 3 code additions - start
-const { prepareReserve, prepareAccountData, prepareLedgerData} = require('./library/3_helpers')
+const { prepareAccountData, prepareLedgerData } = require('./library/3_helpers')
 // Step 3 code additions - end

 const TESTNET_URL = "wss://s.altnet.rippletest.net:51233"
@@ -481,8 +480,6 @@ const main = async () => {

  ipcMain.on('address-entered', async (event, address) =>  {

-    let reserve = null
-
    const client = new xrpl.Client(TESTNET_URL)

    await client.connect()
@@ -498,7 +495,6 @@ const main = async () => {

    // Reference: https://xrpl.org/subscribe.html#ledger-stream
    client.on("ledgerClosed", async (rawLedgerData) => {
-      reserve = prepareReserve(rawLedgerData)
      const ledger = prepareLedgerData(rawLedgerData)
      appWindow.webContents.send('update-ledger-data', ledger)
    })
@@ -520,7 +516,7 @@ const main = async () => {
        "ledger_index": transaction.ledger_index
      }
      const accountInfoResponse = await client.request(accountInfoRequest)
-      const accountData = prepareAccountData(accountInfoResponse.result.account_data, reserve)
+      const accountData = prepareAccountData(accountInfoResponse.result.account_data)
      appWindow.webContents.send('update-account-data', accountData)
    })

@@ -602,7 +598,6 @@ onEnterAccountAddress: (address) => {
        Classic Address: <strong id="account-address-classic"></strong><br/>
        X-Address: <strong id="account-address-x"></strong><br/>
        XRP Balance: <strong id="account-balance"></strong><br/>
-        XRP Reserved: <strong id="account-reserve"></strong><br/>
    </fieldset>

    <fieldset>
@@ -667,7 +662,7 @@ At this point, our wallet shows the account's balance getting updated, but doesn
 2. Now, in `index.js`, require the new helper function at the bottom of the import section like so:

 ```javascript
-const { prepareReserve, prepareAccountData, prepareLedgerData} = require('./library/3_helpers')
+const { prepareAccountData, prepareLedgerData} = require('./library/3_helpers')
 const { prepareTxData } = require('./library/4_helpers')
 ```

@@ -684,7 +679,7 @@ client.on("transaction", async (transaction) => {
  }

  const accountInfoResponse = await client.request(accountInfoRequest)
-  const accountData = prepareAccountData(accountInfoResponse.result.account_data, reserve)
+  const accountData = prepareAccountData(accountInfoResponse.result.account_data)
  appWindow.webContents.send('update-account-data', accountData)

  // Step 4 code additions - start
@@ -1096,7 +1091,6 @@ After finishing this step the application should look like this:
          <li class="list-group-item">Classic Address: <strong id="account-address-classic"></strong></li>
          <li class="list-group-item">X-Address: <strong id="account-address-x"></strong></li>
          <li class="list-group-item">XRP Balance: <strong id="account-balance"></strong></li>
-          <li class="list-group-item">XRP Reserved: <strong id="account-reserve"></strong></li>
        </ul>
        <div class="spacer"></div>
        <h3>