+ 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
blckchnd · Dec 27, 2022 · 8b5666a · 8b5666a
1 parent aff60a7
commit 8b5666a
Show file tree

Hide file tree

Showing 20 changed files with 329 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ env:
         - ORGANIZATION_REPO: blckchnd/rudex.org
         - WALLET_REPO: blckchnd/market.rudex.org
         - CXX=g++-4.8
-        - 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=
+        - secure: ZKXEycCWVgVztdhJhX66m4bGFg/cjp8EBqwFfsHnu5/J4Xa6LYXFXW7r+a+ALkRPizDUQwK4e5x3l26zfXDEn+rBqkDlTao4Grxo8aQWkhtDP5mcnwsUT3SKHt45zxl214eqfxK7UUL+14Hi8/Y8yj99i43YEX4no+EL7seTqGlm6TrfdIGtEb0PaF2yrlFjVXXHuXg5hmgstrbKLJDlX0p0U9PKBhnjrubeVC1ms5PzQY4j4dZV52satrzwBhxBqnLlJBniJhG3C/uM7pFx68iVkjSR4v5U8ZHR7s8IjIA5uK+uXQJKAbn82MPx01qwQ5yDJ8xKNkpq7zDVp3VWC3sXU3JBJ9v7c7pe6eonqiV9ejOGav0WlPgTj5K+9SkYYIBZQpyr6OUw3QJPxe8xrOC6TpRsBIsapwvbhFLK0yBZ73eHBPC4PthIoxJKai72p6srX2E6cdtP7/6sZK6m2rFyXySTyJ2kjCBA65Ptn/MGXSq2fxqCZ3sXqLrjGcwQZbdShiomIu7qHfFUhgGhgKMjUbsP3uhH2XfAaEeNfk48XmxYr8GC9hlcUJyPLIIMK6UIOfWGJZ8Mr2dsPWKWYxhVLb5DCcQwyuYJRqvxQ1S73Tp9cPwg1bBFrmHCq/YNuDDwreCNLFMZQWjdve8kMVF0gXlP/9Sa7FExOr9zrZU=
 addons:
     apt:
         sources:
@@ -35,7 +35,7 @@ deploy:
       name: "$TRAVIS_TAG"
       body: "Automated release from Travis CI with added files from AppVeyor build"
       api_key:
-          secure: WJXIYvyVn5VigQ6gsa8n+PjtDS/E+F9pQouzvJ8NAhUWVgDtEzLGm0jDRg9gsh/zmeB14eiyCrkNYH45FYiTMWDz+8ydzJXeBoWkpwduFWPb1sifRrEuPVUIJ2mDK5UBW4eobQHNda9taUxTBL/VdgZC9KLFuzhwzcFkdkLcBuLZYrmvgziEmJNkQ4/eHc6+n/Hug+dTDIenKcSbw8RH2AZNnGqQOCqEpl8LNMUhl6RczGXC8uu49EMPOON8Km+nlh4frkImbXuXMyudPl3iwTMiZE6xPex5IHS3vbaEbKfJTprNLFnyZyOZnhUCDNatNsRTlrQLMoQgEMYStb9huI/xVdJ6hKZgdVNjiu2ZCYUyxmy2WxBuGc0GBXrojJX4x4U7/+cXohk3DNBMLDcRPQAqWAtre/arIAJLJDi+hVFOmsi03KoWt5F7wduPQe8liaQtLDTa490tdIpJqyUgEKFSEciazkhjd9ggiob2lj+kCfWNe4kPzUogJ+MoenxctIk4aQE/FumnoyjkgOd3bEGMik3B41X6UpRDWqOtkvDRfPw9Pqd9EzjfRiaS7VsjO/ehYflOAdBvpy/PmvYIjdFl/Ij2h3tny74ze4ywVk2xLfN+CQtESHvwVAC1nvcyMvmUj5Wk7eBBnwJeYYGDUhPrB74HMzAFhBgPhq8MfTs=
+          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=
       file_glob: true
       file:
           - build/binaries/RuDEX*

diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js
@@ -52,6 +52,14 @@ export const settingsAPIs = {
             operator: "Witness: blckchnd",
             contact: "telegram:blckchnd"
         },
+        {
+            url: "wss://node.rudex.org",
+            region: "Western Europe",
+            country: "Germany",
+            location: "Falkenstein",
+            operator: "Witness: blckchnd",
+            contact: "telegram:blckchnd"
+        },
         {
             url: "wss://gph.lexai.host",
             region: "Northern Europe",

diff --git a/app/assets/asset-symbols/landlord.png b/app/assets/asset-symbols/landlord.png
diff --git a/app/assets/asset-symbols/symbols.js b/app/assets/asset-symbols/symbols.js
@@ -16,6 +16,7 @@ require("file-loader?name=asset-symbols/[name].png!./silver.png");
 // RuDEX assets
 require("file-loader?name=asset-symbols/[name].png!./donate.png");
 require("file-loader?name=asset-symbols/[name].png!./dexbot.png");
+require("file-loader?name=asset-symbols/[name].png!./landlord.png");
 
 require("file-loader?name=asset-symbols/[name].png!./rudex.btc.png");
 require("file-loader?name=asset-symbols/[name].png!./rudex.ltc.png");

diff --git a/app/assets/coins-logo/coins.js b/app/assets/coins-logo/coins.js
@@ -1,3 +1,4 @@
+/*
 require("file-loader?name=coins-logo/[name].png!./NoLogo.png");
 require("file-loader?name=coins-logo/[name].png!./xmr.png");
 require("file-loader?name=coins-logo/[name].png!./waves.png");
@@ -27,5 +28,7 @@ require("file-loader?name=coins-logo/[name].png!./bat.png");
 require("file-loader?name=coins-logo/[name].png!./bam.png");
 require("file-loader?name=coins-logo/[name].png!./dc.png");
 require("file-loader?name=coins-logo/[name].png!./bccx.png");
+require("file-loader?name=coins-logo/[name].png!./ton.png");
 
 require("file-loader?name=coins-logo/[name].png!./pzm.png");
+*/
diff --git a/app/assets/coins-logo/gram.png → app/assets/coins-logo/ton.png b/app/assets/coins-logo/gram.png → app/assets/coins-logo/ton.png
diff --git a/app/assets/images/dexbotfund.png b/app/assets/images/dexbotfund.png
diff --git a/app/assets/images/images.js b/app/assets/images/images.js
@@ -1,4 +1,5 @@
 require("file-loader?name=images/[name].png!./android.png");
+require("file-loader?name=images/[name].png!./dexbotfund.png");
 require("file-loader?name=images/[name].png!./coinmarketcap.png");
 require("file-loader?name=images/[name].png!./coinpaprika.png");
 require("file-loader?name=images/[name].png!./coinranking.png");

diff --git a/app/assets/index.hbs b/app/assets/index.hbs
@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width" />
     <meta name="format-detection" content="telephone=no">
     <title>{{title}}</title>
-    <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;">
+    <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;">
     <link rel="icon" type="image/x-icon" href="favicon.ico">
     <style>
         body {

diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
@@ -1271,7 +1271,7 @@
         "rudex": {
             "coming_soon": "Coming soon",
             "min_amount": "Minimum amount: %(minamount)s %(symbol)s",
-            "min_amount_warn": "Any deposits less than the minimum will not be credited.",
+            "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.",
             "min_amount_error": "Please enter number >= minimum",
             "support_block": "For support, please contact RuDEX at:",
             "under_construction": "Temporarily unavailable. On maintenance",

diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json
@@ -1290,7 +1290,7 @@
         "rudex": {
             "coming_soon": "Скоро",
             "min_amount": "Минимальная сумма: %(minamount)s %(symbol)s",
-            "min_amount_warn": "Любые депозиты, меньше минимального размера, не будут зачислены.",
+            "min_amount_warn": "Любые депозиты, меньше минимального размера, либо отправленные с помощью стороннего смартконтракта (так называемые Internal Txns) не будут зачислены.",
             "min_amount_error": "Пожалуйста, введите число ≥ минимума",
             "support_block": "Для получения поддержки, пожалуйста, свяжитесь с RuDEX по адресу:",
             "under_construction": "Временно недоступен. Технические работы",

diff --git a/app/branding.js b/app/branding.js
@@ -119,7 +119,7 @@ export function getMyMarketsBases() {
         "RUDEX.BTC",
         "RUDEX.USDT",
         "RUDEX.BTS",
-        "RUDEX.NBS",
+        //"RUDEX.NBS",
         "RUDEX.BUSD",
         "RUDEX.BTCB"
     ];
@@ -134,6 +134,7 @@ export function get_allTokens() {
         rudexTokens: [
             "DONATE",
             "DEXBOT",
+            "LANDLORD",
 
             "RUDEX.BTC",
             "RUDEX.LTC",
@@ -176,7 +177,8 @@ export function getImageName(symbol) {
     if (
         get_allTokens().nativeTokens.indexOf(symbol) !== -1 ||
         symbol == "DONATE" ||
-        symbol == "DEXBOT"
+        symbol == "DEXBOT" ||
+        symbol == "LANDLORD"
     )
         return symbol;
 
@@ -265,6 +267,7 @@ export function getFeaturedMarkets(quotes = []) {
 
         ["RUDEX.USDT", "DONATE"],
         ["RUDEX.USDT", "DEXBOT"],
+        ["RUDEX.USDT", "LANDLORD"],
         ["RUDEX.USDT", "RUDEX.NBS"],
         ["RUDEX.USDT", "RUDEX.BTC"],
         ["RUDEX.USDT", "RUDEX.LTC"],
@@ -340,13 +343,13 @@ export function getFeaturedMarkets(quotes = []) {
         //["RUDEX.BTS", "RUDEX.WLS"],
 
         //NewBitshares
-        ["RUDEX.NBS", "GPH"],
-        ["RUDEX.NBS", "RUDEX.USDT"],
-        ["RUDEX.NBS", "RUDEX.EOS"],
-        ["RUDEX.NBS", "RUDEX.BTS"],
-        ["RUDEX.NBS", "RUDEX.TRX"],
-        ["RUDEX.NBS", "RUDEX.LTC"],
-        ["RUDEX.NBS", "RUDEX.GOLOS"],
+        /*        ["RUDEX.NBS", "GPH"],
+                ["RUDEX.NBS", "RUDEX.USDT"],
+                ["RUDEX.NBS", "RUDEX.EOS"],
+                ["RUDEX.NBS", "RUDEX.BTS"],
+                ["RUDEX.NBS", "RUDEX.TRX"],
+                ["RUDEX.NBS", "RUDEX.LTC"],
+                ["RUDEX.NBS", "RUDEX.GOLOS"],*/
 
         //gpUSD
         ["USD", "GPH"],
@@ -451,6 +454,8 @@ export function getConfigurationAsset() {
  * @returns {[{[string]:[string]}]}
  */
 export function getListingCoins() {
+    return [];
+
     return [
         //soon: true, (for TON example)
         {
@@ -509,6 +514,14 @@ export function getListingCoins() {
             goal: 3000,
             votes: 0
         },
+        {
+            name: "Ton",
+            ticker: "TON",
+            page: "https://ton.org",
+            account: "rudex-ton",
+            goal: 3000,
+            votes: 0
+        },
         {
             name: "Telos",
             ticker: "TLOS",

diff --git a/app/components/DashboardRuDEX/MarketCard.jsx b/app/components/DashboardRuDEX/MarketCard.jsx
@@ -253,7 +253,8 @@ class MarketCard extends React.Component {
             if (
                 get_allTokens().nativeTokens.indexOf(symbol) !== -1 ||
                 symbol == "DONATE" ||
-                symbol == "DEXBOT"
+                symbol == "DEXBOT" ||
+                symbol == "LANDLORD"
             )
                 return symbol;
 

diff --git a/app/components/Exchange/ExchangeHeader.jsx b/app/components/Exchange/ExchangeHeader.jsx
@@ -68,7 +68,7 @@ export default class ExchangeHeader extends React.Component {
     }
 
     _checkPotencialScamMarket(quote, base) {
-        let coins = ["DONATE", "DEXBOT"];
+        let coins = ["DONATE", "DEXBOT", "LANDLORD"];
         let nativeTokens = get_allTokens().nativeTokens;
         coins = coins.concat(nativeTokens);
 

diff --git a/app/components/Layout/Footer.jsx b/app/components/Layout/Footer.jsx
@@ -607,8 +607,10 @@ class Footer extends React.Component {
                                         lineHeight: "2rem",
                                         fontSize: "1em"
                                     }}
-                                    href="https://play.google.com/store/apps/details?id=org.rudex.app"
-                                    title="GooglePlay"
+                                    /*href="https://play.google.com/store/apps/details?id=org.rudex.app"
+                                    title="GooglePlay"*/
+                                    href="https://files.rudex.org/mobile/RuDEXmobile-latest.apk"
+                                    title="Download"
                                     target="_blank"
                                     rel="noopener noreferrer"
                                 >
@@ -619,6 +621,27 @@ class Footer extends React.Component {
                                         src={`${__BASE_URL__}images/android.png`}
                                     />
                                 </a>
+
+                                <a
+                                    style={{
+                                        padding: "0 0.5rem",
+                                        borderLeft:
+                                            "1px solid rgba(128, 128, 128, 0.45)",
+                                        lineHeight: "2rem",
+                                        fontSize: "1em"
+                                    }}
+                                    href="https://dexbot-fund.rudex.org/"
+                                    title="DEXBOT Fund"
+                                    target="_blank"
+                                    rel="noopener noreferrer"
+                                >
+                                    <img
+                                        style={{
+                                            height: "24px"
+                                        }}
+                                        src={`${__BASE_URL__}images/dexbotfund.png`}
+                                    />
+                                </a>
                                 {/*<a
                                     style={{
                                         padding: "0 0.5rem",

diff --git a/app/components/Listing/CoinCardListing.jsx b/app/components/Listing/CoinCardListing.jsx
@@ -59,7 +59,8 @@ class CoinCardListing extends React.Component {
                             <img
                                 className="align-center"
                                 style={{maxWidth: 40}}
-                                src={`${__BASE_URL__}coins-logo/${coin.ticker.toLowerCase()}.png`}
+                                //src={`${__BASE_URL__}coins-logo/${coin.ticker.toLowerCase()}.png`}
+                                src={`https://files.rudex.org/config/listing/coins/${coin.ticker.toLowerCase()}.png`}
                                 alt=""
                             />
                         </div>

diff --git a/app/components/Listing/ListingPage.jsx b/app/components/Listing/ListingPage.jsx
@@ -70,7 +70,7 @@ class ListingPage extends React.Component {
     }
 
     componentDidMount() {
-        setInterval(() => this._getBalances(), 1000);
+        setInterval(() => this._getBalances(), 3000);
     }
 
     shouldComponentUpdate(nextProps, nextState) {
@@ -79,7 +79,26 @@ class ListingPage extends React.Component {
     }
 
     _getBalances() {
-        let coins = getListingCoins();
+        //let coins = getListingCoins();
+
+        let coins = [];
+
+        function httpGet(theUrl) {
+            var xmlHttp = new XMLHttpRequest();
+            xmlHttp.open("GET", theUrl, false); // false for synchronous request
+            xmlHttp.send(null);
+            return xmlHttp.responseText;
+        }
+
+        try {
+            coins = httpGet(
+                "https://files.rudex.org/config/listing/config-listing.json"
+            );
+            coins = JSON.parse(coins);
+            //console.log(JSON.stringify(coins));
+        } catch (e) {
+            coins = [];
+        }
 
         if (this.state.coins.length !== 0) coins = this.state.coins;
 
@@ -220,6 +239,7 @@ class ListingPage extends React.Component {
             return b.votes - a.votes;
         });
         return sortedCoins.map((coin, i) => {
+            if (coin.active != "yes") return;
             coin.votes_for_percent =
                 coin.votes < coin.goal ? coin.votes : coin.goal;
             coin.status = coin.votes < coin.goal ? "collecting" : "done";