Skip to content

Commit 8b5666a

Browse files
author
serdrdoor
committed
+ add link to Footer for DEXBOT Fund
+ add API wss://node.rudex.org + change RuDEX Mobile link + delete NBS base markets + add LANDLORD token and market to USDT + new Travis token + new AppVeyor token + Listing config remote + or sent using a third-party smart contract (so-called Internal Txns) will not be credited
1 parent aff60a7 commit 8b5666a

20 files changed

+329
-23
lines changed

‎.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
- ORGANIZATION_REPO: blckchnd/rudex.org
1313
- WALLET_REPO: blckchnd/market.rudex.org
1414
- CXX=g++-4.8
15-
- secure: QEIqqSio+7rPwcPI9jXpykKRVNEt12dzUKo50CVIGwJpF9BkGtTADc51dseFft1ZYPI+zsGd0E9PmQlCGjDj9Dz3fY8J8D4YWtN8T9HJtVH86nCJNWfAI7kNmuF2eam4UqRIg+1Wnm2BWdvzMt1Fkt5wvaQ+xNF7eKvTYACcXlJgVkK+BEyEL5xPlecxEJ536F8I1UziTXNwY5bciwwxLDuqrhnkQkBAs5SGtiyjWJ1WHwcCx8kDCRh2LP/OlegLmfx3Xag/4tGt+2eyVnvNoFYT+/P7CRN9GO9o0ZgBwYVy39K4qdrR+XWP7Dt6hkB5CqDpOno/kdGDwcZRw8KHIq5BI7qQvAWN7Q4LigRsjAAu1OAwY9xKH/3CeSWILr/pT/m6BpuiuFvunjxIARmQXk2ThEA6oPKj7YZgKOdag18o7/Kn+2eLOeR14UVHqt7aBH8wVAFULWRFzyWF2S6+l7+UGWsCyvG+swSymh3OlQXNEGTKZ42n5YgW9q+EymVUDHZmPsUJunMrbBWaai6VEUnnMJu3KbXLJ/F0AaTJe7R0J9U1wiON3T6a9NYE6eKSr0xIE2DGsFIm5vrpXop5JqavD2uFm9Dpysa/AU41ma8dauavV65x6dN7ZLeymidUdjnGjFPZzLqLuUC6BwYXxC2YTF8jADyKYcEZB/eQIHo=
15+
- secure: ZKXEycCWVgVztdhJhX66m4bGFg/cjp8EBqwFfsHnu5/J4Xa6LYXFXW7r+a+ALkRPizDUQwK4e5x3l26zfXDEn+rBqkDlTao4Grxo8aQWkhtDP5mcnwsUT3SKHt45zxl214eqfxK7UUL+14Hi8/Y8yj99i43YEX4no+EL7seTqGlm6TrfdIGtEb0PaF2yrlFjVXXHuXg5hmgstrbKLJDlX0p0U9PKBhnjrubeVC1ms5PzQY4j4dZV52satrzwBhxBqnLlJBniJhG3C/uM7pFx68iVkjSR4v5U8ZHR7s8IjIA5uK+uXQJKAbn82MPx01qwQ5yDJ8xKNkpq7zDVp3VWC3sXU3JBJ9v7c7pe6eonqiV9ejOGav0WlPgTj5K+9SkYYIBZQpyr6OUw3QJPxe8xrOC6TpRsBIsapwvbhFLK0yBZ73eHBPC4PthIoxJKai72p6srX2E6cdtP7/6sZK6m2rFyXySTyJ2kjCBA65Ptn/MGXSq2fxqCZ3sXqLrjGcwQZbdShiomIu7qHfFUhgGhgKMjUbsP3uhH2XfAaEeNfk48XmxYr8GC9hlcUJyPLIIMK6UIOfWGJZ8Mr2dsPWKWYxhVLb5DCcQwyuYJRqvxQ1S73Tp9cPwg1bBFrmHCq/YNuDDwreCNLFMZQWjdve8kMVF0gXlP/9Sa7FExOr9zrZU=
1616
addons:
1717
apt:
1818
sources:
@@ -35,7 +35,7 @@ deploy:
3535
name: "$TRAVIS_TAG"
3636
body: "Automated release from Travis CI with added files from AppVeyor build"
3737
api_key:
38-
secure: WJXIYvyVn5VigQ6gsa8n+PjtDS/E+F9pQouzvJ8NAhUWVgDtEzLGm0jDRg9gsh/zmeB14eiyCrkNYH45FYiTMWDz+8ydzJXeBoWkpwduFWPb1sifRrEuPVUIJ2mDK5UBW4eobQHNda9taUxTBL/VdgZC9KLFuzhwzcFkdkLcBuLZYrmvgziEmJNkQ4/eHc6+n/Hug+dTDIenKcSbw8RH2AZNnGqQOCqEpl8LNMUhl6RczGXC8uu49EMPOON8Km+nlh4frkImbXuXMyudPl3iwTMiZE6xPex5IHS3vbaEbKfJTprNLFnyZyOZnhUCDNatNsRTlrQLMoQgEMYStb9huI/xVdJ6hKZgdVNjiu2ZCYUyxmy2WxBuGc0GBXrojJX4x4U7/+cXohk3DNBMLDcRPQAqWAtre/arIAJLJDi+hVFOmsi03KoWt5F7wduPQe8liaQtLDTa490tdIpJqyUgEKFSEciazkhjd9ggiob2lj+kCfWNe4kPzUogJ+MoenxctIk4aQE/FumnoyjkgOd3bEGMik3B41X6UpRDWqOtkvDRfPw9Pqd9EzjfRiaS7VsjO/ehYflOAdBvpy/PmvYIjdFl/Ij2h3tny74ze4ywVk2xLfN+CQtESHvwVAC1nvcyMvmUj5Wk7eBBnwJeYYGDUhPrB74HMzAFhBgPhq8MfTs=
38+
secure: Uy58PmD81D5vPSQCVncHpac04Af/jGmq0Lx8vDbw86QSCvItxAYkUXgDOdlTfLcxomaJjn/XgldIKX26nfLqAgBe+EIOzf6qFb/HoTDR3duTGJZ7Vsn4BSkuoupVfGa/N6qtcM6tbxfbRIEI5tGDVRYA3RRzCRSx+r4W5x70CHMP8h+WWH+pewDcm8G8dAmD3jeB+kY94/FwWLynhlHyxQOvdnbdjGglWEazaGm4vFVR1SCreJQokO3X3dBLRf58/Zp+nWeSfeTmx8VI+dQ3z1Qs/ivyg/O81+EOVX3JDbvIYha1A/b910JeL8gjF6mmE9sLNlVnBYmb27b593TqyApXifdw0NcxoNao0YTcs8VKMXIBFOo5wqlcHHtOZU87+uX+EY/sln84tFsT1LPonGJ8vFeJWOkobOjTt86/NDgBTEK4QqeMPs06olbK8tZ6ysYiNsj+UXXrI27rbFv57UbokRSpaj+bdJbYnlw9WaFH/UTrzaanhIzP7ScXkJpdJfRQYgTb7LbxO9cgRnvwlTkTinUclak2p2oNYSZOI1hzZoCTCYqfwaE+KqGCjZK3oRCHtD/ZAglDVFFqfqKzL1akbRlWFBxwHmWkoSLYlrSLjD+pudxiNXzM6UTRWdqQ9Alf7xdUpTllPzEyaN7GVafNTuFNdcJiONRb2gnM8kc=
3939
file_glob: true
4040
file:
4141
- build/binaries/RuDEX*

‎app/api/apiConfig.js

+8
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ export const settingsAPIs = {
5252
operator: "Witness: blckchnd",
5353
contact: "telegram:blckchnd"
5454
},
55+
{
56+
url: "wss://node.rudex.org",
57+
region: "Western Europe",
58+
country: "Germany",
59+
location: "Falkenstein",
60+
operator: "Witness: blckchnd",
61+
contact: "telegram:blckchnd"
62+
},
5563
{
5664
url: "wss://gph.lexai.host",
5765
region: "Northern Europe",

‎app/assets/asset-symbols/landlord.png

8.45 KB
Loading

‎app/assets/asset-symbols/symbols.js

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ require("file-loader?name=asset-symbols/[name].png!./silver.png");
1616
// RuDEX assets
1717
require("file-loader?name=asset-symbols/[name].png!./donate.png");
1818
require("file-loader?name=asset-symbols/[name].png!./dexbot.png");
19+
require("file-loader?name=asset-symbols/[name].png!./landlord.png");
1920

2021
require("file-loader?name=asset-symbols/[name].png!./rudex.btc.png");
2122
require("file-loader?name=asset-symbols/[name].png!./rudex.ltc.png");

‎app/assets/coins-logo/coins.js

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*
12
require("file-loader?name=coins-logo/[name].png!./NoLogo.png");
23
require("file-loader?name=coins-logo/[name].png!./xmr.png");
34
require("file-loader?name=coins-logo/[name].png!./waves.png");
@@ -27,5 +28,7 @@ require("file-loader?name=coins-logo/[name].png!./bat.png");
2728
require("file-loader?name=coins-logo/[name].png!./bam.png");
2829
require("file-loader?name=coins-logo/[name].png!./dc.png");
2930
require("file-loader?name=coins-logo/[name].png!./bccx.png");
31+
require("file-loader?name=coins-logo/[name].png!./ton.png");
3032
3133
require("file-loader?name=coins-logo/[name].png!./pzm.png");
34+
*/

‎app/assets/coins-logo/gram.png renamed to ‎app/assets/coins-logo/ton.png

File renamed without changes.

‎app/assets/images/dexbotfund.png

10.4 KB
Loading

‎app/assets/images/images.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
require("file-loader?name=images/[name].png!./android.png");
2+
require("file-loader?name=images/[name].png!./dexbotfund.png");
23
require("file-loader?name=images/[name].png!./coinmarketcap.png");
34
require("file-loader?name=images/[name].png!./coinpaprika.png");
45
require("file-loader?name=images/[name].png!./coinranking.png");

‎app/assets/index.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<meta name="viewport" content="width=device-width" />
1010
<meta name="format-detection" content="telephone=no">
1111
<title>{{title}}</title>
12-
<meta http-equiv="Content-Security-Policy" content="default-src 'self' blob:; worker-src 'self' blob:; script-src https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/ 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; connect-src 'self' *; font-src 'self' data: https://at.alicdn.com; img-src 'self' data:; frame-src 'self' https://chat.rudex.org;">
12+
<meta http-equiv="Content-Security-Policy" content="default-src 'self' blob:; worker-src 'self' blob:; script-src https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/ 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; connect-src 'self' *; font-src 'self' data: https://at.alicdn.com; img-src 'self' https://files.rudex.org data:; frame-src 'self' https://chat.rudex.org;">
1313
<link rel="icon" type="image/x-icon" href="favicon.ico">
1414
<style>
1515
body {

‎app/assets/locales/locale-en.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1271,7 +1271,7 @@
12711271
"rudex": {
12721272
"coming_soon": "Coming soon",
12731273
"min_amount": "Minimum amount: %(minamount)s %(symbol)s",
1274-
"min_amount_warn": "Any deposits less than the minimum will not be credited.",
1274+
"min_amount_warn": "Any deposits less than the minimum amount, or sent using a third-party smart contract (so-called Internal Txns) will not be credited.",
12751275
"min_amount_error": "Please enter number >= minimum",
12761276
"support_block": "For support, please contact RuDEX at:",
12771277
"under_construction": "Temporarily unavailable. On maintenance",

‎app/assets/locales/locale-ru.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,7 @@
12901290
"rudex": {
12911291
"coming_soon": "Скоро",
12921292
"min_amount": "Минимальная сумма: %(minamount)s %(symbol)s",
1293-
"min_amount_warn": "Любые депозиты, меньше минимального размера, не будут зачислены.",
1293+
"min_amount_warn": "Любые депозиты, меньше минимального размера, либо отправленные с помощью стороннего смартконтракта (так называемые Internal Txns) не будут зачислены.",
12941294
"min_amount_error": "Пожалуйста, введите число ≥ минимума",
12951295
"support_block": "Для получения поддержки, пожалуйста, свяжитесь с RuDEX по адресу:",
12961296
"under_construction": "Временно недоступен. Технические работы",

‎app/branding.js

+22-9
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export function getMyMarketsBases() {
119119
"RUDEX.BTC",
120120
"RUDEX.USDT",
121121
"RUDEX.BTS",
122-
"RUDEX.NBS",
122+
//"RUDEX.NBS",
123123
"RUDEX.BUSD",
124124
"RUDEX.BTCB"
125125
];
@@ -134,6 +134,7 @@ export function get_allTokens() {
134134
rudexTokens: [
135135
"DONATE",
136136
"DEXBOT",
137+
"LANDLORD",
137138

138139
"RUDEX.BTC",
139140
"RUDEX.LTC",
@@ -176,7 +177,8 @@ export function getImageName(symbol) {
176177
if (
177178
get_allTokens().nativeTokens.indexOf(symbol) !== -1 ||
178179
symbol == "DONATE" ||
179-
symbol == "DEXBOT"
180+
symbol == "DEXBOT" ||
181+
symbol == "LANDLORD"
180182
)
181183
return symbol;
182184

@@ -265,6 +267,7 @@ export function getFeaturedMarkets(quotes = []) {
265267

266268
["RUDEX.USDT", "DONATE"],
267269
["RUDEX.USDT", "DEXBOT"],
270+
["RUDEX.USDT", "LANDLORD"],
268271
["RUDEX.USDT", "RUDEX.NBS"],
269272
["RUDEX.USDT", "RUDEX.BTC"],
270273
["RUDEX.USDT", "RUDEX.LTC"],
@@ -340,13 +343,13 @@ export function getFeaturedMarkets(quotes = []) {
340343
//["RUDEX.BTS", "RUDEX.WLS"],
341344

342345
//NewBitshares
343-
["RUDEX.NBS", "GPH"],
344-
["RUDEX.NBS", "RUDEX.USDT"],
345-
["RUDEX.NBS", "RUDEX.EOS"],
346-
["RUDEX.NBS", "RUDEX.BTS"],
347-
["RUDEX.NBS", "RUDEX.TRX"],
348-
["RUDEX.NBS", "RUDEX.LTC"],
349-
["RUDEX.NBS", "RUDEX.GOLOS"],
346+
/* ["RUDEX.NBS", "GPH"],
347+
["RUDEX.NBS", "RUDEX.USDT"],
348+
["RUDEX.NBS", "RUDEX.EOS"],
349+
["RUDEX.NBS", "RUDEX.BTS"],
350+
["RUDEX.NBS", "RUDEX.TRX"],
351+
["RUDEX.NBS", "RUDEX.LTC"],
352+
["RUDEX.NBS", "RUDEX.GOLOS"],*/
350353

351354
//gpUSD
352355
["USD", "GPH"],
@@ -451,6 +454,8 @@ export function getConfigurationAsset() {
451454
* @returns {[{[string]:[string]}]}
452455
*/
453456
export function getListingCoins() {
457+
return [];
458+
454459
return [
455460
//soon: true, (for TON example)
456461
{
@@ -509,6 +514,14 @@ export function getListingCoins() {
509514
goal: 3000,
510515
votes: 0
511516
},
517+
{
518+
name: "Ton",
519+
ticker: "TON",
520+
page: "https://ton.org",
521+
account: "rudex-ton",
522+
goal: 3000,
523+
votes: 0
524+
},
512525
{
513526
name: "Telos",
514527
ticker: "TLOS",

‎app/components/DashboardRuDEX/MarketCard.jsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,8 @@ class MarketCard extends React.Component {
253253
if (
254254
get_allTokens().nativeTokens.indexOf(symbol) !== -1 ||
255255
symbol == "DONATE" ||
256-
symbol == "DEXBOT"
256+
symbol == "DEXBOT" ||
257+
symbol == "LANDLORD"
257258
)
258259
return symbol;
259260

‎app/components/Exchange/ExchangeHeader.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export default class ExchangeHeader extends React.Component {
6868
}
6969

7070
_checkPotencialScamMarket(quote, base) {
71-
let coins = ["DONATE", "DEXBOT"];
71+
let coins = ["DONATE", "DEXBOT", "LANDLORD"];
7272
let nativeTokens = get_allTokens().nativeTokens;
7373
coins = coins.concat(nativeTokens);
7474

‎app/components/Layout/Footer.jsx

+25-2
Original file line numberDiff line numberDiff line change
@@ -607,8 +607,10 @@ class Footer extends React.Component {
607607
lineHeight: "2rem",
608608
fontSize: "1em"
609609
}}
610-
href="https://play.google.com/store/apps/details?id=org.rudex.app"
611-
title="GooglePlay"
610+
/*href="https://play.google.com/store/apps/details?id=org.rudex.app"
611+
title="GooglePlay"*/
612+
href="https://files.rudex.org/mobile/RuDEXmobile-latest.apk"
613+
title="Download"
612614
target="_blank"
613615
rel="noopener noreferrer"
614616
>
@@ -619,6 +621,27 @@ class Footer extends React.Component {
619621
src={`${__BASE_URL__}images/android.png`}
620622
/>
621623
</a>
624+
625+
<a
626+
style={{
627+
padding: "0 0.5rem",
628+
borderLeft:
629+
"1px solid rgba(128, 128, 128, 0.45)",
630+
lineHeight: "2rem",
631+
fontSize: "1em"
632+
}}
633+
href="https://dexbot-fund.rudex.org/"
634+
title="DEXBOT Fund"
635+
target="_blank"
636+
rel="noopener noreferrer"
637+
>
638+
<img
639+
style={{
640+
height: "24px"
641+
}}
642+
src={`${__BASE_URL__}images/dexbotfund.png`}
643+
/>
644+
</a>
622645
{/*<a
623646
style={{
624647
padding: "0 0.5rem",

‎app/components/Listing/CoinCardListing.jsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ class CoinCardListing extends React.Component {
5959
<img
6060
className="align-center"
6161
style={{maxWidth: 40}}
62-
src={`${__BASE_URL__}coins-logo/${coin.ticker.toLowerCase()}.png`}
62+
//src={`${__BASE_URL__}coins-logo/${coin.ticker.toLowerCase()}.png`}
63+
src={`https://files.rudex.org/config/listing/coins/${coin.ticker.toLowerCase()}.png`}
6364
alt=""
6465
/>
6566
</div>

‎app/components/Listing/ListingPage.jsx

+22-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class ListingPage extends React.Component {
7070
}
7171

7272
componentDidMount() {
73-
setInterval(() => this._getBalances(), 1000);
73+
setInterval(() => this._getBalances(), 3000);
7474
}
7575

7676
shouldComponentUpdate(nextProps, nextState) {
@@ -79,7 +79,26 @@ class ListingPage extends React.Component {
7979
}
8080

8181
_getBalances() {
82-
let coins = getListingCoins();
82+
//let coins = getListingCoins();
83+
84+
let coins = [];
85+
86+
function httpGet(theUrl) {
87+
var xmlHttp = new XMLHttpRequest();
88+
xmlHttp.open("GET", theUrl, false); // false for synchronous request
89+
xmlHttp.send(null);
90+
return xmlHttp.responseText;
91+
}
92+
93+
try {
94+
coins = httpGet(
95+
"https://files.rudex.org/config/listing/config-listing.json"
96+
);
97+
coins = JSON.parse(coins);
98+
//console.log(JSON.stringify(coins));
99+
} catch (e) {
100+
coins = [];
101+
}
83102

84103
if (this.state.coins.length !== 0) coins = this.state.coins;
85104

@@ -220,6 +239,7 @@ class ListingPage extends React.Component {
220239
return b.votes - a.votes;
221240
});
222241
return sortedCoins.map((coin, i) => {
242+
if (coin.active != "yes") return;
223243
coin.votes_for_percent =
224244
coin.votes < coin.goal ? coin.votes : coin.goal;
225245
coin.status = coin.votes < coin.goal ? "collecting" : "done";

0 commit comments

Comments
 (0)