Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/Development' into api-pr1
Browse files Browse the repository at this point in the history 
Conflicts:
	common/src/main/java/io/bisq/common/locale/LocaleUtil.java
  • Loading branch information
@mrosseel
mrosseel committed Oct 11, 2017
2 parents f1d3743 + 0c86ae9 commit 0755cac
Show file tree
Hide file tree
Showing 134 changed files with 1,536 additions and 1,121 deletions.
10 changes: 5 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<img src="https://bisq.io/wp-content/uploads/2014/09/bitsquare-home2.jpg"/>
<img src="https://bisq.network/images/logo_white_bg.png"/>


What is Bisq?
Expand All @@ -12,12 +12,12 @@ There are no central points of control or failure in the Bisq network. There are

Because the national currency portion of any trade must be transferred via traditional means such as a wire transfer, Bisq incorporates first-class support for human arbitration to resolve any errors or disputes.

You can read about all of this and more in the [whitepaper](https://bisq.io/bitsquare.pdf) and [arbitration](https://bisq.io/arbitration_system.pdf) documents. Several [videos](https://bisq.io/blog/category/video) are available as well.
You can read about all of this and more in the [whitepaper](https://bisq.network/bitsquare.pdf) and [arbitration](https://bisq.network/arbitration_system.pdf) documents. Several [videos](https://bisq.network/blog/category/video) are available as well.

Status
------
Bisq has released the beta version on the 27th of April 2016. It is operational since that time without any major incident.
Please follow the current development state at our [road map]( https://bisq.io/roadmap).
Please follow the current development state at our [road map]( https://bisq.network/roadmap).
For the latest version checkout our [releases page](https://github.com/bisq-network/exchange/releases) at Github.

Building from source
Expand All @@ -33,9 +33,9 @@ Staying in Touch

Contact the team and keep up to date using any of the following:

- The [Bisq Website](https://bisq.io)
- The [Bisq Website](https://bisq.network)
- GitHub [Issues](https://github.com/bisq-network/exchange/issues)
- The [Bisq Forum]( https://forum.bisq.io)
- The [Bisq Forum]( https://forum.bisq.network)
- The [#bitsquare](https://webchat.freenode.net/?channels=bitsquare) IRC channel on Freenode ([logs](https://botbot.me/freenode/bitsquare))
- Our [mailing list](https://groups.google.com/forum/#!forum/bitsquare)
- [@Bitsquare_](https://twitter.com/bitsquare_) on Twitter
Expand Down
1 change: 0 additions & 1 deletion common/src/main/java/io/bisq/common/app/DevEnv.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ public class DevEnv {
@SuppressWarnings("PointlessBooleanExpression")
public static final boolean DEV_MODE = STRESS_TEST_MODE || true;

public static final boolean DAO_ACTIVATED = false;
public static final boolean DAO_PHASE2_ACTIVATED = false;
}
1 change: 1 addition & 0 deletions common/src/main/java/io/bisq/common/locale/CountryUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ private static String getRegionName(final String regionCode) {
}

private static final Map<String, String> regionCodeToNameMap = new HashMap<>();
// Key is: ISO 3166 code, value is region code as defined in regionCodeToNameMap
private static final Map<String, String> regionByCountryCodeMap = new HashMap<>();

static {
Expand Down
105 changes: 6 additions & 99 deletions common/src/main/java/io/bisq/common/locale/CurrencyUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,150 +82,55 @@ public static List<CryptoCurrency> getAllSortedCryptoCurrencies() {
}

// Don't make a PR for adding a coin but follow the steps described here:
// https://forum.bisq.io/t/how-to-add-your-favorite-altcoin/
// https://forum.bisq.network/t/how-to-add-your-favorite-altcoin/
public static List<CryptoCurrency> createAllSortedCryptoCurrenciesList() {
final List<CryptoCurrency> result = new ArrayList<>();

result.add(new CryptoCurrency("AIB", "Advanced Internet Blocks"));
result.add(new CryptoCurrency("ANC", "Anoncoin"));
result.add(new CryptoCurrency("ANTI", "Anti"));
result.add(new CryptoCurrency("ARCO", "AquariusCoin"));
result.add(new CryptoCurrency("ARG", "Argentum"));
result.add(new CryptoCurrency("REP", "Augur", true));
result.add(new CryptoCurrency("BATL", "Battlestars"));
result.add(new CryptoCurrency("BIGUP", "BigUp"));
// result.add(new CryptoCurrency("BSQ", "Bisq Token"));
if (!baseCurrencyCode.equals("BTC"))
result.add(new CryptoCurrency("BTC", "Bitcoin"));
result.add(new CryptoCurrency("BITAUD", "BitAUD", true));
result.add(new CryptoCurrency("BITCHF", "BitCHF", true));
result.add(new CryptoCurrency("BITCNY", "BitCNY", true));
result.add(new CryptoCurrency("BITEUR", "BitEUR", true));
result.add(new CryptoCurrency("BITGBP", "BitGBP", true));
result.add(new CryptoCurrency("BITHKD", "BitHKD", true));
result.add(new CryptoCurrency("BITNZD", "BitNZD", true));
result.add(new CryptoCurrency("BITSEK", "BitSEK", true));
result.add(new CryptoCurrency("BITSGD", "BitSGD", true));
result.add(new CryptoCurrency("SYNQ", "BitSYNQ"));
result.add(new CryptoCurrency("BTS", "BitShares"));
result.add(new CryptoCurrency("BITUSD", "BitUSD", true));
result.add(new CryptoCurrency("BLK", "Blackcoin"));
result.add(new CryptoCurrency("BURST", "Burstcoin"));
result.add(new CryptoCurrency("GBYTE", "Byte"));
result.add(new CryptoCurrency("CLAM", "Clams"));
result.add(new CryptoCurrency("CLOAK", "CloakCoin"));
result.add(new CryptoCurrency("CMT", "Comet"));
result.add(new CryptoCurrency("XCP", "Counterparty"));
result.add(new CryptoCurrency("CRBIT", "Creditbit"));
result.add(new CryptoCurrency("CRW", "Crown"));
result.add(new CryptoCurrency("CBX", "Crypto Bullion"));
result.add(new CryptoCurrency("DNET", "DarkNet"));
result.add(new CryptoCurrency("DIBC", "DIBCOIN"));
if (!baseCurrencyCode.equals("DASH"))
result.add(new CryptoCurrency("DASH", "Dash"));
result.add(new CryptoCurrency("DEC", "DECENT"));
result.add(new CryptoCurrency("DCR", "Decred"));
result.add(new CryptoCurrency("DGB", "Digibyte"));
result.add(new CryptoCurrency("DRS", "Digital Rupees"));
result.add(new CryptoCurrency("DGD", "DigixDAO Tokens", true));
if (!baseCurrencyCode.equals("DOGE"))
result.add(new CryptoCurrency("DOGE", "Dogecoin"));
result.add(new CryptoCurrency("DMC", "DynamicCoin"));
result.add(new CryptoCurrency("EMC", "Emercoin"));
result.add(new CryptoCurrency("EURT", "EUR Tether"));
result.add(new CryptoCurrency("ELLA", "Ellaism"));
result.add(new CryptoCurrency("ESP", "Espers"));
result.add(new CryptoCurrency("ENT", "Eternity"));
result.add(new CryptoCurrency("ETH", "Ether"));
result.add(new CryptoCurrency("ETC", "Ether Classic"));
result.add(new CryptoCurrency("ERC", "Europecoin"));
result.add(new CryptoCurrency("EGC", "EverGreenCoin"));
result.add(new CryptoCurrency("EOS", "EOS", true));
result.add(new CryptoCurrency("FCT", "Factom"));
result.add(new CryptoCurrency("FAIR", "FairCoin"));
result.add(new CryptoCurrency("FLO", "FlorinCoin"));
//TODO ticker?
//result.add(new CryptoCurrency("FILE", "Filecoin", true));
result.add(new CryptoCurrency("GAME", "GameCredits"));
result.add(new CryptoCurrency("GEMZ", "Gemz"));
result.add(new CryptoCurrency("GRC", "Gridcoin"));
result.add(new CryptoCurrency("GRS", "Groestlcoin"));
result.add(new CryptoCurrency("NLG", "Gulden"));
result.add(new CryptoCurrency("HODL", "HOdlcoin"));
result.add(new CryptoCurrency("HNC", "HunCoin"));
result.add(new CryptoCurrency("IOC", "I/O Coin"));
result.add(new CryptoCurrency("IOTA", "IOTA", true));
result.add(new CryptoCurrency("ELLA", "Ellaism"));
result.add(new CryptoCurrency("IOP", "Fermat"));
result.add(new CryptoCurrency("JNS", "Janus", true));
result.add(new CryptoCurrency("JPYT", "JPY Tether"));
result.add(new CryptoCurrency("JBS", "Jumbucks"));
result.add(new CryptoCurrency("GRC", "Gridcoin"));
result.add(new CryptoCurrency("LBC", "LBRY Credits"));
result.add(new CryptoCurrency("LTBC", "LTBcoin"));
result.add(new CryptoCurrency("LSK", "Lisk"));
if (!baseCurrencyCode.equals("LTC"))
result.add(new CryptoCurrency("LTC", "Litecoin"));
result.add(new CryptoCurrency("MAID", "MaidSafeCoin"));
result.add(new CryptoCurrency("MKR", "Maker", true));
result.add(new CryptoCurrency("MXT", "MarteXcoin"));
result.add(new CryptoCurrency("MOIN", "Moin"));
result.add(new CryptoCurrency("XMR", "Monero"));
result.add(new CryptoCurrency("MT", "Mycelium Token", true));
result.add(new CryptoCurrency("XMY", "Myriadcoin"));
result.add(new CryptoCurrency("NAV", "Nav Coin"));
result.add(new CryptoCurrency("XEM", "NEM"));
result.add(new CryptoCurrency("NEVA", "Nevacoin"));
result.add(new CryptoCurrency("NMC", "Namecoin"));
result.add(new CryptoCurrency("NBT", "NuBits"));
result.add(new CryptoCurrency("NSR", "NuShares"));
result.add(new CryptoCurrency("NXT", "Nxt"));
result.add(new CryptoCurrency("888", "OctoCoin"));
result.add(new CryptoCurrency("OK", "OKCash"));
result.add(new CryptoCurrency("OMNI", "Omni"));
result.add(new CryptoCurrency("OPAL", "Opal"));
result.add(new CryptoCurrency("PART", "Particl"));
result.add(new CryptoCurrency("PASC", "Pascal Coin", true));
result.add(new CryptoCurrency("PPC", "Peercoin"));
result.add(new CryptoCurrency("PEPECASH", "Pepe Cash"));
result.add(new CryptoCurrency("PINK", "Pinkcoin"));
result.add(new CryptoCurrency("PIVX", "PIVX"));
result.add(new CryptoCurrency("XPTX", "PlatinumBar"));
result.add(new CryptoCurrency("PLU", "Plutons", true));
result.add(new CryptoCurrency("PNC", "Pranacoin"));
result.add(new CryptoCurrency("POST", "PostCoin"));
result.add(new CryptoCurrency("POT", "PotCoin"));
result.add(new CryptoCurrency("XPM", "Primecoin"));
result.add(new CryptoCurrency("RADS", "Radium"));
result.add(new CryptoCurrency("REALEST", "RealEst. Coin"));
result.add(new CryptoCurrency("PNC", "Pranacoin"));
result.add(new CryptoCurrency("RDD", "ReddCoin"));
result.add(new CryptoCurrency("XRP", "Ripple"));
result.add(new CryptoCurrency("SFSC", "Safe FileSystem Coin"));
result.add(new CryptoCurrency("SHIFT", "Shift"));
result.add(new CryptoCurrency("SC", "Siacoin"));
result.add(new CryptoCurrency("SF", "Siafund"));
result.add(new CryptoCurrency("SIB", "Sibcoin"));
result.add(new CryptoCurrency("SMLY", "Smileycoin"));
result.add(new CryptoCurrency("SLR", "SolarCoin"));
result.add(new CryptoCurrency("STEEM", "STEEM"));
result.add(new CryptoCurrency("STEEMUSD", "Steem Dollars", true));
result.add(new CryptoCurrency("XLM", "Stellar Lumens"));
result.add(new CryptoCurrency("SJCX", "StorjcoinX"));
result.add(new CryptoCurrency("STRAT", "Stratis"));
result.add(new CryptoCurrency("SWT", "Swarm City Token", true));
result.add(new CryptoCurrency("SYNX", "Syndicate"));
result.add(new CryptoCurrency("AMP", "Synereo", true));
result.add(new CryptoCurrency("TRI", "Triangles"));
result.add(new CryptoCurrency("USDT", "USD Tether"));
result.add(new CryptoCurrency("UNO", "Unobtanium"));
result.add(new CryptoCurrency("VCN", "VCoin"));
result.add(new CryptoCurrency("VPN", "VPNCoin"));
result.add(new CryptoCurrency("XVG", "Verge"));
result.add(new CryptoCurrency("VRC", "VeriCoin"));
result.add(new CryptoCurrency("WAC", "WACoins"));
result.add(new CryptoCurrency("WAVES", "Waves"));
result.add(new CryptoCurrency("WDC", "Worldcoin"));
result.add(new CryptoCurrency("XAUR", "Xaurum"));
result.add(new CryptoCurrency("YACC", "YACCoin"));
result.add(new CryptoCurrency("YBC", "YbCoin"));
result.add(new CryptoCurrency("ZEC", "Zcash"));
result.add(new CryptoCurrency("XZC", "Zcoin"));
result.add(new CryptoCurrency("ZEN", "ZenCash"));
Expand Down Expand Up @@ -254,6 +159,8 @@ public static List<CryptoCurrency> getMainCryptoCurrencies() {
if (!baseCurrencyCode.equals("DASH"))
result.add(new CryptoCurrency("DASH", "Dash"));
result.add(new CryptoCurrency("DCR", "Decred"));
if (!baseCurrencyCode.equals("DOGE"))
result.add(new CryptoCurrency("DOGE", "Dogecoin"));
result.add(new CryptoCurrency("ETH", "Ether"));
result.add(new CryptoCurrency("ETC", "Ether Classic"));
result.add(new CryptoCurrency("GRC", "Gridcoin"));
Expand Down
3 changes: 2 additions & 1 deletion common/src/main/java/io/bisq/common/locale/LocaleUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public class LocaleUtil {
public static List<Locale> getAllLocales() {

// derived form Locale.getAvailableLocales() and added some missing locales
// Key is ISO 639-1 code (https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes), value is ISO 3166 country code
List<Locale> allLocales = new ArrayList<>();

allLocales.add(new Locale("bg", "", ""));
Expand Down Expand Up @@ -160,7 +161,7 @@ public static List<Locale> getAllLocales() {
allLocales.add(new Locale("es", "PE", ""));
allLocales.add(new Locale("en", "PH", ""));
allLocales.add(new Locale("pl", "PL", ""));
allLocales.add(new Locale("es", "PR", ""));
allLocales.add(new Locale("es", "PR", "")); // Puerto Rico
allLocales.add(new Locale("pt", "PT", ""));
allLocales.add(new Locale("es", "PY", ""));
allLocales.add(new Locale("ar", "QA", ""));
Expand Down
46 changes: 18 additions & 28 deletions common/src/main/proto/pb.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,24 +410,10 @@ message PubKeyScript {
string hex = 5;
}

message TxInputVo {
message TxInput {
string tx_id = 1;
int32 tx_output_index = 2;
}

message TxInput {
TxInputVo tx_input_vo = 1;
TxOutput connected_tx_output = 2;
}

message TxOutputVo {
int32 index = 1;
int64 value = 2;
string tx_id = 3;
PubKeyScript pub_key_script = 4;
string address = 5;
bytes op_return_data = 6;
int32 block_height= 7;
TxOutput connected_tx_output = 3;
}

message SpentInfo {
Expand All @@ -449,11 +435,17 @@ enum TxOutputType {
}

message TxOutput {
TxOutputVo tx_output_vo = 1;
bool is_unspent = 2;
bool is_verified = 3;
TxOutputType tx_output_type = 4;
SpentInfo spent_info = 5;
int32 index = 1;
int64 value = 2;
string tx_id = 3;
PubKeyScript pub_key_script = 4;
string address = 5;
bytes op_return_data = 6;
int32 block_height= 7;
bool is_unspent = 8;
bool is_verified = 9;
TxOutputType tx_output_type = 10;
SpentInfo spent_info = 11;
}

message TxVo {
Expand Down Expand Up @@ -486,16 +478,12 @@ message Tx {
int64 burnt_fee = 4;
TxType tx_type = 5;
}

message BsqBlockVo {
message BsqBlock {
int32 height = 1;
string hash = 2;
string previous_block_hash = 3;
}

message BsqBlock {
BsqBlockVo bsq_block_vo = 1;
repeated Tx txs = 2;
repeated Tx txs = 4;
}

message TxIdIndexTuple {
Expand Down Expand Up @@ -551,6 +539,8 @@ message Filter {
string signature_as_base64 = 4;
bytes owner_pub_key_bytes = 5;
map<string, string> extra_data = 6;
repeated string banned_currencies = 7;
repeated string banned_payment_methods = 8;
}

message TradeStatistics {
Expand Down
Loading

0 comments on commit 0755cac

Please sign in to comment.