Skip to content
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

Jump to bottom

Add tx fee rate api methods: gettxfeerate, settxfeerate, unsettxfeerate #4858

Merged
merged 71 commits into from Dec 3, 2020
Merged

Add tx fee rate api methods: gettxfeerate, settxfeerate, unsettxfeerate #4858

Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
fc8af8c
Define new grpc bsq/btc balances protos
ghubstan Nov 13, 2020
faf45ec
Add proto wrappers for serving bsq, btc or all balances
ghubstan Nov 13, 2020
4c03b46
Define proto for api method 'getunusedbsqaddress'
ghubstan Nov 13, 2020
3e98910
Define proto fapi method 'sendbsq'
ghubstan Nov 13, 2020
9f033ee
Add proto fields to support trade fee currency choice
ghubstan Nov 13, 2020
c1c099c
Implement and test api method 'getunusedbsqaddress'
ghubstan Nov 13, 2020
7c2068e
Add teardown to test case
ghubstan Nov 13, 2020
8dc1a74
Remove trailing spaces in blank line
ghubstan Nov 13, 2020
208a37b
Implement and test new getbalance(s) api methods
ghubstan Nov 13, 2020
7f0f949
Resolve unnecessary use of fully qualified name for codacy
ghubstan Nov 13, 2020
0d3b3a6
Stub out api method 'sendbsq' in core
ghubstan Nov 13, 2020
dc3274f
Re comment sendbsq tests so travis ci does not fail
ghubstan Nov 13, 2020
446bd32
Refactor desktop's BsqSendView, share with api
ghubstan Nov 13, 2020
4a90b40
Resolve 'Avoid creating BigDecimal with a decimal' issue for codacy
ghubstan Nov 13, 2020
722460e
Support paying trade fees in bsq or btc (api)
ghubstan Nov 13, 2020
8157f8f
Delete deprecated api test, adjust api build/run doc
ghubstan Nov 13, 2020
7e9ab22
Refactor api getbalance methods.
ghubstan Nov 14, 2020
187a85f
Fix typo
ghubstan Nov 14, 2020
34efc04
Remove unnecessary fully qualified name
ghubstan Nov 14, 2020
530a9f9
Remove unused imports
ghubstan Nov 14, 2020
ec38152
Add api method 'getpaymentmethods'
ghubstan Nov 18, 2020
a465261
Avoid codacy issue over use of fully qualified name
ghubstan Nov 18, 2020
0046b08
Revert "Avoid codacy issue over use of fully qualified name"
ghubstan Nov 18, 2020
7a7d5ba
Print the payment method id (only)
ghubstan Nov 18, 2020
0e0af20
Avoid codacy issue over use of fully qualified name
ghubstan Nov 18, 2020
7d0648a
Make codacy happy again
ghubstan Nov 18, 2020
32ed7ac
Add ReflectionUtils to common.util pkg
ghubstan Nov 18, 2020
c25deba
Add new (gson) PaymentAccountTypeAdapter to core.api.model
ghubstan Nov 18, 2020
1f84ad0
Add isCountryBasedPaymentAccount to abstract PaymentAccount
ghubstan Nov 18, 2020
32dd727
Add new PaymentAccountForm to core.api.model
ghubstan Nov 18, 2020
8996fa1
Add boilerplate for new 'getpaymentacctform' api method
ghubstan Nov 18, 2020
dc227ec
Add new api method 'getpaymentacctform' to CLI
ghubstan Nov 18, 2020
fdb89a2
Test new api method 'getpaymentacctform'
ghubstan Nov 18, 2020
35c1c4e
Ensure EXPECTED_FORM.clear() is never skipped
ghubstan Nov 18, 2020
08228d0
Replace existing api method 'createpaymentacct' impl
ghubstan Nov 18, 2020
138822e
Avoid 'unnecessary use of fully qualified name' codacy issue
ghubstan Nov 18, 2020
cb9a68b
Tidy up payment accts api related msgs on CLI
ghubstan Nov 19, 2020
ff887eb
Fix createpaymentacct validation problems
ghubstan Nov 19, 2020
58f1af6
Log server stack traces, pass concise err msgs to CLI
ghubstan Nov 20, 2020
459b2a9
Add create payment account (api) tests
ghubstan Nov 20, 2020
bb6762a
Reverse argument order for assert(expected, actual) convention
ghubstan Nov 20, 2020
636fac9
Add isMoneyGramAccount to abstract PaymentAccount
ghubstan Nov 21, 2020
23bfa2e
Refactor didReadCountryField to set country on MoneyGram acct
ghubstan Nov 21, 2020
76097fc
Enable CreateMoneyGramAccount test
ghubstan Nov 21, 2020
424f948
Fix broken tests
ghubstan Nov 22, 2020
daeb34b
Add two new api method tests
ghubstan Nov 22, 2020
08d5673
Fix getbalance out bug in CLI
ghubstan Nov 22, 2020
ab5780e
Print 'no offers found' msg in CLI if list is empty
ghubstan Nov 22, 2020
c885438
Fix minor error & help msg bugs
ghubstan Nov 23, 2020
f50634e
Resolve BsqSendView file conflict
ghubstan Nov 26, 2020
9d863e5
Remove deprecated method long getAvailableBalance
ghubstan Nov 26, 2020
baf300a
Add missing newlines to console output statements
ghubstan Nov 26, 2020
1559288
Implement fromProto
ghubstan Nov 26, 2020
8f13b85
Merge branch 'master' into 20-pr-change-requests-A
ghubstan Nov 26, 2020
5a06e4e
Adjust to changed CoinUtil
ghubstan Nov 26, 2020
8fd5786
Adjust test for a new payment method
ghubstan Nov 26, 2020
4464676
Add protobuf defs for gettxfeerate, settxfeerate, unsettxfeerate
ghubstan Nov 26, 2020
9662f26
Add protbuf TxFeeRateInfo
ghubstan Nov 26, 2020
abe7160
Add TxFeeRateInfo proto wrapper
ghubstan Nov 26, 2020
0b0f9f1
Add gettxfeerate, settxfeerate, unsettxfeerate implementations
ghubstan Nov 26, 2020
06eb378
Test new tx fee rate api methods
ghubstan Nov 26, 2020
965b003
Remove unnecessary use of fully qualified name for codacy
ghubstan Nov 27, 2020
45cfb95
Remove many log.isDebugEnabled() checks
ghubstan Dec 1, 2020
62a2aa8
Don't be so polite
ghubstan Dec 1, 2020
2989f1b
Loosen up the PaymentMethod count test assert
ghubstan Dec 1, 2020
faf030f
Add useCustomTxFeeRate field to TxFeeRateInfo proto wrapper
ghubstan Dec 1, 2020
987d893
Use ListenableFuture and callback when requesting tx fee
ghubstan Dec 2, 2020
9b4bdfc
Make salt an editable payment acct json form field
ghubstan Dec 2, 2020
65df9e1
Change sendbsq's amount parameter type to String
ghubstan Dec 2, 2020
2efd094
Remove method only used in class' toString
ghubstan Dec 2, 2020
7f636e4
Prevent attempt to send amount of BSQ < dust
ghubstan Dec 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions core/src/main/java/bisq/core/btc/model/BsqTransferModel.java
View file
Open in desktop
@@ -1,7 +1,6 @@
package bisq.core.btc.model;

import bisq.core.dao.state.model.blockchain.TxType;
import bisq.core.util.coin.CoinUtil;

import org.bitcoinj.core.Coin;
import org.bitcoinj.core.LegacyAddress;
Expand Down Expand Up @@ -40,10 +39,6 @@ public String getReceiverAddressAsString() {
return receiverAddress.toString();
}

public double getMiningFeeInSatoshisPerByte() {
return CoinUtil.getFeePerVbyte(miningFee, txSize);
}

public double getTxSizeInKb() {
return txSize / 1000d;
}
Expand All @@ -54,7 +49,6 @@ public String toShortString() {
", receiverAmount=" + receiverAmount + "\n" +
", txWithBtcFee.txId=" + txWithBtcFee.getTxId() + "\n" +
", miningFee=" + miningFee + "\n" +
", miningFeeInSatoshisPerByte=" + getMiningFeeInSatoshisPerByte() + "\n" +
", txSizeInKb=" + getTxSizeInKb() + "\n" +
'}';
}
Expand All @@ -68,7 +62,6 @@ public String toString() {
", txWithBtcFee=" + txWithBtcFee + "\n" +
", signedTx=" + signedTx + "\n" +
", miningFee=" + miningFee + "\n" +
", miningFeeInSatoshisPerByte=" + getMiningFeeInSatoshisPerByte() + "\n" +
", txSize=" + txSize + "\n" +
", txSizeInKb=" + getTxSizeInKb() + "\n" +
", txType=" + txType + "\n" +
Expand Down