[bisq-network/bisq] Add proof of burn feature (#1912)
Manfred Karrer
notifications at github.com
Sun Nov 11 17:57:47 UTC 2018
You can view, comment on, or merge this pull request online at:
https://github.com/bisq-network/bisq/pull/1912
-- Commit Summary --
* Merge branch 'delist-untraded-assets' of https://github.com/cbeams/bisq into cbeams-delist-untraded-assets
* Remove commented out print code
* Merge branch 'support-removed-assets' into add-asset-listing-fee
* Merge branch 'cbeams-delist-untraded-assets' into add-asset-listing-fee
* Add asset listing params
* Merge
* cleanup
* Add asset listing fee and proof of burn domain and views (WIP)
* Merge branch 'release-candidate-0.9.0' into add-asset-listing-fee
* Cleanup
* Complete asset listing fee feature
* Merge branch 'release-candidate-0.9.0' into add-proof-of-burn-feature
* Add proof of burn feature to dao
-- File Changes --
M common/src/main/java/bisq/common/app/Version.java (2)
M common/src/main/proto/pb.proto (35)
M core/src/main/java/bisq/core/app/BisqSetup.java (6)
M core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java (6)
M core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java (10)
M core/src/main/java/bisq/core/dao/DaoFacade.java (8)
M core/src/main/java/bisq/core/dao/DaoModule.java (6)
M core/src/main/java/bisq/core/dao/DaoSetup.java (6)
A core/src/main/java/bisq/core/dao/governance/asset/AssetConsensus.java (65)
M core/src/main/java/bisq/core/dao/governance/asset/AssetService.java (314)
R core/src/main/java/bisq/core/dao/governance/asset/AssetState.java (12)
A core/src/main/java/bisq/core/dao/governance/asset/FeePayment.java (58)
D core/src/main/java/bisq/core/dao/governance/asset/RemovedAsset.java (72)
A core/src/main/java/bisq/core/dao/governance/asset/StatefulAsset.java (107)
M core/src/main/java/bisq/core/dao/governance/param/Param.java (5)
A core/src/main/java/bisq/core/dao/governance/proofofburn/MyProofOfBurn.java (98)
R core/src/main/java/bisq/core/dao/governance/proofofburn/MyProofOfBurnList.java (33)
A core/src/main/java/bisq/core/dao/governance/proofofburn/MyProofOfBurnListService.java (104)
A core/src/main/java/bisq/core/dao/governance/proofofburn/ProofOfBurnConsensus.java (59)
A core/src/main/java/bisq/core/dao/governance/proofofburn/ProofOfBurnService.java (245)
M core/src/main/java/bisq/core/dao/governance/proposal/BaseProposalFactory.java (2)
M core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultService.java (10)
M core/src/main/java/bisq/core/dao/node/explorer/JsonTxOutputType.java (2)
M core/src/main/java/bisq/core/dao/node/explorer/JsonTxType.java (4)
M core/src/main/java/bisq/core/dao/node/parser/OpReturnParser.java (12)
M core/src/main/java/bisq/core/dao/node/parser/TxInputParser.java (2)
M core/src/main/java/bisq/core/dao/node/parser/TxOutputParser.java (17)
M core/src/main/java/bisq/core/dao/node/parser/TxParser.java (6)
M core/src/main/java/bisq/core/dao/state/DaoStateService.java (28)
M core/src/main/java/bisq/core/dao/state/DaoStateStorageService.java (2)
M core/src/main/java/bisq/core/dao/state/model/blockchain/OpReturnType.java (4)
M core/src/main/java/bisq/core/dao/state/model/blockchain/TxOutputType.java (2)
M core/src/main/java/bisq/core/dao/state/model/blockchain/TxType.java (4)
M core/src/main/java/bisq/core/locale/CurrencyUtil.java (44)
M core/src/main/java/bisq/core/payment/AccountAgeWitnessService.java (2)
M core/src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java (6)
M core/src/main/java/bisq/core/setup/CorePersistedDataHost.java (4)
M core/src/main/java/bisq/core/trade/statistics/AssetTradeActivityCheck.java (12)
M core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java (5)
M core/src/main/resources/i18n/displayStrings.properties (58)
M desktop/src/main/java/bisq/desktop/components/paymentmethods/CryptoCurrencyForm.java (2)
M desktop/src/main/java/bisq/desktop/main/dao/DaoView.java (19)
A desktop/src/main/java/bisq/desktop/main/dao/burnbsq/BurnBsqView.fxml (37)
A desktop/src/main/java/bisq/desktop/main/dao/burnbsq/BurnBsqView.java (125)
A desktop/src/main/java/bisq/desktop/main/dao/burnbsq/assetfee/AssetFeeView.fxml (33)
A desktop/src/main/java/bisq/desktop/main/dao/burnbsq/assetfee/AssetFeeView.java (417)
A desktop/src/main/java/bisq/desktop/main/dao/burnbsq/assetfee/AssetListItem.java (57)
A desktop/src/main/java/bisq/desktop/main/dao/burnbsq/proofofburn/MyProofOfBurnListItem.java (72)
A desktop/src/main/java/bisq/desktop/main/dao/burnbsq/proofofburn/ProofOfBurnListItem.java (51)
A desktop/src/main/java/bisq/desktop/main/dao/burnbsq/proofofburn/ProofOfBurnSignatureWindow.java (89)
A desktop/src/main/java/bisq/desktop/main/dao/burnbsq/proofofburn/ProofOfBurnVerificationWindow.java (85)
A desktop/src/main/java/bisq/desktop/main/dao/burnbsq/proofofburn/ProofOfBurnView.fxml (33)
A desktop/src/main/java/bisq/desktop/main/dao/burnbsq/proofofburn/ProofOfBurnView.java (638)
M desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java (4)
M desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java (1)
M desktop/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java (8)
M desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java (3)
M desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java (14)
M desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java (2)
M desktop/src/main/java/bisq/desktop/util/validation/BsqValidator.java (3)
M desktop/src/main/java/bisq/desktop/util/validation/BtcValidator.java (3)
-- Patch Links --
https://github.com/bisq-network/bisq/pull/1912.patch
https://github.com/bisq-network/bisq/pull/1912.diff
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq/pull/1912
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20181111/66291ba8/attachment-0001.html>
More information about the bisq-github
mailing list