Skip to content

UI estimated fee error #3505 #3506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sschiessl-bcp merged 2 commits into from
Apr 27, 2022
Merged

UI estimated fee error #3505 #3506

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03adb3e
UI estimated fee error #3505
xiangxn Apr 26, 2022
ef9a1d8
fix op_code bug
xiangxn Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions app/lib/common/trxHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@ function checkFeeStatusAsync({
let hasValidCER = true;

/*
** If the fee is to be paid in a non-core asset, check the fee
** pool and convert the amount using the CER
*/
** If the fee is to be paid in a non-core asset, check the fee
** pool and convert the amount using the CER
*/
if (feeID !== "1.3.0") {
// Convert the amount using the CER
let cer = feeAsset.getIn([
Expand All @@ -157,9 +157,9 @@ function checkFeeStatusAsync({
let quote = new Asset(q);

/*
** If the CER is incorrectly configured, the multiplication
** will fail, so catch the error and default to core
*/
** If the CER is incorrectly configured, the multiplication
** will fail, so catch the error and default to core
*/
try {
let price = new Price({base, quote});
fee = fee.times(price, true);
Expand Down Expand Up @@ -215,9 +215,9 @@ let _feeCache = {};
function estimateFee(op_type, options, globalObject, data = {}) {
// console.time("estimateFee");
/*
* The actual content doesn't matter, only the length of it, so we use a
* string of equal length to improve caching
*/
* The actual content doesn't matter, only the length of it, so we use a
* string of equal length to improve caching
*/
if (!!data.content)
data.content = new Array(data.content.length + 1).join("a");
if (!globalObject) return 0;
Expand All @@ -227,22 +227,28 @@ function estimateFee(op_type, options, globalObject, data = {}) {
return _feeCache[cacheKey];
}
let op_code = operations[op_type];
let currentFees = globalObject.getIn([
let currentFees = null;

// The data returned by the API is not necessarily continuous.
let params = globalObject.getIn([
"parameters",
"current_fees",
"parameters",
op_code,
1
"parameters"
]);
/* Default to transfer fees if the op is missing in globalObject */
if (!currentFees)
let index = params.findIndex(item => item.get(0) == op_code);
if (index > -1) {
currentFees = params.getIn([index, 1]);
} else {
/* Default to transfer fees if the op is missing in globalObject */
currentFees = globalObject.getIn([
"parameters",
"current_fees",
"parameters",
0,
1
]);
}

currentFees = currentFees.toJS();

let fee = 0;
Expand Down