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

Qt port from Liquid-qt #569

Merged
merged 97 commits into from
Apr 12, 2019
Merged

Qt port from Liquid-qt #569

merged 97 commits into from
Apr 12, 2019

Conversation

instagibbs
Copy link
Collaborator

@instagibbs instagibbs commented Apr 9, 2019 •
edited
Loading

Splash page is always Liquid-themed like before. Pegged asset is assumed to be L-BTC. Default network for QT is still elementsregtest. Do we want it to be liquidv1?

resolves #528

promag and others added 30 commits April 8, 2019 10:24
@promag @instagibbs
gui: Avoid TransactionRecord instance for IsMine outputs
41c8d4c 
Github-Pull: bitcoin/bitcoin #12578
Rebased-From: 82dd3e0ffa0af629a34b28ed7eca4027e0376756
@promag @instagibbs
gui: Add transaction record type Fee
3edcdf8 
Github-Pull: bitcoin/bitcoin #12578
Rebased-From: 550f1f3d3498d051ab94afdc0b9fb883c0655b99
@promag @instagibbs
gui: Alternate row background based on txid
1655947 
Github-Pull: bitcoin/bitcoin #12578
Rebased-From: 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938
@luke-jr @instagibbs
GUI: Ignore explicit fee output when determining if a transaction is …
0aeab14 
…send-to-self
@luke-jr @instagibbs
GUI: TransactionRecord: Collapse credit+debit fields to just amount
060ad2f
@instagibbs
GUI: TransactionRecord: Add asset field
ef2f717
@luke-jr @instagibbs
GUI: TransactionRecord: Turn non-bitcoin fees into entries
a582fe0
@luke-jr @instagibbs
GUI: TransactionTableModel: Include unit name with formatted amount
19c87c0
@luke-jr @instagibbs
GUI: TransactionTableModel: Remove bitcoin unit from Amount column he…
eef551a 
…ader
@luke-jr @instagibbs
GUI: Overview: Use formatted amount text from TransactionTableModel
2bcd243
@instagibbs
Wallet: GetIssuanceAssets to just get CAssets for issuances
e6b3676
@luke-jr @instagibbs
GUI: TransactionRecord: Add asset issuance record type
51e7897
@luke-jr @instagibbs
GUI: TransactionRecord: When time/index/etc match, sort fee, issuance…
4ea8f88 
…, send, then receive
@luke-jr @instagibbs
Wallet: GetIssuanceAssets to get CAmountMap for issuances
906cc4c
@luke-jr @instagibbs
GUI: TransactionRecord: Special-case the common scenario where assets…
89275eb 
… are simply issued to myself
@luke-jr @instagibbs
GUI: Abstract asset+amount formatting into new GUIUtil::formatAssetAm…
988ed5e 
…ount
@luke-jr @instagibbs
GUI: Add GUIUtil::formatMultiAssetAmount to handle a CAmountMap
6342d80
@luke-jr @instagibbs
GUI: Overview: Show all assets in balances
f5fb840
@luke-jr @instagibbs
GUI: Always include bitcoins in formatMultiAssetAmount
f027ca0
@greenaddress @instagibbs
replace bitcoin-qt with elements-qt
85f0ad8
@luke-jr @instagibbs
GUI: Option to remove asset name for GUIUtil::formatAssetAmount
2953613
@luke-jr @instagibbs
AmountSpinBox: Resolve singleStep default when making steps
d81c9f7
@luke-jr @instagibbs
CAsset: GetIdentifier to get label or hex id
047799c
@instagibbs
bugfix: issuance to self not a debit
881862c
@luke-jr @instagibbs
GUI: GUIUtil::parseAssetAmount abstraction
a1a8848
@luke-jr @instagibbs
GUI: BitcoinAmountField: Support for non-bitcoin assets
2c75c44
@luke-jr @instagibbs
GUI: BitcoinAmountField: Allow code to set assets not in allowed_assets
3e669cd
@luke-jr @instagibbs
GUI: BitcoinAmountField: Allow changing allowed assets after construc…
7f00087 
…tion
@luke-jr @instagibbs
GUI: WalletModel: Track asset type collection
a163be0
@luke-jr @instagibbs
GUI: SendCoinsEntry: Propagate asset types available to amount field
2ebae1a
@stevenroose
Copy link
Member

This is hard to review. I reviewed the changes outside of src/qt. I think that's fine.
utACK 003fb19 for that matter

@stevenroose stevenroose merged commit 003fb19 into ElementsProject:master Apr 12, 2019
stevenroose added a commit that referenced this pull request Apr 12, 2019
@stevenroose
Merge #569: Qt port from Liquid-qt
12387b2 
003fb19 QT: Carbon copy 0.14-based transaction accounting (Gregory Sanders)
6333166 QT: get fee directly from elementsmode transactions (Gregory Sanders)
a337b76 QT: Fixup OSX build (Gregory Sanders)
9626907 QT: Disable URI unit tests since unused (Gregory Sanders)
95d0981 QT: Fix QT to work in non-elementsmode (Gregory Sanders)
027aeef QT: Remove ^M and trailing whitespace (Gregory Sanders)
c299dd2 QT: fix qt linter (Gregory Sanders)
8adf591 QT include linting (Gregory Sanders)
ab21387 QT: Always return blinded address (Gregory Sanders)
dbac2af QT: Enter a s/Bitcoin/Liquid/ address (Gregory Sanders)
1dde8a7 Update blech32 checkbox text (Gregory Sanders)
7108ab7 Add unix build notes for Elements-QT dependencies (Gregory Sanders)
967ed83 f'init: If bitcoind is unreachable, explain where the user can get it' (Gregory Sanders)
acf2436 f'GUI: Pre-render amount for transaction notifications so asset is correct' (Gregory Sanders)
d51b9ed f'GUI: Display label rather than address on popups' (Gregory Sanders)
f7f5bb7 f'GUI: Disable Subtract fee from amount' (Gregory Sanders)
084a2fd f'GUI: Make liquidv1 the' (Gregory Sanders)
0aff675 f'GUI: Add liquidv1 network style' (Gregory Sanders)
cbf93b9 Added liquid.conf template (Daniel Olaya)
1a654f4 fix logo position and size on retina displays (Riccardo Casatta)
3241af9 GUI: Adjust recommended number of blocks confirmed to 2 (Luke Dashjr)
3779ae2 Bugfix: GUI: Re-enable Show/Remove buttons on Receive tab (Luke Dashjr)
f963920 GUI: Pre-render amount for transaction notifications so asset is correct (Luke Dashjr)
3bedac4 GUI: Drop "(GUI node for Bitcoin)" from program description (Luke Dashjr)
33f54fb GUI: Remove unnecessary references to Bitcoin (Luke Dashjr)
be7527f GUI: Replace "Bitcoin" with "Liquid" in appropriate strings (Luke Dashjr)
f62c0d3 GUI: Replace "Bitcoin" with "Liquid" in appropriate strings (Luke Dashjr)
737e99a GUI: Make liquidv1 the "normal title bar" style (Luke Dashjr)
d82eee9 GUI: Add liquidv1 network style (Luke Dashjr)
ce752c0 GUI: Remove access to unported "transaction details" display (Luke Dashjr)
0a3f589 init: If bitcoind is unreachable, explain where the user can get it (Luke Dashjr)
6802658 GUI: Adjust blockchain and chainstate sizes in Intro (Luke Dashjr)
d522775 Bugfix: GUI: Ensure negative symbol is before whole number in GUIUtil::formatAssetAmount (Luke Dashjr)
36ebb13 GUI: Disable "Subtract fee from amount" checkbox when a non-pegged asset is selected (Luke Dashjr)
1f0b688 GUI: Emit BitcoinAmountField::valueChanged when unit changes even if the current value is invalid (Luke Dashjr)
954f775 Bugfix: GUI: Receive: Don't try to update label for non-existent Amount column (Luke Dashjr)
bbb5a4c Gitian: Remove libconsensus from Windows/macOS builds (Luke Dashjr)
08aea0e configure: Rename binary to elements name (Gregory Sanders)
795f7f1 Gitian: Use newer librsvg so Liquid logo renders correctly (Luke Dashjr)
4c678d1 GUI: Receive: Eliminate "Copy URI" from receive request dialog (Luke Dashjr)
9ee4629 GUI: Add "L-" prefix to Bitcoin units (Luke Dashjr)
6879be7 GUI: Liquid branding (Luke Dashjr)
3f1764a Generate bitcoin_testnet.ico using ImageMagick (Luke Dashjr)
f60462d Rather than clean generated icons, plan to distribute them (Luke Dashjr)
d389515 Render NSIS wizard sidebar image (Luke Dashjr)
ff6a0a1 Render some icons when possible (Luke Dashjr)
ec8e73a Make a modified copy of qrc file for VPATH builds (Luke Dashjr)
06b30cf Travis: Include dependencies for building icons (Luke Dashjr)
4fa10fe gitian: Dependencies for rendering icons (Luke Dashjr)
3351499 Reuse Windows ICO for Windows installer (Luke Dashjr)
749e0a8 clientversion: Fix CLIENT_NAME to "Elements Core" (Luke Dashjr)
20bf9c5 GUI: Disable coin control (non-functional) (Luke Dashjr)
82dfd3f GUI: Receive: Eliminate URI, and make QR code of just the address (Luke Dashjr)
273aa76 GUI: Receive: Split up long addresses across multiple lines, in QR code image (Luke Dashjr)
25600f9 GUI: Receive: Remove URI-specific parameters for now (Luke Dashjr)
20479e4 GUI: Receive: Replace "Copy URI" with "Copy address" (Luke Dashjr)
d4d45b6 GUI: Use CT address for examples (Luke Dashjr)
0d11cd0 GUI: Transactions: Remove "to yourself" filter, no longer applicable (Luke Dashjr)
66ac3e6 GUI: Move the "Recent Transactions" view below "Balances" (Luke Dashjr)
6ab7bcc Bugfix: GUI: Overview: Fix hiding of immature when balances are zero (Gregory Sanders)
8048a6d QT: have output amounts propagated for subtractfeefromoutput logic (Gregory Sanders)
2a334b7 Slightly smarter change key vector padding (Gregory Sanders)
79e0cb7 GUI: Support for sending assets (Luke Dashjr)
f4d5552 GUI: Clone SendCoinsRecipient to SendAssetsRecipient (Luke Dashjr)
70458f6 Pad change keys for wallet interface pending txs (Gregory Sanders)
466b3d0 CAmountMap::operator! to check if empty (Luke Dashjr)
af726c7 GUI: BitcoinAmountField: Limit issued assets to 21M (Luke Dashjr)
2ebae1a GUI: SendCoinsEntry: Propagate asset types available to amount field (Luke Dashjr)
a163be0 GUI: WalletModel: Track asset type collection (Luke Dashjr)
7f00087 GUI: BitcoinAmountField: Allow changing allowed assets after construction (Luke Dashjr)
3e669cd GUI: BitcoinAmountField: Allow code to set assets not in allowed_assets (Luke Dashjr)
2c75c44 GUI: BitcoinAmountField: Support for non-bitcoin assets (Luke Dashjr)
a1a8848 GUI: GUIUtil::parseAssetAmount abstraction (Luke Dashjr)
881862c bugfix: issuance to self not a debit (Gregory Sanders)
047799c CAsset: GetIdentifier to get label or hex id (Luke Dashjr)
d81c9f7 AmountSpinBox: Resolve singleStep default when making steps (Luke Dashjr)
2953613 GUI: Option to remove asset name for GUIUtil::formatAssetAmount (Luke Dashjr)
85f0ad8 replace bitcoin-qt with elements-qt (Lawrence Nahum)
f027ca0 GUI: Always include bitcoins in formatMultiAssetAmount (Luke Dashjr)
f5fb840 GUI: Overview: Show all assets in balances (Luke Dashjr)
6342d80 GUI: Add GUIUtil::formatMultiAssetAmount to handle a CAmountMap (Luke Dashjr)
988ed5e GUI: Abstract asset+amount formatting into new GUIUtil::formatAssetAmount (Luke Dashjr)
89275eb GUI: TransactionRecord: Special-case the common scenario where assets are simply issued to myself (Luke Dashjr)
906cc4c Wallet: GetIssuanceAssets to get CAmountMap for issuances (Luke Dashjr)
4ea8f88 GUI: TransactionRecord: When time/index/etc match, sort fee, issuance, send, then receive (Luke Dashjr)
51e7897 GUI: TransactionRecord: Add asset issuance record type (Luke Dashjr)
e6b3676 Wallet: GetIssuanceAssets to just get CAssets for issuances (Gregory Sanders)
2bcd243 GUI: Overview: Use formatted amount text from TransactionTableModel (Luke Dashjr)
eef551a GUI: TransactionTableModel: Remove bitcoin unit from Amount column header (Luke Dashjr)
19c87c0 GUI: TransactionTableModel: Include unit name with formatted amount (Luke Dashjr)
a582fe0 GUI: TransactionRecord: Turn non-bitcoin fees into entries (Luke Dashjr)
ef2f717 GUI: TransactionRecord: Add asset field (Gregory Sanders)
060ad2f GUI: TransactionRecord: Collapse credit+debit fields to just amount (Luke Dashjr)
0aeab14 GUI: Ignore explicit fee output when determining if a transaction is send-to-self (Luke Dashjr)
1655947 gui: Alternate row background based on txid (João Barbosa)
3edcdf8 gui: Add transaction record type Fee (João Barbosa)
41c8d4c gui: Avoid TransactionRecord instance for IsMine outputs (João Barbosa)

Pull request description:

  Splash page is always Liquid-themed like before. Pegged asset is assumed to be `L-BTC`. Default network for QT is still `elementsregtest`. Do we want it to be `liquidv1`?

  resolves #528

Tree-SHA512: cd7c07262195c344185f5b7bd779985cf7ee26f0fdf1fa105a4ce93b51cbbd83cc78884e3ed711d884697a48904c2d76647eba76509f6a22210b75f6fcdc13c5
@apoelstra apoelstra mentioned this pull request Dec 7, 2020
Closed
apoelstra added a commit to apoelstra/elements that referenced this pull request Dec 12, 2020
@apoelstra
Revert "gui: Alternate row background based on txid"
b314a22 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
apoelstra added a commit to apoelstra/elements that referenced this pull request Dec 13, 2020
@apoelstra
Revert "gui: Alternate row background based on txid"
e56825b 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
apoelstra added a commit to apoelstra/elements that referenced this pull request Dec 13, 2020
@apoelstra
Revert "gui: Alternate row background based on txid"
2351324 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
apoelstra added a commit to apoelstra/elements that referenced this pull request Dec 13, 2020
@apoelstra
Revert "gui: Alternate row background based on txid"
9e75d2b 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
apoelstra added a commit to apoelstra/elements that referenced this pull request Dec 13, 2020
@apoelstra
Revert "gui: Alternate row background based on txid"
c2041a4 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
apoelstra added a commit to apoelstra/elements that referenced this pull request Dec 13, 2020
@apoelstra
Revert "gui: Alternate row background based on txid"
51ec128 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
apoelstra added a commit to apoelstra/elements that referenced this pull request Dec 13, 2020
@apoelstra
Revert "gui: Alternate row background based on txid"
a8a23f6 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
apoelstra added a commit to apoelstra/elements that referenced this pull request Dec 13, 2020
@apoelstra
Revert "gui: Alternate row background based on txid"
9d6b8c7 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
apoelstra added a commit to apoelstra/elements that referenced this pull request Dec 14, 2020
@apoelstra
Revert "gui: Alternate row background based on txid"
246aa9d 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
apoelstra added a commit to apoelstra/elements that referenced this pull request Dec 14, 2020
@apoelstra
Revert "gui: Alternate row background based on txid"
578377a 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
apoelstra added a commit to apoelstra/elements that referenced this pull request Dec 14, 2020
@apoelstra
Revert "gui: Alternate row background based on txid"
11e8053 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
apoelstra added a commit to apoelstra/elements that referenced this pull request Dec 14, 2020
@apoelstra
Revert "gui: Alternate row background based on txid"
2e46cec 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
apoelstra added a commit to apoelstra/elements that referenced this pull request Dec 16, 2020
@apoelstra
Revert "gui: Alternate row background based on txid"
1af4e96 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
apoelstra added a commit to apoelstra/elements that referenced this pull request Dec 16, 2020
@apoelstra
Revert "gui: Alternate row background based on txid"
fe4ca2e 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
apoelstra added a commit to apoelstra/elements that referenced this pull request Dec 16, 2020
@apoelstra
Revert "gui: Alternate row background based on txid"
832990c 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
apoelstra added a commit to apoelstra/elements that referenced this pull request Mar 26, 2021
@apoelstra
Revert "gui: Alternate row background based on txid"
f912cb8 
This reverts commit 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938.

This was included in ElementsProject#569
which received no review, and is a backport of upstream PR
bitcoin/bitcoin#12578 which was
later closed. It leaks memory which is causing CI to fail.
@delta1 delta1 mentioned this pull request Feb 4, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

QT support for assets
6 participants
@instagibbs @stevenroose @promag @luke-jr @greenaddress @RCasatta