Merge pull request #10 from bitshares/develop

merge

.github/workflows/npm-build-and-deploy-develop.yml

@@ -0,0 +1,35 @@
+# This workflow will do a clean install of node dependencies, build the source code and push the binaries to the deployment repository.
+name: Continuous Delivery and Deployment
+
+on:
+    push:
+        branches: [develop]
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        strategy:
+            matrix:
+                node-version: [10.x]
+
+        steps:
+            - uses: actions/checkout@v2
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v1
+              with:
+                  node-version: ${{ matrix.node-version }}
+            - run: npm ci
+            - run: npm run build
+            - name: Create CNAME file
+              uses: finnp/create-file-action@master
+              env:
+                  FILE_NAME: build/dist/CNAME
+                  FILE_DATA: develop.bitshares.org
+            - name: Deploy
+              uses: s0/git-publish-subdir-action@master
+              env:
+                  REPO: git@github.com:bitshares/develop.bitshares.org.git
+                  BRANCH: master
+                  FOLDER: build/dist
+                  SSH_PRIVATE_KEY: ${{ secrets.AUTOMATION_UI_DEPLOYMENT_KEY }}

.gitignore

@@ -20,4 +20,9 @@ app/stats-dev.json
 app/stats-prod.json
 app/test/MarketClasses.js
 yarn.lock
-charting_library/charting_library.zip
+
+charting_library/*
+!charting_library/scss
+!charting_library/charting_library.17.025.02b61a1c.zip.md5
+!charting_library/package-charting-library.js
+!charting_library/install-charting-library.js

app/actions/MarketsActions.js

@@ -723,14 +723,22 @@ class MarketsActions {
         });
     }
 
-    cancelLimitOrders(accountID, orderIDs) {
-        let fee_asset_id = accountUtils.getFinalFeeAsset(
-            accountID,
-            "limit_order_cancel"
-        );
-
-        var tr = WalletApi.new_transaction();
-        orderIDs.forEach(id => {
+    cancelLimitOrders(accountID, orderIDs, fallbackFeeAssets = "1.3.0") {
+        if (__DEV__) {
+            console.log("cancelLimitOrders", accountID, orderIDs);
+        }
+        let tr = WalletApi.new_transaction();
+        for (let i = 0; i < orderIDs.length; i++) {
+            let id = orderIDs[i];
+            let fallbackFeeAsset =
+                typeof fallbackFeeAssets === "string"
+                    ? fallbackFeeAssets
+                    : fallbackFeeAssets[i];
+            let fee_asset_id = accountUtils.getFinalFeeAsset(
+                accountID,
+                "limit_order_cancel",
+                fallbackFeeAsset
+            );
             tr.add_type_operation("limit_order_cancel", {
                 fee: {
                     amount: 0,
@@ -739,8 +747,7 @@ class MarketsActions {
                 fee_paying_account: accountID,
                 order: id
             });
-        });
-
+        }
         return WalletDb.process_transaction(tr, null, true).catch(error => {
             console.log("cancel error:", error);
         });

app/actions/TransactionConfirmActions.js

@@ -50,7 +50,9 @@ class TransactionConfirmActions {
                     // try to break down the error in human readable pieces
                     let splitError = error.message.split("\n");
                     let data, code;
-                    if (splitError.length > 1) {
+                    if (splitError.length == 1) {
+                        message = splitError[0];
+                    } else if (splitError.length > 1) {
                         try {
                             jsonError = JSON.parse(splitError[1]);
                             data = jsonError.data;

app/api/ApplicationApi.js

@@ -803,15 +803,7 @@ const ApplicationApi = {
                     amount: amount,
                     asset_id: objects.asset.get("id")
                 },
-                // fixme should be given
-                policy: [
-                    0,
-                    {
-                        begin_timestamp: parseInt(new Date().getTime() / 1000),
-                        vesting_cliff_seconds: 100,
-                        vesting_duration_seconds: 100
-                    }
-                ]
+                policy: policy
             }
         );
 

app/api/accountApi.js

@@ -5,7 +5,7 @@ class Api {
         // direct query, circumventing subscription system of ChainStore
         return Apis.instance()
             .db_api()
-            .exec("lookup_accounts", [startChar, limit]);
+            .exec("lookup_accounts", [startChar, limit], false);
     }
     lookupAccountByPublicKey(pubKey) {
         // direct query, circumventing subscription system of ChainStore

app/api/apiConfig.js

@@ -155,14 +155,6 @@ export const settingsAPIs = {
             operator: "Witness: btspp-witness",
             contact: "telegram:btsplusplus"
         },
-        {
-            url: "wss://blockzms.xyz/ws",
-            region: "Northern America",
-            country: "U.S.A.",
-            location: "New Jersey",
-            operator: "Witness: delegate-zhaomu",
-            contact: "telegram:lzmlam;wechat:lzmlam"
-        },
         {
             url: "wss://api.bts.mobi/ws",
             region: "Northern America",
@@ -186,14 +178,6 @@ export const settingsAPIs = {
             operator: "Witness: bhuz",
             contact: "telegram:bhuzor"
         },
-        {
-            url: "wss://kimziv.com/ws",
-            region: "Northern America",
-            country: "U.S.A.",
-            location: "New Jersey",
-            operator: "Witness: witness.yao",
-            contact: "telegram:imyao"
-        },
         {
             url: "wss://api.btsgo.net/ws",
             region: "Southeastern Asia",
@@ -248,15 +232,15 @@ export const settingsAPIs = {
             country: "China",
             location: "Shandong",
             operator: "Witness: liuye",
-            contact: "email:work@domyself.me"
+            contact: "email:work@akawa.ink"
         },
         {
-            url: "wss://btsfullnode.bangzi.info/ws",
-            region: "Western Europe",
-            country: "Germany",
-            location: "Munich",
-            operator: "Witness: Bangzi",
-            contact: "telegram:Bangzi"
+            url: "wss://api-us.61bts.com",
+            region: "Northern America",
+            country: "USA",
+            location: "St. Louis",
+            operator: "Witness: liuye",
+            contact: "email:work@akawa.ink"
         },
         {
             url: "wss://api.dex.trading/",
@@ -348,12 +332,12 @@ export const settingsAPIs = {
             contact: "wechat:xiaoyuan_409"
         },
         {
-            url: "wss://fujian.cnvote.vip:81/",
-            region: "Eastern Asia",
+            url: "wss://hongkong.bitshares.im/ws",
+            region: "East Asia",
             country: "China",
-            location: "Fujian",
-            operator: "ptschina",
-            contact: "wechat:planetlife"
+            location: "Hong Kong",
+            operator: "Witness: clone",
+            contact: "telegram: yexiao"
         },
         {
             url: "wss://singapore.bitshares.im/ws",
@@ -370,7 +354,15 @@ export const settingsAPIs = {
             location: "New York",
             operator: "Witness: clone",
             contact: "telegram: yexiao"
-        },        
+        },
+        {
+            url: "wss://api.iamredbar.com/ws",
+            region: "Northern America",
+            country: "U.S.A.",
+            location: "Minnesota",
+            operator: "Witness: iamredbar",
+            contact: "telegram: iamredbar"
+        },
         // Testnet
         {
             url: "wss://node.testnet.bitshares.eu",
@@ -403,10 +395,32 @@ export const settingsAPIs = {
             location: "Tokyo",
             operator: "Witness: clone",
             contact: "telegram: yexiao"
+        },
+        {
+            url: "wss://api-testnet.61bts.com/ws",
+            region: "Eastern Asia",
+            country: "China",
+            location: "Shandong",
+            operator: "Witness: liuye",
+            contact: "email:work@akawa.ink"
+        },
+        {
+            url: "wss://api-us-testnet.61bts.com/ws",
+            region: "Northern America",
+            country: "USA",
+            location: "St. Louis",
+            operator: "Witness: liuye",
+            contact: "email:work@akawa.ink"
         }
-
     ],
     ES_WRAPPER_LIST: [
+        {
+            url: "https://api.bitshares.ws/openexplorer",
+            region: "Western Europe",
+            country: "Germany",
+            operator: "blocksights.info",
+            contact: "bitshares:blocksights"
+        }
     ],
     DEFAULT_FAUCET: getFaucet().url,
     TESTNET_FAUCET: getTestFaucet().url

app/assets/asset-symbols/symbols.js

@@ -82,7 +82,11 @@ require("file-loader?name=asset-symbols/[name].png!./cof.png");
 require("file-loader?name=asset-symbols/[name].png!./exr.png");
 require("file-loader?name=asset-symbols/[name].png!./lcrt.png");
 require("file-loader?name=asset-symbols/[name].png!./nvc.png");
-require("file-loader?name=asset-symbols/[name].png!./nmc.png");
+require("file-loader?name=asset-symbols/[name].png!./atri.png");
+require("file-loader?name=asset-symbols/[name].png!./bat.png");
+require("file-loader?name=asset-symbols/[name].png!./fil.png");
+require("file-loader?name=asset-symbols/[name].png!./usdc.png");
+require("file-loader?name=asset-symbols/[name].png!./usdn.png");
 
 // 3rd party assets (RuDEX)
 require("file-loader?name=asset-symbols/[name].png!./ppy.png");

app/assets/locales/locale-de.json

@@ -1580,6 +1580,15 @@
             "amount": "Betrag zum Tauschen",
             "submit": "Ok"
         },
+        "create_lock": {
+            "amount": "Amount to lock",
+            "from": "Account to lock from",
+            "submit": "Lock",
+            "targetType": "Lock Type",
+            "title": "Create Lock",
+            "type_warning": "Please choose a lock type.",
+            "warning_message": "Note that locked assets must be requested to unlock, and can only be claimed back after the unlock period has passed. Current unlock period would be %(lock_days)s days"
+        },
         "deposit": {
             "address_generation_error": "Adresse konnte nicht genieriert werden.",
             "amount": "Einzahlungsbetrag",
@@ -1774,6 +1783,19 @@
         "publish_feed": "{account} hat eine Preisangabe von {price} veröffentlicht.",
         "reg_account": "{registrar} hat das Konto {newaccount} registriert.",
         "set_proxy": "{account} hat {proxy} als seinen Vertreter eingestellt.",
+        "ticket_create": "{account} locked away {amount} in a ticket",
+        "ticket_types": {
+            "0": "Liquid",
+            "1": "Claimable 180 days after unlock request",
+            "2": "Claimable 360 days after unlock request",
+            "3": "Claimable 720 days after unlock request",
+            "4": "Locked forever",
+            "liquid": "Liquid",
+            "lock_180_days": "Claimable 180 days after unlock request",
+            "lock_360_days": "Claimable 360 days after unlock request",
+            "lock_720_days": "Claimable 720 days after unlock request",
+            "lock_forever": "Locked forever"
+        },
         "transfer": "{from} hat {amount} an {to} überwiesen.",
         "transfer_account": "Konto {account} wurde an {to} übertragen.",
         "unlisted_by": "{lister} hat {listee} von der Liste gestrichen.",
@@ -2559,6 +2581,7 @@
             "proposal_create": "Vorschlag erstellen",
             "proposal_delete": "Vorschlag löschen",
             "proposal_update": "Vorschlag aktualisieren",
+            "ticket_create": "Create ticket",
             "transfer": "Überweisung",
             "transfer_from_blind": "Überweisung von blindem Konto",
             "transfer_to_blind": "Überweisung zu blinden Konten",
@@ -2696,7 +2719,10 @@
         }
     },
     "voting": {
+        "create_ticket": "Lock 1 {asset}",
         "description": "The BitShares blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).",
+        "increase_voting_power": "Create Lock",
+        "ticket_explanation": "Obtain voting power by locking away the core token BTS.",
         "title": "Voting"
     },
     "walkthrough": {