qr testing mode, fixed qr pure address and EIP681 issues

status-im · Apr 6, 2020 · 95b779a · 95b779a
1 parent e7a213f
commit 95b779a
Show file tree

Hide file tree

Showing 20 changed files with 288 additions and 310 deletions.
diff --git a/.env b/.env
@@ -23,3 +23,4 @@ MOBILE_UI_FOR_DESKTOP=1
 STATUS_GO_PROTOCOL=0
 STATUS_GO_ENABLE_NIMBUS=0
 KEYCARD_TEST_MENU=0
+QR_READ_TEST_MENU=1
diff --git a/.env.e2e b/.env.e2e
@@ -23,3 +23,4 @@ BLANK_PREVIEW=0
 TOOLTIP_EVENTS=1
 COMMANDS_ENABLED=1
 KEYCARD_TEST_MENU=1
+QR_READ_TEST_MENU=1
diff --git a/src/status_im/ethereum/eip681.cljs b/src/status_im/ethereum/eip681.cljs
@@ -51,26 +51,28 @@
    Invalid URI will be parsed as `nil`."
   [s]
   (when (string? s)
-    (let [[_ authority-path query] (re-find uri-pattern s)]
-      (when authority-path
-        (let [[_ raw-address chain-id function-name] (re-find authority-path-pattern authority-path)]
-          (when (or (ethereum/address? raw-address)
-                    (if (string/starts-with? raw-address "pay-")
-                      (let [pay-address (string/replace-first raw-address "pay-" "")]
-                        (or (ens/is-valid-eth-name? pay-address)
-                            (ethereum/address? pay-address)))))
-            (let [address (if (string/starts-with? raw-address "pay-")
-                            (string/replace-first raw-address "pay-" "")
-                            raw-address)]
-              (when-let [arguments (parse-arguments function-name query)]
-                (let [contract-address (get-in arguments [:function-arguments :address])]
-                  (if-not (or (not contract-address) (or (ens/is-valid-eth-name? contract-address) (ethereum/address? contract-address)))
-                    nil
-                    (merge {:address address
-                            :chain-id (if chain-id
-                                        (js/parseInt chain-id)
-                                        (ethereum/chain-keyword->chain-id :mainnet))}
-                           arguments)))))))))))
+    (if (ethereum/address? s)
+      {:address s}
+      (let [[_ authority-path query] (re-find uri-pattern s)]
+        (when authority-path
+          (let [[_ raw-address chain-id function-name] (re-find authority-path-pattern authority-path)]
+            (when (or (ethereum/address? raw-address)
+                      (if (string/starts-with? raw-address "pay-")
+                        (let [pay-address (string/replace-first raw-address "pay-" "")]
+                          (or (ens/is-valid-eth-name? pay-address)
+                              (ethereum/address? pay-address)))))
+              (let [address (if (string/starts-with? raw-address "pay-")
+                              (string/replace-first raw-address "pay-" "")
+                              raw-address)]
+                (when-let [arguments (parse-arguments function-name query)]
+                  (let [contract-address (get-in arguments [:function-arguments :address])]
+                    (if-not (or (not contract-address) (or (ens/is-valid-eth-name? contract-address) (ethereum/address? contract-address)))
+                      nil
+                      (merge {:address address
+                              :chain-id (if chain-id
+                                          (js/parseInt chain-id)
+                                          (ethereum/chain-keyword->chain-id :mainnet))}
+                             arguments))))))))))))
 
 (defn parse-eth-value [s]
   "Takes a map as returned by `parse-uri` and returns value as BigNumber"
@@ -79,7 +81,7 @@
           n (money/bignumber (string/replace s "ETH" ""))]
       (if eth? (.times n 1e18) n))))
 
-(defn extract-request-details [{:keys [value address chain-id function-name function-arguments]} all-tokens]
+(defn extract-request-details [{:keys [value address function-name function-arguments]} all-tokens]
   "Return a map encapsulating request details (with keys `value`, `address` and `symbol`) from a parsed URI.
    Supports ethereum and erc20 token."
   (when address
@@ -90,7 +92,7 @@
        :address address}
       "transfer"
       {:value   (money/bignumber (:uint256 function-arguments))
-       :symbol  (:symbol (tokens/address->token all-tokens (ethereum/chain-id->chain-keyword chain-id) address))
+       :symbol  (:symbol (tokens/address->token all-tokens address))
        :address (:address function-arguments)}
       nil)))
 
@@ -118,8 +120,8 @@
 
 (defn generate-erc20-uri
   "Generate a EIP 681 URI encapsulating ERC20 token transfer"
-  [address {:keys [symbol value chain-id] :as m} all-tokens]
-  (when-let [token (tokens/symbol->token all-tokens (if chain-id (ethereum/chain-id->chain-keyword chain-id) :mainnet) symbol)]
+  [address {:keys [symbol value] :as m} all-tokens]
+  (when-let [token (tokens/symbol->token all-tokens symbol)]
     (generate-uri (:address token)
                   (merge (dissoc m :value :symbol)
                          {:function-name      "transfer"

diff --git a/src/status_im/ethereum/macros.clj b/src/status_im/ethereum/macros.clj
@@ -27,7 +27,10 @@
   "In react-native arguments to require must be static strings.
    Resolve all icons at compilation time so no variable is used."
   [network tokens]
-  (mapv #(assoc-in % [:icon :source] (token->icon network %)) tokens))
+  (mapv #(-> %
+             (assoc-in [:icon :source] (token->icon network %))
+             (update :address string/lower-case))
+        tokens))
 
 (defn network->icon [network]
   (let [s     (str "./resources/images/tokens/" (name network) "/0-native.png")

diff --git a/src/status_im/ethereum/subscriptions.cljs b/src/status_im/ethereum/subscriptions.cljs
@@ -1,10 +1,5 @@
 (ns status-im.ethereum.subscriptions
-  (:require [re-frame.core :as re-frame]
-            [status-im.constants :as constants]
-            [status-im.ethereum.eip55 :as eip55]
-            [status-im.ethereum.core :as ethereum]
-            [status-im.ethereum.json-rpc :as json-rpc]
-            [status-im.ethereum.tokens :as tokens]
+  (:require [status-im.ethereum.eip55 :as eip55]
             [status-im.wallet.db :as wallet]
             [status-im.ethereum.transactions.core :as transactions]
             [status-im.utils.fx :as fx]
@@ -26,28 +21,24 @@
 
 (fx/defn new-block
   [{:keys [db] :as cofx} historical? block-number accounts transactions-per-account]
-  (let [{:keys [:wallet/all-tokens]} db
-        chain (ethereum/chain-keyword db)
-        chain-tokens (into {} (map (juxt :address identity)
-                                   (tokens/tokens-for all-tokens chain)))]
-    (log/debug "[wallet-subs] new-block"
-               "accounts" accounts
-               "block" block-number
-               "transactions-per-account" transactions-per-account)
-    (fx/merge cofx
-              (cond-> {}
-                (not historical?)
-                (assoc :db (assoc db :ethereum/current-block block-number))
+  (log/debug "[wallet-subs] new-block"
+             "accounts" accounts
+             "block" block-number
+             "transactions-per-account" transactions-per-account)
+  (fx/merge cofx
+            (cond-> {}
+              (not historical?)
+              (assoc :db (assoc db :ethereum/current-block block-number))
 
-                ;;NOTE only get transfers if the new block contains some
-                ;;     from/to one of the multiaccount accounts
-                (not-empty accounts)
-                (assoc :transactions/get-transfers
-                       {:chain-tokens chain-tokens
-                        :addresses    accounts
-                        :before-block block-number
-                        :historical?  historical?}))
-              (transactions/check-watched-transactions))))
+              ;;NOTE only get transfers if the new block contains some
+              ;;     from/to one of the multiaccount accounts
+              (not-empty accounts)
+              (assoc :transactions/get-transfers
+                     {:chain-tokens (:wallet/all-tokens db)
+                      :addresses    accounts
+                      :before-block block-number
+                      :historical?  historical?}))
+            (transactions/check-watched-transactions)))
 
 (fx/defn reorg
   [{:keys [db] :as cofx} {:keys [blockNumber accounts]}]
@@ -68,28 +59,24 @@
   (log/debug "[wallet-subs] recent-history-fetching-ended"
              "accounts" accounts
              "block" blockNumber)
-  (let [{:keys [:wallet/all-tokens]} db
-        chain (ethereum/chain-keyword db)
-        chain-tokens (into {} (map (juxt :address identity)
-                                   (tokens/tokens-for all-tokens chain)))]
-    {:db (-> db
-             (update-in [:wallet :accounts]
-                        wallet/remove-transactions-since-block blockNumber)
-             (transactions/update-fetching-status accounts :recent? false))
-     :transactions/get-transfers
-     {:chain-tokens chain-tokens
-      :addresses    (reduce
-                     (fn [v address]
-                       (let [normalized-address
-                             (eip55/address->checksum address)]
-                         (if (contains? v normalized-address)
-                           v
-                           (conj v address))))
-                     []
-                     accounts)
-      :before-block blockNumber
-      :limit        20
-      :historical?  true}}))
+  {:db (-> db
+           (update-in [:wallet :accounts]
+                      wallet/remove-transactions-since-block blockNumber)
+           (transactions/update-fetching-status accounts :recent? false))
+   :transactions/get-transfers
+   {:chain-tokens (:wallet/all-tokens db)
+    :addresses    (reduce
+                   (fn [v address]
+                     (let [normalized-address
+                           (eip55/address->checksum address)]
+                       (if (contains? v normalized-address)
+                         v
+                         (conj v address))))
+                   []
+                   accounts)
+    :before-block blockNumber
+    :limit        20
+    :historical?  true}})
 
 (fx/defn new-wallet-event
   [cofx {:keys [type blockNumber accounts newTransactions] :as event}]

diff --git a/src/status_im/ethereum/tokens.cljs b/src/status_im/ethereum/tokens.cljs
@@ -543,35 +543,24 @@
 
    :custom []})
 
-;; TODO all these should be improved, we don't need to recalculate this each time, it can be done only once
-(defn tokens-for
-  "makes sure all addresses are lower-case
-   TODO: token list should be speced and not accept non-lower-cased addresses"
-  [all-tokens chain]
-  (mapv #(update % :address string/lower-case) (vals (get all-tokens chain))))
+(defn nfts-for [all-tokens]
+  (filter :nft? (vals all-tokens)))
 
-(defn nfts-for [all-tokens chain]
-  (filter :nft? (tokens-for all-tokens chain)))
-
-(defn token-for [chain all-tokens token]
-  (some #(when (= token (name (:symbol %))) %) (tokens-for all-tokens chain)))
-
-(defn sorted-tokens-for [all-tokens chain]
-  (->> (tokens-for all-tokens chain)
+(defn sorted-tokens-for [all-tokens]
+  (->> (vals all-tokens)
        (filter #(not (:hidden? %)))
        (sort #(compare (string/lower-case (:name %1))
                        (string/lower-case (:name %2))))))
 
-(defn symbol->token [all-tokens chain symbol]
-  (some #(when (= symbol (:symbol %)) %) (tokens-for all-tokens chain)))
+(defn symbol->token [all-tokens symbol]
+  (some #(when (= symbol (:symbol %)) %) (vals all-tokens)))
 
-(defn address->token [all-tokens chain address]
-  (some #(when (= (string/lower-case address)
-                  (string/lower-case (:address %))) %) (tokens-for all-tokens chain)))
+(defn address->token [all-tokens address]
+  (get all-tokens (string/lower-case address)))
 
 (defn asset-for [all-tokens chain symbol]
   (let [native-coin (native-currency chain)]
     (if (or (= (:symbol-display native-coin) symbol)
             (= (:symbol native-coin) symbol))
       native-coin
-      (symbol->token all-tokens chain symbol))))
+      (symbol->token all-tokens symbol))))
diff --git a/src/status_im/ethereum/transactions/core.cljs b/src/status_im/ethereum/transactions/core.cljs
@@ -275,20 +275,13 @@
 (fx/defn fetch-more-tx
   {:events [:transactions/fetch-more]}
   [{:keys [db] :as cofx} address]
-  (let [all-tokens   (:wallet/all-tokens db)
-        chain        (ethereum/chain-keyword db)
-        chain-tokens (into
-                      {}
-                      (map (juxt :address identity)
-                           (tokens/tokens-for
-                            all-tokens chain)))
-        min-known-block (or (get-min-known-block db address)
+  (let [min-known-block (or (get-min-known-block db address)
                             (:ethereum/current-block db))
         min-block-transfers-count (or (min-block-transfers-count db address) 0)]
     (fx/merge
      cofx
      {:transactions/get-transfers
-      {:chain-tokens          chain-tokens
+      {:chain-tokens          (:wallet/all-tokens db)
        :addresses             [address]
        :before-block          min-known-block
        :historical?           true

diff --git a/src/status_im/signing/core.cljs b/src/status_im/signing/core.cljs
@@ -102,8 +102,7 @@
 
 (fx/defn prepare-unconfirmed-transaction
   [{:keys [db now]} hash {:keys [value gasPrice gas data to from]} symbol amount]
-  (let [all-tokens (:wallet/all-tokens db)
-        token      (tokens/symbol->token all-tokens (ethereum/chain-keyword db) symbol)]
+  (let [token (tokens/symbol->token (:wallet/all-tokens db) symbol)]
     {:db (assoc-in db [:wallet :accounts from :transactions hash]
                    {:timestamp (str now)
                     :to        to
@@ -129,7 +128,7 @@
     :approve-and-call))
 
 (defn get-transfer-token [db to data]
-  (let [{:keys [symbol decimals] :as token} (tokens/address->token (:wallet/all-tokens db) (ethereum/chain-keyword db) to)]
+  (let [{:keys [symbol decimals] :as token} (tokens/address->token (:wallet/all-tokens db) to)]
     (when (and token data (string? data))
       (when-let [type (get-method-type data)]
         (let [[address value _] (abi-spec/decode

diff --git a/src/status_im/subs.cljs b/src/status_im/subs.cljs
@@ -1108,18 +1108,21 @@
                             0))
                  acc)) 0 balance))
 
+(re-frame/reg-sub
+ :wallet/token->decimals
+ :<- [:wallet/all-tokens]
+ (fn [all-tokens]
+   (into {} (map #(vector (:symbol %) (:decimals %)) (vals all-tokens)))))
+
 (re-frame/reg-sub
  :portfolio-value
  :<- [:balances]
  :<- [:prices]
  :<- [:wallet/currency]
- :<- [:ethereum/chain-keyword]
- :<- [:wallet/all-tokens]
- (fn [[balances prices currency chain all-tokens]]
+ :<- [:wallet/token->decimals]
+ (fn [[balances prices currency token->decimals]]
    (if (and balances prices)
-     (let [assets              (tokens/tokens-for all-tokens chain)
-           token->decimals     (into {} (map #(vector (:symbol %) (:decimals %)) assets))
-           currency-key        (-> currency :code keyword)
+     (let [currency-key        (-> currency :code keyword)
            balance-total-value (apply + (map #(get-balance-total-value % prices currency-key token->decimals) balances))]
        (if (pos? balance-total-value)
          (-> balance-total-value
@@ -1135,13 +1138,10 @@
    [(re-frame/subscribe [:balance address])
     (re-frame/subscribe [:prices])
     (re-frame/subscribe [:wallet/currency])
-    (re-frame/subscribe [:ethereum/chain-keyword])
-    (re-frame/subscribe [:wallet/all-tokens])])
- (fn [[balance prices currency chain all-tokens]]
+    (re-frame/subscribe [:wallet/token->decimals])])
+ (fn [[balance prices currency token->decimals]]
    (if (and balance prices)
-     (let [assets              (tokens/tokens-for all-tokens chain)
-           token->decimals     (into {} (map #(vector (:symbol %) (:decimals %)) assets))
-           currency-key        (-> currency :code keyword)
+     (let [currency-key        (-> currency :code keyword)
            balance-total-value (get-balance-total-value balance prices currency-key token->decimals)]
        (if (pos? balance-total-value)
          (-> balance-total-value
@@ -1152,22 +1152,14 @@
      "...")))
 
 (re-frame/reg-sub
- :wallet/chain-tokens
+ :wallet/sorted-tokens
  :<- [:wallet/all-tokens]
- :<- [:ethereum/chain-keyword]
- (fn [[all-tokens chain]]
-   (get all-tokens chain)))
-
-(re-frame/reg-sub
- :wallet/sorted-chain-tokens
- :<- [:wallet/all-tokens]
- :<- [:ethereum/chain-keyword]
- (fn [[all-tokens chain]]
-   (tokens/sorted-tokens-for all-tokens chain)))
+ (fn [all-tokens]
+   (tokens/sorted-tokens-for all-tokens)))
 
 (re-frame/reg-sub
  :wallet/grouped-chain-tokens
- :<- [:wallet/sorted-chain-tokens]
+ :<- [:wallet/sorted-tokens]
  :<- [:wallet/visible-tokens-symbols]
  (fn [[all-tokens visible-tokens]]
    (let [vt-set (set visible-tokens)]
@@ -1218,10 +1210,9 @@
  :wallet/visible-assets
  :<- [:ethereum/chain-keyword]
  :<- [:wallet/visible-tokens-symbols]
- :<- [:wallet/all-tokens]
- (fn [[chain visible-tokens-symbols all-tokens]]
-   (conj (filter #(contains? visible-tokens-symbols (:symbol %))
-                 (tokens/sorted-tokens-for all-tokens chain))
+ :<- [:wallet/sorted-tokens]
+ (fn [[chain visible-tokens-symbols all-tokens-sorted]]
+   (conj (filter #(contains? visible-tokens-symbols (:symbol %)) all-tokens-sorted)
          (tokens/native-currency chain))))
 
 (re-frame/reg-sub

diff --git a/src/status_im/ui/screens/chat/message/command.cljs b/src/status_im/ui/screens/chat/message/command.cljs
@@ -146,7 +146,7 @@
   [contract value]
   (let [{:keys [symbol icon decimals color] :as token}
         (if (seq contract)
-          (get @(re-frame/subscribe [:wallet/chain-tokens])
+          (get @(re-frame/subscribe [:wallet/all-tokens])
                contract
                transactions/default-erc20-token)
           @(re-frame/subscribe [:ethereum/native-currency]))