<p>This PR adds changes from the Http-API branch which have been applied there for a while but not well tested and reviewed. After that is merged it should make meging the Http-API branch easier.<br>
It does not contain Http-API content beside the option keys.</p>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>  <a href='https://github.com/bisq-network/bisq/pull/1797'>https://github.com/bisq-network/bisq/pull/1797</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Add BisqSetupCompleteListener interface</li>
  <li>Add HTTP_API_HOST and HTTP_API_PORT options</li>
  <li>Refactor balanceModel</li>
  <li>Add methods to OfferUtil</li>
  <li>Add TxFeeEstimation class</li>
  <li>Use OfferUtil.getAcceptedBanks</li>
  <li>Use OfferUtil.getExtraDataMap</li>
  <li>Use OfferUtil.getAcceptedCountryCodes</li>
  <li>Use OfferUtil.getBankId and getCountryCode</li>
  <li>Add TODOs</li>
  <li>Fix ConcurrentModificationException</li>
  <li>Add TxFeeEstimation class</li>
  <li>Fix arguments</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-0">core/src/main/java/bisq/core/app/AppOptionKeys.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-1">core/src/main/java/bisq/core/app/BisqEnvironment.java</a>
    (12)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-2">core/src/main/java/bisq/core/app/BisqExecutable.java</a>
    (11)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-3">core/src/main/java/bisq/core/app/BisqFacade.java</a>
    (11)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-4">core/src/main/java/bisq/core/app/BisqHeadlessApp.java</a>
    (1)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-5">core/src/main/java/bisq/core/app/BisqHeadlessAppMain.java</a>
    (5)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-6">core/src/main/java/bisq/core/app/BisqSetup.java</a>
    (31)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-7">core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java</a>
    (5)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-8">core/src/main/java/bisq/core/btc/BalanceUtil.java</a>
    (82)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-9">core/src/main/java/bisq/core/btc/Balances.java</a>
    (108)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-10">core/src/main/java/bisq/core/btc/BitcoinModule.java</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-11">core/src/main/java/bisq/core/btc/model/AddressEntryList.java</a>
    (9)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-12">core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java</a>
    (19)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-13">core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java</a>
    (31)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-14">core/src/main/java/bisq/core/offer/OfferUtil.java</a>
    (124)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-15">core/src/main/java/bisq/core/offer/TxFeeEstimation.java</a>
    (137)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-16">core/src/main/java/bisq/core/offer/placeoffer/tasks/ValidateOffer.java</a>
    (1)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-17">core/src/main/java/bisq/core/payment/AccountAgeWitnessService.java</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-18">core/src/main/java/bisq/core/presentation/BalancePresentation.java</a>
    (12)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-19">core/src/main/java/bisq/core/trade/TradeManager.java</a>
    (7)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-20">core/src/main/java/bisq/core/user/Preferences.java</a>
    (4)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-21">core/src/test/java/bisq/core/offer/TxFeeEstimationTest.java</a>
    (124)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-22">desktop/src/main/java/bisq/desktop/app/BisqAppMain.java</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-23">desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-24">desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java</a>
    (120)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-25">desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModel.java</a>
    (39)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-26">desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java</a>
    (169)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-27">desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java</a>
    (29)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1797/files#diff-28">desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModelTest.java</a>
    (4)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/bisq-network/bisq/pull/1797.patch'>https://github.com/bisq-network/bisq/pull/1797.patch</a></li>
  <li><a href='https://github.com/bisq-network/bisq/pull/1797.diff'>https://github.com/bisq-network/bisq/pull/1797.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/bisq-network/bisq/pull/1797">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AkpZtpmkg-uvYoBwFYFJeoIu6pr6_yl1ks5um_MPgaJpZM4XyQ2P">mute the thread</a>.<img src="https://github.com/notifications/beacon/AkpZthxO7VR2Ou383GSmbv_6pYh7ikBZks5um_MPgaJpZM4XyQ2P.gif" height="1" width="1" alt="" /></p>
<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/bisq-network/bisq","title":"bisq-network/bisq","subtitle":"GitHub repository","main_image_url":"https://assets-cdn.github.com/images/email/message_cards/header.png","avatar_image_url":"https://assets-cdn.github.com/images/email/message_cards/avatar.png","action":{"name":"Open in GitHub","url":"https://github.com/bisq-network/bisq"}},"updates":{"snippets":[{"icon":"DESCRIPTION","message":"Prepare http api merge (#1797)"}],"action":{"name":"View Pull Request","url":"https://github.com/bisq-network/bisq/pull/1797"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/1797",
"url": "https://github.com/bisq-network/bisq/pull/1797",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
},
{
"@type": "MessageCard",
"@context": "http://schema.org/extensions",
"hideOriginalBody": "false",
"originator": "AF6C5A86-E920-430C-9C59-A73278B5EFEB",
"title": "Prepare http api merge (#1797)",
"sections": [
{
"text": "",
"activityTitle": "**Manfred Karrer**",
"activityImage": "https://assets-cdn.github.com/images/email/message_cards/avatar.png",
"activitySubtitle": "@ManfredKarrer",
"facts": [

]
},
{
"title": "Commit Summary",
"facts": [
{
"name": "9b5be6f",
"value": "Add BisqSetupCompleteListener interface"
},
{
"name": "e3e0552",
"value": "Add HTTP_API_HOST and HTTP_API_PORT options"
},
{
"name": "dc469e5",
"value": "Refactor balanceModel"
},
{
"name": "e6f9d77",
"value": "Add methods to OfferUtil"
},
{
"name": "118c247",
"value": "Add TxFeeEstimation class"
},
{
"name": "6d1ae1e",
"value": "Use OfferUtil.getAcceptedBanks"
},
{
"name": "ea9c221",
"value": "Use OfferUtil.getExtraDataMap"
},
{
"name": "998dfa7",
"value": "Use OfferUtil.getAcceptedCountryCodes"
},
{
"name": "063db25",
"value": "Use OfferUtil.getBankId and getCountryCode"
},
{
"name": "eb89ed2",
"value": "Add TODOs"
},
{
"name": "6ed70b9",
"value": "Fix ConcurrentModificationException"
},
{
"name": "a74c656",
"value": "Add TxFeeEstimation class"
},
{
"name": "495f622",
"value": "Fix arguments"
}
]
},
{
"title": "File Changes",
"facts": [
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/app/AppOptionKeys.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-0) (2 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/app/BisqEnvironment.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-1) (12 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/app/BisqExecutable.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-2) (11 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/app/BisqFacade.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-3) (11 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/app/BisqHeadlessApp.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-4) (1 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/app/BisqHeadlessAppMain.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-5) (5 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/app/BisqSetup.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-6) (31 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-7) (5 changes)"
},
{
"name": "Added",
"value": "[core/src/main/java/bisq/core/btc/BalanceUtil.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-8) (82 changes)"
},
{
"name": "Added",
"value": "[core/src/main/java/bisq/core/btc/Balances.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-9) (108 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/btc/BitcoinModule.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-10) (4 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/btc/model/AddressEntryList.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-11) (9 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-12) (19 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-13) (31 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/offer/OfferUtil.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-14) (124 changes)"
},
{
"name": "Added",
"value": "[core/src/main/java/bisq/core/offer/TxFeeEstimation.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-15) (137 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/offer/placeoffer/tasks/ValidateOffer.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-16) (1 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/payment/AccountAgeWitnessService.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-17) (6 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/presentation/BalancePresentation.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-18) (12 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/trade/TradeManager.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-19) (7 changes)"
},
{
"name": "Modified",
"value": "[core/src/main/java/bisq/core/user/Preferences.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-20) (4 changes)"
},
{
"name": "Added",
"value": "[core/src/test/java/bisq/core/offer/TxFeeEstimationTest.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-21) (124 changes)"
},
{
"name": "Modified",
"value": "[desktop/src/main/java/bisq/desktop/app/BisqAppMain.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-22) (4 changes)"
},
{
"name": "Modified",
"value": "[desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-23) (2 changes)"
},
{
"name": "Modified",
"value": "[desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-24) (120 changes)"
},
{
"name": "Modified",
"value": "[desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModel.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-25) (39 changes)"
},
{
"name": "Modified",
"value": "[desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-26) (169 changes)"
},
{
"name": "Modified",
"value": "[desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-27) (29 changes)"
},
{
"name": "Modified",
"value": "[desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModelTest.java](https://github.com/bisq-network/bisq/pull/1797/files#diff-28) (4 changes)"
}
]
}
],
"potentialAction": [
{
"name": "Add a comment",
"@type": "ActionCard",
"inputs": [
{
"isMultiLine": true,
"@type": "TextInput",
"id": "IssueComment",
"isRequired": false
}
],
"actions": [
{
"name": "Comment",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"IssueComment\",\n\"repositoryFullName\": \"bisq-network/bisq\",\n\"issueId\": 1797,\n\"IssueComment\": \"{{IssueComment.value}}\"\n}"
}
]
},
{
"name": "Close pull request",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"PullRequestClose\",\n\"repositoryFullName\": \"bisq-network/bisq\",\n\"pullRequestId\": 1797\n}"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/bisq-network/bisq/pull/1797"
}
],
"@type": "OpenUri",
"name": "View on GitHub"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/bisq-network/bisq/pull/1797.patch"
}
],
"@type": "OpenUri",
"name": "View patch"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/bisq-network/bisq/pull/1797.diff"
}
],
"@type": "OpenUri",
"name": "View diff"
},
{
"name": "Unsubscribe",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"MuteNotification\",\n\"threadId\": 399052175\n}"
}
],
"themeColor": "26292E"
}
]</script>