status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-02-19 14:24:40 +00:00
Code Issues Projects Releases Wiki Activity

qr testing mode, fixed qr pure address and EIP681 issues

Browse Source 
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
Andrey Shovkoplyas 2020-04-03 15:29:41 +02:00
parent e813d1e4e4
commit 45dae49fc0
No known key found for this signature in database
GPG Key ID: EAAB7C8622D860A4
20 changed files with 303 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env
View File

@ -23,3 +23,4 @@ MOBILE_UI_FOR_DESKTOP=1
STATUS_GO_PROTOCOL=0 STATUS_GO_PROTOCOL=0
STATUS_GO_ENABLE_NIMBUS=0 STATUS_GO_ENABLE_NIMBUS=0
KEYCARD_TEST_MENU=0 KEYCARD_TEST_MENU=0
QR_READ_TEST_MENU=1

1
.env.e2e
View File

@ -23,3 +23,4 @@ BLANK_PREVIEW=0
TOOLTIP_EVENTS=1 TOOLTIP_EVENTS=1
COMMANDS_ENABLED=1 COMMANDS_ENABLED=1
KEYCARD_TEST_MENU=1 KEYCARD_TEST_MENU=1
QR_READ_TEST_MENU=1

71
src/status_im/ethereum/eip681.cljs
View File

@ -25,7 +25,7 @@
(def key-value-format (str "([^" parameter-separator key-value-separator "]+)")) (def key-value-format (str "([^" parameter-separator key-value-separator "]+)"))
(def query-pattern (re-pattern (str key-value-format key-value-separator key-value-format))) (def query-pattern (re-pattern (str key-value-format key-value-separator key-value-format)))
(def valid-native-arguments #{:value :gas :gasPrice}) (def valid-native-arguments #{:value :gas :gasPrice :gasLimit})
(defn- parse-query [s] (defn- parse-query [s]
(into {} (for [[_ k v] (re-seq query-pattern (or s ""))] (into {} (for [[_ k v] (re-seq query-pattern (or s ""))]
@ -51,26 +51,28 @@
Invalid URI will be parsed as `nil`." Invalid URI will be parsed as `nil`."
[s] [s]
(when (string? s) (when (string? s)
(let [[_ authority-path query] (re-find uri-pattern s)] (if (ethereum/address? s)
(when authority-path {:address s}
(let [[_ raw-address chain-id function-name] (re-find authority-path-pattern authority-path)] (let [[_ authority-path query] (re-find uri-pattern s)]
(when (or (ethereum/address? raw-address) (when authority-path
(if (string/starts-with? raw-address "pay-") (let [[_ raw-address chain-id function-name] (re-find authority-path-pattern authority-path)]
(let [pay-address (string/replace-first raw-address "pay-" "")] (when (or (ethereum/address? raw-address)
(or (ens/is-valid-eth-name? pay-address) (if (string/starts-with? raw-address "pay-")
(ethereum/address? pay-address))))) (let [pay-address (string/replace-first raw-address "pay-" "")]
(let [address (if (string/starts-with? raw-address "pay-") (or (ens/is-valid-eth-name? pay-address)
(string/replace-first raw-address "pay-" "") (ethereum/address? pay-address)))))
raw-address)] (let [address (if (string/starts-with? raw-address "pay-")
(when-let [arguments (parse-arguments function-name query)] (string/replace-first raw-address "pay-" "")
(let [contract-address (get-in arguments [:function-arguments :address])] raw-address)]
(if-not (or (not contract-address) (or (ens/is-valid-eth-name? contract-address) (ethereum/address? contract-address))) (when-let [arguments (parse-arguments function-name query)]
nil (let [contract-address (get-in arguments [:function-arguments :address])]
(merge {:address address (if-not (or (not contract-address) (or (ens/is-valid-eth-name? contract-address) (ethereum/address? contract-address)))
:chain-id (if chain-id nil
(js/parseInt chain-id) (merge {:address address
(ethereum/chain-keyword->chain-id :mainnet))} :chain-id (if chain-id
arguments))))))))))) (js/parseInt chain-id)
(ethereum/chain-keyword->chain-id :mainnet))}
arguments))))))))))))
(defn parse-eth-value [s] (defn parse-eth-value [s]
"Takes a map as returned by `parse-uri` and returns value as BigNumber" "Takes a map as returned by `parse-uri` and returns value as BigNumber"
@ -79,20 +81,21 @@
n (money/bignumber (string/replace s "ETH" ""))] n (money/bignumber (string/replace s "ETH" ""))]
(if eth? (.times n 1e18) n)))) (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] :as details} all-tokens]
"Return a map encapsulating request details (with keys `value`, `address` and `symbol`) from a parsed URI. "Return a map encapsulating request details (with keys `value`, `address` and `symbol`) from a parsed URI.
Supports ethereum and erc20 token." Supports ethereum and erc20 token."
(when address (when address
(case function-name (merge details
nil (case function-name
{:value (parse-eth-value value) nil
:symbol :ETH {:value (parse-eth-value value)
:address address} :symbol :ETH
"transfer" :address address}
{:value (money/bignumber (:uint256 function-arguments)) "transfer"
:symbol (:symbol (tokens/address->token all-tokens (ethereum/chain-id->chain-keyword chain-id) address)) {:value (money/bignumber (:uint256 function-arguments))
:address (:address function-arguments)} :symbol (:symbol (tokens/address->token all-tokens address))
nil))) :address (:address function-arguments)}
nil))))
(defn- generate-query-string [m] (defn- generate-query-string [m]
(string/join parameter-separator (string/join parameter-separator
@ -118,8 +121,8 @@
(defn generate-erc20-uri (defn generate-erc20-uri
"Generate a EIP 681 URI encapsulating ERC20 token transfer" "Generate a EIP 681 URI encapsulating ERC20 token transfer"
[address {:keys [symbol value chain-id] :as m} all-tokens] [address {:keys [symbol value] :as m} all-tokens]
(when-let [token (tokens/symbol->token all-tokens (if chain-id (ethereum/chain-id->chain-keyword chain-id) :mainnet) symbol)] (when-let [token (tokens/symbol->token all-tokens symbol)]
(generate-uri (:address token) (generate-uri (:address token)
(merge (dissoc m :value :symbol) (merge (dissoc m :value :symbol)
{:function-name "transfer" {:function-name "transfer"

5
src/status_im/ethereum/macros.clj
View File

@ -27,7 +27,10 @@
"In react-native arguments to require must be static strings. "In react-native arguments to require must be static strings.
Resolve all icons at compilation time so no variable is used." Resolve all icons at compilation time so no variable is used."
[network tokens] [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] (defn network->icon [network]
(let [s (str "./resources/images/tokens/" (name network) "/0-native.png") (let [s (str "./resources/images/tokens/" (name network) "/0-native.png")

85
src/status_im/ethereum/subscriptions.cljs
View File

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

29
src/status_im/ethereum/tokens.cljs
View File

@ -543,35 +543,24 @@
:custom []}) :custom []})
;; TODO all these should be improved, we don't need to recalculate this each time, it can be done only once (defn nfts-for [all-tokens]
(defn tokens-for (filter :nft? (vals all-tokens)))
"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 chain] (defn sorted-tokens-for [all-tokens]
(filter :nft? (tokens-for all-tokens chain))) (->> (vals all-tokens)
(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)
(filter #(not (:hidden? %))) (filter #(not (:hidden? %)))
(sort #(compare (string/lower-case (:name %1)) (sort #(compare (string/lower-case (:name %1))
(string/lower-case (:name %2)))))) (string/lower-case (:name %2))))))
(defn symbol->token [all-tokens chain symbol] (defn symbol->token [all-tokens symbol]
(some #(when (= symbol (:symbol %)) %) (tokens-for all-tokens chain))) (some #(when (= symbol (:symbol %)) %) (vals all-tokens)))
(defn address->token [all-tokens chain address] (defn address->token [all-tokens address]
(some #(when (= (string/lower-case address) (get all-tokens (string/lower-case address)))
(string/lower-case (:address %))) %) (tokens-for all-tokens chain)))
(defn asset-for [all-tokens chain symbol] (defn asset-for [all-tokens chain symbol]
(let [native-coin (native-currency chain)] (let [native-coin (native-currency chain)]
(if (or (= (:symbol-display native-coin) symbol) (if (or (= (:symbol-display native-coin) symbol)
(= (:symbol native-coin) symbol)) (= (:symbol native-coin) symbol))
native-coin native-coin
(symbol->token all-tokens chain symbol)))) (symbol->token all-tokens symbol))))

11
src/status_im/ethereum/transactions/core.cljs
View File

@ -275,20 +275,13 @@
(fx/defn fetch-more-tx (fx/defn fetch-more-tx
{:events [:transactions/fetch-more]} {:events [:transactions/fetch-more]}
[{:keys [db] :as cofx} address] [{:keys [db] :as cofx} address]
(let [all-tokens (:wallet/all-tokens db) (let [min-known-block (or (get-min-known-block db address)
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)
(:ethereum/current-block db)) (:ethereum/current-block db))
min-block-transfers-count (or (min-block-transfers-count db address) 0)] min-block-transfers-count (or (min-block-transfers-count db address) 0)]
(fx/merge (fx/merge
cofx cofx
{:transactions/get-transfers {:transactions/get-transfers
{:chain-tokens chain-tokens {:chain-tokens (:wallet/all-tokens db)
:addresses [address] :addresses [address]
:before-block min-known-block :before-block min-known-block
:historical? true :historical? true

5
src/status_im/signing/core.cljs
View File

@ -106,8 +106,7 @@
(fx/defn prepare-unconfirmed-transaction (fx/defn prepare-unconfirmed-transaction
[{:keys [db now]} hash {:keys [value gasPrice gas data to from]} symbol amount] [{:keys [db now]} hash {:keys [value gasPrice gas data to from]} symbol amount]
(let [all-tokens (:wallet/all-tokens db) (let [token (tokens/symbol->token (:wallet/all-tokens db) symbol)]
token (tokens/symbol->token all-tokens (ethereum/chain-keyword db) symbol)]
{:db (assoc-in db [:wallet :accounts from :transactions hash] {:db (assoc-in db [:wallet :accounts from :transactions hash]
{:timestamp (str now) {:timestamp (str now)
:to to :to to
@ -133,7 +132,7 @@
:approve-and-call)) :approve-and-call))
(defn get-transfer-token [db to data] (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 (and token data (string? data))
(when-let [type (get-method-type data)] (when-let [type (get-method-type data)]
(let [[address value _] (abi-spec/decode (let [[address value _] (abi-spec/decode

47
src/status_im/subs.cljs
View File

@ -1118,18 +1118,21 @@
0)) 0))
acc)) 0 balance)) 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 (re-frame/reg-sub
:portfolio-value :portfolio-value
:<- [:balances] :<- [:balances]
:<- [:prices] :<- [:prices]
:<- [:wallet/currency] :<- [:wallet/currency]
:<- [:ethereum/chain-keyword] :<- [:wallet/token->decimals]
:<- [:wallet/all-tokens] (fn [[balances prices currency token->decimals]]
(fn [[balances prices currency chain all-tokens]]
(if (and balances prices) (if (and balances prices)
(let [assets (tokens/tokens-for all-tokens chain) (let [currency-key (-> currency :code keyword)
token->decimals (into {} (map #(vector (:symbol %) (:decimals %)) assets))
currency-key (-> currency :code keyword)
balance-total-value (apply + (map #(get-balance-total-value % prices currency-key token->decimals) balances))] balance-total-value (apply + (map #(get-balance-total-value % prices currency-key token->decimals) balances))]
(if (pos? balance-total-value) (if (pos? balance-total-value)
(-> balance-total-value (-> balance-total-value
@ -1145,13 +1148,10 @@
[(re-frame/subscribe [:balance address]) [(re-frame/subscribe [:balance address])
(re-frame/subscribe [:prices]) (re-frame/subscribe [:prices])
(re-frame/subscribe [:wallet/currency]) (re-frame/subscribe [:wallet/currency])
(re-frame/subscribe [:ethereum/chain-keyword]) (re-frame/subscribe [:wallet/token->decimals])])
(re-frame/subscribe [:wallet/all-tokens])]) (fn [[balance prices currency token->decimals]]
(fn [[balance prices currency chain all-tokens]]
(if (and balance prices) (if (and balance prices)
(let [assets (tokens/tokens-for all-tokens chain) (let [currency-key (-> currency :code keyword)
token->decimals (into {} (map #(vector (:symbol %) (:decimals %)) assets))
currency-key (-> currency :code keyword)
balance-total-value (get-balance-total-value balance prices currency-key token->decimals)] balance-total-value (get-balance-total-value balance prices currency-key token->decimals)]
(if (pos? balance-total-value) (if (pos? balance-total-value)
(-> balance-total-value (-> balance-total-value
@ -1162,22 +1162,14 @@
"..."))) "...")))
(re-frame/reg-sub (re-frame/reg-sub
:wallet/chain-tokens :wallet/sorted-tokens
:<- [:wallet/all-tokens] :<- [:wallet/all-tokens]
:<- [:ethereum/chain-keyword] (fn [all-tokens]
(fn [[all-tokens chain]] (tokens/sorted-tokens-for all-tokens)))
(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)))
(re-frame/reg-sub (re-frame/reg-sub
:wallet/grouped-chain-tokens :wallet/grouped-chain-tokens
:<- [:wallet/sorted-chain-tokens] :<- [:wallet/sorted-tokens]
:<- [:wallet/visible-tokens-symbols] :<- [:wallet/visible-tokens-symbols]
(fn [[all-tokens visible-tokens]] (fn [[all-tokens visible-tokens]]
(let [vt-set (set visible-tokens)] (let [vt-set (set visible-tokens)]
@ -1228,10 +1220,9 @@
:wallet/visible-assets :wallet/visible-assets
:<- [:ethereum/chain-keyword] :<- [:ethereum/chain-keyword]
:<- [:wallet/visible-tokens-symbols] :<- [:wallet/visible-tokens-symbols]
:<- [:wallet/all-tokens] :<- [:wallet/sorted-tokens]
(fn [[chain visible-tokens-symbols all-tokens]] (fn [[chain visible-tokens-symbols all-tokens-sorted]]
(conj (filter #(contains? visible-tokens-symbols (:symbol %)) (conj (filter #(contains? visible-tokens-symbols (:symbol %)) all-tokens-sorted)
(tokens/sorted-tokens-for all-tokens chain))
(tokens/native-currency chain)))) (tokens/native-currency chain))))
(re-frame/reg-sub (re-frame/reg-sub

2
src/status_im/ui/screens/chat/message/command.cljs
View File

@ -146,7 +146,7 @@
[contract value] [contract value]
(let [{:keys [symbol icon decimals color] :as token} (let [{:keys [symbol icon decimals color] :as token}
(if (seq contract) (if (seq contract)
(get @(re-frame/subscribe [:wallet/chain-tokens]) (get @(re-frame/subscribe [:wallet/all-tokens])
contract contract
transactions/default-erc20-token) transactions/default-erc20-token)
@(re-frame/subscribe [:ethereum/native-currency])) @(re-frame/subscribe [:ethereum/native-currency]))

49
src/status_im/ui/screens/qr_scanner/views.cljs
View File

@ -6,7 +6,9 @@
[status-im.ui.components.react :as react] [status-im.ui.components.react :as react]
[status-im.ui.components.toolbar.view :as topbar] [status-im.ui.components.toolbar.view :as topbar]
[status-im.ui.screens.qr-scanner.styles :as styles] [status-im.ui.screens.qr-scanner.styles :as styles]
[status-im.ui.components.colors :as colors])) [status-im.ui.components.colors :as colors]
[status-im.utils.config :as config]
[status-im.ui.components.button :as button]))
(defn- topbar [camera-flashlight {:keys [title] :as opts}] (defn- topbar [camera-flashlight {:keys [title] :as opts}]
[topbar/toolbar [topbar/toolbar
@ -23,6 +25,25 @@
:icon-opts {:color colors/white} :icon-opts {:color colors/white}
:handler #(re-frame/dispatch [:wallet/toggle-flashlight])}]]]) :handler #(re-frame/dispatch [:wallet/toggle-flashlight])}]]])
(defn qr-test-view [opts]
(let [text-value (atom "")]
[react/safe-area-view {:style {:flex 1
:background-color colors/black-persist}}
[topbar nil opts]
[react/view {:flex 1
:align-items :center
:justify-content :center}
[react/text-input {:multiline true
:style {:color colors/white-persist}
:on-change-text #(reset! text-value %)}]
[react/view {:flex-direction :row}
[button/button
{:label "Cancel"
:on-press #(re-frame/dispatch [:qr-scanner.callback/scan-qr-code-cancel opts])}]
[button/button
{:label "OK"
:on-press #(re-frame/dispatch [:qr-scanner.callback/scan-qr-code-success opts @text-value])}]]]]))
(defn corner [border1 border2 corner] (defn corner [border1 border2 corner]
[react/view (assoc {:border-color colors/white-persist :width 60 :height 60} border1 5 border2 5 corner 32)]) [react/view (assoc {:border-color colors/white-persist :width 60 :height 60} border1 5 border2 5 corner 32)])
@ -44,15 +65,17 @@
{:keys [height width]} [:dimensions/window] {:keys [height width]} [:dimensions/window]
camera-flashlight [:wallet.send/camera-flashlight] camera-flashlight [:wallet.send/camera-flashlight]
opts [:get-screen-params]] opts [:get-screen-params]]
[react/safe-area-view {:style {:flex 1 (if config/qr-test-menu-enabled?
:background-color colors/black-persist}} [qr-test-view opts]
[topbar camera-flashlight opts] [react/safe-area-view {:style {:flex 1
[react/with-activity-indicator :background-color colors/black-persist}}
{} [topbar camera-flashlight opts]
[camera/camera [react/with-activity-indicator
{:style {:flex 1} {}
:captureAudio false [camera/camera
:onBarCodeRead #(when-not @read-once? {:style {:flex 1}
(reset! read-once? true) :captureAudio false
(on-barcode-read opts %))}]] :onBarCodeRead #(when-not @read-once?
[viewfinder (int (* 2 (/ (min height width) 3)))]])) (reset! read-once? true)
(on-barcode-read opts %))}]]
[viewfinder (int (* 2 (/ (min height width) 3)))]])))

3
src/status_im/ui/screens/wallet/send/sheets.cljs
View File

@ -37,7 +37,8 @@
(defn- request-camera-permissions [] (defn- request-camera-permissions []
(let [options {:handler :wallet.send/qr-scanner-result (let [options {:handler :wallet.send/qr-scanner-result
:cancel-handler :wallet.send/qr-scanner-cancel}] :cancel-handler :wallet.send/qr-scanner-cancel
:modal-opened? true}]
(re-frame/dispatch (re-frame/dispatch
[:request-permissions [:request-permissions
{:permissions [:camera] {:permissions [:camera]

1
src/status_im/utils/config.cljs
View File

@ -40,6 +40,7 @@
(def waku-enabled? (enabled? (get-config :WAKU_ENABLED "0"))) (def waku-enabled? (enabled? (get-config :WAKU_ENABLED "0")))
(def commands-enabled? (enabled? (get-config :COMMANDS_ENABLED "0"))) (def commands-enabled? (enabled? (get-config :COMMANDS_ENABLED "0")))
(def keycard-test-menu-enabled? (enabled? (get-config :KEYCARD_TEST_MENU "0"))) (def keycard-test-menu-enabled? (enabled? (get-config :KEYCARD_TEST_MENU "0")))
(def qr-test-menu-enabled? (enabled? (get-config :QR_READ_TEST_MENU "0")))
;; CONFIG VALUES ;; CONFIG VALUES
(def log-level (def log-level

4
src/status_im/utils/universal_links/core.cljs
View File

@ -102,8 +102,8 @@
(fx/defn handle-eip681 [cofx url] (fx/defn handle-eip681 [cofx url]
(fx/merge cofx (fx/merge cofx
(choose-recipient/resolve-ens-addresses url) (choose-recipient/parse-eip681-uri-and-resolve-ens url)
(navigation/navigate-to-cofx :wallet nil))) (navigation/navigate-to-cofx :wallet nil)))
(defn handle-not-found [full-url] (defn handle-not-found [full-url]
(log/info "universal-links: no handler for " full-url)) (log/info "universal-links: no handler for " full-url))

3
src/status_im/wallet/accounts/core.cljs
View File

@ -271,8 +271,7 @@
(fx/defn view-only-qr-scanner-result (fx/defn view-only-qr-scanner-result
{:events [:wallet.add-new/qr-scanner-result]} {:events [:wallet.add-new/qr-scanner-result]}
[{db :db :as cofx} data _] [{db :db :as cofx} data _]
(let [address (or (when (ethereum/address? data) data) (let [address (:address (eip681/parse-uri data))]
(:address (eip681/parse-uri data)))]
(fx/merge cofx (fx/merge cofx
(merge {:db (-> db (merge {:db (-> db
(assoc-in [:add-account :scanned-address] address) (assoc-in [:add-account :scanned-address] address)

127
src/status_im/wallet/choose_recipient/core.cljs
View File

@ -1,6 +1,5 @@
(ns status-im.wallet.choose-recipient.core (ns status-im.wallet.choose-recipient.core
(:require [re-frame.core :as re-frame] (:require [re-frame.core :as re-frame]
[status-im.constants :as constants]
[status-im.contact.db :as contact.db] [status-im.contact.db :as contact.db]
[status-im.ethereum.core :as ethereum] [status-im.ethereum.core :as ethereum]
[status-im.ethereum.eip55 :as eip55] [status-im.ethereum.eip55 :as eip55]
@ -23,51 +22,6 @@
(defn- find-address-name [db address] (defn- find-address-name [db address]
(:name (contact.db/find-contact-by-address (:contacts/contacts db) address))) (:name (contact.db/find-contact-by-address (:contacts/contacts db) address)))
(defn- fill-request-details [db {:keys [address name value symbol gas gasPrice public-key from-chat?]} request?]
{:pre [(not (nil? address))]}
(let [name (or name (find-address-name db address))
;;TODO request isn't implemented
data-path (if request?
:wallet/prepare-transaction
:wallet/prepare-transaction)]
(update db data-path
(fn [{old-symbol :symbol :as old-transaction}]
(let [symbol-changed? (not= old-symbol symbol)]
(cond-> (assoc old-transaction
:to address :to-name name :public-key public-key
:gas (money/bignumber gas)
:gas-price (money/bignumber gasPrice))
value (assoc :amount value)
symbol (assoc :symbol symbol)
from-chat? (assoc :from-chat? from-chat?)))))))
;;TODO request isn't implemented
(fx/defn fill-request-from-contact
{:events [:wallet/fill-request-from-contact]}
[{db :db} {:keys [address name public-key]} request?]
{:db (fill-request-details db {:address address :name name :public-key public-key} request?)
:dispatch [:navigate-back]})
(defn- extract-details
"First try to parse as EIP681 URI, if not assume this is an address directly.
Returns a map containing at least the `address` and `chain-id` keys"
[m chain-id all-tokens]
(or (merge m (eip681/extract-request-details m all-tokens))
(when (ethereum/address? m)
{:address m :chain-id chain-id})))
;; NOTE(janherich) - whenever changing assets, we want to clear the previusly set amount/amount-text
(defn changed-asset [{:keys [db] :as fx} old-symbol new-symbol]
(-> fx
(assoc-in [:db :wallet/prepare-transaction :amount] nil)
(assoc-in [:db :wallet/prepare-transaction :amount-text] nil)
(assoc-in [:db :wallet/prepare-transaction :asset-error]
(i18n/label :t/changed-asset-warning {:old old-symbol :new new-symbol}))))
(defn changed-amount-warning [fx old-amount new-amount]
(assoc-in fx [:db :wallet/prepare-transaction :amount-error]
(i18n/label :t/changed-amount-warning {:old old-amount :new new-amount})))
(defn use-default-eth-gas [fx] (defn use-default-eth-gas [fx]
(assoc-in fx [:db :wallet :send-transaction :gas] (assoc-in fx [:db :wallet :send-transaction :gas]
ethereum/default-transaction-gas)) ethereum/default-transaction-gas))
@ -115,44 +69,54 @@
:else :else
{:ui/show-error (i18n/label :t/wallet-invalid-address {:data recipient})}))) {:ui/show-error (i18n/label :t/wallet-invalid-address {:data recipient})})))
(defn- fill-prepare-transaction-details
[db
{:keys [address name value symbol gas gasPrice gasLimit]
:or {symbol :ETH}}
all-tokens]
(assoc db :wallet/prepare-transaction
(cond-> {:to address
:to-name (or name (find-address-name db address))
:from (ethereum/get-default-account
(get db :multiaccount/accounts))}
gas (assoc :gas (money/bignumber gas))
gasLimit (assoc :gas (money/bignumber gasLimit))
gasPrice (assoc :gasPrice (money/bignumber gasPrice))
value (assoc :amount-text
(if (= :ETH symbol)
(str (money/internal->formatted value symbol (get all-tokens symbol)))
(str value)))
symbol (assoc :symbol symbol))))
(fx/defn request-uri-parsed (fx/defn request-uri-parsed
{:events [:wallet/request-uri-parsed]} {:events [:wallet/request-uri-parsed]}
[{{:networks/keys [networks current-network] :wallet/keys [all-tokens] :as db} :db} data uri] [{{:networks/keys [networks current-network]
(let [current-chain-id (get-in networks [current-network :config :NetworkId]) :wallet/keys [all-tokens] :as db} :db}
{:keys [address chain-id] :as details} (extract-details data current-chain-id all-tokens) {:keys [chain-id] :as data}
valid-network? (boolean (= current-chain-id chain-id)) uri]
previous-state (get db :wallet/prepare-transaction) (let [{:keys [address] :as details}
old-symbol (:symbol previous-state) (eip681/extract-request-details data all-tokens)]
new-symbol (:symbol details) (if address
old-amount (:amount previous-state) (if (:wallet/prepare-transaction db)
new-amount (:value details) {:db (update db :wallet/prepare-transaction assoc
symbol-changed? (and old-symbol new-symbol (not= old-symbol new-symbol)) :to address :to-name (find-address-name db address))}
amount-changed? (and old-amount new-amount (not= old-amount new-amount))] (let [current-chain-id (get-in networks [current-network :config :NetworkId])]
(cond-> {:db db} (merge {:db (fill-prepare-transaction-details db details all-tokens)}
(and address valid-network?) (update :db #(fill-request-details % details false)) (when (and chain-id (not= current-chain-id chain-id))
symbol-changed? (changed-asset old-symbol new-symbol) {:ui/show-error (i18n/label :t/wallet-invalid-chain-id
amount-changed? (changed-amount-warning old-amount new-amount) {:data uri :chain current-chain-id})}))))
(not (:from previous-state)) {:ui/show-error (i18n/label :t/wallet-invalid-address {:data uri})})))
(update :db assoc-in [:wallet/prepare-transaction :from]
(ethereum/get-default-account (get db :multiaccount/accounts)))
(not old-symbol)
(update :db assoc-in [:wallet/prepare-transaction :symbol] (or new-symbol :ETH))
(not address) (assoc :ui/show-error (i18n/label :t/wallet-invalid-address {:data uri}))
(and address (not valid-network?))
(assoc :ui/show-error (i18n/label :t/wallet-invalid-chain-id
{:data uri :chain current-chain-id})))))
(fx/defn qr-scanner-cancel (fx/defn qr-scanner-cancel
{:events [:wallet.send/qr-scanner-cancel]} {:events [:wallet.send/qr-scanner-cancel]}
[{db :db} _] [{db :db} _]
{:db (assoc-in db [:wallet/prepare-transaction :modal-opened?] false)}) {:db (assoc-in db [:wallet/prepare-transaction :modal-opened?] false)})
(fx/defn resolve-ens-addresses (fx/defn parse-eip681-uri-and-resolve-ens
{:events [:wallet.send/resolve-ens-addresses :wallet.send/qr-code-request-scanned]} [{db :db :as cofx} uri]
[{{:networks/keys [current-network] :wallet/keys [all-tokens] :as db} :db :as cofx} uri]
(if-let [message (eip681/parse-uri uri)] (if-let [message (eip681/parse-uri uri)]
;; first we get a vector of ens-names to resolve and a vector of paths of ;; first we get a vector of ens-names to resolve and a vector of paths of
;; these names ;; these names
(let [{:keys [paths ens-names]} (let [{:keys [paths ens-names]}
(reduce (fn [acc path] (reduce (fn [acc path]
(let [address (get-in message path)] (let [address (get-in message path)]
@ -163,8 +127,9 @@
acc))) acc)))
{:paths [] :ens-names []} {:paths [] :ens-names []}
[[:address] [:function-arguments :address]])] [[:address] [:function-arguments :address]])]
(println "message" message)
(if (empty? ens-names) (if (empty? ens-names)
;; if there is no ens-names, we dispatch request-uri-parsed immediately ;; if there are no ens-names, we dispatch request-uri-parsed immediately
(request-uri-parsed cofx message uri) (request-uri-parsed cofx message uri)
{::resolve-addresses {::resolve-addresses
{:registry (get ens/ens-registries (ethereum/chain-keyword db)) {:registry (get ens/ens-registries (ethereum/chain-keyword db))
@ -173,8 +138,8 @@
(fn [addresses] (fn [addresses]
(re-frame/dispatch (re-frame/dispatch
[:wallet/request-uri-parsed [:wallet/request-uri-parsed
;; we replace the ens-names at their path in the message by their ;; we replace ens-names at their path in the message by their
;; actual address ;; actual address
(reduce (fn [message [path address]] (reduce (fn [message [path address]]
(assoc-in message path address)) (assoc-in message path address))
message message
@ -185,6 +150,8 @@
{:events [:wallet.send/qr-scanner-result]} {:events [:wallet.send/qr-scanner-result]}
[{db :db :as cofx} data opts] [{db :db :as cofx} data opts]
(fx/merge cofx (fx/merge cofx
{:db (assoc-in db [:wallet/prepare-transaction :modal-opened?] false)}
(navigation/navigate-back) (navigation/navigate-back)
(resolve-ens-addresses data))) (parse-eip681-uri-and-resolve-ens data)
(fn [{:keys [db]}]
(when (get-in db [:wallet/prepare-transaction :modal-opened?])
{:db (assoc-in db [:wallet/prepare-transaction :modal-opened?] false)}))))

25
src/status_im/wallet/collectibles/core.cljs
View File

@ -19,8 +19,8 @@
(defmulti load-collectibles-fx (fn [_ symbol _ _ _] symbol)) (defmulti load-collectibles-fx (fn [_ symbol _ _ _] symbol))
(defmethod load-collectibles-fx :default [all-tokens symbol items-number address chain] (defmethod load-collectibles-fx :default [all-tokens symbol items-number address]
{:load-collectibles-fx [all-tokens symbol items-number address chain]}) {:load-collectibles-fx [all-tokens symbol items-number address]})
(defn load-token [i items-number contract address symbol] (defn load-token [i items-number contract address symbol]
(when (< i items-number) (when (< i items-number)
@ -31,21 +31,18 @@
(re-frame/reg-fx (re-frame/reg-fx
:load-collectibles-fx :load-collectibles-fx
(fn [[all-tokens symbol items-number address chain]] (fn [[all-tokens symbol items-number address]]
(let [contract (:address (tokens/symbol->token all-tokens chain symbol))] (let [contract (:address (tokens/symbol->token all-tokens symbol))]
(load-token 0 items-number contract address symbol)))) (load-token 0 items-number contract address symbol))))
(handlers/register-handler-fx (handlers/register-handler-fx
:show-collectibles-list :show-collectibles-list
(fn [{:keys [db]} [_ {:keys [symbol amount] :as collectible} address]] (fn [{:keys [db]} [_ {:keys [symbol amount] :as collectible} address]]
(let [{:networks/keys [current-network networks]} db (let [all-tokens (:wallet/all-tokens db)
chain (ethereum/chain-id->chain-keyword
(get-in networks [current-network :config :NetworkId]))
all-tokens (:wallet/all-tokens db)
items-number (money/to-number amount) items-number (money/to-number amount)
loaded-items-number (count (get-in db [:collectibles symbol]))] loaded-items-number (count (get-in db [:collectibles symbol]))]
(merge (when (not= items-number loaded-items-number) (merge (when (not= items-number loaded-items-number)
(load-collectibles-fx all-tokens symbol items-number address chain)) (load-collectibles-fx all-tokens symbol items-number address))
{:dispatch [:navigate-to :collectibles-list collectible]})))) {:dispatch [:navigate-to :collectibles-list collectible]}))))
;; Crypto Kitties ;; Crypto Kitties
@ -101,16 +98,12 @@
(def kudos :KDO) (def kudos :KDO)
(defmethod load-collectible-fx kudos [{db :db} symbol id] (defmethod load-collectible-fx kudos [{db :db} symbol id]
(let [{:networks/keys [current-network networks]} db {:erc721-token-uri [(:wallet/all-tokens db) symbol id]})
chain-id (get-in networks [current-network :config :NetworkId])
all-tokens (:wallet/all-tokens db)]
{:erc721-token-uri [all-tokens symbol id chain-id]}))
(re-frame/reg-fx (re-frame/reg-fx
:erc721-token-uri :erc721-token-uri
(fn [[all-tokens symbol tokenId chain-id]] (fn [[all-tokens symbol tokenId]]
(let [chain (ethereum/chain-id->chain-keyword chain-id) (let [contract (:address (tokens/symbol->token all-tokens symbol))]
contract (:address (tokens/symbol->token all-tokens chain symbol))]
(erc721/token-uri contract (erc721/token-uri contract
tokenId tokenId
#(re-frame/dispatch [:token-uri-success #(re-frame/dispatch [:token-uri-success

36
src/status_im/wallet/core.cljs
View File

@ -200,9 +200,9 @@
(update-in db [:wallet :errors] dissoc error-type)) (update-in db [:wallet :errors] dissoc error-type))
(defn tokens-symbols (defn tokens-symbols
[visible-token-symbols all-tokens chain] [visible-token-symbols all-tokens]
(set/difference (set visible-token-symbols) (set/difference (set visible-token-symbols)
(set (map :symbol (tokens/nfts-for all-tokens chain))))) (set (map :symbol (tokens/nfts-for all-tokens)))))
(defn rpc->token [tokens] (defn rpc->token [tokens]
(reduce (fn [acc {:keys [address] :as token}] (reduce (fn [acc {:keys [address] :as token}]
@ -213,21 +213,14 @@
tokens)) tokens))
(fx/defn initialize-tokens (fx/defn initialize-tokens
[{:keys [db] :as cofx} custom-tokens] [{:keys [db]} custom-tokens]
(let [chain (ethereum/chain-keyword db) (let [default-tokens (utils.core/index-by :address (get tokens/all-default-tokens
custom-tokens {chain (rpc->token custom-tokens)} (ethereum/chain-keyword db)))
;;TODO why do we need all tokens ? chain can be changed only through relogin all-tokens (merge default-tokens (rpc->token custom-tokens))]
all-tokens (merge-with (merge
merge {:db (assoc db :wallet/all-tokens all-tokens)}
(utils.core/map-values #(utils.core/index-by :address %) (when config/erc20-contract-warnings-enabled?
tokens/all-default-tokens) {:wallet/validate-tokens default-tokens}))))
custom-tokens)]
(fx/merge
cofx
(merge
{:db (assoc db :wallet/all-tokens all-tokens)}
(when config/erc20-contract-warnings-enabled?
{:wallet/validate-tokens (get tokens/all-default-tokens chain)})))))
(fx/defn update-balances (fx/defn update-balances
[{{:keys [network-status :wallet/all-tokens [{{:keys [network-status :wallet/all-tokens
@ -239,7 +232,7 @@
assets (get visible-tokens chain) assets (get visible-tokens chain)
init? (or (empty? assets) init? (or (empty? assets)
(= assets (constants/default-visible-tokens chain))) (= assets (constants/default-visible-tokens chain)))
tokens (->> (tokens/tokens-for all-tokens chain) tokens (->> (vals all-tokens)
(remove #(or (:hidden? %) (remove #(or (:hidden? %)
;;if not init remove not visible tokens ;;if not init remove not visible tokens
(and (not init?) (and (not init?)
@ -269,7 +262,7 @@
(let [chain (ethereum/chain-keyword db) (let [chain (ethereum/chain-keyword db)
mainnet? (= :mainnet chain) mainnet? (= :mainnet chain)
assets (get visible-tokens chain #{}) assets (get visible-tokens chain #{})
tokens (tokens-symbols assets all-tokens chain) tokens (tokens-symbols assets all-tokens)
currency (get constants/currencies currency)] currency (get constants/currencies currency)]
(when (not= network-status :offline) (when (not= network-status :offline)
{:wallet/get-prices {:wallet/get-prices
@ -446,7 +439,7 @@
chain (ethereum/network->chain-keyword current-network) chain (ethereum/network->chain-keyword current-network)
{:keys [symbol decimals]} {:keys [symbol decimals]}
(if (seq contract) (if (seq contract)
(get (get all-tokens chain) contract) (get all-tokens contract)
(tokens/native-currency chain)) (tokens/native-currency chain))
amount-text (str (money/internal->formatted value symbol decimals))] amount-text (str (money/internal->formatted value symbol decimals))]
{:db (assoc db :wallet/prepare-transaction {:db (assoc db :wallet/prepare-transaction
@ -608,7 +601,8 @@
{:events [:wallet.send/qr-scanner-allowed]} {:events [:wallet.send/qr-scanner-allowed]}
[{:keys [db] :as cofx} options] [{:keys [db] :as cofx} options]
(fx/merge cofx (fx/merge cofx
{:db (assoc-in db [:wallet/prepare-transaction :modal-opened?] true)} (when (:modal-opened? options)
{:db (assoc-in db [:wallet/prepare-transaction :modal-opened?] true)})
(bottom-sheet/hide-bottom-sheet) (bottom-sheet/hide-bottom-sheet)
(navigation/navigate-to-cofx :qr-scanner options))) (navigation/navigate-to-cofx :qr-scanner options)))

17
src/status_im/wallet/custom_tokens/core.cljs
View File

@ -85,10 +85,9 @@
(string/trim %)])))) (string/trim %)]))))
(defn field-exists? (defn field-exists?
[{:wallet/keys [all-tokens] :as db} field-key field-value] [{:wallet/keys [all-tokens]} field-key field-value]
(let [chain-key (ethereum/chain-keyword db)] (some #(= field-value (get % field-key))
(some #(= field-value (get % field-key)) (vals all-tokens)))
(vals (get all-tokens chain-key)))))
(fx/defn total-supply-result (fx/defn total-supply-result
[{:keys [db]} contract total-supply] [{:keys [db]} contract total-supply]
@ -100,10 +99,8 @@
:error (i18n/label :t/wrong-contract)})})) :error (i18n/label :t/wrong-contract)})}))
(defn token-in-list? (defn token-in-list?
[{:wallet/keys [all-tokens] :as db} contract] [{:wallet/keys [all-tokens]} contract]
(let [chain-key (ethereum/chain-keyword db) (not (nil? (get all-tokens (string/lower-case contract)))))
addresses (set (map string/lower-case (keys (get all-tokens chain-key))))]
(not (nil? (get addresses (string/lower-case contract))))))
(fx/defn contract-address-is-changed (fx/defn contract-address-is-changed
[{:keys [db]} contract] [{:keys [db]} contract]
@ -177,7 +174,7 @@
:decimals (int decimals) :decimals (int decimals)
:color (rand-nth colors/chat-colors)}] :color (rand-nth colors/chat-colors)}]
(fx/merge cofx (fx/merge cofx
{:db (assoc-in db [:wallet/all-tokens chain-key contract] {:db (assoc-in db [:wallet/all-tokens contract]
(assoc new-token :custom? true)) (assoc new-token :custom? true))
::json-rpc/call [{:method "wallet_addCustomToken" ::json-rpc/call [{:method "wallet_addCustomToken"
:params [new-token] :params [new-token]
@ -191,7 +188,7 @@
[{:keys [db] :as cofx} {:keys [address] :as token} navigate-back?] [{:keys [db] :as cofx} {:keys [address] :as token} navigate-back?]
(let [chain-key (ethereum/chain-keyword db)] (let [chain-key (ethereum/chain-keyword db)]
(fx/merge cofx (fx/merge cofx
{:db (update-in db [:wallet/all-tokens chain-key] dissoc address) {:db (update db :wallet/all-tokens dissoc address)
::json-rpc/call [{:method "wallet_deleteCustomToken" ::json-rpc/call [{:method "wallet_deleteCustomToken"
:params [address] :params [address]
:on-success #()}]} :on-success #()}]}

102
test/cljs/status_im/test/ethereum/eip681.cljs
View File

@ -16,34 +16,73 @@
(is (= nil (eip681/parse-uri "ethereum:pay-gimme.ether?value=1e18"))) (is (= nil (eip681/parse-uri "ethereum:pay-gimme.ether?value=1e18")))
(is (= nil (eip681/parse-uri "ethereum:pay-snt.thetoken.ether/transfer?address=gimme.eth&uint256=1&gas=100"))) (is (= nil (eip681/parse-uri "ethereum:pay-snt.thetoken.ether/transfer?address=gimme.eth&uint256=1&gas=100")))
(is (= nil (eip681/parse-uri "ethereum:pay-snt.thetoken.eth/transfer?address=gimme.ether&uint256=1&gas=100"))) (is (= nil (eip681/parse-uri "ethereum:pay-snt.thetoken.eth/transfer?address=gimme.ether&uint256=1&gas=100")))
(is (= {:address "gimme.eth" :value "1e18" :chain-id 1} (eip681/parse-uri "ethereum:pay-gimme.eth?value=1e18")))
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "1e18" :chain-id 1} (eip681/parse-uri "ethereum:pay-0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=1e18"))) (is (= (eip681/parse-uri "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7")
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :chain-id 1} (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7"))) {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7"}))
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "1" :chain-id 1} (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=1")))
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7", :chain-id 1} (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?unknown=1"))) (is (= (eip681/parse-uri "ethereum:pay-gimme.eth?value=1e18")
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7", :chain-id 1} (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?address=0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7"))) {:address "gimme.eth" :value "1e18" :chain-id 1}))
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "2.014e18" :chain-id 1} (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=2.014e18")))
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "-1e18" :chain-id 1} (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=-1e18"))) (is (= (eip681/parse-uri "ethereum:pay-0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=1e18")
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "+1E18" :chain-id 1} (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=+1E18"))) {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "1e18" :chain-id 1}))
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "1E18" :gas "100" :chain-id 1} (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=1E18&gas=100")))
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "NOT_NUMBER" :chain-id 1} (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=NOT_NUMBER"))) (is (= (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7")
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "1ETH" :chain-id 1} (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=1ETH"))) {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :chain-id 1}))
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "1e18" :gas "5000" :chain-id 1} (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7@1?value=1e18&gas=5000")))
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "1e18" :gas "5000" :chain-id 3} (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7@3?value=1e18&gas=5000"))) (is (= (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=1")
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :chain-id 1 :function-name "transfer"} (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7/transfer"))) {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "1" :chain-id 1}))
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :chain-id 1 :function-name "transfer" :function-arguments {:address "0x8e23ee67d1332ad560396262c48ffbb01f93d052" :uint256 "1"}}
(eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7/transfer?address=0x8e23ee67d1332ad560396262c48ffbb01f93d052&uint256=1"))) (is (= (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?unknown=1")
(is (= {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :chain-id 1 :function-name "transfer" :gas "100" :function-arguments {:address "0x8e23ee67d1332ad560396262c48ffbb01f93d052" :uint256 "1"}} {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7", :chain-id 1}))
(eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7/transfer?address=0x8e23ee67d1332ad560396262c48ffbb01f93d052&uint256=1&gas=100")))
(is (= {:address "snt.thetoken.eth" :chain-id 1 :function-name "transfer" :gas "100" :function-arguments {:address "gimme.eth" :uint256 "1"}} (is (= (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?address=0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7")
(eip681/parse-uri "ethereum:pay-snt.thetoken.eth/transfer?address=gimme.eth&uint256=1&gas=100")))) {:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7", :chain-id 1}))
(is (= (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=2.014e18")
{:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "2.014e18" :chain-id 1}))
(is (= (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=-1e18")
{:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "-1e18" :chain-id 1}))
(is (= (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=+1E18")
{:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "+1E18" :chain-id 1}))
(is (= (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=1E18&gas=100")
{:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "1E18" :gas "100" :chain-id 1}))
(is (= (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=NOT_NUMBER")
{:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "NOT_NUMBER" :chain-id 1}))
(is (= (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7?value=1ETH")
{:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "1ETH" :chain-id 1}))
(is (= (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7@1?value=1e18&gas=5000")
{:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "1e18" :gas "5000" :chain-id 1}))
(is (= (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7@3?value=1e18&gas=5000")
{:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :value "1e18" :gas "5000" :chain-id 3}))
(is (= (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7/transfer")
{:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :chain-id 1 :function-name "transfer"}))
(is (= (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7/transfer?address=0x8e23ee67d1332ad560396262c48ffbb01f93d052&uint256=1")
{:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :chain-id 1
:function-name "transfer" :function-arguments {:address "0x8e23ee67d1332ad560396262c48ffbb01f93d052" :uint256 "1"}}))
(is (= (eip681/parse-uri "ethereum:0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7/transfer?address=0x8e23ee67d1332ad560396262c48ffbb01f93d052&uint256=1&gas=100")
{:address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" :chain-id 1 :gas "100"
:function-name "transfer" :function-arguments {:address "0x8e23ee67d1332ad560396262c48ffbb01f93d052" :uint256 "1"}}))
(is (= (eip681/parse-uri "ethereum:pay-snt.thetoken.eth/transfer?address=gimme.eth&uint256=1&gas=100")
{:address "snt.thetoken.eth" :chain-id 1 :gas "100"
:function-name "transfer" :function-arguments {:address "gimme.eth" :uint256 "1"}})))
(def all-tokens (def all-tokens
{:mainnet {"0x744d70fdbe2ba4cf95131626614a1763df805b9e" {:address "0x744d70fdbe2ba4cf95131626614a1763df805b9e" {:mainnet {"0x744d70fdbe2ba4cf95131626614a1763df805b9e" {:address "0x744d70fdbe2ba4cf95131626614a1763df805b9e"
:name "Status Network Token" :name "Status Network Token"
:symbol :SNT :symbol :SNT
:decimals 18}} :decimals 18}}
:testnet {"0xc55cF4B03948D7EBc8b9E8BAD92643703811d162" {:address "0xc55cF4B03948D7EBc8b9E8BAD92643703811d162" :testnet {"0xc55cf4b03948d7ebc8b9e8bad92643703811d162" {:address "0xc55cf4b03948d7ebc8b9e8bad92643703811d162"
:name "Status Test Token" :name "Status Test Token"
:symbol :STT :symbol :STT
:decimals 18}}}) :decimals 18}}})
@ -51,13 +90,13 @@
(deftest generate-erc20-uri (deftest generate-erc20-uri
(is (= nil (eip681/generate-erc20-uri nil nil all-tokens))) (is (= nil (eip681/generate-erc20-uri nil nil all-tokens)))
(is (= "ethereum:0x744d70fdbe2ba4cf95131626614a1763df805b9e/transfer?uint256=5&address=0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" (is (= "ethereum:0x744d70fdbe2ba4cf95131626614a1763df805b9e/transfer?uint256=5&address=0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7"
(eip681/generate-erc20-uri "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" {:symbol :SNT :value 5} all-tokens))) (eip681/generate-erc20-uri "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" {:symbol :SNT :value 5} (:mainnet all-tokens))))
(is (= "ethereum:0x744d70fdbe2ba4cf95131626614a1763df805b9e/transfer?uint256=5&address=0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7&gas=10000&gasPrice=10000" (is (= "ethereum:0x744d70fdbe2ba4cf95131626614a1763df805b9e/transfer?uint256=5&address=0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7&gas=10000&gasPrice=10000"
(eip681/generate-erc20-uri "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" {:symbol :SNT :value 5 :gas 10000 :gasPrice 10000} all-tokens))) (eip681/generate-erc20-uri "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" {:symbol :SNT :value 5 :gas 10000 :gasPrice 10000} (:mainnet all-tokens))))
(is (= "ethereum:0x744d70fdbe2ba4cf95131626614a1763df805b9e/transfer?uint256=5&address=0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" (is (= "ethereum:0x744d70fdbe2ba4cf95131626614a1763df805b9e/transfer?uint256=5&address=0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7"
(eip681/generate-erc20-uri "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" {:symbol :SNT :chain-id 1 :value 5} all-tokens))) (eip681/generate-erc20-uri "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" {:symbol :SNT :chain-id 1 :value 5} (:mainnet all-tokens))))
(is (= "ethereum:0xc55cf4b03948d7ebc8b9e8bad92643703811d162@3/transfer?uint256=5&address=0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" (is (= "ethereum:0xc55cf4b03948d7ebc8b9e8bad92643703811d162@3/transfer?uint256=5&address=0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7"
(eip681/generate-erc20-uri "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" {:symbol :STT :chain-id 3 :value 5} all-tokens)))) (eip681/generate-erc20-uri "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" {:symbol :STT :chain-id 3 :value 5} (:testnet all-tokens)))))
(deftest generate-uri (deftest generate-uri
(is (= nil (eip681/generate-uri nil nil))) (is (= nil (eip681/generate-uri nil nil)))
@ -96,13 +135,14 @@
(is (.equals (money/ether->wei (money/bignumber 1)) value)) (is (.equals (money/ether->wei (money/bignumber 1)) value))
(is (= :ETH symbol)) (is (= :ETH symbol))
(is (= "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" address))) (is (= "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" address)))
(is (nil? (eip681/extract-request-details {:address "0x744d70fdbe2ba4cf95131626614a1763df805b9e" :chain-id 1 :function-name "unknown"} {}))) (is (= (eip681/extract-request-details {:address "0x744d70fdbe2ba4cf95131626614a1763df805b9e" :chain-id 1 :function-name "unknown"}
{:address "0x744d70fdbe2ba4cf95131626614a1763df805b9e" :chain-id 1 :function-name "unknown"})))
(let [{:keys [value symbol address]} (eip681/extract-request-details {:address "0x744d70fdbe2ba4cf95131626614a1763df805b9e" :chain-id 1 (let [{:keys [value symbol address]} (eip681/extract-request-details {:address "0x744d70fdbe2ba4cf95131626614a1763df805b9e" :chain-id 1
:function-name "transfer" :function-arguments {:uint256 1000 :address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7"}} :function-name "transfer" :function-arguments {:uint256 1000 :address "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7"}}
{:mainnet {"0x744d70fdbe2ba4cf95131626614a1763df805b9e" {:address "0x744d70fdbe2ba4cf95131626614a1763df805b9e" {"0x744d70fdbe2ba4cf95131626614a1763df805b9e" {:address "0x744d70fdbe2ba4cf95131626614a1763df805b9e"
:name "Status Network Token" :name "Status Network Token"
:symbol :SNT :symbol :SNT
:decimals 18}}})] :decimals 18}})]
(is (.equals (money/bignumber 1000) value)) (is (.equals (money/bignumber 1000) value))
(is (= :SNT symbol)) (is (= :SNT symbol))
(is (= "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" address)))) (is (= "0x89205a3a3b2a69de6dbf7f01ed13b2108b2c43e7" address))))