diff --git a/README.md b/README.md index d9df02135..b2e90451a 100644 --- a/README.md +++ b/README.md @@ -48,12 +48,12 @@ new option naming system. ###### MariaDb -In the conf directory, copy brs-default.properties into a new file named brs.properties. +In the conf directory, copy `brs-default.properties` into a new file named `brs.properties`. Download and install MariaDB The MariaDb installation will ask to setup a password for the root user. -Add this password to the brs.properties file created above in the following section: +Add this password to the `brs.properties` file created above in the following section: ``` DB.Url=jdbc:mariadb://localhost:3306/brs_master DB.Username=root @@ -61,15 +61,13 @@ DB.Password=YOUR_PASSWORD ``` The MariaDB installation will also install HeidiSQL, a gui tool to administer MariaDb. -Use it to connect to the newly created mariaDb server and create a new DB called 'burstwallet'. +Use it to connect to the newly created mariaDb server and create a new DB called `burstwallet`. #### MacOS -Plase use beatsbears' comfortable script -to install and maintain the Burst wallet on your Mac. -An older howto at ecomineearth - basically describes -the manual steps the script above does for you. +BRS can be installed using a [Homebrew](https://brew.sh/) [formula](https://github.com/nixops/homebrew-burstcoind). A short tutorial on how to install BRS using homebrew can be found at [ecomine.earth/macos](https://ecomine.earth/macos/). + +A number of other Hombrew formulas (written by [Nixops](https://github.com/nixops)) are also available for plotters and miners. #### Other Unix-like systems @@ -95,7 +93,7 @@ mysql -uroot < init-mysql.sql ##### Configure your Wallet -Now you need to add the following stuff to your conf/brs.properties: +Now you need to add the following stuff to your `conf/brs.properties`: ``` DB.Url=jdbc:mariadb://localhost:3306/brs_master diff --git a/html/ui/css/dev/burstold.css b/html/ui/css/dev/burstold.css index 5b9cd9d6c..2de6fc672 100644 --- a/html/ui/css/dev/burstold.css +++ b/html/ui/css/dev/burstold.css @@ -371,6 +371,12 @@ padding:5px .padding-left-10{ padding-left:10px; } +.padding-right-5{ + padding-right:5px; +} +.padding-right-10{ + padding-right:10px; +} .font-size-10{ font-size:10px; } @@ -578,14 +584,34 @@ to { color: #749a02; text-shadow: 0 0 9px #266000; } -.btn-suggested-fee{ - color: #fff !important; - background-color: #428bca; - border-color: #357ebd; - text-shadow: 0 -1px 0 rgba(0,0,0,0.2); - -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075); - box-shadow: inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075); - } - .btn-suggested-fee:hover, .btn-suggested-fee:active, .btn-suggested-fee:focus { - color: #fff !important; - } \ No newline at end of file +.btn-suggested-fee { + color: #fff !important; + background-color: #428bca; + border-color: #357ebd; + text-shadow: 0 -1px 0 rgba(0,0,0,0.2); + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075); + box-shadow: inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075); +} +.btn-suggested-fee:hover, .btn-suggested-fee:active, .btn-suggested-fee:focus { + color: #fff !important; +} +.btn-generic { + color: #fff !important; + background-color: #428bca; + border-color: #357ebd; + text-shadow: 0 -1px 0 rgba(0,0,0,0.2); + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075); + box-shadow: inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075); +} +.btn-generic:hover, .btn-generic:active, .btn-generic:focus { + color: #fff !important; +} +.display-none{ + display:none; +} +.display-visible{ + display:visible; +} +.bold{ + font-weight:bold; +} diff --git a/html/ui/html/header.html b/html/ui/html/header.html index bd05d6375..01bd8ac23 100644 --- a/html/ui/html/header.html +++ b/html/ui/html/header.html @@ -19,6 +19,7 @@
  • Send BURST
    • +
  • Request BURST QR
  • diff --git a/html/ui/html/modals/alias.html b/html/ui/html/modals/alias.html index 6abca95b3..5dbecd6af 100644 --- a/html/ui/html/modals/alias.html +++ b/html/ui/html/modals/alias.html @@ -38,23 +38,23 @@

    Transfer Alias

    -
    -
    -
    - -
    - - BURST -
    -
    +
    + +
    + + BURST
    -
    -
    - - -
    +
    + Suggested fee: + + +
    +
    + + +
    @@ -193,6 +193,23 @@

    Buy Alias

    +
    + +
    + + BURST +
    +
    +
    +
    +
    + Suggested fee: + + + +
    +
    +
    @@ -200,22 +217,9 @@

    Buy Alias

    -
    -
    -
    - -
    - - BURST -
    -
    -
    -
    -
    - - -
    -
    +
    + +
    @@ -283,34 +287,38 @@

    Sell Alias

    -
    -
    -
    - -
    - - BURST -
    -
    +
    + +
    + + BURST
    -
    -
    +
    +
    +
    +
    BURST
    +
    + Suggested fee: + + + +
    -
    -
    +
    +
    -
    -
    - +
    + +
    diff --git a/html/ui/html/modals/dgs.html b/html/ui/html/modals/dgs.html index 6d29e397b..e94f55f04 100644 --- a/html/ui/html/modals/dgs.html +++ b/html/ui/html/modals/dgs.html @@ -22,7 +22,7 @@

    List Product For Sale<

    -
    +
    @@ -37,23 +37,29 @@

    List Product For Sale<

    -
    -
    -
    - -
    - - BURST -
    -
    +
    + +
    + + BURST
    -
    -
    - - +
    +
    +
    +
    +
    + Suggested fee: + + + +
    +
    + + +
    @@ -99,25 +105,31 @@

    Confirm Marketp

    Please confirm if you want to delete this item.

    -
    Loading...
    +
    +
    Loading...
    +
    -
    -
    -
    - -
    - - BURST -
    -
    +
    + +
    + + BURST
    -
    -
    - - +
    +
    +
    +
    + Suggested fee: + + +
    +
    + + +
    @@ -162,17 +174,19 @@

    Marketplace It
    -
    Loading...
    +
    +
    Loading...
    +
    -
    +
    -
    +
    @@ -181,23 +195,27 @@

    Marketplace It

    -
    -
    -
    - -
    - - BURST -
    -
    +
    + +
    + + BURST
    -
    -
    - - +
    +
    +
    +
    + Suggested fee: + + +
    +
    + + +
    @@ -242,39 +260,45 @@

    Marketplace
    -
    Loading...
    +
    +
    Loading...
    +
    -
    +
    -
    +
    -
    -
    -
    - -
    - - BURST -
    -
    +
    + +
    + + BURST
    -
    -
    - - +
    +
    +
    +
    + Suggested fee: + + +
    +
    + + +
    @@ -339,7 +363,9 @@

    Marketplace Purchase
    -
    Loading...
    +
    +
    Loading...
    +
    @@ -350,13 +376,13 @@

    Marketplace Purchase
    -
    +
    -
    +
    @@ -373,23 +399,27 @@

    Marketplace PurchaseThis message is encrypted.

    -
    -
    -
    - -
    - - BURST -
    -
    +
    + +
    + + BURST
    -
    -
    - - +
    +
    +
    +
    + Suggested fee: + + +
    +
    + + +
    diff --git a/html/ui/html/modals/request_burst_qr.html b/html/ui/html/modals/request_burst_qr.html new file mode 100644 index 000000000..c66d3fcf8 --- /dev/null +++ b/html/ui/html/modals/request_burst_qr.html @@ -0,0 +1,120 @@ + diff --git a/html/ui/html/modals/send_message.html b/html/ui/html/modals/send_message.html index 7ca665081..9a6af473e 100644 --- a/html/ui/html/modals/send_message.html +++ b/html/ui/html/modals/send_message.html @@ -29,23 +29,27 @@

    Send Message

    -
    -
    -
    - -
    - - BURST -
    -
    +
    + +
    + + BURST
    -
    -
    - - +
    +
    +
    +
    + Suggested fee: + + +
    +
    + + +
    diff --git a/html/ui/index.html b/html/ui/index.html index 9c006bac9..1b3dd5e32 100644 --- a/html/ui/index.html +++ b/html/ui/index.html @@ -118,6 +118,7 @@ BRS.loadModalHTML("html/modals/forging.html"); BRS.loadModalHTML("html/modals/messages_decrypt.html"); BRS.loadModalHTML("html/modals/raw_transaction.html"); + BRS.loadModalHTML("html/modals/request_burst_qr.html"); BRS.loadModalHTML("html/modals/reward_assignment.html"); BRS.loadModalHTML("html/modals/send_message.html"); BRS.loadModalHTML("html/modals/send_money.html"); @@ -156,6 +157,7 @@ + diff --git a/html/ui/js/brs.aliases.js b/html/ui/js/brs.aliases.js index fe15f6de1..3876c7a89 100644 --- a/html/ui/js/brs.aliases.js +++ b/html/ui/js/brs.aliases.js @@ -4,11 +4,32 @@ var BRS; BRS = (function (BRS, $, undefined) { $('#register_alias_modal').on('show.bs.modal', function (e) { - BRS.showFeeSuggestions(register_alias_fee, suggested_fee_response_alias_register); + BRS.showFeeSuggestions("#register_alias_fee", "#suggested_fee_response_alias_register"); }); $("#suggested_fee_alias_register").on("click", function(e) { e.preventDefault(); - BRS.showFeeSuggestions(register_alias_fee, suggested_fee_response_alias_register); + BRS.showFeeSuggestions("#register_alias_fee", "#suggested_fee_response_alias_register"); + }); + $('#transfer_alias_modal').on('show.bs.modal', function (e) { + BRS.showFeeSuggestions("#transfer_alias_fee", "#suggested_fee_response_alias_transfer"); + }); + $("#suggested_fee_alias_transfer").on("click", function(e) { + e.preventDefault(); + BRS.showFeeSuggestions("#transfer_alias_fee", "#suggested_fee_response_alias_transfer"); + }); + $('#sell_alias_modal').on('show.bs.modal', function (e) { + BRS.showFeeSuggestions("#sell_alias_fee", "#suggested_fee_response_alias_sell"); + }); + $("#suggested_fee_alias_sell").on("click", function(e) { + e.preventDefault(); + BRS.showFeeSuggestions("#sell_alias_fee", "#suggested_fee_response_alias_sell"); + }); + $('#buy_alias_modal').on('show.bs.modal', function (e) { + BRS.showFeeSuggestions("#buy_alias_fee", "#suggested_fee_response_alias_buy"); + }); + $("#suggested_fee_alias_buy").on("click", function(e) { + e.preventDefault(); + BRS.showFeeSuggestions("#buy_alias_fee", "#suggested_fee_response_alias_buy"); }); BRS.pages.aliases = function () { BRS.sendRequest("getAliases+", { diff --git a/html/ui/js/brs.crowdfunding.js b/html/ui/js/brs.crowdfunding.js index c404594e6..432f95bd7 100644 --- a/html/ui/js/brs.crowdfunding.js +++ b/html/ui/js/brs.crowdfunding.js @@ -352,25 +352,25 @@ var BRS = (function(BRS, $, undefined) { html = html + '
    ' + '
    ' + '
    ' + '
    '; $('.at-block').append(html); } - $(document).ready(function(e) { - $('.form-search').on('submit', function() { - return false; - }); - $('#search-btn').on('click', function(e) { - var query = $.trim($(this).parent().prevAll('.search-query').val()).toLowerCase(); - $('div.col-lg-4 div.crowdbox .crowdtext').each(function() { - var $this = $(this); - var h2Text = $this.closest('div.crowdbox').parent().find('h2'); - if ($this.text().toLowerCase().indexOf(query) === -1 && h2Text.text().toLowerCase().indexOf(query) === -1) { - $this.closest('div.crowdbox').parent().fadeOut(); - $this.closest('div.crowdbox').parent().css('display', 'none'); - } - else { - $this.closest('div.crowdbox').parent().fadeIn(); - $this.closest('div.crowdbox').parent().css('display', 'visible'); - } - }); + const searchHandler = function (e) { + e.preventDefault(); + var query = $.trim($(this).parent().parent().find('input').val()).toLowerCase(); + $('div.col-lg-4 div.crowdbox .crowdtext').each(function () { + var $this = $(this); + var h2Text = $this.closest('div.crowdbox').parent().find('h2'); + if ($this.text().toLowerCase().indexOf(query) === -1 && h2Text.text().toLowerCase().indexOf(query) === -1) { + $this.closest('div.crowdbox').parent().fadeOut(); + $this.closest('div.crowdbox').parent().css('display', 'none'); + } + else { + $this.closest('div.crowdbox').parent().fadeIn(); + $this.closest('div.crowdbox').parent().css('display', 'visible'); + } }); + }; + $(document).ready(function(e) { + + $('#search-btn').on('click', searchHandler); /** * Ceowd funding tab click event @@ -438,6 +438,7 @@ var BRS = (function(BRS, $, undefined) { $(".sidebar-menu").on("click", function(e){ if (!$("li#sidebar_crowdfunding").hasClass('active')){ $("#new-project").hide(); + $('#search-btn').off('click', searchHandler); } }); diff --git a/html/ui/js/brs.dgs.js b/html/ui/js/brs.dgs.js index 70f6b2288..58503fb8a 100644 --- a/html/ui/js/brs.dgs.js +++ b/html/ui/js/brs.dgs.js @@ -5,6 +5,42 @@ var BRS = (function(BRS, $, undefined) { var _goodsToShow; var _currentSeller; + $('#dgs_listing_modal').on('show.bs.modal', function (e) { + BRS.showFeeSuggestions("#dgs_listing_fee", "#suggested_fee_response_dgs_list_product_for_sale"); + }); + $("#suggested_fee_dgs_list_product_for_sale").on("click", function(e) { + e.preventDefault(); + BRS.showFeeSuggestions("#dgs_listing_fee", "#suggested_fee_response_dgs_list_product_for_sale"); + }); + $('#dgs_listing_modal').on('show.bs.modal', function (e) { + BRS.showFeeSuggestions("#dgs_delisting_fee", "#suggested_fee_response_dgs_delisting_modal"); + }); + $("#suggested_fee_dgs_delisting_fee").on("click", function(e) { + e.preventDefault(); + BRS.showFeeSuggestions("#dgs_delisting_fee", "#suggested_fee_response_dgs_delisting_modal"); + }); + $('#dgs_price_change_modal').on('show.bs.modal', function (e) { + BRS.showFeeSuggestions("#dgs_price_change_fee", "#suggested_fee_response_dgs_price_change_modal"); + }); + $("#suggested_fee_dgs_price_change_modal").on("click", function(e) { + e.preventDefault(); + BRS.showFeeSuggestions("#dgs_price_change_fee", "#suggested_fee_response_dgs_price_change_modal"); + }); + $('#dgs_quantity_change_modal').on('show.bs.modal', function (e) { + BRS.showFeeSuggestions("#dgs_quantity_change_fee", "#suggested_fee_response_dgs_quantity_change_modal"); + }); + $("#suggested_fee_dgs_quantity_change_modal").on("click", function(e) { + e.preventDefault(); + BRS.showFeeSuggestions("#dgs_quantity_change_fee", "#suggested_fee_response_dgs_quantity_change_modal"); + }); + $('#dgs_purchase_modal').on('show.bs.modal', function (e) { + BRS.showFeeSuggestions("#dgs_purchase_fee", "#suggested_fee_response_dgs_purchase_modal"); + }); + $("#suggested_fee_dgs_purchase_modal").on("click", function(e) { + e.preventDefault(); + BRS.showFeeSuggestions("#dgs_purchase_fee", "#suggested_fee_response_dgs_purchase_modal"); + }); + BRS.getMarketplaceItemHTML = function(good) { return "" + "" + String(good.name).escapeHTML() +"" + diff --git a/html/ui/js/brs.messages.js b/html/ui/js/brs.messages.js index 1dd836e29..541c68047 100644 --- a/html/ui/js/brs.messages.js +++ b/html/ui/js/brs.messages.js @@ -5,6 +5,14 @@ var BRS = (function(BRS, $, undefined) { var _messages = {}; var _latestMessages = {}; + $('#send_message_modal').on('show.bs.modal', function (e) { + BRS.showFeeSuggestions("#send_message_fee", "#suggested_fee_response_send_message"); + }); + $("#suggested_fee_send_message").on("click", function(e) { + e.preventDefault(); + BRS.showFeeSuggestions("#send_message_fee", "#suggested_fee_response_send_message"); + }); + BRS.pages.messages = function(callback) { _messages = {}; diff --git a/html/ui/js/brs.modals.accountinfo.js b/html/ui/js/brs.modals.accountinfo.js index 0d3ce9bc4..df360b928 100644 --- a/html/ui/js/brs.modals.accountinfo.js +++ b/html/ui/js/brs.modals.accountinfo.js @@ -6,11 +6,11 @@ var BRS = (function(BRS, $, undefined) { $("#account_info_modal").on("show.bs.modal", function(e) { $("#account_info_name").val(BRS.accountInfo.name); $("#account_info_description").val(BRS.accountInfo.description); - BRS.showFeeSuggestions(account_info_fee, suggested_fee_response_account, account_info_bottom_fee); + BRS.showFeeSuggestions("#account_info_fee", "#suggested_fee_response_account", "#account_info_bottom_fee"); }); $("#account_info_fee_suggested").on("click", function(e) { e.preventDefault(); - BRS.showFeeSuggestions(account_info_fee, suggested_fee_response_account, account_info_bottom_fee); + BRS.showFeeSuggestions("#account_info_fee", "#suggested_fee_response_account", "#account_info_bottom_fee"); }); BRS.forms.setAccountInfoComplete = function(response, data) { var name = $.trim(String(data.name)); diff --git a/html/ui/js/brs.modals.js b/html/ui/js/brs.modals.js index a4df33680..cb3029275 100644 --- a/html/ui/js/brs.modals.js +++ b/html/ui/js/brs.modals.js @@ -560,11 +560,11 @@ var BRS = (function(BRS, $, undefined) { $("#reward_assignment_modal").on("show.bs.modal", function(e) { - BRS.showFeeSuggestions(reward_assignment_fee, suggested_fee_response_reward_assignment, reward_assignment_bottom_fee); + BRS.showFeeSuggestions("#reward_assignment_fee", "#suggested_fee_response_reward_assignment", "#reward_assignment_bottom_fee"); }); $("#reward_assignment_fee_suggested").on("click", function(e) { e.preventDefault(); - BRS.showFeeSuggestions(reward_assignment_fee, suggested_fee_response_reward_assignment, reward_assignment_bottom_fee); + BRS.showFeeSuggestions("#reward_assignment_fee", "#suggested_fee_response_reward_assignment", "#reward_assignment_bottom_fee"); }); return BRS; diff --git a/html/ui/js/brs.modals.request.js b/html/ui/js/brs.modals.request.js new file mode 100644 index 000000000..27e3149e0 --- /dev/null +++ b/html/ui/js/brs.modals.request.js @@ -0,0 +1,202 @@ +/** + * @depends {brs.js} + */ +var BRS = (function(BRS, $, undefined) { + var radio = document.request_burst_form.request_burst_suggested_fee; + $('#request_burst_qr_modal').on('show.bs.modal', function (e) { + $("#new_qr_button").hide(); + $("#request_burst_immutable").prop('checked', true); + $("#request_burst_account_id").val(String(BRS.accountRS).escapeHTML()); + + var array = ["standard","cheap","priority"]; + for(var i = 0; i < radio.length; i++) { + radio[i].value = array[i]; + radio[i].onclick = function() { + $("#request_burst_fee").val(""); + $("#request_burst_fee_div").toggleClass("has-error",false); + $("#request_burst_fee_div").toggleClass("has-success",false); + }; + } + + BRS.sendRequest("suggestFee", { + }, function(response) { + if (!response.errorCode) { + $("#standard_fee_response").html("(" +(response.standard/100000000).toFixed(8)+ ")"); + $("#cheap_fee_response").html("(" + (response.cheap/100000000).toFixed(8)+ ")"); + $("#priority_fee_response").html("(" +(response.priority/100000000).toFixed(8)+ ")"); + $("[name='fee_value']").i18n(); // apply locale to DOM after ajax call + $("[name='fee_value']").on("click", function(e) { + e.preventDefault(); + $("#request_burst_fee").val($(this).text()); + }); + } + else { + $("#suggested_fee_response").html(response.errorDescription); + $("[name='suggested_fee_spinner']").addClass("suggested_fee_spinner_display_none"); + } + }); + }); + $("#request_burst_amount").change(function() { + var amount = Number($("#request_burst_amount").val()); + $("#request_burst_amount").val(amount); + if(amount >= 0.00000001 || (!$("#request_burst_immutable").is(':checked') && (!amount || amount == 0))) + { + $("#request_burst_amount_div").toggleClass("has-error",false); + $("#request_burst_amount_div").toggleClass("has-success",true); + } + else + { + $("#request_burst_amount_div").toggleClass("has-success",false); + $("#request_burst_amount_div").toggleClass("has-error",true); + } + }); + + $("#request_burst_fee").change(function() { + var fee = Number($("#request_burst_fee").val()); + $("#request_burst_fee").val(fee); + if(fee >= 0.00735) + { + for(var i = 0; i < radio.length; i++) { + radio[i].checked = false; + } + $("#request_burst_fee_div").toggleClass("has-error",false); + $("#request_burst_fee_div").toggleClass("has-success",true); + } + else + { + $("#request_burst_fee_div").toggleClass("has-success",false); + $("#request_burst_fee_div").toggleClass("has-error",true); + } + }); + + $('#request_burst_immutable').change(function() { + var amount = Number($("#request_burst_amount").val()); + if($(this).is(":checked")) { + if(amount >= 0.00000001){ + $("#request_burst_amount_div").toggleClass("has-error",false); + $("#request_burst_amount_div").toggleClass("has-success",true); + } + else + { + $("#request_burst_amount_div").toggleClass("has-success",false); + $("#request_burst_amount_div").toggleClass("has-error",true); + } + + } + else + { + if(amount >= 0.00000001 || (!amount || amount == 0)){ + $("#request_burst_amount_div").toggleClass("has-error",false); + $("#request_burst_amount_div").toggleClass("has-success",true); + } + else + { + $("#request_burst_amount_div").toggleClass("has-success",false); + $("#request_burst_amount_div").toggleClass("has-error",true); + } + + } + }); + + $("#generate_qr_button").on("click", function(e) { + e.preventDefault(); + var amount = Number($("#request_burst_amount").val()); + if(((!amount || amount < 0.00000001) && $("#request_burst_immutable").is(':checked')) || (amount && amount < 0.00000001)) + { + $("#request_burst_amount_div").toggleClass("has-success",false); + $("#request_burst_amount_div").toggleClass("has-error",true); + return; + } + else + { + $("#request_burst_amount_div").toggleClass("has-error",false); + $("#request_burst_amount_div").toggleClass("has-success",true); + } + var fee = Number($("#request_burst_fee").val()); + for(var i = 0; i < radio.length; i++) { + if(radio[i].checked == true) + var suggested_fee = radio[i].value; + } + if((!fee || fee < 0.00735) && !suggested_fee) + { + $("#request_burst_fee_div").toggleClass("has-success",false); + $("#request_burst_fee_div").toggleClass("has-error",true); + return; + } + else + { + $("#request_burst_fee_div").toggleClass("has-error",false); + $("#request_burst_fee_div").toggleClass("has-success",true); + } + var amountNQT = amount * 100000000; + var feeNQT = fee * 100000000; + var receiverId = BRS.accountRS; + if($("#request_burst_immutable").is(':checked')){ + immutable = "&immutable=true"; + $("#request_burst_immutable_response").html("Yes"); + } + else{ + immutable = ""; + $("#request_burst_immutable_response").html("No"); + } + if(suggested_fee){ + $("#request_burst_qrcode_response").html(''); + $("#request_burst_fee_response").html(suggested_fee.charAt(0).toUpperCase() + suggested_fee.slice(1)); + } + else{ + $("#request_burst_qrcode_response").html(''); + $("#request_burst_fee_response").html($("#request_burst_fee").val()); + } + $("#generate_qr_button").hide(); + $("#new_qr_button").show(); + $("#cancel_button").html('Close'); + $("#request_burst_recipient_response").html(receiverId); + if($("#request_burst_amount").val()) + $("#request_burst_amount_response").html($("#request_burst_amount").val() + " BURST"); + $("#request_burst_div").removeClass("display-visible"); + $("#request_burst_div").addClass("display-none"); + $("#request_burst_response_div").removeClass("display-none"); + $("#request_burst_response_div").addClass("display-visible"); + }); + + + $('#request_burst_qr_modal').on('hide.bs.modal', function (e) { + $("#request_burst_div").removeClass("display-none"); + $("#request_burst_div").addClass("display-visible"); + $("#request_burst_response_div").removeClass("display-visible"); + $("#request_burst_response_div").addClass("display-none"); + $("#request_burst_amount_div").toggleClass("has-error",false); + $("#request_burst_amount_div").toggleClass("has-success",false); + $("#request_burst_fee_div").toggleClass("has-success",true); + $("#request_burst_fee_div").toggleClass("has-error",false); + var radio = document.request_burst_form.request_burst_suggested_fee; + for(var i = 0; i < radio.length; i++) { + radio[i].checked = false; + } + $("#cancel_button").html('Cancel'); + $("#generate_qr_button").show(); + }); + + $("#new_qr_button").on("click", function(e) { + $("#request_burst_div").removeClass("display-none"); + $("#request_burst_div").addClass("display-visible"); + $("#request_burst_response_div").removeClass("display-visible"); + $("#request_burst_response_div").addClass("display-none"); + $("#request_burst_amount_div").toggleClass("has-error",false); + $("#request_burst_amount_div").toggleClass("has-success",false); + $("#request_burst_fee_div").toggleClass("has-success",true); + $("#request_burst_fee_div").toggleClass("has-error",false); + $("#request_burst_amount").val(""); + $("#request_burst_fee").val(0.1); + var radio = document.request_burst_form.request_burst_suggested_fee; + for(var i = 0; i < radio.length; i++) { + radio[i].checked = false; + } + $("#request_burst_immutable").prop('checked', true); + $("#cancel_button").html('Cancel'); + $("#generate_qr_button").show(); + $("#new_qr_button").hide(); + }); + + return BRS; +}(BRS || {}, jQuery)); diff --git a/html/ui/js/brs.modals.transaction.js b/html/ui/js/brs.modals.transaction.js index 3a464360f..593a18b32 100644 --- a/html/ui/js/brs.modals.transaction.js +++ b/html/ui/js/brs.modals.transaction.js @@ -13,19 +13,19 @@ var BRS = (function(BRS, $, undefined) { BRS.showTransactionModal(transactionId); }); $('#send_money_modal').on('show.bs.modal', function (e) { - BRS.showFeeSuggestions(send_money_fee, suggested_fee_response_ordinary); - BRS.showFeeSuggestions(multi_out_fee,suggested_fee_response_multi); + BRS.showFeeSuggestions("#send_money_fee", "#suggested_fee_response_ordinary"); + BRS.showFeeSuggestions("#multi_out_fee", "#suggested_fee_response_multi"); }); $('#send_money_modal').on('hide.bs.modal', function (e) { $("#total_amount_multi_out").html('0.1 BURST'); }); $("#suggested_fee_ordinary").on("click", function(e) { e.preventDefault(); - BRS.showFeeSuggestions(send_money_fee, suggested_fee_response_ordinary); + BRS.showFeeSuggestions("#send_money_fee", "#suggested_fee_response_ordinary"); }); $("#suggested_fee_multi").on("click", function(e) { e.preventDefault(); - BRS.showFeeSuggestions(multi_out_fee,suggested_fee_response_multi); + BRS.showFeeSuggestions("#multi_out_fee","#suggested_fee_response_multi"); }); diff --git a/html/ui/locales/en.json b/html/ui/locales/en.json index d34fbae98..505fd2d83 100644 --- a/html/ui/locales/en.json +++ b/html/ui/locales/en.json @@ -124,6 +124,7 @@ "change_price": "Change Price", "change_qty": "Change QTY", "change_quantity": "Change Quantity", + "cheap":"Cheap", "cheap_fee": "Cheap fee:", "checking_for_updates": "Checking for updates...", "choose_own_passphrase": "Want to choose your own passphrase? Click here.", @@ -440,6 +441,7 @@ "general": "General", "general_release": "General Release", "generate": "Generate", + "generate_qr":"Generate QR", "generated_token_is": "The generated token is:", "generate_token": "Generate Token", "generating_passphrase_wait": "Generating your passphrase. Please wait", @@ -464,6 +466,8 @@ "host": "Host", "hub_announcement": "Hub Announcement", "import_contact": "Import Contacts", + "immutable": "Immutable", + "immutable_title": "If Immutable is checked, sender would not be able to change an amount or a fee before signing a transaction.", "includes_feedback": "Includes feedback", "incorrectly_typed_passphrase": "You have not typed the passphrase correctly, please try again!", "incorrect_purchase": "Incorrect purchase.", @@ -548,6 +552,7 @@ "new_group_name": "New Group Name", "new_group_title": "New Group Title", "new_price": "New Price", + "new_qr":"New QR", "new_quantity": "New Quantity", "new_q_create_account": "New? Create Your Account!", "next": "Next", @@ -613,6 +618,7 @@ "open_orders": "Open Orders", "options_are_binary": "Options are Binary", "option_x": "option __x__", + "or_use_suggested_fee": "Or use a suggested fee", "order": "Order", "order_date": "Order Date", "order_description": "Order Description", @@ -650,6 +656,7 @@ "previous_block_hash": "Previous Block Hash", "previous_page": "Previous Page", "price": "Price", + "priority":"Priority", "priority_fee": "Priority fee:", "private_feedback": "Private Feedback", "processors": "Processors", @@ -707,6 +714,8 @@ "remove_from_bookmarks": "Remove From Bookmarks", "remove_from_group": "Remove From Group", "repeat": "Repeat", + "request_burst_qr":"Request BURST QR", + "request_fee_explanation_text":"Fees are calculated for the current blockchain usage and are shown only as an example. Selecting one of the options would ensure that the desired type of fee would be calculated and applied when a transaction is being sent.", "returning_user_q": "Returning User?", "same_out": "Same Amount", "search_aliases": "Search Aliases...", @@ -745,6 +754,7 @@ "show_console_log_button": "Show Console Log Button", "signature_hash": "Signature Hash", "signed_transaction_bytes": "Signed Transaction Bytes", + "standard":"Standard", "standard_fee": "Standard fee:", "start_date": "Start Date", "start_forging": "Start Forging", @@ -819,7 +829,7 @@ "success_update_contact": "The contact has been updated successfully!", "success_valid_token": "The token is valid and belongs to account __account_link__. It was generated on __timestamp__.", "suggested_fee": "Suggested fee:", - "suggested_fee_help": "Cheap fee: 50% chance transaction will make it in one of the next ten blocks.
    Standard fee: 50% chance transaction will make it in the next block.
    Priority fee: 90% chance transaction will make it in the next block and 99% to make within next two blocks.", + "suggested_fee_help": "Standard fee: 50% chance transaction will make it in the next block.
    Cheap fee: 50% chance transaction will make it in one of the next ten blocks.
    Priority fee: 90% chance transaction will make it in the next block and 99% to make within next two blocks.", "tags": "Tags", "tags_categories": "Tags (categories)", "tentative": "Tentative", diff --git a/pom.xml b/pom.xml index 37c9c40a4..b39f0af4a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ burstcoin burstcoin - 2.2.2 + 2.2.3 Burstcoin Reference Software https://github.com/PoC-Consortium/burstcoin @@ -41,6 +41,7 @@ 0.1.4 3.5.0 4.5.2 + 3.3.0 5.2.0 1.2.0 @@ -180,6 +181,16 @@ commons-lang ${commons-lang.version} + + com.google.zxing + core + ${xzing.version} + + + com.google.zxing + javase + ${xzing.version} + org.junit.platform @@ -295,6 +306,7 @@ src + resources test/java @@ -378,6 +390,11 @@ + + + + + diff --git a/src/brs/BlockchainProcessorImpl.java b/src/brs/BlockchainProcessorImpl.java index 84d1240be..4181b593c 100644 --- a/src/brs/BlockchainProcessorImpl.java +++ b/src/brs/BlockchainProcessorImpl.java @@ -661,66 +661,68 @@ private void processFork(Peer peer, final List forkBlocks, long forkBlock } } synchronized (downloadCache) { - logger.warn("Cache is now processed. Starting to process fork."); - Block forkBlock = blockchain.getBlock(forkBlockId); - - // we read the current cumulative difficulty - BigInteger curCumulativeDifficulty = blockchain.getLastBlock().getCumulativeDifficulty(); - - // We remove blocks from chain back to where we start our fork - // and save it in a list if we need to restore - List myPoppedOffBlocks = popOffTo(forkBlock); - - // now we check that our chain is popped off. - // If all seems ok is we try to push fork. - int pushedForkBlocks = 0; - if (blockchain.getLastBlock().getId() == forkBlockId) { - for (Block block : forkBlocks) { - if (blockchain.getLastBlock().getId() == block.getPreviousBlockId()) { + synchronized (transactionProcessor.getUnconfirmedTransactionsSyncObj()) { + logger.warn("Cache is now processed. Starting to process fork."); + Block forkBlock = blockchain.getBlock(forkBlockId); + + // we read the current cumulative difficulty + BigInteger curCumulativeDifficulty = blockchain.getLastBlock().getCumulativeDifficulty(); + + // We remove blocks from chain back to where we start our fork + // and save it in a list if we need to restore + List myPoppedOffBlocks = popOffTo(forkBlock); + + // now we check that our chain is popped off. + // If all seems ok is we try to push fork. + int pushedForkBlocks = 0; + if (blockchain.getLastBlock().getId() == forkBlockId) { + for (Block block : forkBlocks) { + if (blockchain.getLastBlock().getId() == block.getPreviousBlockId()) { + try { + blockService.preVerify(block); + pushBlock(block); + pushedForkBlocks += 1; + } catch (BlockNotAcceptedException e) { + peer.blacklist(e, "during processing a fork"); + break; + } + } + } + } + + /* + * we check if we succeeded to push any block. if we did we check against cumulative + * difficulty If it is lower we blacklist peer and set chain to be processed later. + */ + if (pushedForkBlocks > 0 && blockchain.getLastBlock().getCumulativeDifficulty() + .compareTo(curCumulativeDifficulty) < 0) { + logger.warn("Fork was bad and Pop off was caused by peer " + peer.getPeerAddress() + ", blacklisting"); + peer.blacklist("got a bad fork"); + List peerPoppedOffBlocks = popOffTo(forkBlock); + pushedForkBlocks = 0; + peerPoppedOffBlocks.forEach(block -> transactionProcessor.processLater(block.getTransactions())); + } + + // if we did not push any blocks we try to restore chain. + if (pushedForkBlocks == 0) { + for (int i = myPoppedOffBlocks.size() - 1; i >= 0; i--) { + Block block = myPoppedOffBlocks.remove(i); try { blockService.preVerify(block); pushBlock(block); - pushedForkBlocks += 1; } catch (BlockNotAcceptedException e) { - peer.blacklist(e, "during processing a fork"); + logger.warn("Popped off block no longer acceptable: " + block.getJSONObject().toJSONString(), e); break; } } + } else { + myPoppedOffBlocks.forEach(block -> transactionProcessor.processLater(block.getTransactions())); + logger.warn("Successfully switched to better chain."); } + logger.warn("Forkprocessing complete."); + downloadCache.resetForkBlocks(); + downloadCache.resetCache(); // Reset and set cached vars to chaindata. } - - /* - * we check if we succeeded to push any block. if we did we check against cumulative - * difficulty If it is lower we blacklist peer and set chain to be processed later. - */ - if (pushedForkBlocks > 0 && blockchain.getLastBlock().getCumulativeDifficulty() - .compareTo(curCumulativeDifficulty) < 0) { - logger.warn("Fork was bad and Pop off was caused by peer " + peer.getPeerAddress() + ", blacklisting"); - peer.blacklist("got a bad fork"); - List peerPoppedOffBlocks = popOffTo(forkBlock); - pushedForkBlocks = 0; - peerPoppedOffBlocks.forEach(block -> transactionProcessor.processLater(block.getTransactions())); - } - - // if we did not push any blocks we try to restore chain. - if (pushedForkBlocks == 0) { - for (int i = myPoppedOffBlocks.size() - 1; i >= 0; i--) { - Block block = myPoppedOffBlocks.remove(i); - try { - blockService.preVerify(block); - pushBlock(block); - } catch (BlockNotAcceptedException e) { - logger.warn("Popped off block no longer acceptable: " + block.getJSONObject().toJSONString(), e); - break; - } - } - } else { - myPoppedOffBlocks.forEach(block -> transactionProcessor.processLater(block.getTransactions())); - logger.warn("Successfully switched to better chain."); - } - logger.warn("Forkprocessing complete."); - downloadCache.resetForkBlocks(); - downloadCache.resetCache(); // Reset and set cached vars to chaindata. } } }; @@ -844,168 +846,170 @@ private void addGenesisBlock() { } private void pushBlock(final Block block) throws BlockNotAcceptedException { - stores.beginTransaction(); - int curTime = timeService.getEpochTime(); - - Block previousLastBlock = null; - try { - - previousLastBlock = blockchain.getLastBlock(); - - if (previousLastBlock.getId() != block.getPreviousBlockId()) { - throw new BlockOutOfOrderException( - "Previous block id doesn't match for block " + block.getHeight() - + ((previousLastBlock.getHeight() + 1) == block.getHeight() ? "" : " invalid previous height " + previousLastBlock.getHeight() ) - ); - } + synchronized (transactionProcessor.getUnconfirmedTransactionsSyncObj()) { + stores.beginTransaction(); + int curTime = timeService.getEpochTime(); - if (block.getVersion() != getBlockVersion()) { - throw new BlockNotAcceptedException("Invalid version " + block.getVersion() + " for block " + block.getHeight()); - } + Block previousLastBlock = null; + try { - if (block.getVersion() != 1 - && !Arrays.equals(Crypto.sha256().digest(previousLastBlock.getBytes()), - block.getPreviousBlockHash())) { - throw new BlockNotAcceptedException("Previous block hash doesn't match for block " + block.getHeight()); - } - if (block.getTimestamp() > curTime + MAX_TIMESTAMP_DIFFERENCE - || block.getTimestamp() <= previousLastBlock.getTimestamp()) { - throw new BlockOutOfOrderException("Invalid timestamp: " + block.getTimestamp() - + " current time is " + curTime - + ", previous block timestamp is " + previousLastBlock.getTimestamp()); - } - if (block.getId() == 0L || blockDb.hasBlock(block.getId())) { - throw new BlockNotAcceptedException("Duplicate block or invalid id for block " + block.getHeight()); - } - if (! blockService.verifyGenerationSignature(block)) { - throw new BlockNotAcceptedException("Generation signature verification failed for block " + block.getHeight()); - } - if (! blockService.verifyBlockSignature(block)) { - throw new BlockNotAcceptedException("Block signature verification failed for block " + block.getHeight()); - } + previousLastBlock = blockchain.getLastBlock(); - final TransactionDuplicatesCheckerImpl transactionDuplicatesChecker = new TransactionDuplicatesCheckerImpl(); - long calculatedTotalAmount = 0; - long calculatedTotalFee = 0; - MessageDigest digest = Crypto.sha256(); + if (previousLastBlock.getId() != block.getPreviousBlockId()) { + throw new BlockOutOfOrderException( + "Previous block id doesn't match for block " + block.getHeight() + + ((previousLastBlock.getHeight() + 1) == block.getHeight() ? "" : " invalid previous height " + previousLastBlock.getHeight()) + ); + } - ArrayList accountIds = new ArrayList(); - try (DSLContext ctx = Db.getDSLContext()) { - block.getTransactions().forEach(t -> { - if (t.getRecipientId() != 0L) - accountIds.add(t.getRecipientId()); - if (t.getSenderId() != 0L) - accountIds.add(t.getSenderId()); - }); - if (!accountIds.isEmpty()) { - stores.getAccountStore().getAccountTable().fillCache(accountIds); + if (block.getVersion() != getBlockVersion()) { + throw new BlockNotAcceptedException("Invalid version " + block.getVersion() + " for block " + block.getHeight()); } - } - for (Transaction transaction : block.getTransactions()) { - if (transaction.getTimestamp() > curTime + MAX_TIMESTAMP_DIFFERENCE) { - throw new BlockOutOfOrderException("Invalid transaction timestamp: " - + transaction.getTimestamp() + ", current time is " + curTime); + if (block.getVersion() != 1 + && !Arrays.equals(Crypto.sha256().digest(previousLastBlock.getBytes()), + block.getPreviousBlockHash())) { + throw new BlockNotAcceptedException("Previous block hash doesn't match for block " + block.getHeight()); } - if (transaction.getTimestamp() > block.getTimestamp() + MAX_TIMESTAMP_DIFFERENCE - || transaction.getExpiration() < block.getTimestamp()) { - throw new TransactionNotAcceptedException("Invalid transaction timestamp " - + transaction.getTimestamp() + " for transaction " + transaction.getStringId() - + ", current time is " + curTime + ", block timestamp is " + block.getTimestamp(), - transaction); + if (block.getTimestamp() > curTime + MAX_TIMESTAMP_DIFFERENCE + || block.getTimestamp() <= previousLastBlock.getTimestamp()) { + throw new BlockOutOfOrderException("Invalid timestamp: " + block.getTimestamp() + + " current time is " + curTime + + ", previous block timestamp is " + previousLastBlock.getTimestamp()); } - if (transactionDb.hasTransaction(transaction.getId())) { - throw new TransactionNotAcceptedException( - "Transaction " + transaction.getStringId() + " is already in the blockchain", - transaction); + if (block.getId() == 0L || blockDb.hasBlock(block.getId())) { + throw new BlockNotAcceptedException("Duplicate block or invalid id for block " + block.getHeight()); } - if (transaction.getReferencedTransactionFullHash() != null) { - if ((previousLastBlock.getHeight() < Constants.REFERENCED_TRANSACTION_FULL_HASH_BLOCK - && !transactionDb.hasTransaction( - Convert.fullHashToId(transaction.getReferencedTransactionFullHash()))) - || (previousLastBlock - .getHeight() >= Constants.REFERENCED_TRANSACTION_FULL_HASH_BLOCK - && !hasAllReferencedTransactions(transaction, transaction.getTimestamp(), 0))) { - throw new TransactionNotAcceptedException("Missing or invalid referenced transaction " - + transaction.getReferencedTransactionFullHash() + " for transaction " - + transaction.getStringId(), transaction); - } + if (!blockService.verifyGenerationSignature(block)) { + throw new BlockNotAcceptedException("Generation signature verification failed for block " + block.getHeight()); } - if (transaction.getVersion() != transactionProcessor.getTransactionVersion(previousLastBlock.getHeight())) { - throw new TransactionNotAcceptedException("Invalid transaction version " - + transaction.getVersion() + " at height " + previousLastBlock.getHeight(), - transaction); + if (!blockService.verifyBlockSignature(block)) { + throw new BlockNotAcceptedException("Block signature verification failed for block " + block.getHeight()); } - - if (!transactionService.verifyPublicKey(transaction)) { - throw new TransactionNotAcceptedException("Wrong public key in transaction " - + transaction.getStringId() + " at height " + previousLastBlock.getHeight(), - transaction); + + final TransactionDuplicatesCheckerImpl transactionDuplicatesChecker = new TransactionDuplicatesCheckerImpl(); + long calculatedTotalAmount = 0; + long calculatedTotalFee = 0; + MessageDigest digest = Crypto.sha256(); + + ArrayList accountIds = new ArrayList(); + try (DSLContext ctx = Db.getDSLContext()) { + block.getTransactions().forEach(t -> { + if (t.getRecipientId() != 0L) + accountIds.add(t.getRecipientId()); + if (t.getSenderId() != 0L) + accountIds.add(t.getSenderId()); + }); + if (!accountIds.isEmpty()) { + stores.getAccountStore().getAccountTable().fillCache(accountIds); + } } - if (Burst.getFluxCapacitor().isActive(FeatureToggle.AUTOMATED_TRANSACTION_BLOCK)) { - if (! economicClustering.verifyFork(transaction)) { - logger.debug("Block " + block.getStringId() + " height " - + (previousLastBlock.getHeight() + 1) - + " contains transaction that was generated on a fork: " - + transaction.getStringId() + " ecBlockHeight " + transaction.getECBlockHeight() - + " ecBlockId " + Convert.toUnsignedLong(transaction.getECBlockId())); - throw new TransactionNotAcceptedException("Transaction belongs to a different fork", + + for (Transaction transaction : block.getTransactions()) { + if (transaction.getTimestamp() > curTime + MAX_TIMESTAMP_DIFFERENCE) { + throw new BlockOutOfOrderException("Invalid transaction timestamp: " + + transaction.getTimestamp() + ", current time is " + curTime); + } + if (transaction.getTimestamp() > block.getTimestamp() + MAX_TIMESTAMP_DIFFERENCE + || transaction.getExpiration() < block.getTimestamp()) { + throw new TransactionNotAcceptedException("Invalid transaction timestamp " + + transaction.getTimestamp() + " for transaction " + transaction.getStringId() + + ", current time is " + curTime + ", block timestamp is " + block.getTimestamp(), transaction); } - } - if (transaction.getId() == 0L) { - throw new TransactionNotAcceptedException("Invalid transaction id", transaction); - } + if (transactionDb.hasTransaction(transaction.getId())) { + throw new TransactionNotAcceptedException( + "Transaction " + transaction.getStringId() + " is already in the blockchain", + transaction); + } + if (transaction.getReferencedTransactionFullHash() != null) { + if ((previousLastBlock.getHeight() < Constants.REFERENCED_TRANSACTION_FULL_HASH_BLOCK + && !transactionDb.hasTransaction( + Convert.fullHashToId(transaction.getReferencedTransactionFullHash()))) + || (previousLastBlock + .getHeight() >= Constants.REFERENCED_TRANSACTION_FULL_HASH_BLOCK + && !hasAllReferencedTransactions(transaction, transaction.getTimestamp(), 0))) { + throw new TransactionNotAcceptedException("Missing or invalid referenced transaction " + + transaction.getReferencedTransactionFullHash() + " for transaction " + + transaction.getStringId(), transaction); + } + } + if (transaction.getVersion() != transactionProcessor.getTransactionVersion(previousLastBlock.getHeight())) { + throw new TransactionNotAcceptedException("Invalid transaction version " + + transaction.getVersion() + " at height " + previousLastBlock.getHeight(), + transaction); + } + + if (!transactionService.verifyPublicKey(transaction)) { + throw new TransactionNotAcceptedException("Wrong public key in transaction " + + transaction.getStringId() + " at height " + previousLastBlock.getHeight(), + transaction); + } + if (Burst.getFluxCapacitor().isActive(FeatureToggle.AUTOMATED_TRANSACTION_BLOCK)) { + if (!economicClustering.verifyFork(transaction)) { + logger.debug("Block " + block.getStringId() + " height " + + (previousLastBlock.getHeight() + 1) + + " contains transaction that was generated on a fork: " + + transaction.getStringId() + " ecBlockHeight " + transaction.getECBlockHeight() + + " ecBlockId " + Convert.toUnsignedLong(transaction.getECBlockId())); + throw new TransactionNotAcceptedException("Transaction belongs to a different fork", + transaction); + } + } + if (transaction.getId() == 0L) { + throw new TransactionNotAcceptedException("Invalid transaction id", transaction); + } + + if (transactionDuplicatesChecker.hasAnyDuplicate(transaction)) { + throw new TransactionNotAcceptedException("Transaction is a duplicate: " + transaction.getStringId(), transaction); + } - if (transactionDuplicatesChecker.hasAnyDuplicate(transaction)) { - throw new TransactionNotAcceptedException("Transaction is a duplicate: " + transaction.getStringId(), transaction); + try { + transactionService.validate(transaction); + } catch (BurstException.ValidationException e) { + throw new TransactionNotAcceptedException(e.getMessage(), transaction); + } + + calculatedTotalAmount += transaction.getAmountNQT(); + calculatedTotalFee += transaction.getFeeNQT(); + digest.update(transaction.getBytes()); } - try { - transactionService.validate(transaction); - } catch (BurstException.ValidationException e) { - throw new TransactionNotAcceptedException(e.getMessage(), transaction); + if (calculatedTotalAmount > block.getTotalAmountNQT() + || calculatedTotalFee > block.getTotalFeeNQT()) { + throw new BlockNotAcceptedException("Total amount or fee don't match transaction totals for block " + block.getHeight()); + } + if (!Arrays.equals(digest.digest(), block.getPayloadHash())) { + throw new BlockNotAcceptedException("Payload hash doesn't match for block " + block.getHeight()); } - calculatedTotalAmount += transaction.getAmountNQT(); - calculatedTotalFee += transaction.getFeeNQT(); - digest.update(transaction.getBytes()); - } - - if (calculatedTotalAmount > block.getTotalAmountNQT() - || calculatedTotalFee > block.getTotalFeeNQT()) { - throw new BlockNotAcceptedException("Total amount or fee don't match transaction totals for block " + block.getHeight()); + long remainingAmount = + Convert.safeSubtract(block.getTotalAmountNQT(), calculatedTotalAmount); + long remainingFee = Convert.safeSubtract(block.getTotalFeeNQT(), calculatedTotalFee); + + blockService.setPrevious(block, previousLastBlock); + blockListeners.notify(block, Event.BEFORE_BLOCK_ACCEPT); + transactionProcessor.requeueAllUnconfirmedTransactions(); + accountService.flushAccountTable(); + addBlock(block); + downloadCache.removeBlock(block); //We make sure downloadCache do not have this block anymore. + accept(block, remainingAmount, remainingFee); + derivedTableManager.getDerivedTables().forEach(DerivedTable::finish); + stores.commitTransaction(); + } catch (BlockNotAcceptedException | ArithmeticException e) { + stores.rollbackTransaction(); + blockchain.setLastBlock(previousLastBlock); + downloadCache.resetCache(); + throw e; + } finally { + stores.endTransaction(); } - if (!Arrays.equals(digest.digest(), block.getPayloadHash())) { - throw new BlockNotAcceptedException("Payload hash doesn't match for block " + block.getHeight()); + logger.debug("Successfully pushed " + block.getId() + " (height " + block.getHeight() + ")"); + statisticsManager.blockAdded(); + blockListeners.notify(block, Event.BLOCK_PUSHED); + if (block.getTimestamp() >= timeService.getEpochTime() - MAX_TIMESTAMP_DIFFERENCE) { + Peers.sendToSomePeers(block); } - - long remainingAmount = - Convert.safeSubtract(block.getTotalAmountNQT(), calculatedTotalAmount); - long remainingFee = Convert.safeSubtract(block.getTotalFeeNQT(), calculatedTotalFee); - - blockService.setPrevious(block, previousLastBlock); - blockListeners.notify(block, Event.BEFORE_BLOCK_ACCEPT); - transactionProcessor.requeueAllUnconfirmedTransactions(); - accountService.flushAccountTable(); - addBlock(block); - downloadCache.removeBlock(block); //We make sure downloadCache do not have this block anymore. - accept(block, remainingAmount, remainingFee); - derivedTableManager.getDerivedTables().forEach(DerivedTable::finish); - stores.commitTransaction(); - } catch (BlockNotAcceptedException | ArithmeticException e) { - stores.rollbackTransaction(); - blockchain.setLastBlock(previousLastBlock); - downloadCache.resetCache(); - throw e; - } finally { - stores.endTransaction(); - } - logger.debug("Successfully pushed " + block.getId() + " (height " + block.getHeight() + ")"); - statisticsManager.blockAdded(); - blockListeners.notify(block, Event.BLOCK_PUSHED); - if (block.getTimestamp() >= timeService.getEpochTime() - MAX_TIMESTAMP_DIFFERENCE) { - Peers.sendToSomePeers(block); } } @@ -1070,25 +1074,27 @@ private List popOffTo(Block commonBlock) { } List poppedOffBlocks = new ArrayList<>(); synchronized (downloadCache) { - //Burst.getTransactionProcessor().clearUnconfirmedTransactions(); - try { - stores.beginTransaction(); - Block block = blockchain.getLastBlock(); - logger.debug("Rollback from " + block.getHeight() + " to " + commonBlock.getHeight()); - while (block.getId() != commonBlock.getId() && block.getId() != Genesis.GENESIS_BLOCK_ID) { - poppedOffBlocks.add(block); - block = popLastBlock(); + synchronized (transactionProcessor.getUnconfirmedTransactionsSyncObj()) { + //Burst.getTransactionProcessor().clearUnconfirmedTransactions(); + try { + stores.beginTransaction(); + Block block = blockchain.getLastBlock(); + logger.debug("Rollback from " + block.getHeight() + " to " + commonBlock.getHeight()); + while (block.getId() != commonBlock.getId() && block.getId() != Genesis.GENESIS_BLOCK_ID) { + poppedOffBlocks.add(block); + block = popLastBlock(); + } + derivedTableManager.getDerivedTables().forEach(table -> table.rollback(commonBlock.getHeight())); + dbCacheManager.flushCache(); + stores.commitTransaction(); + downloadCache.resetCache(); + } catch (RuntimeException e) { + stores.rollbackTransaction(); + logger.debug("Error popping off to " + commonBlock.getHeight(), e); + throw e; + } finally { + stores.endTransaction(); } - derivedTableManager.getDerivedTables().forEach(table -> table.rollback(commonBlock.getHeight())); - dbCacheManager.flushCache(); - stores.commitTransaction(); - downloadCache.resetCache(); - } catch (RuntimeException e) { - stores.rollbackTransaction(); - logger.debug("Error popping off to " + commonBlock.getHeight(), e); - throw e; - } finally { - stores.endTransaction(); } } return poppedOffBlocks; diff --git a/src/brs/Burst.java b/src/brs/Burst.java index f72463b0d..c4faf39d4 100644 --- a/src/brs/Burst.java +++ b/src/brs/Burst.java @@ -7,6 +7,7 @@ import brs.assetexchange.AssetExchange; import brs.assetexchange.AssetExchangeImpl; import brs.blockchainlistener.DevNullListener; +import brs.deeplink.DeeplinkQRCodeGenerator; import brs.feesuggestions.FeeSuggestionCalculator; import brs.props.Props; import brs.db.BlockDb; @@ -61,7 +62,7 @@ public final class Burst { - public static final String VERSION = "2.2.2"; + public static final String VERSION = "2.2.3"; public static final String APPLICATION = "BRS"; public static final String LEGACY_APP = "NRS"; public static final String LEGACY_VER = "1.2.9"; @@ -234,6 +235,8 @@ private static void loadWallet(PropertyService propertyService) { generator.generateForBlockchainProcessor(threadPool, blockchainProcessor); + final DeeplinkQRCodeGenerator deepLinkQRCodeGenerator = new DeeplinkQRCodeGenerator(); + final ParameterService parameterService = new ParameterServiceImpl(accountService, aliasService, assetExchange, digitalGoodsStoreService, blockchain, blockchainProcessor, transactionProcessor, atService); @@ -248,7 +251,7 @@ private static void loadWallet(PropertyService propertyService) { api = new API(transactionProcessor, blockchain, blockchainProcessor, parameterService, accountService, aliasService, assetExchange, escrowService, digitalGoodsStoreService, subscriptionService, atService, timeService, economicClustering, propertyService, threadPool, - transactionService, blockService, generator, apiTransactionManager, feeSuggestionCalculator); + transactionService, blockService, generator, apiTransactionManager, feeSuggestionCalculator, deepLinkQRCodeGenerator); DebugTrace.init(propertyService, blockchainProcessor, accountService, assetExchange, digitalGoodsStoreService); diff --git a/src/brs/TransactionProcessorImpl.java b/src/brs/TransactionProcessorImpl.java index be054b3f1..fdf46e1aa 100644 --- a/src/brs/TransactionProcessorImpl.java +++ b/src/brs/TransactionProcessorImpl.java @@ -42,6 +42,8 @@ public class TransactionProcessorImpl implements TransactionProcessor { private final int rebroadcastAfter; private final int rebroadcastEvery; + private final Object unconfirmedTransactionsSyncObj = new Object(); + private int limitUnconfirmedTransactionsToRetrieve; private final Set nonBroadcastedTransactions = Collections.newSetFromMap(new ConcurrentHashMap()); @@ -147,57 +149,60 @@ private JSONStreamAware unconfirmedTransactionRequest(Long lastUnconfirmedTransa public void run() { try { try { - if(! lostTransactions.isEmpty()) { + synchronized (unconfirmedTransactionsSyncObj) { + if (!lostTransactions.isEmpty()) { List reAdded = processTransactions(lostTransactions, false); - if(enableTransactionRebroadcasting && timeService.getEpochTime() - blockchain.getLastBlock().getTimestamp() < 4 * 60) { + if (enableTransactionRebroadcasting && timeService.getEpochTime() - blockchain.getLastBlock().getTimestamp() < 4 * 60) { List rebroadcastLost = new ArrayList<>(); reAdded.forEach(lost -> { - if (lostTransactionHeights.containsKey(lost.getId())) { - int addedHeight = lostTransactionHeights.get(lost.getId()); - if (blockchain.getHeight() - addedHeight >= rebroadcastAfter - && (blockchain.getHeight() - addedHeight - rebroadcastAfter) % rebroadcastEvery == 0) { - rebroadcastLost.add(lost); - } - } else { - lostTransactionHeights.put(lost.getId(), blockchain.getHeight()); + if (lostTransactionHeights.containsKey(lost.getId())) { + int addedHeight = lostTransactionHeights.get(lost.getId()); + if (blockchain.getHeight() - addedHeight >= rebroadcastAfter + && (blockchain.getHeight() - addedHeight - rebroadcastAfter) % rebroadcastEvery == 0) { + rebroadcastLost.add(lost); } - }); + } else { + lostTransactionHeights.put(lost.getId(), blockchain.getHeight()); + } + }); - for(Transaction lost : rebroadcastLost) { - if(!nonBroadcastedTransactions.contains(lost)) { + for (Transaction lost : rebroadcastLost) { + if (!nonBroadcastedTransactions.contains(lost)) { nonBroadcastedTransactions.add(lost); } } - lostTransactionHeights.keySet().removeIf(id -> getUnconfirmedTransaction(id) == null); + lostTransactionHeights.keySet().removeIf(id -> getUnconfirmedTransaction(id) == null); } lostTransactions.clear(); } - Peer peer = Peers.getAnyPeer(Peer.State.CONNECTED); - if (peer == null) { - return; - } - JSONObject response = peer.send(peer.getLastUnconfirmedTransactionTimestamp() == null ? getUnconfirmedTransactionsRequest : unconfirmedTransactionRequest(peer.getLastUnconfirmedTransactionTimestamp())); - if (response == null) { - return; - } + Peer peer = Peers.getAnyPeer(Peer.State.CONNECTED); + if (peer == null) { + return; + } + JSONObject response = peer + .send(peer.getLastUnconfirmedTransactionTimestamp() == null ? getUnconfirmedTransactionsRequest : unconfirmedTransactionRequest(peer.getLastUnconfirmedTransactionTimestamp())); + if (response == null) { + return; + } - JSONArray transactionsData = (JSONArray) response.get(UNCONFIRMED_TRANSACTIONS_RESPONSE); - Object lastUnconfirmedTransactionTimeStampResponse = response.get(LAST_UNCONFIRMED_TRANSACTION_TIMESTAMP_RESPONSE); + JSONArray transactionsData = (JSONArray) response.get(UNCONFIRMED_TRANSACTIONS_RESPONSE); + Object lastUnconfirmedTransactionTimeStampResponse = response.get(LAST_UNCONFIRMED_TRANSACTION_TIMESTAMP_RESPONSE); - if(lastUnconfirmedTransactionTimeStampResponse != null) { - peer.setLastUnconfirmedTransactionTimestamp(Convert.parseLong("" + lastUnconfirmedTransactionTimeStampResponse)); - } + if (lastUnconfirmedTransactionTimeStampResponse != null) { + peer.setLastUnconfirmedTransactionTimestamp(Convert.parseLong("" + lastUnconfirmedTransactionTimeStampResponse)); + } - if (transactionsData == null || transactionsData.isEmpty()) { - return; - } - try { - processPeerTransactions(transactionsData); - } catch (BurstException.ValidationException|RuntimeException e) { - peer.blacklist(e, "pulled invalid data using getUnconfirmedTransactions"); + if (transactionsData == null || transactionsData.isEmpty()) { + return; + } + try { + processPeerTransactions(transactionsData); + } catch (BurstException.ValidationException | RuntimeException e) { + peer.blacklist(e, "pulled invalid data using getUnconfirmedTransactions"); + } } } catch (Exception e) { logger.debug("Error processing unconfirmed transactions", e); @@ -225,6 +230,10 @@ void notifyListeners(List transactions, Event eventType) transactionListeners.notify(transactions, eventType); } + public Object getUnconfirmedTransactionsSyncObj() { + return unconfirmedTransactionsSyncObj; + } + @Override public TimedUnconfirmedTransactionOverview getAllUnconfirmedTransactions(Long lastUnconfirmedTransactionTimestamp, Long limit) { if(lastUnconfirmedTransactionTimestamp != null) { @@ -303,38 +312,42 @@ public Transaction parseTransaction(JSONObject transactionData) throws BurstExce @Override public void clearUnconfirmedTransactions() { - List removed = new ArrayList<>(); - try { - stores.beginTransaction(); + synchronized (unconfirmedTransactionsSyncObj) { + List removed = new ArrayList<>(); + try { + stores.beginTransaction(); + unconfirmedTransactionStore.forEach( + transaction -> { + removed.add(transaction); + } + ); + accountService.flushAccountTable(); + unconfirmedTransactionStore.clear(); + stores.commitTransaction(); + } catch (Exception e) { + logger.error(e.toString(), e); + stores.rollbackTransaction(); + throw e; + } finally { + stores.endTransaction(); + } + lostTransactions.clear(); + transactionListeners.notify(removed, Event.REMOVED_UNCONFIRMED_TRANSACTIONS); + } + } + + void requeueAllUnconfirmedTransactions() { + synchronized (unconfirmedTransactionsSyncObj) { + List removed = new ArrayList<>(); unconfirmedTransactionStore.forEach( transaction -> { removed.add(transaction); + lostTransactions.add(transaction); } ); - accountService.flushAccountTable(); unconfirmedTransactionStore.clear(); - stores.commitTransaction(); - } catch (Exception e) { - logger.error(e.toString(), e); - stores.rollbackTransaction(); - throw e; - } finally { - stores.endTransaction(); + transactionListeners.notify(removed, Event.REMOVED_UNCONFIRMED_TRANSACTIONS); } - lostTransactions.clear(); - transactionListeners.notify(removed, Event.REMOVED_UNCONFIRMED_TRANSACTIONS); - } - - void requeueAllUnconfirmedTransactions() { - List removed = new ArrayList<>(); - unconfirmedTransactionStore.forEach( - transaction -> { - removed.add(transaction); - lostTransactions.add(transaction); - } - ); - unconfirmedTransactionStore.clear(); - transactionListeners.notify(removed, Event.REMOVED_UNCONFIRMED_TRANSACTIONS); } int getTransactionVersion(int previousBlockHeight) { return Burst.getFluxCapacitor().isActive(FeatureToggle.DIGITAL_GOODS_STORE, previousBlockHeight) ? 1 : 0; @@ -353,7 +366,7 @@ void processLater(Collection transactions) { } private void processPeerTransactions(JSONArray transactionsData) throws BurstException.ValidationException { - + if (blockchain.getLastBlock().getTimestamp() < timeService.getEpochTime() - 60 * 1440 && ! testUnconfirmedTransactions) { return; } @@ -384,75 +397,76 @@ private void processPeerTransactions(JSONArray transactionsData) throws BurstExc } List processTransactions(Collection transactions, final boolean sendToPeers) throws BurstException.ValidationException { - if (transactions.isEmpty()) { - return Collections.emptyList(); - } - List sendToPeersTransactions = new ArrayList<>(); - List addedUnconfirmedTransactions = new ArrayList<>(); + synchronized (unconfirmedTransactionsSyncObj) { + if (transactions.isEmpty()) { + return Collections.emptyList(); + } + List sendToPeersTransactions = new ArrayList<>(); + List addedUnconfirmedTransactions = new ArrayList<>(); - for (Transaction transaction : transactions) { + for (Transaction transaction : transactions) { - try { - int curTime = timeService.getEpochTime(); - if (transaction.getTimestamp() > curTime + 15 || transaction.getExpiration() < curTime - || transaction.getDeadline() > 1440) { - continue; - } - try { - stores.beginTransaction(); - if (blockchain.getHeight() < Constants.NQT_BLOCK) { - break; // not ready to process transactions - } - - if (dbs.getTransactionDb().hasTransaction(transaction.getId()) || unconfirmedTransactionStore.exists(transaction.getId())) { - stores.commitTransaction(); + int curTime = timeService.getEpochTime(); + if (transaction.getTimestamp() > curTime + 15 || transaction.getExpiration() < curTime + || transaction.getDeadline() > 1440) { continue; } - if (!(transaction.verifySignature() && transactionService.verifyPublicKey(transaction))) { - if (accountService.getAccount(transaction.getSenderId()) != null) { - logger.debug("Transaction " + transaction.getJSONObject().toJSONString() + " failed to verify"); + try { + stores.beginTransaction(); + if (blockchain.getHeight() < Constants.NQT_BLOCK) { + break; // not ready to process transactions } - stores.commitTransaction(); - continue; - } - unconfirmedTransactionStore.put(transaction); - addedUnconfirmedTransactions.add(transaction); + if (dbs.getTransactionDb().hasTransaction(transaction.getId()) || unconfirmedTransactionStore.exists(transaction.getId())) { + stores.commitTransaction(); + continue; + } - if (sendToPeers) { - if (nonBroadcastedTransactions.contains(transaction)) { - logger.debug("Received back transaction " + transaction.getStringId() - + " that we generated, will not forward to peers"); - nonBroadcastedTransactions.remove(transaction); + if (!(transaction.verifySignature() && transactionService.verifyPublicKey(transaction))) { + if (accountService.getAccount(transaction.getSenderId()) != null) { + logger.debug("Transaction " + transaction.getJSONObject().toJSONString() + " failed to verify"); + } + stores.commitTransaction(); + continue; } - else { - sendToPeersTransactions.add(transaction); + + unconfirmedTransactionStore.put(transaction); + addedUnconfirmedTransactions.add(transaction); + + if (sendToPeers) { + if (nonBroadcastedTransactions.contains(transaction)) { + logger.debug("Received back transaction " + transaction.getStringId() + + " that we generated, will not forward to peers"); + nonBroadcastedTransactions.remove(transaction); + } else { + sendToPeersTransactions.add(transaction); + } } - } - stores.commitTransaction(); - } catch (Exception e) { - stores.rollbackTransaction(); - throw e; - } finally { - stores.endTransaction(); + stores.commitTransaction(); + } catch (Exception e) { + stores.rollbackTransaction(); + throw e; + } finally { + stores.endTransaction(); + } + } catch (RuntimeException e) { + logger.info("Error processing transaction", e); } - } catch (RuntimeException e) { - logger.info("Error processing transaction", e); } - } - if (! sendToPeersTransactions.isEmpty()) { - Peers.sendToSomePeers(sendToPeersTransactions); - } + if (!sendToPeersTransactions.isEmpty()) { + Peers.sendToSomePeers(sendToPeersTransactions); + } - if (! addedUnconfirmedTransactions.isEmpty()) { - transactionListeners.notify(addedUnconfirmedTransactions, Event.ADDED_UNCONFIRMED_TRANSACTIONS); - } + if (!addedUnconfirmedTransactions.isEmpty()) { + transactionListeners.notify(addedUnconfirmedTransactions, Event.ADDED_UNCONFIRMED_TRANSACTIONS); + } - return addedUnconfirmedTransactions; + return addedUnconfirmedTransactions; + } } public void revalidateUnconfirmedTransactions() { diff --git a/src/brs/deeplink/DeeplinkQRCodeGenerator.java b/src/brs/deeplink/DeeplinkQRCodeGenerator.java new file mode 100644 index 000000000..13e6cfb7d --- /dev/null +++ b/src/brs/deeplink/DeeplinkQRCodeGenerator.java @@ -0,0 +1,92 @@ +package brs.deeplink; + +import brs.feesuggestions.FeeSuggestionType; +import com.google.zxing.BarcodeFormat; +import com.google.zxing.EncodeHintType; +import com.google.zxing.WriterException; +import com.google.zxing.client.j2se.MatrixToImageConfig; +import com.google.zxing.client.j2se.MatrixToImageWriter; +import com.google.zxing.common.BitMatrix; +import com.google.zxing.qrcode.QRCodeWriter; +import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import java.awt.AlphaComposite; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import javax.imageio.ImageIO; +import org.apache.commons.lang.StringUtils; + +public class DeeplinkQRCodeGenerator { + + private final QRCodeWriter qrCodeWriter = new QRCodeWriter(); + private final Map hints = new HashMap<>(); + private final Optional overlay; + + private static final String OVERLAY_LOCATION = "resources/images/burst_overlay_logo.png"; + + + public DeeplinkQRCodeGenerator() { + hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.L); + + overlay = loadImage(OVERLAY_LOCATION); + } + + public BufferedImage generateRequestBurstDeepLinkQRCode(String receiverId, long amountNQT, FeeSuggestionType feeSuggestionType, Long feeNQT, String message, boolean immutable) + throws WriterException { + final StringBuilder deeplinkBuilder = new StringBuilder("burst://requestBurst"); + + deeplinkBuilder.append("&receiver=" + receiverId); + deeplinkBuilder.append("&amountNQT=" + amountNQT); + + if (feeNQT != null) { + deeplinkBuilder.append("&feeNQT=" + feeNQT); + } else { + deeplinkBuilder.append("&feeSuggestionType=" + feeSuggestionType.getType()); + } + + if (!StringUtils.isEmpty(message)) { + deeplinkBuilder.append("&message=" + message); + } + + deeplinkBuilder.append("&immutable=" + immutable); + + return generateBurstQRCode(deeplinkBuilder.toString()); + } + + private BufferedImage generateBurstQRCode(String url) throws WriterException { + final BitMatrix bitMatrix = qrCodeWriter.encode(url, BarcodeFormat.QR_CODE, 350, 350, hints); + final BufferedImage qrImage = MatrixToImageWriter.toBufferedImage(bitMatrix, new MatrixToImageConfig()); + + if (overlay.isPresent()) { + final BufferedImage overlayImage = overlay.get(); + + int deltaHeight = qrImage.getHeight() - overlayImage.getHeight(); + int deltaWidth = qrImage.getWidth() - overlayImage.getWidth(); + + BufferedImage combined = new BufferedImage(qrImage.getHeight(), qrImage.getWidth(), BufferedImage.TYPE_INT_RGB); + Graphics2D g = (Graphics2D) combined.getGraphics(); + + g.drawImage(qrImage, 0, 0, null); + g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f)); + + g.drawImage(overlayImage, Math.round(deltaWidth / 2), Math.round(deltaHeight / 2), null); + + g.dispose(); + return combined; + } + + return qrImage; + } + + private Optional loadImage(String imageLocation) { + try { + return Optional.of(ImageIO.read(new FileInputStream(imageLocation))); + } catch (IOException ex) { + return Optional.empty(); + } + } +} diff --git a/src/brs/feesuggestions/FeeSuggestionType.java b/src/brs/feesuggestions/FeeSuggestionType.java new file mode 100644 index 000000000..51b34a3c5 --- /dev/null +++ b/src/brs/feesuggestions/FeeSuggestionType.java @@ -0,0 +1,21 @@ +package brs.feesuggestions; + +import java.util.Arrays; + +public enum FeeSuggestionType { + CHEAP("cheap"), STANDARD("standard"), PRIORITY("priority"); + + private final String type; + + FeeSuggestionType(String type) { + this.type = type; + } + + public String getType() { + return type; + } + + public static FeeSuggestionType getByType(String type) { + return Arrays.stream(values()).filter(s -> s.type.equals(type)).findFirst().orElse(null); + } +} diff --git a/src/brs/http/API.java b/src/brs/http/API.java index e0b90b7be..186c94eef 100644 --- a/src/brs/http/API.java +++ b/src/brs/http/API.java @@ -6,6 +6,7 @@ import brs.Generator; import brs.TransactionProcessor; import brs.assetexchange.AssetExchange; +import brs.deeplink.DeeplinkQRCodeGenerator; import brs.feesuggestions.FeeSuggestionCalculator; import brs.props.PropertyService; import brs.props.Props; @@ -41,7 +42,7 @@ public API(TransactionProcessor transactionProcessor, SubscriptionService subscriptionService, ATService atService, TimeService timeService, EconomicClustering economicClustering, PropertyService propertyService, ThreadPool threadPool, TransactionService transactionService, BlockService blockService, - Generator generator, APITransactionManager apiTransactionManager, FeeSuggestionCalculator feeSuggestionCalculator) { + Generator generator, APITransactionManager apiTransactionManager, FeeSuggestionCalculator feeSuggestionCalculator, DeeplinkQRCodeGenerator deepLinkQRCodeGenerator) { enableDebugAPI = propertyService.getBoolean(Props.API_DEBUG); List allowedBotHostsList = propertyService.getStringList(Props.API_ALLOWED); @@ -123,7 +124,7 @@ public API(TransactionProcessor transactionProcessor, ServletHolder peerServletHolder = new ServletHolder(new APIServlet(transactionProcessor, blockchain, blockchainProcessor, parameterService, accountService, aliasService, assetExchange, escrowService, digitalGoodsStoreService, subscriptionService, atService, timeService, economicClustering, transactionService, blockService, generator, propertyService, - apiTransactionManager, feeSuggestionCalculator)); + apiTransactionManager, feeSuggestionCalculator, deepLinkQRCodeGenerator)); apiHandler.addServlet(peerServletHolder, "/burst"); if (propertyService.getBoolean(Props.JETTY_API_GZIP_FILTER)) { diff --git a/src/brs/http/APIServlet.java b/src/brs/http/APIServlet.java index 842dc5fc0..ad24efccb 100644 --- a/src/brs/http/APIServlet.java +++ b/src/brs/http/APIServlet.java @@ -12,6 +12,7 @@ import brs.Generator; import brs.TransactionProcessor; import brs.assetexchange.AssetExchange; +import brs.deeplink.DeeplinkQRCodeGenerator; import brs.feesuggestions.FeeSuggestionCalculator; import brs.props.Props; import brs.services.ATService; @@ -53,12 +54,14 @@ public APIServlet(TransactionProcessor transactionProcessor, Blockchain blockcha AccountService accountService, AliasService aliasService, AssetExchange assetExchange, EscrowService escrowService, DGSGoodsStoreService digitalGoodsStoreService, SubscriptionService subscriptionService, ATService atService, TimeService timeService, EconomicClustering economicClustering, TransactionService transactionService, - BlockService blockService, Generator generator, PropertyService propertyService, APITransactionManager apiTransactionManager, FeeSuggestionCalculator feeSuggestionCalculator) { + BlockService blockService, Generator generator, PropertyService propertyService, APITransactionManager apiTransactionManager, FeeSuggestionCalculator feeSuggestionCalculator, + DeeplinkQRCodeGenerator deeplinkQRCodeGenerator) { enforcePost = propertyService.getBoolean(Props.API_SERVER_ENFORCE_POST); acceptSurplusParams = propertyService.getBoolean(Props.API_ACCEPT_SURPLUS_PARAMS); final Map map = new HashMap<>(); + final Map primitiveMap = new HashMap<>(); map.put("broadcastTransaction", new BroadcastTransaction(transactionProcessor, parameterService, transactionService)); map.put("calculateFullHash", new CalculateFullHash()); @@ -177,6 +180,8 @@ public APIServlet(TransactionProcessor transactionProcessor, Blockchain blockcha map.put("getATLong", GetATLong.instance); map.put("getAccountATs", new GetAccountATs(parameterService, atService, accountService)); + primitiveMap.put("generateSendTransactionQRCode", new GenerateDeeplinkQRCode(deeplinkQRCodeGenerator)); + if (API.enableDebugAPI) { map.put("clearUnconfirmedTransactions", new ClearUnconfirmedTransactions(transactionProcessor)); map.put("fullReset", new FullReset(blockchainProcessor)); @@ -185,6 +190,7 @@ public APIServlet(TransactionProcessor transactionProcessor, Blockchain blockcha } apiRequestHandlers = Collections.unmodifiableMap(map); + primitiveRequestHandlers = Collections.unmodifiableMap(primitiveMap); } private static boolean acceptSurplusParams; @@ -230,9 +236,25 @@ boolean startDbTransaction() { } + abstract static class PrimitiveRequestHandler { + + public abstract void processRequest(HttpServletRequest req, HttpServletResponse resp); + + public void addErrorMessage(HttpServletResponse resp, JSONStreamAware msg) throws IOException { + try (Writer writer = resp.getWriter()) { + resp.setContentType("text/plain; charset=UTF-8"); + resp.setStatus(500); + + msg.writeJSONString(writer); + } + } + + } + private static boolean enforcePost; static Map apiRequestHandlers; + static Map primitiveRequestHandlers; @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { @@ -279,7 +301,13 @@ private void process(HttpServletRequest req, HttpServletResponse resp) throws IO APIRequestHandler apiRequestHandler = apiRequestHandlers.get(requestType); if (apiRequestHandler == null) { - response = ERROR_INCORRECT_REQUEST; + final PrimitiveRequestHandler primitiveRequestHandler = primitiveRequestHandlers.get(req.getParameter("requestType")); + + if(primitiveRequestHandler != null) { + primitiveRequestHandler.processRequest(req, resp); + } else { + response = ERROR_INCORRECT_REQUEST; + } return; } @@ -310,9 +338,11 @@ private void process(HttpServletRequest req, HttpServletResponse resp) throws IO } } finally { - resp.setContentType("text/plain; charset=UTF-8"); - try (Writer writer = resp.getWriter()) { - response.writeJSONString(writer); + if(resp.getContentType() == null || resp.getContentType().isEmpty()) { + resp.setContentType("text/plain; charset=UTF-8"); + try (Writer writer = resp.getWriter()) { + response.writeJSONString(writer); + } } } diff --git a/src/brs/http/CreateTransaction.java b/src/brs/http/CreateTransaction.java index 122d4abc5..54a72b3fc 100644 --- a/src/brs/http/CreateTransaction.java +++ b/src/brs/http/CreateTransaction.java @@ -15,7 +15,7 @@ import static brs.http.common.Parameters.ENCRYPTED_MESSAGE_NONCE_PARAMETER; import static brs.http.common.Parameters.ENCRYPT_TO_SELF_MESSAGE_DATA; import static brs.http.common.Parameters.ENCRYPT_TO_SELF_MESSAGE_NONCE; -import static brs.http.common.Parameters.FEE_QT_PARAMETER; +import static brs.http.common.Parameters.FEE_NQT_PARAMETER; import static brs.http.common.Parameters.MESSAGE_IS_TEXT_PARAMETER; import static brs.http.common.Parameters.MESSAGE_PARAMETER; import static brs.http.common.Parameters.MESSAGE_TO_ENCRYPT_IS_TEXT_PARAMETER; @@ -30,7 +30,7 @@ abstract class CreateTransaction extends APIServlet.APIRequestHandler { private static final String[] commonParameters = new String[] { - SECRET_PHRASE_PARAMETER, PUBLIC_KEY_PARAMETER, FEE_QT_PARAMETER, + SECRET_PHRASE_PARAMETER, PUBLIC_KEY_PARAMETER, FEE_NQT_PARAMETER, DEADLINE_PARAMETER, REFERENCED_TRANSACTION_FULL_HASH_PARAMETER, BROADCAST_PARAMETER, MESSAGE_PARAMETER, MESSAGE_IS_TEXT_PARAMETER, MESSAGE_TO_ENCRYPT_PARAMETER, MESSAGE_TO_ENCRYPT_IS_TEXT_PARAMETER, ENCRYPTED_MESSAGE_DATA_PARAMETER, ENCRYPTED_MESSAGE_NONCE_PARAMETER, diff --git a/src/brs/http/GenerateDeeplinkQRCode.java b/src/brs/http/GenerateDeeplinkQRCode.java new file mode 100644 index 000000000..090069d1e --- /dev/null +++ b/src/brs/http/GenerateDeeplinkQRCode.java @@ -0,0 +1,118 @@ +package brs.http; + +import static brs.http.JSONResponses.FEE_OR_FEE_SUGGESTION_REQUIRED; +import static brs.http.JSONResponses.FEE_SUGGESTION_TYPE_INVALID; +import static brs.http.JSONResponses.INCORRECT_AMOUNT; +import static brs.http.JSONResponses.INCORRECT_FEE; +import static brs.http.JSONResponses.INCORRECT_MESSAGE_LENGTH; +import static brs.http.JSONResponses.MISSING_AMOUNT; +import static brs.http.JSONResponses.MISSING_RECEIVER_ID; +import static brs.http.common.Parameters.AMOUNT_NQT_PARAMETER; +import static brs.http.common.Parameters.FEE_NQT_PARAMETER; +import static brs.http.common.Parameters.FEE_SUGGESTION_TYPE_PARAMETER; +import static brs.http.common.Parameters.IMMUTABLE_PARAMETER; +import static brs.http.common.Parameters.MESSAGE_PARAMETER; +import static brs.http.common.Parameters.RECEIVER_ID_PARAMETER; + +import brs.Constants; +import brs.deeplink.DeeplinkQRCodeGenerator; +import brs.feesuggestions.FeeSuggestionType; +import brs.http.APIServlet.PrimitiveRequestHandler; +import brs.http.common.Parameters; +import brs.util.Convert; +import com.google.zxing.WriterException; +import java.awt.image.BufferedImage; +import java.io.IOException; +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class GenerateDeeplinkQRCode extends PrimitiveRequestHandler { + + private final Logger logger = LoggerFactory.getLogger(GenerateDeeplinkQRCode.class); + + private final DeeplinkQRCodeGenerator deeplinkQRCodeGenerator; + + public GenerateDeeplinkQRCode(DeeplinkQRCodeGenerator deeplinkQRCodeGenerator) { + this.deeplinkQRCodeGenerator = deeplinkQRCodeGenerator; + } + + @Override + public void processRequest(HttpServletRequest req, HttpServletResponse resp) { + try { + final boolean immutable = Parameters.isTrue(req.getParameter(IMMUTABLE_PARAMETER)); + + final String receiverId = Convert.emptyToNull(req.getParameter(RECEIVER_ID_PARAMETER)); + + if (StringUtils.isEmpty(receiverId)) { + addErrorMessage(resp, MISSING_RECEIVER_ID); + return; + } + + final String amountNQTString = Convert.emptyToNull(req.getParameter(AMOUNT_NQT_PARAMETER)); + if (immutable && StringUtils.isEmpty(amountNQTString)) { + addErrorMessage(resp, MISSING_AMOUNT); + return; + } + + final Long amountNQT = Convert.parseLong(amountNQTString); + if (immutable && (amountNQT < 0 || amountNQT > Constants.MAX_BALANCE_NQT)) { + addErrorMessage(resp, INCORRECT_AMOUNT); + return; + } + + final String feeNQTString = Convert.emptyToNull(req.getParameter(FEE_NQT_PARAMETER)); + + Long feeNQT = null; + + if (!StringUtils.isEmpty(feeNQTString)) { + feeNQT = Convert.parseLong(feeNQTString); + + if (feeNQT != null && (feeNQT <= 0 || feeNQT >= Constants.MAX_BALANCE_NQT)) { + addErrorMessage(resp, INCORRECT_FEE); + return; + } + } + + FeeSuggestionType feeSuggestionType = null; + + if (feeNQT == null) { + final String feeSuggestionTypeString = Convert.emptyToNull(req.getParameter(FEE_SUGGESTION_TYPE_PARAMETER)); + + if (StringUtils.isEmpty(feeSuggestionTypeString)) { + addErrorMessage(resp, FEE_OR_FEE_SUGGESTION_REQUIRED); + return; + } else { + feeSuggestionType = FeeSuggestionType.getByType(feeSuggestionTypeString); + + if (feeSuggestionType == null) { + addErrorMessage(resp, FEE_SUGGESTION_TYPE_INVALID); + return; + } + } + } + + final String message = Convert.emptyToNull(req.getParameter(MESSAGE_PARAMETER)); + + if (!StringUtils.isEmpty(message) && message.length() > Constants.MAX_ARBITRARY_MESSAGE_LENGTH) { + addErrorMessage(resp, INCORRECT_MESSAGE_LENGTH); + return; + } + + resp.setContentType("image/jpeg"); + + final BufferedImage qrImage = deeplinkQRCodeGenerator.generateRequestBurstDeepLinkQRCode(receiverId, amountNQT, feeSuggestionType, feeNQT, message, immutable); + ImageIO.write(qrImage, "jpg", resp.getOutputStream()); + resp.getOutputStream().close(); + } catch (WriterException | IOException e) { + logger.error("Could not generate Deeplink QR code", e); + resp.setStatus(500); + } catch (IllegalArgumentException e) { + logger.error("Problem with arguments", e); + resp.setStatus(500); + } + } +} diff --git a/src/brs/http/JSONResponses.java b/src/brs/http/JSONResponses.java index 520e78434..08d79287b 100644 --- a/src/brs/http/JSONResponses.java +++ b/src/brs/http/JSONResponses.java @@ -23,7 +23,7 @@ public final class JSONResponses { public static final JSONStreamAware INCORRECT_PUBLIC_KEY = incorrect(PUBLIC_KEY_PARAMETER); public static final JSONStreamAware MISSING_ALIAS_NAME = missing(ALIAS_NAME_PARAMETER); public static final JSONStreamAware MISSING_ALIAS_OR_ALIAS_NAME = missing(ALIAS_PARAMETER, "aliasName"); - public static final JSONStreamAware MISSING_FEE = missing(FEE_QT_PARAMETER); + public static final JSONStreamAware MISSING_FEE = missing(FEE_NQT_PARAMETER); public static final JSONStreamAware MISSING_DEADLINE = missing(DEADLINE_PARAMETER); public static final JSONStreamAware INCORRECT_DEADLINE = incorrect(DEADLINE_PARAMETER); public static final JSONStreamAware INCORRECT_FEE = incorrect(FEE_PARAMETER); @@ -108,8 +108,13 @@ public final class JSONResponses { public static final JSONStreamAware UNKNOWN_AT = unknown(AT_PARAMETER); public static final JSONStreamAware INCORRECT_AT = incorrect(AT_PARAMETER); public static final JSONStreamAware INCORRECT_CREATION_BYTES = incorrect("incorrect creation bytes"); - - + + public static final JSONStreamAware MISSING_RECEIVER_ID = missing(RECEIVER_ID_PARAMETER); + + public static final JSONStreamAware FEE_OR_FEE_SUGGESTION_REQUIRED = incorrect(FEE_SUGGESTION_TYPE_PARAMETER, "Either feeNQT or feeSuggestionType is a required parameter"); + public static final JSONStreamAware FEE_SUGGESTION_TYPE_INVALID = incorrect(FEE_SUGGESTION_TYPE_PARAMETER, "feeSuggestionType is not valid"); + public static final JSONStreamAware INCORRECT_MESSAGE_LENGTH = incorrect(MESSAGE_PARAMETER, "Message can have a max length of " + Constants.MAX_ARBITRARY_MESSAGE_LENGTH); + public static final JSONStreamAware NOT_ENOUGH_FUNDS; static { JSONObject response = new JSONObject(); diff --git a/src/brs/http/ParameterParser.java b/src/brs/http/ParameterParser.java index adbc98b03..d092be28f 100644 --- a/src/brs/http/ParameterParser.java +++ b/src/brs/http/ParameterParser.java @@ -20,7 +20,7 @@ import static brs.http.common.Parameters.AMOUNT_NQT_PARAMETER; import static brs.http.common.Parameters.BUYER_PARAMETER; import static brs.http.common.Parameters.CREATION_BYTES_PARAMETER; -import static brs.http.common.Parameters.FEE_QT_PARAMETER; +import static brs.http.common.Parameters.FEE_NQT_PARAMETER; import static brs.http.common.Parameters.FIRST_INDEX_PARAMETER; import static brs.http.common.Parameters.GOODS_DATA_PARAMETER; import static brs.http.common.Parameters.GOODS_NONCE_PARAMETER; @@ -46,7 +46,7 @@ final class ParameterParser { static long getFeeNQT(HttpServletRequest req) throws ParameterException { - String feeValueNQT = Convert.emptyToNull(req.getParameter(FEE_QT_PARAMETER)); + String feeValueNQT = Convert.emptyToNull(req.getParameter(FEE_NQT_PARAMETER)); if (feeValueNQT == null) { throw new ParameterException(MISSING_FEE); } diff --git a/src/brs/http/SendMoneyMulti.java b/src/brs/http/SendMoneyMulti.java index 43d4b76dc..585a6f65f 100644 --- a/src/brs/http/SendMoneyMulti.java +++ b/src/brs/http/SendMoneyMulti.java @@ -2,20 +2,9 @@ import static brs.http.common.Parameters.BROADCAST_PARAMETER; import static brs.http.common.Parameters.DEADLINE_PARAMETER; -import static brs.http.common.Parameters.ENCRYPTED_MESSAGE_DATA_PARAMETER; -import static brs.http.common.Parameters.ENCRYPTED_MESSAGE_NONCE_PARAMETER; -import static brs.http.common.Parameters.ENCRYPT_TO_SELF_MESSAGE_DATA; -import static brs.http.common.Parameters.ENCRYPT_TO_SELF_MESSAGE_NONCE; -import static brs.http.common.Parameters.FEE_QT_PARAMETER; -import static brs.http.common.Parameters.MESSAGE_IS_TEXT_PARAMETER; -import static brs.http.common.Parameters.MESSAGE_PARAMETER; -import static brs.http.common.Parameters.MESSAGE_TO_ENCRYPT_IS_TEXT_PARAMETER; -import static brs.http.common.Parameters.MESSAGE_TO_ENCRYPT_PARAMETER; -import static brs.http.common.Parameters.MESSAGE_TO_ENCRYPT_TO_SELF_IS_TEXT_PARAMETER; -import static brs.http.common.Parameters.MESSAGE_TO_ENCRYPT_TO_SELF_PARAMETER; +import static brs.http.common.Parameters.FEE_NQT_PARAMETER; import static brs.http.common.Parameters.PUBLIC_KEY_PARAMETER; import static brs.http.common.Parameters.RECIPIENTS_PARAMETER; -import static brs.http.common.Parameters.RECIPIENT_PUBLIC_KEY_PARAMETER; import static brs.http.common.Parameters.REFERENCED_TRANSACTION_FULL_HASH_PARAMETER; import static brs.http.common.Parameters.SECRET_PHRASE_PARAMETER; import static brs.http.common.ResultFields.ERROR_CODE_RESPONSE; @@ -39,7 +28,7 @@ public final class SendMoneyMulti extends CreateTransaction { private static final String[] commonParameters = new String[] { - SECRET_PHRASE_PARAMETER, PUBLIC_KEY_PARAMETER, FEE_QT_PARAMETER, + SECRET_PHRASE_PARAMETER, PUBLIC_KEY_PARAMETER, FEE_NQT_PARAMETER, DEADLINE_PARAMETER, REFERENCED_TRANSACTION_FULL_HASH_PARAMETER, BROADCAST_PARAMETER, RECIPIENTS_PARAMETER}; diff --git a/src/brs/http/SendMoneyMultiSame.java b/src/brs/http/SendMoneyMultiSame.java index 2b32516b4..08aebcec2 100644 --- a/src/brs/http/SendMoneyMultiSame.java +++ b/src/brs/http/SendMoneyMultiSame.java @@ -3,7 +3,7 @@ import static brs.http.common.Parameters.AMOUNT_NQT_PARAMETER; import static brs.http.common.Parameters.BROADCAST_PARAMETER; import static brs.http.common.Parameters.DEADLINE_PARAMETER; -import static brs.http.common.Parameters.FEE_QT_PARAMETER; +import static brs.http.common.Parameters.FEE_NQT_PARAMETER; import static brs.http.common.Parameters.PUBLIC_KEY_PARAMETER; import static brs.http.common.Parameters.RECIPIENTS_PARAMETER; import static brs.http.common.Parameters.REFERENCED_TRANSACTION_FULL_HASH_PARAMETER; @@ -18,10 +18,8 @@ import brs.Constants; import brs.services.ParameterService; import brs.util.Convert; -import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.Collection; -import java.util.Map.Entry; import javax.servlet.http.HttpServletRequest; import org.json.simple.JSONObject; import org.json.simple.JSONStreamAware; @@ -29,7 +27,7 @@ public final class SendMoneyMultiSame extends CreateTransaction { private static final String[] commonParameters = new String[] { - SECRET_PHRASE_PARAMETER, PUBLIC_KEY_PARAMETER, FEE_QT_PARAMETER, + SECRET_PHRASE_PARAMETER, PUBLIC_KEY_PARAMETER, FEE_NQT_PARAMETER, DEADLINE_PARAMETER, REFERENCED_TRANSACTION_FULL_HASH_PARAMETER, BROADCAST_PARAMETER, RECIPIENTS_PARAMETER, AMOUNT_NQT_PARAMETER}; diff --git a/src/brs/http/common/Parameters.java b/src/brs/http/common/Parameters.java index 7fe380724..9a6866785 100644 --- a/src/brs/http/common/Parameters.java +++ b/src/brs/http/common/Parameters.java @@ -5,7 +5,7 @@ public class Parameters { public static final String ALIAS_PARAMETER = "alias"; public static final String AMOUNT_NQT_PARAMETER = "amountNQT"; public static final String ALIAS_NAME_PARAMETER = "aliasName"; - public static final String FEE_QT_PARAMETER = "feeNQT"; + public static final String FEE_NQT_PARAMETER = "feeNQT"; public static final String PRICE_NQT_PARAMETER = "priceNQT"; public static final String QUANTITY_QNT_PARAMETER = "quantityQNT"; public static final String ASSET_PARAMETER = "asset"; @@ -122,6 +122,9 @@ public class Parameters { public static final String RECIPIENTS_RESPONSE = "recipients"; public static final String LAST_UNCONFIRMED_TRANSACTION_TIMESTAMP_PARAMETER = "lastUnconfirmedTransactionTimestamp"; public static final String LIMIT_UNCONFIRMED_TRANSACTIONS_RETRIEVED_PARAMETER = "limitUnconfirmedTransactionsRetrieved"; + public static final String RECEIVER_ID_PARAMETER = "receiverId"; + public static final String FEE_SUGGESTION_TYPE_PARAMETER = "feeSuggestionType"; + public static final String IMMUTABLE_PARAMETER = "immutable"; public static final String FEE_SUGGESTION_RESPONSE = "feeSuggestion"; diff --git a/src/brs/peer/PeerImpl.java b/src/brs/peer/PeerImpl.java index b8a316ad3..374a2d6b6 100644 --- a/src/brs/peer/PeerImpl.java +++ b/src/brs/peer/PeerImpl.java @@ -239,6 +239,7 @@ public void blacklist(Exception cause, String description) { } else { boolean alreadyBlacklisted = isBlacklisted(); + logger.error("Reason for following blacklist: " + cause.getMessage(), cause); blacklist(description); // refresh blacklist expiry if ( ! alreadyBlacklisted ) { logger.debug("... because of: " + cause.toString(), cause); diff --git a/src/brs/peer/Peers.java b/src/brs/peer/Peers.java index 5f4adcbd9..2583bbf54 100644 --- a/src/brs/peer/Peers.java +++ b/src/brs/peer/Peers.java @@ -264,15 +264,17 @@ static void init(TimeService timeService, AccountService accountService, Blockch BlockchainProcessor blockchainProcessor, PropertyService propertyService, ThreadPool threadPool) { if (Peers.shareMyAddress) { if (useUpnp) { + port = propertyService.getInt(Props.P2P_PORT); + GatewayDiscover gatewayDiscover = new GatewayDiscover(); + gatewayDiscover.setTimeout(2000); + try { + gatewayDiscover.discover(); + } catch (IOException | SAXException | ParserConfigurationException e) { + } + logger.trace("Looking for Gateway Devices"); + gateway = gatewayDiscover.getValidGateway(); + Runnable GwDiscover = () -> { - GatewayDiscover gatewayDiscover = new GatewayDiscover(); - gatewayDiscover.setTimeout(2000); - try { - gatewayDiscover.discover(); - } catch (IOException | SAXException | ParserConfigurationException e) { - } - logger.trace("Looking for Gateway Devices"); - gateway = gatewayDiscover.getValidGateway(); if (gateway != null) { gateway.setHttpReadTimeout(2000); try { @@ -285,11 +287,13 @@ static void init(TimeService timeService, AccountService accountService, Blockch logger.info("Port was already mapped. Aborting test."); } else { if (gateway.addPortMapping(port, port, localAddress.getHostAddress(), "TCP", "burstcoin")) { - logger.info("UPNP Mapping successful"); + logger.info("UPnP Mapping successful"); + } else { + logger.warn("UPnP Mapping was denied!"); } } } catch (IOException | SAXException e) { - logger.error("Can't start UPNP", e); + logger.error("Can't start UPnP", e); } } }; diff --git a/src/brs/transactionduplicates/TransactionDuplicatesCheckerImpl.java b/src/brs/transactionduplicates/TransactionDuplicatesCheckerImpl.java index fc30adf1a..4a9e5bfe9 100644 --- a/src/brs/transactionduplicates/TransactionDuplicatesCheckerImpl.java +++ b/src/brs/transactionduplicates/TransactionDuplicatesCheckerImpl.java @@ -3,9 +3,13 @@ import brs.Transaction; import brs.TransactionType; import java.util.HashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TransactionDuplicatesCheckerImpl { + private final Logger logger = LoggerFactory.getLogger(TransactionDuplicatesCheckerImpl.class); + private final HashMap> duplicates = new HashMap<>(); public void clear() { @@ -16,6 +20,7 @@ public TransactionDuplicationResult removeCheaperDuplicate(Transaction transacti final TransactionDuplicationKey transactionDuplicateKey = transaction.getDuplicationKey(); if (transactionDuplicateKey.equals(TransactionDuplicationKey.IS_ALWAYS_DUPLICATE)) { + logger.debug("Transaction {}: Is always a duplicate (Type: {})", transaction.getId(), transaction.getType().toString()); return new TransactionDuplicationResult(true, null); } else if (transactionDuplicateKey.equals(TransactionDuplicationKey.IS_NEVER_DUPLICATE)) { return new TransactionDuplicationResult(false, null); @@ -28,6 +33,7 @@ public TransactionDuplicationResult removeCheaperDuplicate(Transaction transacti final Transaction possiblyExistingTransaction = transactionOverview.get(transactionDuplicateKey.key); if (possiblyExistingTransaction != null && possiblyExistingTransaction.getFeeNQT() >= transaction.getFeeNQT()) { + logger.debug("Transaction {}: is a duplicate of {} (Type: {})", transaction.getId(), possiblyExistingTransaction.getId(), transaction.getType()); return new TransactionDuplicationResult(true, transaction); } else { transactionOverview.put(transactionDuplicateKey.key, transaction); diff --git a/src/brs/unconfirmedtransactions/ReservedBalanceCache.java b/src/brs/unconfirmedtransactions/ReservedBalanceCache.java index bb9147f4d..b7f956ba7 100644 --- a/src/brs/unconfirmedtransactions/ReservedBalanceCache.java +++ b/src/brs/unconfirmedtransactions/ReservedBalanceCache.java @@ -36,12 +36,12 @@ void reserveBalanceAndPut(Transaction transaction) throws BurstException.Validat ); if (senderAccount == null) { - LOGGER.debug(String.format("Account %d does not exist and has no balance. Required funds: %d",transaction.getSenderId(), amountNQT)); + LOGGER.debug(String.format("Transaction %d: Account %d does not exist and has no balance. Required funds: %d", transaction.getId(), transaction.getSenderId(), amountNQT)); throw new BurstException.NotCurrentlyValidException("Account unknown"); } else if ( amountNQT > senderAccount.getUnconfirmedBalanceNQT() ) { - LOGGER.debug(String.format("Account %d balance to low. You have %d > %d Balance", - transaction.getSenderId(), amountNQT, senderAccount.getUnconfirmedBalanceNQT() + LOGGER.debug(String.format("Transaction %d: Account %d balance too low. You have %d > %d Balance", + transaction.getId(), transaction.getSenderId(), amountNQT, senderAccount.getUnconfirmedBalanceNQT() )); throw new BurstException.NotCurrentlyValidException("Insufficient funds"); diff --git a/src/brs/unconfirmedtransactions/UnconfirmedTransactionStoreImpl.java b/src/brs/unconfirmedtransactions/UnconfirmedTransactionStoreImpl.java index 6875cd5f8..f3c8a8bc9 100644 --- a/src/brs/unconfirmedtransactions/UnconfirmedTransactionStoreImpl.java +++ b/src/brs/unconfirmedtransactions/UnconfirmedTransactionStoreImpl.java @@ -75,15 +75,30 @@ public void put(Transaction transaction) throws ValidationException { if (transactionCanBeAddedToCache(transaction)) { final TransactionDuplicationResult duplicationInformation = transactionDuplicatesChecker.removeCheaperDuplicate(transaction); - if(duplicationInformation.isDuplicate() && duplicationInformation.getTransaction() != transaction) { - removeTransaction(duplicationInformation.getTransaction()); - } + if(duplicationInformation.isDuplicate()) { + final Transaction duplicatedTransaction = duplicationInformation.getTransaction(); + + if(duplicatedTransaction != null && duplicatedTransaction != transaction) { + logger.debug("Transaction {}: Adding more expensive duplicate transaction", transaction.getId()); + removeTransaction(duplicationInformation.getTransaction()); - addTransaction(transaction, timeService.getEpochTimeMillis()); + addTransaction(transaction, timeService.getEpochTimeMillis()); - if (totalSize > maxSize) { - removeCheapestFirstToExpireTransaction(); + if (totalSize > maxSize) { + removeCheapestFirstToExpireTransaction(); + } + } else { + logger.debug("Transaction {}: Will not add a cheaper duplicate UT", transaction.getId()); + } + } else { + addTransaction(transaction, timeService.getEpochTimeMillis()); + logger.debug("Cache size: " + totalSize + "/" + maxSize+ " Added UT " + transaction.getId() + " " + transaction.getSenderId() + " " + transaction.getAmountNQT() + " " + transaction.getFeeNQT()); + if (totalSize > maxSize) { + removeCheapestFirstToExpireTransaction(); + } } + } else { + logger.debug("Transaction {}: Will not add UT due to duplication, or too full", transaction.getId()); } } } @@ -188,6 +203,7 @@ public void forEach(Consumer consumer) { @Override public void remove(Transaction transaction) { synchronized (internalStore) { + logger.debug("Removing " + transaction.getId()); if (exists(transaction.getId())) { removeTransaction(transaction); } @@ -197,6 +213,7 @@ public void remove(Transaction transaction) { @Override public void clear() { synchronized (internalStore) { + logger.debug("Clearing UTStore"); totalSize = 0; internalStore.clear(); reservedBalanceCache.clear(); @@ -210,6 +227,8 @@ private boolean transactionIsCurrentlyInCache(Transaction transaction) { } private void addTransaction(Transaction transaction, long time) throws ValidationException { + this.reservedBalanceCache.reserveBalanceAndPut(transaction); + final List slot = getOrCreateAmountSlotForTransaction(transaction); slot.add(new UnconfirmedTransactionTiming(transaction, time)); totalSize++; @@ -217,8 +236,6 @@ private void addTransaction(Transaction transaction, long time) throws Validatio if(! StringUtils.isEmpty(transaction.getReferencedTransactionFullHash())) { numberUnconfirmedTransactionsFullHash++; } - - this.reservedBalanceCache.reserveBalanceAndPut(transaction); } private List getOrCreateAmountSlotForTransaction(Transaction transaction) { @@ -244,7 +261,12 @@ private void removeCheapestFirstToExpireTransaction() { } private boolean transactionIsCurrentlyValid(Transaction transaction) { - return timeService.getEpochTime() < transaction.getExpiration(); + if(timeService.getEpochTime() < transaction.getExpiration()) { + return true; + } else { + logger.debug("Transaction {} past expiration: {}", transaction.getId(), transaction.getExpiration()); + return false; + } } private void removeTransaction(Transaction transaction) { diff --git a/test/java/brs/common/QuickMocker.java b/test/java/brs/common/QuickMocker.java index 93b02515b..7023e9f6f 100644 --- a/test/java/brs/common/QuickMocker.java +++ b/test/java/brs/common/QuickMocker.java @@ -1,7 +1,7 @@ package brs.common; import static brs.http.common.Parameters.DEADLINE_PARAMETER; -import static brs.http.common.Parameters.FEE_QT_PARAMETER; +import static brs.http.common.Parameters.FEE_NQT_PARAMETER; import static brs.http.common.Parameters.PUBLIC_KEY_PARAMETER; import static brs.http.common.Parameters.SECRET_PHRASE_PARAMETER; import static org.mockito.ArgumentMatchers.eq; @@ -41,7 +41,7 @@ public static HttpServletRequest httpServletRequestDefaultKeys(MockParam... para new MockParam(SECRET_PHRASE_PARAMETER, TestConstants.TEST_SECRET_PHRASE), new MockParam(PUBLIC_KEY_PARAMETER, TestConstants.TEST_PUBLIC_KEY), new MockParam(DEADLINE_PARAMETER, TestConstants.DEADLINE), - new MockParam(FEE_QT_PARAMETER, TestConstants.FEE) + new MockParam(FEE_NQT_PARAMETER, TestConstants.FEE) )); paramsWithKeys.addAll(Arrays.asList(parameters)); diff --git a/test/java/brs/unconfirmedtransactions/UnconfirmedTransactionStoreTest.java b/test/java/brs/unconfirmedtransactions/UnconfirmedTransactionStoreTest.java index e585e2679..162eb5175 100644 --- a/test/java/brs/unconfirmedtransactions/UnconfirmedTransactionStoreTest.java +++ b/test/java/brs/unconfirmedtransactions/UnconfirmedTransactionStoreTest.java @@ -2,6 +2,7 @@ import static brs.Attachment.ORDINARY_PAYMENT; import static brs.Constants.FEE_QUANT; +import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -214,7 +215,13 @@ public void unconfirmedTransactionGetsDeniedForNotEnoughUnconfirmedBalance() thr Transaction transaction = new Transaction.Builder((byte) 1, TestConstants.TEST_PUBLIC_KEY_BYTES, 1, Constants.MAX_BALANCE_NQT, timeService.getEpochTime() + 50000, (short) 500, ORDINARY_PAYMENT) .id(1).senderId(123L).build(); transaction.sign(TestConstants.TEST_SECRET_PHRASE); - t.put(transaction); + + try { + t.put(transaction); + } catch (NotCurrentlyValidException ex) { + assertTrue(t.getAll(Integer.MAX_VALUE).getTransactions().isEmpty()); + throw ex; + } } @DisplayName("When adding the same unconfirmed transaction, nothing changes") @@ -301,4 +308,26 @@ public void cheaperDuplicateTransactionGetsRemoved() throws ValidationException assertNotNull(t.get(expensive.getId())); } + @Test + public void cheaperDuplicateTransactionNeverGetsAdded() throws ValidationException { + Transaction cheap = new Transaction.Builder((byte) 1, TestConstants.TEST_PUBLIC_KEY_BYTES, 1, FEE_QUANT, timeService.getEpochTime() + 50000, (short) 500, + new MessagingAliasSell("aliasName", 123, 5)) + .id(1).senderId(123L).build(); + + Transaction expensive = new Transaction.Builder((byte) 1, TestConstants.TEST_PUBLIC_KEY_BYTES, 1, FEE_QUANT * 2, timeService.getEpochTime() + 50000, (short) 500, + new MessagingAliasSell("aliasName", 123, 5)) + .id(2).senderId(123L).build(); + + t.put(expensive); + + assertEquals(1, t.getAll(100).getTransactions().size()); + assertNotNull(t.get(expensive.getId())); + + t.put(cheap); + + assertEquals(1, t.getAll(100).getTransactions().size()); + assertNull(t.get(cheap.getId())); + assertNotNull(t.get(expensive.getId())); + } + }