Commit graph

18691 commits

Author SHA1 Message Date
Luke Dashjr
6342d80d7f GUI: Add GUIUtil::formatMultiAssetAmount to handle a CAmountMap 2019-04-09 10:19:33 -04:00
Luke Dashjr
988ed5effc GUI: Abstract asset+amount formatting into new GUIUtil::formatAssetAmount 2019-04-09 10:07:17 -04:00
Luke Dashjr
89275ebf21 GUI: TransactionRecord: Special-case the common scenario where assets are simply issued to myself 2019-04-09 09:48:00 -04:00
Luke Dashjr
906cc4c40b Wallet: GetIssuanceAssets to get CAmountMap for issuances 2019-04-08 16:04:35 -04:00
Luke Dashjr
4ea8f88274 GUI: TransactionRecord: When time/index/etc match, sort fee, issuance, send, then receive 2019-04-08 15:59:33 -04:00
Luke Dashjr
51e789722f GUI: TransactionRecord: Add asset issuance record type 2019-04-08 15:54:35 -04:00
Gregory Sanders
e6b3676b37 Wallet: GetIssuanceAssets to just get CAssets for issuances 2019-04-08 15:27:03 -04:00
Luke Dashjr
2bcd24313d GUI: Overview: Use formatted amount text from TransactionTableModel 2019-04-08 11:39:55 -04:00
Luke Dashjr
eef551a588 GUI: TransactionTableModel: Remove bitcoin unit from Amount column header 2019-04-08 11:39:15 -04:00
Luke Dashjr
19c87c0ae7 GUI: TransactionTableModel: Include unit name with formatted amount 2019-04-08 11:37:07 -04:00
Luke Dashjr
a582fe03e4 GUI: TransactionRecord: Turn non-bitcoin fees into entries 2019-04-08 11:30:26 -04:00
Gregory Sanders
ef2f717e67 GUI: TransactionRecord: Add asset field 2019-04-08 11:24:23 -04:00
Luke Dashjr
060ad2f566 GUI: TransactionRecord: Collapse credit+debit fields to just amount 2019-04-08 11:13:31 -04:00
Luke Dashjr
0aeab14f75 GUI: Ignore explicit fee output when determining if a transaction is send-to-self 2019-04-08 11:09:16 -04:00
João Barbosa
1655947c15 gui: Alternate row background based on txid
Github-Pull: bitcoin/bitcoin #12578
Rebased-From: 264f9c4d4f7c1aeb3e89eedddcd88e47e8bba938
2019-04-08 11:02:53 -04:00
João Barbosa
3edcdf8f0b gui: Add transaction record type Fee
Github-Pull: bitcoin/bitcoin #12578
Rebased-From: 550f1f3d3498d051ab94afdc0b9fb883c0655b99
2019-04-08 11:02:37 -04:00
João Barbosa
41c8d4c89c gui: Avoid TransactionRecord instance for IsMine outputs
Github-Pull: bitcoin/bitcoin #12578
Rebased-From: 82dd3e0ffa0af629a34b28ed7eca4027e0376756
2019-04-08 10:24:05 -04:00
Gregory Sanders
ec62262c51
Merge #562: Don't blind with blinding factors that aren't ours
030811b Don't blind with blinding factors that aren't ours (Steven Roose)

Pull request description:

  Cherry-pick of https://github.com/ElementsProject/elements/pull/231.

Tree-SHA512: 14a2e83891edc244ebc1c5cd9a095c0b4914df72f17462cfca2600f6da208f250cc315e91c2ac9232bd6a5197f2d9854cdfeef6ffafdaf36acc51d555c6c13c7
2019-04-04 16:24:15 -04:00
Steven Roose
030811b8f2
Don't blind with blinding factors that aren't ours 2019-04-03 21:31:11 +02:00
Steven Roose
07cf0b218b
Merge #558: Create burn argument for createrawtransaction
39357ca50 Create burn argument for createrawtransaction (Gregory Sanders)

Pull request description:

  Allows a no-data burn of any given asset using the raw interface to support multi-sig burn when `destroyamount` will not suffice.

  Resolves https://github.com/ElementsProject/elements/issues/557

Tree-SHA512: 77309701c97861b30e141138b34efab3be6667993e0aa725d61500fa6943af9ce6114efcfd14fb6f8bade92d98bfcf8a5c7163a382a7358e3f160b36d0d944c8
2019-04-03 21:00:21 +02:00
Steven Roose
f79c2fecb1
Merge #550: add code to test partial blinding functionality to qa/rpc-tests
4258f9ff0 add code to test partial blinding functionality to qa/rpc-tests (Dmitry Petukhov)

Pull request description:

  forward port of https://github.com/ElementsProject/elements/pull/510

  @dgpv

Tree-SHA512: 3c6b8afb63234d98f9c917ad17f08f0d426577891178cecff0cfca5787f5285607e64811119a328cbe09eacae1693201deb458ea8db0c97600dfcffd1cbf90be
2019-04-03 20:58:56 +02:00
Steven Roose
cb9f28cbc4
Merge #556: Fix a few Bitcoin server strings
fa9841b5c Fix a few Bitcoin server strings (Gregory Sanders)

Pull request description:

  Resolves https://github.com/ElementsProject/elements/issues/555

Tree-SHA512: 810162d3ffce21e930f91b8a244a328e2f5f1fee1db45094a5f8d416adfdfea8516d4a936eaee6e5afd2e65ddf13980349a06a657a3941aba65798ee74824fc5
2019-04-03 20:55:29 +02:00
Gregory Sanders
39357ca506 Create burn argument for createrawtransaction 2019-04-02 20:14:20 -04:00
Dmitry Petukhov
4258f9ff00 add code to test partial blinding functionality to qa/rpc-tests 2019-04-02 16:30:03 -04:00
Gregory Sanders
fa9841b5cf Fix a few Bitcoin server strings 2019-04-02 08:42:04 -04:00
Steven Roose
a904f02fb1
Merge #549: Make new actually working master blinding calls, test
9acbd2436 Make new actually working master blinding calls, test (Gregory Sanders)

Pull request description:

  resolves https://github.com/ElementsProject/elements/issues/547

  Previous API was improperly overloading the specific blinding key calls, and incorrectly on top of that.

  Instead implement `importmasterblindingkey` and `dumpmasterblindingkey` and check that `dumpwallet` details are enough to recover same blinded wallet addresses.

Tree-SHA512: d9d954d1cb787182d99b464cc6a80e8383d3ea71e432e6fd0e244b5f5a460b9adfcdc14e38fe841c5a5e2fef1345da78217d519a23a804d5066998828103efd1
2019-04-01 12:36:27 +02:00
Steven Roose
c1c4757937
Merge #548: Port asset tutorial, update to 0.17+ API
4c157da8b Port asset tutorial, update to 0.17+ API (Gregory Sanders)

Pull request description:

  cc @wintercooled

  I didn't port the bash version because I don't feel like rewriting everything to work in bash.

  resolves https://github.com/ElementsProject/elements/issues/546

Tree-SHA512: b1ce9180dc49d5cba0eeba8813e03f486c73f7d3786a85e8aa698eeb5146afb6a89dd9a48611364261937d246368c46843d6666d7eea6b64f7800557e47d083f
2019-04-01 10:34:44 +01:00
Steven Roose
6e2751c151
Merge #545: fix vector length calculation for targets in BlindTransaction
93f49ed81 fix vector length calculation for targets in BlindTransaction (Dmitry Petukhov)

Pull request description:

  port of https://github.com/ElementsProject/elements/pull/514

Tree-SHA512: 5e082bb2590c1dde70b67607524d974f435f673777459b638ca10193040b45239fcb4302cc47d4aa7dbd0a25627294e7ca4f11658a4e41cfcd001c8ca51faf3b
2019-04-01 10:24:53 +01:00
Steven Roose
298c2fb482
Merge #538: Enforce coinbase maturity on bitcoin peg-ins
5acc42e4e feature_fedpeg.py: remove the spam output (Gregory Sanders)
870e41609 Enforce coinbase maturity on bitcoin peg-ins (Gregory Sanders)

Pull request description:

  resolves https://github.com/ElementsProject/elements/issues/14

  Technically a softfork but not really since the elements chain would eventually become valid anyways.

Tree-SHA512: bfdf404f7056e6b16adde3a82b0e11839b921fd08063ae6415d207b553e1a19c5f5a76cb308af1ca63164c001eb59b5874fe33160f7bf87061a6a4a507aa9241
2019-04-01 10:04:07 +01:00
Gregory Sanders
4c157da8bd Port asset tutorial, update to 0.17+ API 2019-03-29 14:02:01 -04:00
Gregory Sanders
9acbd24360 Make new actually working master blinding calls, test 2019-03-29 13:20:26 -04:00
Dmitry Petukhov
93f49ed814 fix vector length calculation for targets in BlindTransaction
the size of surjectionTargets and targetAssetGenerator vectors
was calculated as tx.vin.size()*3, based on the fact that for
each input there might also be up to 2 issuance pseudo-inputs,
but did not take into account that the number of auxiliary generators
may exceed the number of inputs. This fixes the size calculations
by taking into account auxiliary generators supplied beyond vin size.
2019-03-28 16:58:31 -04:00
Gregory Sanders
5acc42e4eb feature_fedpeg.py: remove the spam output 2019-03-28 16:53:11 -04:00
Gregory Sanders
870e41609e Enforce coinbase maturity on bitcoin peg-ins 2019-03-28 16:27:18 -04:00
Steven Roose
09e20ab819
Merge #541: Blockindex compatibility fix, startup speedup
0baa13581 Only check 1 in 1000 block header sigs on load (Gregory Sanders)
87c06d409 Save some space, maintain compatibility with elements-0.14 header index (Gregory Sanders)

Pull request description:

  We diverged from the 0.14 codebase, fix included here as well as performance speedup on initial load.

  In 0.14 we did no signature checking at all, but the signature checks were what alerted me to the incompatibility, so I opted to preserve some of that as sanity check.

Tree-SHA512: 565c9d771e8f7a1057f7dcd1107c9d3f23159d3cf9f9968fdc53f7732abdfbf8a65e3c0a42807fbb80c712cb65d6fa2a7c83c3bf3de5ac0a6b72b49e55f00e83
2019-03-28 11:43:07 +00:00
Gregory Sanders
0baa13581e Only check 1 in 1000 block header sigs on load 2019-03-27 14:42:27 -04:00
Gregory Sanders
87c06d4091 Save some space, maintain compatibility with elements-0.14 header index 2019-03-27 13:54:19 -04:00
Steven Roose
dd1623af0a
Merge #539: Re-enable no wallet functional tests
adcc2d2ad Re-enable no wallet functional tests (Gregory Sanders)

Pull request description:

  We removed QT building which seemed to help, maybe we can reintroduce functional tests.

Tree-SHA512: 8a31ad15ea876c5d33e799351fb46ee7be48f1e55695b0c42badb1bc5368cfbf2139039b6b048ab38a57e330c94776f5511c5e63d05be50e225019983a009757
2019-03-27 10:13:54 +00:00
Gregory Sanders
adcc2d2ada Re-enable no wallet functional tests 2019-03-26 11:48:16 -04:00
Gregory Sanders
712fad0254
Merge #533: Add Travis fedpeg test with downloaded bitcoind
2a7039f Add Travis fedpeg test with downloaded bitcoind (Steven Roose)

Pull request description:

  Fixes #531

Tree-SHA512: 6f2400d7e5efe77b4c4df06e9a140449fecb9d977ca170c9da7c53596b620a0aaa06b1541601284fef6e54aa5c3685cd8db09498d9418b9be21f4e29a466d4e0
2019-03-25 09:19:27 -04:00
Steven Roose
2a7039f13d
Add Travis fedpeg test with downloaded bitcoind 2019-03-25 11:21:06 +00:00
Gregory Sanders
f084479091
Merge #521: [0.17] Change branding from bitcoin to elements
d1f5351 Update man pages (Steven Roose)
e1cd00c Change branding from bitcoin to elements (Steven Roose)
ade539c Don't assume mainchain is Bitcoin (Steven Roose)
cf77a23 Update README to Elements Project (Steven Roose)

Pull request description:

Tree-SHA512: f9428219b15a52fd6cff63e7a725a4cb67a3dbecf59eaf7ca946a2b1af8b803bd75c3a62f1feacc8356ae21d32b308cafb27a254d52db6a462563a82b271e101
2019-03-22 12:18:23 -04:00
Steven Roose
d1f535176d
Update man pages 2019-03-22 10:12:07 +00:00
Steven Roose
e1cd00cc6c Change branding from bitcoin to elements 2019-03-22 10:12:04 +00:00
Steven Roose
ade539cbb4 Don't assume mainchain is Bitcoin 2019-03-21 19:30:52 +00:00
Steven Roose
cf77a238de Update README to Elements Project 2019-03-21 19:29:27 +00:00
Gregory Sanders
753a1ce2a3
Merge #526: [0.17] Add test for superfulous witness record in deserialization
310c4dc Add test for superfulous witness record in deserialization (Gregory Sanders)

Pull request description:

  Backport of 7c1ad7c036

Tree-SHA512: 4f67814e411209ef3424e2ae80bd3c2c4ec92e670742b795c3c79ac7c9eb4be92727472d1611e5dade8710207d47d6157db0b790d62ab8f27c79e7c6141660ae
2019-03-21 15:08:51 -04:00
Gregory Sanders
f9cb345798
Merge #524: [0.17] Make validatepegin default to true if has parent chain
aba54b3 Make validatepegin default to true if has parent chain (Steven Roose)

Pull request description:

Tree-SHA512: 9b28426c0b00c6a31b70dfe906841069a1a3c8725357c3cb5e0d2e7eebe8d8c289033bb74f2b65effe8ff4a51965a60c654557a716a767ca6c7c9cdc13f28e96
2019-03-21 14:54:08 -04:00
Gregory Sanders
310c4dc262 Add test for superfulous witness record in deserialization 2019-03-21 14:06:41 -04:00
Steven Roose
aba54b3f92
Make validatepegin default to true if has parent chain 2019-03-21 17:55:02 +00:00