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.

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

Update roadmap #3025

Merged
merged 1 commit into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,19 @@ private List<ProtocolListItem> getMainProtocols() {
NavigationTarget.BISQ_MU_SIG,
TradeProtocolType.BISQ_MU_SIG,
new Pair<>(10000L, 700000L),
"Q4/24"
"Q2/25"
);
ProtocolListItem submarine = new ProtocolListItem(TradeAppsAttributes.Type.SUBMARINE,
NavigationTarget.SUBMARINE,
TradeProtocolType.SUBMARINE,
new Pair<>(10000L, 700000L),
"Q2/25"
"Q3/25"
);
ProtocolListItem liquidFiat = new ProtocolListItem(TradeAppsAttributes.Type.BISQ_LIGHTNING,
NavigationTarget.BISQ_LIGHTNING,
TradeProtocolType.BISQ_LIGHTNING,
new Pair<>(10000L, 700000L),
"Q2/25"
"Q3/25"
);
return List.of(bisqEasy,
bisqMuSig,
Expand All @@ -92,25 +92,25 @@ private List<ProtocolListItem> getMoreProtocols() {
NavigationTarget.MORE_TRADE_PROTOCOLS,
TradeProtocolType.LIQUID_MU_SIG,
new Pair<>(10000L, 700000L),
"Q2/25"
"Q3/25"
);
ProtocolListItem moneroSwap = new ProtocolListItem(TradeAppsAttributes.Type.MONERO_SWAP,
NavigationTarget.MORE_TRADE_PROTOCOLS,
TradeProtocolType.MONERO_SWAP,
new Pair<>(10000L, 700000L),
"Q3/25"
"Q4/25"
);
ProtocolListItem liquidSwap = new ProtocolListItem(TradeAppsAttributes.Type.LIQUID_SWAP,
NavigationTarget.MORE_TRADE_PROTOCOLS,
TradeProtocolType.LIQUID_SWAP,
new Pair<>(10000L, 700000L),
"Q2/25"
"Q3/25"
);
ProtocolListItem bsqSwap = new ProtocolListItem(TradeAppsAttributes.Type.BSQ_SWAP,
NavigationTarget.MORE_TRADE_PROTOCOLS,
TradeProtocolType.BSQ_SWAP,
new Pair<>(10000L, 700000L),
"Q3/25"
"Q4/25"
);
return List.of(liquidMuSig,
moneroSwap,
Expand Down
14 changes: 7 additions & 7 deletions i18n/src/main/resources/trade_apps.properties
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ tradeApps.BISQ_MU_SIG.overview=Conceptually it follows the trade protocol used i
- Taproot provides more flexibility and privacy.\n\
- Find out more details at: https://github.com/bisq-network/proposals/issues/456
# suppress inspection "UnusedProperty"
tradeApps.BISQ_MU_SIG.release=Bisq MuSig is expected to be ready for release in Q4/2024.
tradeApps.BISQ_MU_SIG.release=Bisq MuSig is expected to be ready for release in Q2/2025.
# suppress inspection "UnusedProperty"
tradeApps.BISQ_MU_SIG.pro=\
+ Reasonable good security for medium value trade amounts\n\
Expand Down Expand Up @@ -118,7 +118,7 @@ tradeApps.SUBMARINE.overview=The swap is performed by using the secret of a hash
By claiming the Lightning payment the secret for claiming the on-chain Bitcoin is revealed to the sender of the Lightning payment. \
This ensures that one payment unlocks the other payment, thus enables an exchange without counterparty risk.
# suppress inspection "UnusedProperty"
tradeApps.SUBMARINE.release=Submarine swaps is expected to be ready for release in Q2/2025.
tradeApps.SUBMARINE.release=Submarine swaps is expected to be ready for release in Q3/2025.
# suppress inspection "UnusedProperty"
tradeApps.SUBMARINE.pro=\
+ Very high security for large trade amounts\n\
Expand Down Expand Up @@ -157,7 +157,7 @@ tradeApps.LIQUID_MU_SIG.overview=Conceptually it follows the Bisq MuSig protocol
- Transactions fees are very low.\n\
- Privacy is better due confidential transactions which hide the amount being sent.
# suppress inspection "UnusedProperty"
tradeApps.LIQUID_MU_SIG.release=Liquid MuSig is expected to be ready for release in Q2/2025.
tradeApps.LIQUID_MU_SIG.release=Liquid MuSig is expected to be ready for release in Q3/2025.
# suppress inspection "UnusedProperty"
tradeApps.LIQUID_MU_SIG.pro=\
+ Reasonable good security for medium value trade amounts\n\
Expand Down Expand Up @@ -201,7 +201,7 @@ tradeApps.BISQ_LIGHTNING.overview=It enables that traders can use their off-chai
- Then the trade happens on Liquid using the MuSig protocol.\n\
- Once the trade has completed, the L-BTC gets swapped back to Lightning by a Submarine swap (again with another trader/liquidity provider).
# suppress inspection "UnusedProperty"
tradeApps.BISQ_LIGHTNING.release=Bisq Lightning is expected to be ready for release in Q2/2025.
tradeApps.BISQ_LIGHTNING.release=Bisq Lightning is expected to be ready for release in Q3/2025.
# suppress inspection "UnusedProperty"
tradeApps.BISQ_LIGHTNING.pro=\
+ Reasonable good security for medium value trade amounts\n\
Expand Down Expand Up @@ -243,7 +243,7 @@ tradeApps.LIQUID_SWAP.overview=To use Liquid swaps the user need to install and
L-BTC might be used on the other end of the trade which is a substitute of Bitcoin on the Liquid chain. To convert Bitcoin to L-BTC one need to send Bitcoin to a peg-in address and will receive after 102 confirmations L-BTC for that. Going back from L-BTC to Bitcoin (peg-out) works similar but requires authorisation from the Liquid federation which is a group of companies and individuals in the Bitcoin space. So it is not a completely trust-less process.\n\n\
One should avoid comparing Liquid assets to the properties of Bitcoin. It targets other use cases and cannot meet the high level of decentralisation and censorship resistance of Bitcoin. It can be seen rather as an alternative to traditional financial products. By using blockchain technology it avoids classical intermediaries, improves security and privacy and provides a better user experience.
# suppress inspection "UnusedProperty"
tradeApps.LIQUID_SWAP.release=Liquid swaps are still in development. It is expected to be released in Q2/2025.
tradeApps.LIQUID_SWAP.release=Liquid swaps are still in development. It is expected to be released in Q3/2025.
# suppress inspection "UnusedProperty"
tradeApps.LIQUID_SWAP.pro=\
+ Confidential transactions provide good privacy\n\
Expand Down Expand Up @@ -282,7 +282,7 @@ tradeApps.BSQ_SWAP.subHeadline=Atomic swap between BSQ (colored coin on Bitcoin)
tradeApps.BSQ_SWAP.overview=Same model as used in Bisq 1. As it is based on one single atomic transaction it is very secure.\n\
It will require to run the Bisq 1 node with the DAO API enabled.
# suppress inspection "UnusedProperty"
tradeApps.BSQ_SWAP.release=BSQ swaps is expected to be ready for release in Q3/2025.
tradeApps.BSQ_SWAP.release=BSQ swaps is expected to be ready for release in Q4/2025.
# suppress inspection "UnusedProperty"
tradeApps.BSQ_SWAP.pro=\
+ Very secure\n\
Expand Down Expand Up @@ -359,7 +359,7 @@ tradeApps.MONERO_SWAP.overview=Based on the Farcaster project (funded by the Mon
The user needs to install and run a Bitcoin node, a Monero node and the Farcaster daemon. During the swap, the nodes of both traders need to be online. The extra effort when using that protocol pays off with a very high level of security. \
Though users should make themselves familiar with the details of that concept and be aware that there are edge case carrying some small risks.
# suppress inspection "UnusedProperty"
tradeApps.MONERO_SWAP.release=Monero swaps are expected to be ready for release in Q3/2025.
tradeApps.MONERO_SWAP.release=Monero swaps are expected to be ready for release in Q4/2025.
# suppress inspection "UnusedProperty"
tradeApps.MONERO_SWAP.pro=\
+ Very secure\n\
Expand Down
14 changes: 7 additions & 7 deletions i18n/src/main/resources/trade_apps_af_ZA.properties
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ tradeApps.BISQ_MU_SIG.subHeadline=Gebaseer op MuSig, Atomiese swaps en Taproot v
# suppress inspection "UnusedProperty"
tradeApps.BISQ_MU_SIG.overview=Konseptueel volg dit die handel protokol wat in Bisq 1 gebruik word, gebaseer op 'n sekuriteitsdeposito en 'n geskille oplossingsproses.\n- Dit verminder die aantal transaksies van 4 na 1.\n- Verbeter privaatheid deur die deposito transaksie soos 'n standaard 'pay-to-pubKey-hash' transaksie te laat lyk.\n- Dit vermy die probleem dat 'n verkoper arbitrage moet open in die geval die koper nie die sekuriteitsdeposito na die handel vrystel nie. Atomiese swaps sal verseker dat die verkoper hul deposito kan terugkry selfs sonder samewerking van die koper.\n- In die geval van 'n nie-responsiewe handel maat, verseker 'n multi-fase uitbetalings transaksie struktuur dat geen arbitrage en terugbetaling deur die DAO vereis word nie.\n- Taproot bied meer buigsaamheid en privaatheid.\n- Leer meer besonderhede by: https://github.com/bisq-network/proposals/issues/456
# suppress inspection "UnusedProperty"
tradeApps.BISQ_MU_SIG.release=Bisq MuSig word verwag om gereed te wees vir vrystelling in Q4/2024.
tradeApps.BISQ_MU_SIG.release=Bisq MuSig word verwag om gereed te wees vir vrystelling in Q2/2025.
# suppress inspection "UnusedProperty"
tradeApps.BISQ_MU_SIG.pro=+ Redelik goeie sekuriteit vir medium waarde handelbedrae\n+ In vergelyking met Bisq Easy is die sekuriteits eienskappe beter en hoër bedrae kan verhandel word. Die hoër bedrae bring handel pryse nader aan marktariewe.\n+ Bestuur om die nalatenskapstelsel van die fiat wêreld te hanteer
# suppress inspection "UnusedProperty"
Expand Down Expand Up @@ -90,7 +90,7 @@ tradeApps.SUBMARINE.subHeadline=Submarine swaps laat toe om off-chain en on-chai
# suppress inspection "UnusedProperty"
tradeApps.SUBMARINE.overview=Die ruil word uitgevoer deur die geheim van 'n hash tyd-geslote kontrak (HTLC) in die Lightning Network te gebruik vir 'n kontrak in 'n Bitcoin transaksie. Deur die Lightning betaling te eis, word die geheim vir die eis van die on-chain Bitcoin aan die sender van die Lightning betaling onthul. Dit verseker dat een betaling die ander betaling ontsluit, wat 'n ruil sonder teenparty risiko moontlik maak.
# suppress inspection "UnusedProperty"
tradeApps.SUBMARINE.release=Submarine Swaps word verwag om gereed te wees vir vrystelling in Q2/2025.
tradeApps.SUBMARINE.release=Submarine Swaps word verwag om gereed te wees vir vrystelling in Q3/2025.
# suppress inspection "UnusedProperty"
tradeApps.SUBMARINE.pro=+ Baie hoë sekuriteit vir groot handelbedrae\n+ Om op-chain Bitcoin na Lightning te ruil kan moontlik privaatheid verbeter.\n+ Uitruil kan gedoen word deur handelsbots, wat vinnige en geoutomatiseerde handel moontlik maak.
# suppress inspection "UnusedProperty"
Expand Down Expand Up @@ -118,7 +118,7 @@ tradeApps.LIQUID_MU_SIG.subHeadline=Gebaseer op 'n sekuriteitsdeposito, 'n MuSig
# suppress inspection "UnusedProperty"
tradeApps.LIQUID_MU_SIG.overview=Konseptueel volg dit die Bisq MuSig-protokol (op die Bitcoin hoofnet). Liquid het nie dieselfde sensuur eienskappe as Bitcoin nie, alhoewel dit 'n paar voordele bo Bitcoin hoofnet bied:\n- Liquid het 'n baie kort blokbevestigingstyd van ongeveer 1 minuut.\n- Transaksiefooie is baie laag.\n- Privaatheid is beter weens vertroulike transaksies wat die bedrag wat gestuur word, versteek.
# suppress inspection "UnusedProperty"
tradeApps.LIQUID_MU_SIG.release=Liquid MuSig word verwag om gereed te wees vir vrystelling in Q2/2025.
tradeApps.LIQUID_MU_SIG.release=Liquid MuSig word verwag om gereed te wees vir vrystelling in Q3/2025.
# suppress inspection "UnusedProperty"
tradeApps.LIQUID_MU_SIG.pro=+ Redelike goeie sekuriteit vir medium waarde handelbedrae\n+ In vergelyking met Bisq MuSig is daar laer transaksie fooie, vinniger bevestiging en beter privaatheid.\n+ Bestuur om met die nalatenskapstelsel van die Fiat-wêreld te werk
# suppress inspection "UnusedProperty"
Expand Down Expand Up @@ -146,7 +146,7 @@ tradeApps.BISQ_LIGHTNING.subHeadline=Kombineer Submarine swaps van Lightning na
# suppress inspection "UnusedProperty"
tradeApps.BISQ_LIGHTNING.overview=Dit stel handelaars in staat om hul off-chain Bitcoin op Lightning te gebruik vir handel met Fiat gebaseer op die Liquid MuSig-protokol. Die protokol is 'n ketting van 3 handel en 2 verskillende protokolle:\n- Eerstens ruil die handelaars hul Lightning Bitcoin via 'n omgekeerde Submarine swap na L-BTC (Submarine swap tussen Lightning en Liquid). Hierdie ruil gebeur met enige likiditeitsverskaffer, nie met die handelsvennoot nie.\n- Dan vind die handel plaas op Liquid met behulp van die MuSig-protokol.\n- Sodra die handel voltooi is, word die L-BTC weer na Lightning teruggeruil deur 'n Submarine swap (weer met 'n ander handelaar/likiditeitsverskaffer).
# suppress inspection "UnusedProperty"
tradeApps.BISQ_LIGHTNING.release=Bisq Lightning word verwag om gereed te wees vir vrystelling in Q2/2025.
tradeApps.BISQ_LIGHTNING.release=Bisq Lightning word verwag om gereed te wees vir vrystelling in Q3/2025.
# suppress inspection "UnusedProperty"
tradeApps.BISQ_LIGHTNING.pro=+ Redelike goeie sekuriteit vir medium waarde handelbedrae\n+ In vergelyking met Bisq MuSig is daar laer transaksie fooie, vinniger bevestiging en beter privaatheid.\n+ Bestuur om te werk met die nalatenskapstelsel van die Fiat-wêreld
# suppress inspection "UnusedProperty"
Expand Down Expand Up @@ -174,7 +174,7 @@ tradeApps.LIQUID_SWAP.subHeadline=Atomiese swap-gebaseerde handelprotokol op die
# suppress inspection "UnusedProperty"
tradeApps.LIQUID_SWAP.overview=Om Liquid swaps te gebruik, moet die gebruiker die Elements beursie installeer en uitvoer en dit konfigureer, sodat dit vanaf die Bisq toepassing toeganklik kan wees.\n\nDie mees gebruikte bate op Liquid is USDT (Tether), 'n stabiele munt wat aan die USD gekoppel is. Terwyl dit nie vergelyk kan word met iets soos Bitcoin nie, het dit baie voordele bo Fiat USD wat gewoonlik bankoordragte behels met al die probleme en ongerief van die ou Fiat-stelsel.\n\nL-BTC kan aan die ander kant van die handel gebruik word, wat 'n plaasvervanger van Bitcoin op die Liquid-ketting is. Om Bitcoin na L-BTC om te skakel, moet 'n gebruiker Bitcoin na 'n peg-in adres stuur en sal na 102 bevestigings L-BTC daarvoor ontvang. Om terug te gaan van L-BTC na Bitcoin (peg-out) werk soortgelyk, maar vereis autorisasie van die Liquid federasie, wat 'n groep maatskappye en individue in die Bitcoin-ruimte is. Dit is dus nie 'n heeltemal vertrouenslose proses nie.\n\nMens moet vermy om Liquid bates te vergelyk met die eienskappe van Bitcoin. Dit teiken ander gebruiksgevalle en kan nie die hoë vlak van desentralisasie en sensuurweerstand van Bitcoin bereik nie. Dit kan eerder gesien word as 'n alternatief vir tradisionele finansiële produkte. Deur blockchain-tegnologie te gebruik, vermy dit klassieke intermediêre, verbeter sekuriteit en privaatheid en bied 'n beter gebruikerservaring.
# suppress inspection "UnusedProperty"
tradeApps.LIQUID_SWAP.release=Liquid swaps is steeds in ontwikkeling. Dit word verwag om vrygestel te word in Q2/2025.
tradeApps.LIQUID_SWAP.release=Liquid swaps is steeds in ontwikkeling. Dit word verwag om vrygestel te word in Q3/2025.
# suppress inspection "UnusedProperty"
tradeApps.LIQUID_SWAP.pro=+ Vertroulike transaksies bied goeie privaatheid\n+ Vinige bevestigingstyd van ongeveer 1 minuut\n+ Lae transaksiefooie\n+ Geschik vir hoë waarde transaksies
# suppress inspection "UnusedProperty"
Expand Down Expand Up @@ -202,7 +202,7 @@ tradeApps.BSQ_SWAP.subHeadline=Atomiese ruil tussen BSQ (gekleure munt op Bitcoi
# suppress inspection "UnusedProperty"
tradeApps.BSQ_SWAP.overview=Dieselfde model as wat in Bisq 1 gebruik is. Aangesien dit op een enkele atomiese transaksie gebaseer is, is dit baie veilig.\nDit sal vereis dat die Bisq 1-knoop met die DAO API geaktiveer word.
# suppress inspection "UnusedProperty"
tradeApps.BSQ_SWAP.release=BSQ Swaps word verwag om gereed te wees vir vrystelling in Q3/2025.
tradeApps.BSQ_SWAP.release=BSQ Swaps word verwag om gereed te wees vir vrystelling in Q4/2025.
# suppress inspection "UnusedProperty"
tradeApps.BSQ_SWAP.pro=+ Baie veilig\n+ Relatief vinnig, alhoewel die handel slegs na die blockchain-bevestiging as voltooi beskou word\n+ Geen makerfooi transaksie en geen sekuriteitsdeposito vereis
# suppress inspection "UnusedProperty"
Expand Down Expand Up @@ -258,7 +258,7 @@ tradeApps.MONERO_SWAP.subHeadline=Atomiese kruis-ketting ruilprotokol vir die ha
# suppress inspection "UnusedProperty"
tradeApps.MONERO_SWAP.overview=Gebaseer op die Farcaster projek (gefinansier deur die Monero gemeenskap) wat gehashte tydsluiting kontrakte (HTLC), adapter handtekeninge en nul-kennis bewys gebruik om Bitcoin en Monero atomies te ruil.\n\nDie gebruiker moet 'n Bitcoin node, 'n Monero node en die Farcaster daemon installeer en uitvoer. Tydens die ruil moet die nodes van albei handelaars aanlyn wees. Die ekstra moeite wanneer daardie protokol gebruik word, betaal af met 'n baie hoë vlak van sekuriteit. Alhoewel gebruikers hulself vertroud moet maak met die besonderhede van daardie konsep en bewus moet wees dat daar randgevalle is wat 'n paar klein risiko's inhou.
# suppress inspection "UnusedProperty"
tradeApps.MONERO_SWAP.release=Monero swaps word verwag om gereed te wees vir vrystelling in Q3/2025.
tradeApps.MONERO_SWAP.release=Monero swaps word verwag om gereed te wees vir vrystelling in Q4/2025.
# suppress inspection "UnusedProperty"
tradeApps.MONERO_SWAP.pro=+ Baie veilig\n+ Redelike privaatheid. Aan die Bitcoin-kant erf dit Bitcoin se privaatheidseienskappe. Aan die Monero-kant voordeel dit van die hoë privaatheid van Monero.\n+ Geschik vir hoë waarde transaksies
# suppress inspection "UnusedProperty"
Expand Down
Loading
Loading