Merge pull request #219 from jdogresorg/counterparty-2.0

Merge changes from counterparty-2.0 branch to master

Author: jdogresorg

CHANGELOG.md

@@ -1,200 +1,8 @@
-Version 0.9.35 - Version 0.9.37 Removed and replaced with:
-- `counterparty-classic` branch
-- `counterparty-2.0` branch
-
-Version 0.9.34 - August 30th, 2024
-- Fix issue with divisiblity on `Reset Supply` form
-- Updates to support datatables 2.1.5
-
-Version 0.9.33 - July 29th, 2024
-- Fix issue with closing dispensers from `origin` address
-
-Version 0.9.32 - July 23rd, 2024
-- Set default CP API servers to public.tokenscan.io
-- Set default explorer API servers to tokenscan.io
-- Fixed numeric value parsing / validation for order forms
-- Fixed `checkWalletUpgrade()` to handle semantic versioning properly
-- Updated NFT display method to load data from API JSON projects array
-- Removed "Counterparty General Fund" from ADS donation options
-- Removed "View Transaction" context menu from history
-- Added "Create Subasset" context menu
-- Added "Verify" option to signing transaction dialog
-- Added support for displaying change address and amount when verifying transaction
-- Added support for closing dispensers from origin address
-- Added support for saving preferred sort order on markets and dispensers
-
-Version 0.9.31 - April 15th, 2024
-- Set default CP API servers to public.xchain.io
-- Add ‘Reset to Defaults’ option in server settings
-
-Version 0.9.30 - April 11th, 2024
-- Start using SSL by default for CP API
-
-Version 0.9.29 - February 29th, 2024
-- Fixed issue with ADS and tx fee calculations
-- Added "UTXO Usage" preference in settings 
-
-Version 0.9.28 - February 15th, 2024
-- Improved transaction fee interface
-- Improved MPMA send transaction fee support
-- Adjusted default tx size to 256 bytes
-
-Version 0.9.27 - February 8th, 2024
-- Better transaction fee estimation support
-
-Version 0.9.26 - November 30th, 2023
-- Added support for new issuance IDs (22/23)
-- Added checks to verify wallet is unlocked before allowing add/import addresses
-- Update to pass `null` for description in asset issuance transfers
-- Update to start using `lock` flag in issuances instead of `LOCK` text
-
-Version 0.9.25 - September 22nd, 2023
-- Fixed issue with missing first address
-- Fixed issue with wallet auto-locking
-
-Version 0.9.24 - September 19th, 2023
-- Added support for pooling ADS donations
-- Added support for reviewing license agreement
-- Started passing forward `advanced` params in CP API requests
-- Fixed issues with sweep form
-- Fixed issue with fee not being properly passed on issuances
-- Added Betting tab back with build bounty
-- Added support for adding up to 100 new addresses at once
-- Added support for importing many private keys at once
-- Added support for auto-lock feature
-- Added support for decoding XCP transactions in sign transactions
-
-Version 0.9.23 - May 4th, 2023
-- Added support for editing DUST preferences
-- Added support for CIP25 (Viewing NFTs and Stamps)
-- Increase max asset description length to 10k characters
-- Fixed security issue with autocomplete
-- Fixed Trezor Support
-- Added issuance data encoding cost notification
-- Added Automatic Donation System (ADS)
-- Added lazy loading of asset list images
-- Added balance list view options menu
-- Fixed issues with BTC/XCP asset divisibility not being set
-- Fixed satoshi rounding issues by using `getSatoshis()`
-
-Version 0.9.22 - September 9th, 2022
- - Issue with `reset supply` form always passing divisible as true
-
-Version 0.9.21 - September 2nd, 2022
- - Changed default token type to non-divisible
- - Updated MPMA data encoding fee calculations
- - updated `checkWalletUpgrade()` to use `ajax()`
- - Got basic Trezor integration working again
- - Updates to support CIP03 Token Resets
- - Updates to support CIP24 Oracled Dispensers
- - Added 'Close Dispenser' main menu item
-
-Version 0.9.20 - May 26th, 2022
- - Update to only pull list of open dispensers for watchlists
- - Increased asset description length to 200 characters
- - Added additional MPMA Send list validations
- - Added better API error handling
- - Start passing pubkey on all `create_send` requests
- - Fixed issue with asterisks in asset descriptions
- - Fixed issue with wallet addresses persisting after wallet reset
- - Fixed MAX button to subtract miners fee from max amount
- - Fixed issue with mpma amounts being rounded at times
- - Support for collapsible subassets
- - Support for importing bech32 addresses
-
-Version 0.9.19 - September 7th, 2021
- - Adjust minimum tx fee code to allow lower minimums
- - Limit dispenser watchlists to 10
- - Limit exchange market list to 10
- - Allow default market and exchange tabs to be removed
- - Dispenser updates to add more protection
- - Fixed issue with removing assets from dispenser watchlist
- - Ignore tabs when changing amount values
- - Hide passphrase by default on entry
- - BTC Name Service and asset support in sends
- - Added 'Copy' button to view address page
-
-Version 0.9.18 - April 17, 2021
- - Added warning about setting up dispensers on used addresses
-
-Version 0.9.17 - March 29, 2021
- - Allow segwit addresses to export private keys
- - Disabled MPMA sends from segwit addresses to prevent loss of BTC
-
-Version 0.9.16 - March 16, 2021
- - Added support for opening dispensers on empty addresses
- - Added multiple dispensers on same address warning
- - 'Buy FULLACCESS' button now links direct to official dispenser
- - Stopped forcing quantity to multiple of what dispensers is offering
-
-Version 0.9.15 - March 14, 2021
- - Added support for editing minimum transaction fee
- - Started enforcing minimum fee on transactions
- - Adjusted MPMA send settings and minimum fee
-
-Version 0.9.14 - March 11, 2021
- - Issue with MPMA sends not working properly at times
-
-Version 0.9.13 - March 10, 2021
- - Started using api.counterparty.io API
- - Issue with sends using text memos
-
-Version 0.9.12 - January 15, 2021
- - Added support for destroy transactions
- - Added support for displaying transaction status
- - Added support for decoding hex memos
- - Added "Cancel Order" option to main menu
- - Bumped minimum BTC order amount to 0.00001
- - Issue with MPMA tx fee not being passed to API
- - Issue with context menus appearing in wrong locations
- - Issue with asset description changing on issuing supply
-
-Version 0.9.11 - March 1, 2020
- - Added BIP39 passphrase support
- - Fixed send amount formatting issue
-
-Version 0.9.10 - February 25, 2020
- - Changed licensing to MIT
- - Added support for segwit addresses
- - Added support for burns
- - Added support for sweeps
- - Added support for dispensers
- - Added support for destroys
- - Added support for multi-peer-multi-assets sends (MPMA)
- - Added donation annoyware
- - Opened Exchange interface to everyone
- - Added Dispensers watchlist interface
-
-Version 0.9.9 - February 20, 2019
- - Removed defunct blocktrail.com API calls (more info)
- - Setup all API calls with multiple failovers
- - Updated bounty amounts to adjust for XCP value drop in last year
- - Added ability to buy XCHAINPEPE and FULLACCESS tokens from DEX
- - Added “API Keys” section to settings
-
-Version 0.9.8 - March 29, 2018
- - Added basic framework for hardware wallet support (import & sign)
- - Added basic Trezor hardware wallet integration
-
-Version 0.9.7 - March 15, 2018
- - Issue with create_btcpay API calls failing (more info)
- - issue with markets sidebar displaying wrong volume and % (more info)
- - Issues with URIs not working on windows/linux (more info)
- - Added support for addresses with 1,000+ assets/tokens (more info)
- - Ability to check for version update manually
-
-Version 0.9.6 - Feburary 10, 2018
- - Added support for Highcharts
- - Added support for Decentralized Exchange (DEX)
- - Added market view (chart, orders, history, etc)
- - Added 20+ technical indicators to market view
- - Added suport Auto-BTCpay and manual BTCpay notifications
- - Added support for /api/history/address endpoint
- - Added support for displaying asset lock status via lock/unlock icons
- - Added version update notification system
- - Issue where asset description was reset when issuing additional supply
- - Issue where issuing additional supply was resetting description
- - Display issue with pending transactions in history list
-
-Version 0.9.5 - October 13, 2017
- - Initial release for Windows, Mac, and Linux
+Version 2.0.0 - October 31st, 2024
+- Add `tag` as required field to /compose/destroy
+- Updates to detect BTC payment to dispenser
+- Updated MPMA sends support new memo format (https://github.com/CounterpartyXCP/counterparty-core/issues/2568)
+- Re-enable form submit button after fee estimation failures
+- Updates to support creating CP 2.0 `dispense` transactions
+- update buy from dispenser form to use `dispense` instead of `send`
+- Updated default servers for counterparty 2.0 APIs and Explorer

html/about.html

@@ -2,7 +2,8 @@
 <center>
     <p>FreeWallet is a free wallet which supports Bitcoin and Counterparty.</p>
     <a href="https://freewallet.io"><img src="images/logo.png" height="100" style="margin-bottom: 5px"></a>
-    <div id="fw_version"></div>
+    <br>FreeWallet Version (<span id="fw_version"></span>)
+    <br>Counterparty API Version (<span id="cp_version"></span>)
     <hr size=1 class="spacer">
     <p>Freewallet uses public APIs available from the following providers:</p>
     <div>
@@ -52,18 +53,23 @@
     var address = '1FWDonkMbC6hL64JiysuggHnUAw2CKWszs',
         debug   = $('#btn-debug'),
         update  = $('#btn-update'),
-        version = (is_nwjs()) ? 'Version ' + nw.App.manifest.version : 'Development Build';
+        apiInfo = FW.COUNTERPARTY_API;
+
+    // Set the FreeWallet and API version information
+    var fw_version = (is_nwjs()) ? nw.App.manifest.version : 'Development Build',
+        cp_version = apiInfo.version_major + '.' + apiInfo.version_minor + '.' + apiInfo.version_revision;
 
     // Display current version number
-    $('#fw_version').html(version);
+    $('#fw_version').html(fw_version);
+    $('#cp_version').html(cp_version);
 
     // Handle showing/hiding the debug button
     if(is_nwjs()){
         debug.click($.debounce(100,function(e){
             nw.Window.get().showDevTools();
         }));
         update.click($.debounce(100,function(e){
-            checkWalletUpgrade(version, true);
+            checkWalletUpgrade(fw_version, true);
         }));
     } else {
         debug.hide();

html/dispensers/buy.html

@@ -31,7 +31,7 @@
         dest    = FW.DIALOG_DATA.destination,
         amt_sat = getSatoshis(vals['btc-amount']),
         fee_sat = getSatoshis(vals['fee-amount']),
-        command = (broadcast) ? 'cpSend' : 'createSend';
+        command = (broadcast) ? 'cpDispense' : 'createDispense';
     eval(command)(network, source, dest, null, null, 'BTC', amt_sat, fee_sat, callback);
 }
 
@@ -118,8 +118,8 @@
             placement: 'bottom'
         }); 
 
-        // Handle updating the transaction fee based on actual tx size
-        updateTransactionSize();
+        // Handle updating the transaction fee based on actual tx size (done automatically in amount field)
+        // updateTransactionSize();
 
     },100);
 

html/fields/amount.html

@@ -89,9 +89,9 @@
 
     // Detect any amount change and format as valid number
     $('#amount').change(function(e){
-        // Handle updating tx size as token name changes
-        if(type=='dividend'||type=='burn'||type=='send')
-            updateTransactionSize();
+        // Handle doing pre-flight check for sends to determine if this is a send or a dispense
+        if(type=='send')
+            checkDestinationForDispenser();
         var amt = String($(this).val()).replace(/[^0-9.]/g,''),
             val = $('#available').val(),
             fmt = (FW.ASSET_INFO.divisible) ? '0,0.00000000' : '0,0',
@@ -121,6 +121,9 @@
         }
         $(this).val(numeral(amt).format(fmt));
         updateSendValue(amt);
+        // Handle updating tx size as token amount changes
+        if(type=='dividend'||type=='burn'||type=='send'||type=='mint-supply'||type=='dispenser-buy')
+            updateTransactionSize();
     });
 
     // Calculate the fiat value as the user types the amount

html/fields/send-list.html

@@ -35,7 +35,7 @@
                 address  = String(info[0]).trim(),
                 asset    = (info[1]) ? String(info[1]).trim() : '',
                 quantity = (info[2]) ? String(info[2]).trim() : '',
-                memo     = (info[3]) ? String(info[3]).trim().replace(/^"|"$/g,'') : '';
+                memo     = (info[3]) ? String(info[3]).trim().replace(/^"|"$/g,'') : '';                
             // Re-assemble any memos which have commas
             if(memo!='')
                 memo = String(info.slice(3,info.length).join(',')).trim().replace(/^"|"$/g,'');
@@ -75,31 +75,24 @@
             if(address==FW.WALLET_ADDRESS)
                 errors.push('Source address cannot be in send destination list!');
 
-
-            //Second tx size estimation
-            let addressInList = addressesList.includes(address)
-            let addressSize = (addressInList?8:21) //21 bytes for the address without checksum and 8 bytes for the integer that represents the index of the address
-            if (!addressInList){addressesList.push(address)}
-            
+            // tx size estimation
+            let addressInList = addressesList.includes(address);
+            let addressSize = (addressInList?8:21); //21 bytes for the address without checksum and 8 bytes for the integer that represents the index of the address
+            if (!addressInList){ addressesList.push(address); }
             let assetInList = assetsList.includes(asset)
             let assetSize = (assetInList?0:(new TextEncoder().encode(asset).length))// assets only appear once in the mpma pack
-            if (!assetInList){assetsList.push(asset)}
-            
-            if (memo != ""){
-                memoAdditionalBits = memoAdditionalBits + 2 //1 bit to signal the memo and 1 bit to tell if the memo is in hex format or not
-            }
-            
+            if (!assetInList){ assetsList.push(asset); }
             estimatedMultiSendSizeData = estimatedMultiSendSizeData +
                 addressSize + //Address size in the mpma pack
                 assetSize + //Asset size in the mpma pack
-                8 + //quantity in bytes
-                (new TextEncoder().encode(memo).length)//memo size in bytes
+                8;  //quantity in bytes
         });
+        // memo size in bytes
+        estimatedMultiSendSizeData = estimatedMultiSendSizeData +(new TextEncoder().encode(memo).length);
         if (memoAdditionalBits > 0){
             estimatedMultiSendSizeData = estimatedMultiSendSizeData + Math.ceil(memoAdditionalBits/8)
         }
 
-        
         // Display any error message
         if(errors.length){
             dialogMessage('<i class="fa fa-lg fa-fw fa-exclamation-circle"></i> Error(s)', errors.join('<br/>') );