status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[refactor] move utils.ethereum to ethereum 

move utils.ethereum.tokens to ethereum.tokens
move utils.ethereum.abi-spec to ethereum.abi-spec
move utils.ethereum.core to ethereum.core
move utils.ethereum.eip165 to ethereum.eip165
move utils.ethereum.eip55 to ethereum.eip55
move utils.ethereum.eip681 to ethereum.eip681
move utils.ethereum.ens to ethereum.ens
move utils.ethereum.erc721 to ethereum.erc721
move utils.ethereum.mnemonics to ethereum.mnemonics
move utils.ethereum.resolver to ethereum.resolver
move utils.ethereum.macros to ethereum.macros

Signed-off-by: yenda <eric@status.im>
This commit is contained in:
yenda 2019-05-22 17:00:34 +02:00
parent ded207ead2
commit b13864d052
No known key found for this signature in database
GPG Key ID: 0095623C0069DCE6
64 changed files with 395 additions and 422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/status_im/accounts/recover/core.cljs
View File

@ -3,16 +3,15 @@
[re-frame.core :as re-frame]
[status-im.accounts.create.core :as accounts.create]
[status-im.accounts.db :as db]
[status-im.ethereum.mnemonic :as mnemonic]
[status-im.i18n :as i18n]
[status-im.native-module.core :as status]
[status-im.node.core :as node]
[status-im.ui.screens.navigation :as navigation]
[status-im.utils.ethereum.mnemonic :as mnemonic]
[status-im.utils.fx :as fx]
[status-im.utils.identicon :as identicon]
[status-im.utils.security :as security]
[status-im.utils.types :as types]
[status-im.utils.fx :as fx]
[status-im.node.core :as node]
[clojure.string :as str]))
[status-im.utils.types :as types]))
(defn check-password-errors [password]
(cond (string/blank? password) :required-field
@ -69,8 +68,8 @@
[{:keys [db] :as cofx} {:keys [error pubkey address]} password]
(if (empty? error)
(let [account-address (-> address
(str/lower-case)
(str/replace-first "0x" ""))
(string/lower-case)
(string/replace-first "0x" ""))
keycard-account? (boolean (get-in db [:accounts/accounts account-address :keycard-instance-uid]))]
(if keycard-account?
;; trying to recover account created with keycard

34
src/status_im/browser/core.cljs
View File

@ -4,14 +4,14 @@
[status-im.browser.permissions :as browser.permissions]
[status-im.constants :as constants]
[status-im.data-store.browser :as browser-store]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.ens :as ens]
[status-im.ethereum.resolver :as resolver]
[status-im.i18n :as i18n]
[status-im.js-dependencies :as dependencies]
[status-im.js-dependencies :as js-dependencies]
[status-im.native-module.core :as status]
[status-im.ui.components.list-selection :as list-selection]
[status-im.ui.screens.navigation :as navigation]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.ens :as ens]
[status-im.utils.ethereum.resolver :as resolver]
[status-im.utils.contenthash :as contenthash]
[status-im.utils.fx :as fx]
[status-im.utils.http :as http]
@ -19,10 +19,8 @@
[status-im.utils.platform :as platform]
[status-im.utils.random :as random]
[status-im.utils.types :as types]
[status-im.utils.universal-links.core :as utils.universal-links]
[taoensso.timbre :as log]
[status-im.js-dependencies :as js-dependencies]
[status-im.utils.universal-links.core :as universal-links]))
[status-im.utils.universal-links.core :as universal-links]
[taoensso.timbre :as log]))
(fx/defn initialize-browsers
[{:keys [db all-stored-browsers]}]
@ -65,7 +63,7 @@
(defn check-if-phishing-url [{:keys [history history-index] :as browser}]
(let [history-host (http/url-host (try (nth history history-index) (catch js/Error _)))]
(cond-> browser history-host (assoc :unsafe? (dependencies/phishing-detect history-host)))))
(cond-> browser history-host (assoc :unsafe? (js-dependencies/phishing-detect history-host)))))
(defn- content->hash [hex]
(when (and hex (not= hex "0x"))
@ -198,8 +196,8 @@
(fx/defn handle-message-link
[cofx link]
(if (utils.universal-links/universal-link? link)
(utils.universal-links/handle-url cofx link)
(if (universal-links/universal-link? link)
(universal-links/handle-url cofx link)
{:browser/show-browser-selection link}))
(fx/defn update-browser-on-nav-change
@ -224,10 +222,10 @@
(fx/defn navigation-state-changed
[cofx event error?]
(let [{:strs [url loading title]} (js->clj event)
deep-link? (utils.universal-links/deep-link? url)]
(if (utils.universal-links/universal-link? url)
deep-link? (universal-links/deep-link? url)]
(if (universal-links/universal-link? url)
(when-not (and deep-link? platform/ios?) ;; ios webview handles this
(utils.universal-links/handle-url cofx url))
(universal-links/handle-url cofx url))
(fx/merge cofx
(update-browser-option :loading? loading)
(update-browser-name title)
@ -240,8 +238,8 @@
[cofx url]
(let [browser (get-current-browser (:db cofx))
normalized-url (http/normalize-and-decode-url url)]
(if (utils.universal-links/universal-link? normalized-url)
(utils.universal-links/handle-url cofx normalized-url)
(if (universal-links/universal-link? normalized-url)
(universal-links/handle-url cofx normalized-url)
(fx/merge cofx
(update-browser-option :url-editing? false)
(update-browser-history browser normalized-url)
@ -256,8 +254,8 @@
browser {:browser-id (random/id)
:history-index 0
:history [normalized-url]}]
(if (utils.universal-links/universal-link? normalized-url)
(utils.universal-links/handle-url cofx normalized-url)
(if (universal-links/universal-link? normalized-url)
(universal-links/handle-url cofx normalized-url)
(fx/merge cofx
{:db (assoc db :browser/options
{:browser-id (:browser-id browser)})}

10
src/status_im/browser/permissions.cljs
View File

@ -1,12 +1,12 @@
(ns status-im.browser.permissions
(:require [status-im.constants :as constants]
[status-im.data-store.dapp-permissions :as dapp-permissions]
[status-im.i18n :as i18n]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.fx :as fx]
[status-im.qr-scanner.core :as qr-scanner]
[status-im.ethereum.core :as ethereum]
[status-im.extensions.registry :as extensions.registry]
[status-im.ui.screens.navigation :as navigation]))
[status-im.i18n :as i18n]
[status-im.qr-scanner.core :as qr-scanner]
[status-im.ui.screens.navigation :as navigation]
[status-im.utils.fx :as fx]))
(declare process-next-permission)
(declare send-response-to-bridge)

6
src/status_im/chat/commands/impl/transactions.cljs
View File

@ -8,8 +8,11 @@
[status-im.chat.commands.protocol :as protocol]
[status-im.contact.db :as db.contact]
[status-im.data-store.messages :as messages-store]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.tokens :as tokens]
[status-im.i18n :as i18n]
[status-im.ui.components.animation :as animation]
[status-im.ui.components.chat-icon.screen :as chat-icon]
[status-im.ui.components.colors :as colors]
[status-im.ui.components.icons.vector-icons :as vector-icons]
[status-im.ui.components.list.views :as list]
@ -21,12 +24,9 @@
choose-recipient.events]
[status-im.ui.screens.wallet.utils :as wallet.utils]
[status-im.utils.datetime :as datetime]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.tokens :as tokens]
[status-im.utils.fx :as fx]
[status-im.utils.money :as money]
[status-im.utils.platform :as platform]
[status-im.ui.components.chat-icon.screen :as chat-icon]
[status-im.wallet.db :as wallet.db])
(:require-macros [status-im.utils.views :refer [defview letsubs]]))

41
src/status_im/chat/models/message.cljs
View File

@ -1,36 +1,29 @@
(ns status-im.chat.models.message
(:require [clojure.string :as string]
[re-frame.core :as re-frame]
(:require [re-frame.core :as re-frame]
[status-im.accounts.db :as accounts.db]
[status-im.native-module.core :as status]
[status-im.constants :as constants]
[status-im.i18n :as i18n]
[status-im.utils.core :as utils]
[status-im.utils.config :as config]
[status-im.contact.db :as contact.db]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.datetime :as time]
[status-im.transport.message.group-chat :as message.group-chat]
[status-im.chat.commands.receiving :as commands-receiving]
[status-im.chat.db :as chat.db]
[status-im.chat.models :as chat-model]
[status-im.chat.models.loading :as chat-loading]
[status-im.chat.models.message-content :as message-content]
[status-im.chat.commands.receiving :as commands-receiving]
[status-im.chat.db :as chat.db]
[status-im.mailserver.core :as mailserver]
[status-im.utils.clocks :as utils.clocks]
[status-im.utils.money :as money]
[status-im.utils.types :as types]
[status-im.notifications.core :as notifications]
[status-im.transport.utils :as transport.utils]
[status-im.transport.message.protocol :as protocol]
[status-im.constants :as constants]
[status-im.contact.db :as contact.db]
[status-im.data-store.messages :as messages-store]
[status-im.data-store.user-statuses :as user-statuses-store]
[status-im.utils.platform :as platform]
[status-im.mailserver.core :as mailserver]
[status-im.native-module.core :as status]
[status-im.notifications.core :as notifications]
[status-im.transport.message.group-chat :as message.group-chat]
[status-im.transport.message.protocol :as protocol]
[status-im.transport.message.transit :as transit]
[status-im.transport.utils :as transport.utils]
[status-im.ui.components.react :as react]
[status-im.utils.clocks :as utils.clocks]
[status-im.utils.datetime :as time]
[status-im.utils.fx :as fx]
[taoensso.timbre :as log]
[status-im.data-store.messages :as messages-store]
[status-im.transport.message.transit :as transit]))
[status-im.utils.platform :as platform]
[status-im.utils.types :as types]
[taoensso.timbre :as log]))
(defn- wrap-group-message
"Wrap a group message in a membership update"

5
src/status_im/constants.cljs
View File

@ -1,7 +1,6 @@
(ns status-im.constants
(:require [status-im.i18n :as i18n]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.types :as types]
(:require [status-im.ethereum.core :as ethereum]
[status-im.i18n :as i18n]
[status-im.utils.config :as config]))
(def ethereum-rpc-url "http://localhost:8545")

4
src/status_im/contact/db.cljs
View File

@ -1,9 +1,9 @@
(ns status-im.contact.db
(:require [cljs.spec.alpha :as spec]
[status-im.ethereum.core :as ethereum]
[status-im.js-dependencies :as js-dependencies]
[status-im.utils.identicon :as identicon]
[status-im.utils.gfycat.core :as gfycat]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.identicon :as identicon]
status-im.utils.db))
;;;; DB

11
src/status_im/data_store/chats.cljs
View File

@ -1,12 +1,11 @@
(ns status-im.data-store.chats
(:require [goog.object :as object]
[re-frame.core :as re-frame]
[status-im.utils.ethereum.core :as utils.ethereum]
[status-im.utils.clocks :as utils.clocks]
[status-im.data-store.realm.core :as core]
[status-im.data-store.messages :as messages]
[status-im.utils.core :as utils]
[cljs.tools.reader.edn :as edn]))
[status-im.data-store.realm.core :as core]
[status-im.ethereum.core :as ethereum]
[status-im.utils.clocks :as utils.clocks]
[status-im.utils.core :as utils]))
(defn remove-empty-vals
"Remove key/value when empty seq or nil"
@ -27,7 +26,7 @@
(sort (keys event))))))
; Build an event id from a message
(def event-id (comp utils.ethereum/sha3 event->string))
(def event-id (comp ethereum/sha3 event->string))
(defn marshal-membership-updates [updates]
(mapcat (fn [{:keys [signature events from]}]

23
src/status_im/data_store/realm/core.cljs
View File

@ -1,18 +1,17 @@
(ns status-im.data-store.realm.core
(:require [goog.object :as object]
[goog.string :as gstr]
[clojure.string :as string]
(:require [clojure.string :as string]
[cognitect.transit :as transit]
[goog.object :as object]
[re-frame.core :as re-frame]
[status-im.data-store.realm.schemas.account.core :as account]
[status-im.data-store.realm.schemas.base.core :as base]
[taoensso.timbre :as log]
[status-im.utils.fs :as fs]
[status-im.utils.async :as utils.async]
[status-im.utils.platform :as utils.platform]
[status-im.utils.ethereum.core :as utils.ethereum]
[cognitect.transit :as transit]
[status-im.ethereum.core :as ethereum]
[status-im.js-dependencies :as js-dependencies]
[status-im.react-native.js-dependencies :as rn-dependencies]
[status-im.js-dependencies :as js-dependencies]))
[status-im.utils.async :as utils.async]
[status-im.utils.fs :as fs]
[status-im.utils.platform :as utils.platform]
[taoensso.timbre :as log]))
(defn to-buffer [key]
(when-not (nil? key)
@ -90,7 +89,7 @@
(defn get-account-db-path
[address]
(str (accounts-realm-dir) (utils.ethereum/sha3 address)))
(str (accounts-realm-dir) (ethereum/sha3 address)))
(defn delete-realms []
(log/warn "realm: deleting all realms")
@ -98,7 +97,7 @@
(defn delete-account-realm
[address]
(log/warn "realm: deleting account db " (utils.ethereum/sha3 address))
(log/warn "realm: deleting account db " (ethereum/sha3 address))
(let [file (get-account-db-path address)]
(.. (fs/unlink file)
(then #(fs/unlink (str file ".lock")))

2
src/status_im/utils/ethereum/abi_spec.cljs → src/status_im/ethereum/abi_spec.cljs
View File

@ -1,4 +1,4 @@
(ns status-im.utils.ethereum.abi-spec
(ns status-im.ethereum.abi-spec
(:require [cljs.spec.alpha :as spec]
[clojure.string :as string]
[status-im.js-dependencies :as dependencies]))

2
src/status_im/ethereum/contracts.cljs
View File

@ -1,5 +1,5 @@
(ns status-im.ethereum.contracts
(:require [status-im.utils.ethereum.core :as ethereum]))
(:require [status-im.ethereum.core :as ethereum]))
(def contracts
{:status/snt

4
src/status_im/utils/ethereum/core.cljs → src/status_im/ethereum/core.cljs
View File

@ -1,7 +1,7 @@
(ns status-im.utils.ethereum.core
(ns status-im.ethereum.core
(:require [clojure.string :as string]
[status-im.ethereum.tokens :as tokens]
[status-im.js-dependencies :as dependencies]
[status-im.utils.ethereum.tokens :as tokens]
[status-im.utils.money :as money]))
;; IDs standardized in https://github.com/ethereum/EIPs/blob/master/EIPS/eip-155.md#list-of-chain-ids

2
src/status_im/ethereum/decode.cljs
View File

@ -1,5 +1,5 @@
(ns status-im.ethereum.decode
(:require [status-im.utils.ethereum.abi-spec :as abi-spec]))
(:require [status-im.ethereum.abi-spec :as abi-spec]))
(defn uint
[hex]

6
src/status_im/utils/ethereum/eip165.cljs → src/status_im/ethereum/eip165.cljs
View File

@ -1,7 +1,7 @@
(ns status-im.utils.ethereum.eip165
(ns status-im.ethereum.eip165
"Utility function related to [EIP165](https://eips.ethereum.org/EIPS/eip-165)"
(:require [status-im.ethereum.json-rpc :as json-rpc]
[status-im.utils.ethereum.abi-spec :as abi-spec]))
(:require [status-im.ethereum.abi-spec :as abi-spec]
[status-im.ethereum.json-rpc :as json-rpc]))
(def supports-interface-hash "0x01ffc9a7")
(def marker-hash "0xffffffff")

2
src/status_im/utils/ethereum/eip55.cljs → src/status_im/ethereum/eip55.cljs
View File

@ -1,4 +1,4 @@
(ns status-im.utils.ethereum.eip55
(ns status-im.ethereum.eip55
"Utility function related to [EIP55](https://eips.ethereum.org/EIPS/eip-55)
This EIP standardize how ethereum addresses should be printed as strings to validate checksum.

9
src/status_im/utils/ethereum/eip681.cljs → src/status_im/ethereum/eip681.cljs
View File

@ -1,13 +1,12 @@
(ns status-im.utils.ethereum.eip681
(ns status-im.ethereum.eip681
"Utility function related to [EIP681](https://eips.ethereum.org/EIPS/eip-681)
This EIP standardize how ethereum payment request can be represented as URI (say to embed them in a QR code).
e.g. ethereum:0x1234@1/transfer?to=0x5678&value=1e18&gas=5000"
(:require [clojure.set :as set]
[clojure.string :as string]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.tokens :as tokens]
(:require [clojure.string :as string]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.tokens :as tokens]
[status-im.utils.money :as money]))
(def scheme "ethereum")

6
src/status_im/utils/ethereum/ens.cljs → src/status_im/ethereum/ens.cljs
View File

@ -1,4 +1,4 @@
(ns status-im.utils.ethereum.ens
(ns status-im.ethereum.ens
"
https://docs.ens.domains/en/latest/index.html
https://eips.ethereum.org/EIPS/eip-137
@ -6,8 +6,8 @@
"
(:refer-clojure :exclude [name])
(:require [clojure.string :as string]
[status-im.ethereum.json-rpc :as json-rpc]
[status-im.utils.ethereum.core :as ethereum]))
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.json-rpc :as json-rpc]))
;; this is the addresses of ens registries for the different networks
(def ens-registries

2
src/status_im/utils/ethereum/erc721.cljs → src/status_im/ethereum/erc721.cljs
View File

@ -1,4 +1,4 @@
(ns status-im.utils.ethereum.erc721
(ns status-im.ethereum.erc721
"
Helper functions to interact with [ERC721](https://eips.ethereum.org/EIPS/eip-721) smart contract
"

2
src/status_im/ethereum/json_rpc.cljs
View File

@ -1,9 +1,9 @@
(ns status-im.ethereum.json-rpc
(:require [clojure.string :as string]
[re-frame.core :as re-frame]
[status-im.ethereum.abi-spec :as abi-spec]
[status-im.ethereum.decode :as decode]
[status-im.native-module.core :as status]
[status-im.utils.ethereum.abi-spec :as abi-spec]
[status-im.utils.money :as money]
[status-im.utils.types :as types]
[taoensso.timbre :as log]))

2
src/status_im/utils/ethereum/macros.clj → src/status_im/ethereum/macros.clj
View File

@ -1,4 +1,4 @@
(ns status-im.utils.ethereum.macros
(ns status-im.ethereum.macros
(:require [clojure.string :as string]
[clojure.java.io :as io]))

2
src/status_im/utils/ethereum/mnemonic.cljs → src/status_im/ethereum/mnemonic.cljs
View File

@ -1,4 +1,4 @@
(ns status-im.utils.ethereum.mnemonic
(ns status-im.ethereum.mnemonic
(:require [clojure.string :as string]))
(def dictionary

6
src/status_im/utils/ethereum/resolver.cljs → src/status_im/ethereum/resolver.cljs
View File

@ -1,6 +1,6 @@
(ns status-im.utils.ethereum.resolver
(:require [status-im.utils.ethereum.ens :as ens])
(:refer-clojure :exclude [name]))
(ns status-im.ethereum.resolver
(:refer-clojure :exclude [name])
(:require [status-im.ethereum.ens :as ens]))
(def default-hash "0x0000000000000000000000000000000000000000000000000000000000000000")
(defn contenthash [registry ens-name cb]

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

@ -1,15 +1,12 @@
(ns status-im.ethereum.subscriptions
(:require [clojure.string :as string]
[re-frame.core :as re-frame]
(:require [re-frame.core :as re-frame]
[status-im.constants :as constants]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.json-rpc :as json-rpc]
[status-im.ethereum.tokens :as tokens]
[status-im.ethereum.transactions.core :as transactions]
[status-im.native-module.core :as status]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.tokens :as tokens]
[status-im.utils.fx :as fx]
[status-im.utils.types :as types]
[taoensso.timbre :as log]
[status-im.ethereum.json-rpc :as json-rpc]))
[taoensso.timbre :as log]))
(fx/defn handle-signal
[cofx {:keys [subscription_id data] :as event}]

8
src/status_im/utils/ethereum/tokens.cljs → src/status_im/ethereum/tokens.cljs
View File

@ -1,7 +1,7 @@
(ns status-im.utils.ethereum.tokens
(:require-macros [status-im.utils.ethereum.macros :refer [resolve-icons] :as ethereum.macros])
(:require [clojure.string :as string]
[status-im.utils.config :as config]))
(ns status-im.ethereum.tokens
(:require [clojure.string :as string])
(:require-macros
[status-im.ethereum.macros :as ethereum.macros :refer [resolve-icons]]))
(defn- asset-border [color]
{:border-color color :border-width 1 :border-radius 32})

4
src/status_im/ethereum/transactions/etherscan.cljs
View File

@ -1,7 +1,7 @@
(ns status-im.ethereum.transactions.etherscan
(:require [re-frame.core :as re-frame]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.tokens :as tokens]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.tokens :as tokens]
[status-im.utils.fx :as fx]
[status-im.utils.http :as http]
[status-im.utils.types :as types]

6
src/status_im/extensions/capacities/ethereum.cljs
View File

@ -1,12 +1,12 @@
(ns status-im.extensions.capacities.ethereum
(:require [clojure.string :as string]
[status-im.constants :as constants]
[status-im.ethereum.abi-spec :as abi-spec]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.ens :as ens]
[status-im.i18n :as i18n]
[status-im.native-module.core :as status]
[status-im.ui.screens.navigation :as navigation]
[status-im.utils.ethereum.abi-spec :as abi-spec]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.ens :as ens]
[status-im.utils.fx :as fx]
[status-im.utils.handlers :as handlers]
[status-im.utils.hex :as hex]

4
src/status_im/hardwallet/core.cljs
View File

@ -6,13 +6,13 @@
[status-im.accounts.logout.core :as accounts.logout]
[status-im.accounts.recover.core :as accounts.recover]
[status-im.data-store.accounts :as accounts-store]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.mnemonic :as mnemonic]
[status-im.i18n :as i18n]
[status-im.node.core :as node]
[status-im.ui.screens.navigation :as navigation]
[status-im.utils.config :as config]
[status-im.utils.datetime :as utils.datetime]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.mnemonic :as mnemonic]
[status-im.utils.fx :as fx]
[status-im.utils.platform :as platform]
[status-im.utils.types :as types]

2
src/status_im/init/core.cljs
View File

@ -7,6 +7,7 @@
[status-im.contact.core :as contact]
[status-im.data-store.core :as data-store]
[status-im.data-store.realm.core :as realm]
[status-im.ethereum.core :as ethereum]
[status-im.extensions.registry :as extensions.registry]
[status-im.i18n :as i18n]
[status-im.models.dev-server :as models.dev-server]
@ -18,7 +19,6 @@
[status-im.stickers.core :as stickers]
[status-im.ui.screens.db :refer [app-db]]
[status-im.ui.screens.navigation :as navigation]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.fx :as fx]
[status-im.utils.keychain.core :as keychain]
[status-im.utils.platform :as platform]

12
src/status_im/network/core.cljs
View File

@ -2,19 +2,19 @@
(:require [clojure.string :as string]
[re-frame.core :as re-frame]
[status-im.accounts.update.core :as accounts.update]
[status-im.chaos-mode.core :as chaos-mode]
[status-im.ethereum.core :as ethereum]
[status-im.fleet.core :as fleet-core]
[status-im.i18n :as i18n]
[status-im.mailserver.core :as mailserver]
[status-im.native-module.core :as status]
[status-im.network.net-info :as net-info]
[status-im.mailserver.core :as mailserver]
[status-im.utils.ethereum.core :as ethereum]
[status-im.ui.screens.mobile-network-settings.events :as mobile-network]
[status-im.ui.screens.navigation :as navigation]
[status-im.fleet.core :as fleet-core]
[status-im.utils.fx :as fx]
[status-im.utils.handlers :as handlers]
[status-im.utils.http :as http]
[status-im.utils.types :as types]
[status-im.ui.screens.mobile-network-settings.events :as mobile-network]
[status-im.chaos-mode.core :as chaos-mode]))
[status-im.utils.types :as types]))
(def url-regex
#"https?://(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}(\.[a-z]{2,6})?\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)")

8
src/status_im/protocol/core.cljs
View File

@ -1,13 +1,13 @@
(ns status-im.protocol.core
(:require [re-frame.core :as re-frame]
[status-im.constants :as constants]
[status-im.transport.core :as transport]
[status-im.ethereum.core :as ethereum]
[status-im.i18n :as i18n]
[status-im.mailserver.core :as mailserver]
[status-im.utils.ethereum.core :as ethereum]
[status-im.transport.core :as transport]
[status-im.utils.fx :as fx]
[status-im.utils.semaphores :as semaphores]
[status-im.utils.utils :as utils]
[status-im.i18n :as i18n]))
[status-im.utils.utils :as utils]))
(fx/defn update-sync-state
[{{:keys [sync-state sync-data] :as db} :db} error sync]

4
src/status_im/stickers/core.cljs
View File

@ -3,11 +3,11 @@
[re-frame.core :as re-frame]
[status-im.accounts.core :as accounts]
[status-im.constants :as constants]
[status-im.ethereum.abi-spec :as abi-spec]
[status-im.ethereum.contracts :as contracts]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.json-rpc :as json-rpc]
[status-im.ui.screens.navigation :as navigation]
[status-im.utils.ethereum.abi-spec :as abi-spec]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.fx :as fx]
[status-im.utils.multihash :as multihash]
[status-im.utils.utils :as utils]

4
src/status_im/subs.cljs
View File

@ -10,8 +10,10 @@
[status-im.chat.db :as chat.db]
[status-im.constants :as constants]
[status-im.contact.db :as contact.db]
[status-im.ethereum.tokens :as tokens]
[status-im.ethereum.transactions.core :as transactions]
[status-im.ethereum.transactions.etherscan :as transactions.etherscan]
[status-im.ethereum.core :as ethereum]
[status-im.fleet.core :as fleet]
[status-im.i18n :as i18n]
[status-im.ui.components.bottom-bar.styles :as tabs.styles]
@ -25,8 +27,6 @@
[status-im.utils.build :as build]
[status-im.utils.config :as config]
[status-im.utils.datetime :as datetime]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.tokens :as tokens]
[status-im.utils.identicon :as identicon]
[status-im.utils.money :as money]
[status-im.utils.platform :as platform]

2
src/status_im/tribute_to_talk/core.cljs
View File

@ -5,12 +5,12 @@
[status-im.accounts.update.core :as accounts.update]
[status-im.contact.db :as contact.db]
[status-im.ethereum.contracts :as contracts]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.json-rpc :as json-rpc]
[status-im.ipfs.core :as ipfs]
[status-im.tribute-to-talk.db :as tribute-to-talk.db]
[status-im.ui.screens.navigation :as navigation]
[status-im.utils.contenthash :as contenthash]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.fx :as fx]
[status-im.wallet.core :as wallet]
[taoensso.timbre :as log]))

4
src/status_im/tribute_to_talk/db.cljs
View File

@ -1,6 +1,6 @@
(ns status-im.tribute-to-talk.db
(:require [status-im.js-dependencies :as dependencies]
[status-im.utils.ethereum.core :as ethereum]))
(:require [status-im.ethereum.core :as ethereum]
[status-im.js-dependencies :as dependencies]))
(def utils dependencies/web3-utils)

2
src/status_im/ui/components/common/common.cljs
View File

@ -1,11 +1,11 @@
(ns status-im.ui.components.common.common
(:require [reagent.core :as reagent]
[status-im.ethereum.core :as ethereum]
[status-im.i18n :as i18n]
[status-im.ui.components.colors :as colors]
[status-im.ui.components.common.styles :as styles]
[status-im.ui.components.icons.vector-icons :as vector-icons]
[status-im.ui.components.react :as react]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.platform :as platform])
(:require-macros [status-im.utils.views :refer [defview letsubs]]))

12
src/status_im/ui/screens/add_new/new_chat/events.cljs
View File

@ -1,11 +1,11 @@
(ns status-im.ui.screens.add-new.new-chat.events
(:require [re-frame.core :as re-frame]
(:require [clojure.string :as string]
[re-frame.core :as re-frame]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.ens :as ens]
[status-im.ethereum.resolver :as resolver]
[status-im.ui.screens.add-new.new-chat.db :as db]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.ens :as ens]
[status-im.utils.ethereum.resolver :as resolver]
[status-im.utils.handlers :as handlers]
[clojure.string :as string]))
[status-im.utils.handlers :as handlers]))
(re-frame/reg-fx
:resolve-public-key

6
src/status_im/ui/screens/browser/views.cljs
View File

@ -3,8 +3,10 @@
[re-frame.core :as re-frame]
[reagent.core :as reagent]
[status-im.browser.core :as browser]
[status-im.ethereum.core :as ethereum]
[status-im.i18n :as i18n]
[status-im.ui.components.colors :as colors]
[status-im.ui.components.connectivity.view :as connectivity]
[status-im.ui.components.icons.vector-icons :as icons]
[status-im.ui.components.react :as react]
[status-im.ui.components.status-bar.view :as status-bar]
@ -16,10 +18,8 @@
[status-im.ui.screens.browser.permissions.views :as permissions.views]
[status-im.ui.screens.browser.site-blocked.views :as site-blocked.views]
[status-im.ui.screens.browser.styles :as styles]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.http :as http]
[status-im.utils.js-resources :as js-res]
[status-im.ui.components.connectivity.view :as connectivity])
[status-im.utils.js-resources :as js-res])
(:require-macros
[status-im.utils.slurp :refer [slurp]]
[status-im.utils.views :as views]))

15
src/status_im/ui/screens/stickers/views.cljs
View File

@ -1,17 +1,16 @@
(ns status-im.ui.screens.stickers.views
(:require-macros [status-im.utils.views :refer [defview letsubs]])
(:require [re-frame.core :as re-frame]
[status-im.ethereum.core :as ethereum]
[status-im.i18n :as i18n]
[status-im.ui.components.colors :as colors]
[status-im.ui.components.icons.vector-icons :as icons]
[status-im.ui.components.react :as react]
[status-im.ui.screens.stickers.styles :as styles]
[status-im.ui.components.status-bar.view :as status-bar]
[status-im.ui.components.styles :as components.styles]
[status-im.ui.components.toolbar.view :as toolbar]
[status-im.ui.components.colors :as colors]
[status-im.ui.components.icons.vector-icons :as icons]
[status-im.utils.money :as money]
[status-im.utils.ethereum.core :as ethereum]
[status-im.ui.components.react :as components]))
[status-im.ui.screens.stickers.styles :as styles]
[status-im.utils.money :as money])
(:require-macros [status-im.utils.views :refer [defview letsubs]]))
(defn- thumbnail-icon [uri size]
[react/image {:style {:width size :height size :border-radius (/ size 2)}
@ -36,7 +35,7 @@
(when (and (not (zero? price))) ;(not no-snt?))
[icons/icon :icons/logo {:color colors/white :width 12 :height 12 :container-style {:margin-right 8}}])
(if pending
[components/activity-indicator {:animating true
[react/activity-indicator {:animating true
:color colors/white}]
[react/text {:style {:color colors/white}
:accessibility-label :sticker-pack-price}

8
src/status_im/ui/screens/wallet/choose_recipient/events.cljs
View File

@ -2,11 +2,11 @@
(:require [re-frame.core :as re-frame]
[status-im.constants :as constants]
[status-im.contact.db :as contact.db]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.eip55 :as eip55]
[status-im.ethereum.eip681 :as eip681]
[status-im.ethereum.ens :as ens]
[status-im.i18n :as i18n]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.eip55 :as eip55]
[status-im.utils.ethereum.eip681 :as eip681]
[status-im.utils.ethereum.ens :as ens]
[status-im.utils.handlers :as handlers]
[status-im.utils.money :as money]))

12
src/status_im/ui/screens/wallet/collectibles/events.cljs
View File

@ -1,12 +1,12 @@
(ns status-im.ui.screens.wallet.collectibles.events
(:require [re-frame.core :as re-frame]
[status-im.utils.handlers :as handlers]
[status-im.utils.ethereum.erc721 :as erc721]
[status-im.utils.ethereum.tokens :as tokens]
[status-im.utils.money :as money]
[status-im.browser.core :as browser]
[status-im.utils.ethereum.core :as ethereum]
[status-im.constants :as constants]))
[status-im.constants :as constants]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.erc721 :as erc721]
[status-im.ethereum.tokens :as tokens]
[status-im.utils.handlers :as handlers]
[status-im.utils.money :as money]))
(defmulti load-collectible-fx (fn [_ symbol _] symbol))

14
src/status_im/ui/screens/wallet/collectibles/kudos/events.cljs
View File

@ -1,13 +1,13 @@
(ns status-im.ui.screens.wallet.collectibles.kudos.events
(:require [status-im.ui.screens.wallet.collectibles.events :as collectibles]
[status-im.utils.http :as http]
[status-im.utils.ethereum.erc721 :as erc721]
[status-im.utils.ethereum.tokens :as tokens]
(:require [clojure.string :as string]
[re-frame.core :as re-frame]
[status-im.utils.handlers :as handlers]
[status-im.constants :as constants]
[status-im.utils.ethereum.core :as ethereum]
[clojure.string :as string]))
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.erc721 :as erc721]
[status-im.ethereum.tokens :as tokens]
[status-im.ui.screens.wallet.collectibles.events :as collectibles]
[status-im.utils.handlers :as handlers]
[status-im.utils.http :as http]))
(def kudos :KDO)

4
src/status_im/ui/screens/wallet/collectibles/superrare/events.cljs
View File

@ -1,6 +1,6 @@
(ns status-im.ui.screens.wallet.collectibles.superrare.events
(:require [status-im.ui.screens.wallet.collectibles.events :as collectibles]
[status-im.utils.ethereum.core :as ethereum]
(:require [status-im.ethereum.core :as ethereum]
[status-im.ui.screens.wallet.collectibles.events :as collectibles]
[status-im.utils.http :as http]
[status-im.utils.types :as types]))

46
src/status_im/ui/screens/wallet/components/views.cljs
View File

@ -1,35 +1,35 @@
(ns status-im.ui.screens.wallet.components.views
(:require-macros [status-im.utils.views :as views])
(:require [clojure.string :as string]
[reagent.core :as reagent]
[re-frame.core :as re-frame]
[reagent.core :as reagent]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.eip55 :as eip55]
[status-im.ethereum.tokens :as tokens]
[status-im.i18n :as i18n]
[status-im.ui.components.bottom-buttons.view :as bottom-buttons]
[status-im.ui.components.button.view :as button]
[status-im.ui.screens.chat.photos :as photos]
[status-im.ui.components.list.views :as list]
[status-im.ui.components.list.styles :as list.styles]
[status-im.ui.components.list-selection :as list-selection]
[status-im.ui.components.react :as react]
[status-im.ui.components.styles :as components.styles]
[status-im.ui.screens.wallet.components.styles :as styles]
[status-im.ui.screens.wallet.choose-recipient.views :as choose-recipient]
[status-im.ui.screens.wallet.styles :as wallet.styles]
[status-im.ui.screens.wallet.utils :as wallet.utils]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.tokens :as tokens]
[status-im.utils.money :as money]
[status-im.utils.platform :as platform]
[status-im.ui.components.tooltip.views :as tooltip]
[status-im.ui.components.chat-icon.screen :as chat-icon]
[status-im.ui.components.colors :as colors]
[status-im.utils.core :as utils.core]
[status-im.utils.utils :as utils.utils]
[status-im.ui.components.icons.vector-icons :as vector-icons]
[status-im.ui.components.list-selection :as list-selection]
[status-im.ui.components.list.styles :as list.styles]
[status-im.ui.components.list.views :as list]
[status-im.ui.components.react :as react]
[status-im.ui.components.status-bar.view :as status-bar]
[status-im.ui.components.styles :as components.styles]
[status-im.ui.components.toolbar.actions :as actions]
[status-im.ui.components.toolbar.view :as toolbar]
[status-im.ui.components.status-bar.view :as status-bar]
[status-im.ui.components.icons.vector-icons :as vector-icons]
[status-im.utils.ethereum.eip55 :as eip55]
[status-im.ui.components.chat-icon.screen :as chat-icon]))
[status-im.ui.components.tooltip.views :as tooltip]
[status-im.ui.screens.chat.photos :as photos]
[status-im.ui.screens.wallet.choose-recipient.views
:as
choose-recipient]
[status-im.ui.screens.wallet.components.styles :as styles]
[status-im.ui.screens.wallet.utils :as wallet.utils]
[status-im.utils.core :as utils.core]
[status-im.utils.money :as money]
[status-im.utils.utils :as utils.utils])
(:require-macros [status-im.utils.views :as views]))
;; Wallet tab has a different coloring scheme (dark) that forces color changes (background, text)
;; It might be replaced by some theme mechanism

4
src/status_im/ui/screens/wallet/navigation.cljs
View File

@ -1,8 +1,8 @@
(ns status-im.ui.screens.wallet.navigation
(:require [re-frame.core :as re-frame]
[status-im.constants :as constants]
[status-im.ui.screens.navigation :as navigation]
[status-im.utils.ethereum.core :as ethereum]))
[status-im.ethereum.core :as ethereum]
[status-im.ui.screens.navigation :as navigation]))
(def transaction-send-default
(let [symbol :ETH]

31
src/status_im/ui/screens/wallet/request/views.cljs
View File

@ -1,6 +1,9 @@
(ns status-im.ui.screens.wallet.request.views
(:require-macros [status-im.utils.views :as views])
(:require [re-frame.core :as re-frame]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.eip55 :as eip55]
[status-im.ethereum.eip681 :as eip681]
[status-im.ethereum.tokens :as tokens]
[status-im.i18n :as i18n]
[status-im.ui.components.bottom-buttons.view :as bottom-buttons]
[status-im.ui.components.button.view :as button]
@ -9,22 +12,13 @@
[status-im.ui.components.list-selection :as list-selection]
[status-im.ui.components.qr-code-viewer.views :as qr-code-viewer]
[status-im.ui.components.react :as react]
[status-im.ui.components.status-bar.view :as status-bar]
[status-im.ui.components.toolbar.actions :as actions]
[status-im.ui.components.toolbar.view :as toolbar]
[status-im.ui.screens.wallet.request.styles :as styles]
[status-im.ui.screens.wallet.styles :as wallet.styles]
[status-im.ui.components.styles :as components.styles]
[status-im.ui.components.toolbar.view :as toolbar]
[status-im.ui.screens.wallet.components.views :as wallet.components]
[status-im.ui.screens.wallet.components.views :as components]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.eip681 :as eip681]
[status-im.utils.utils :as utils]
[status-im.utils.ethereum.tokens :as tokens]
[status-im.ui.screens.wallet.request.styles :as styles]
[status-im.ui.screens.wallet.utils :as wallet.utils]
[status-im.ui.screens.chat.photos :as photos]
[status-im.ui.components.list.styles :as list.styles]
[status-im.utils.ethereum.eip55 :as eip55]))
[status-im.utils.utils :as utils])
(:require-macros [status-im.utils.views :as views]))
;; Request screen
@ -44,14 +38,17 @@
[common/network-info {:text-color :white}]
[react/scroll-view {:ref #(reset! scroll %) :keyboardShouldPersistTaps :always}
[react/view styles/request-details-wrapper
[components/recipient-selector {:contact-only? true
[wallet.components/recipient-selector
{:contact-only? true
:address to
:name to-name
:request? true}]
[components/asset-selector {:disabled? false
[wallet.components/asset-selector
{:disabled? false
:type :request
:symbol symbol}]
[components/amount-selector {:error amount-error
[wallet.components/amount-selector
{:error amount-error
:disabled? (= :offline network-status)
:amount amount
:amount-text amount-text

6
src/status_im/ui/screens/wallet/send/events.cljs
View File

@ -2,13 +2,13 @@
(:require [re-frame.core :as re-frame]
[status-im.chat.commands.sending :as commands-sending]
[status-im.constants :as constants]
[status-im.ethereum.abi-spec :as abi-spec]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.tokens :as tokens]
[status-im.i18n :as i18n]
[status-im.native-module.core :as status]
[status-im.transport.utils :as transport.utils]
[status-im.ui.screens.navigation :as navigation]
[status-im.utils.ethereum.abi-spec :as abi-spec]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.tokens :as tokens]
[status-im.utils.fx :as fx]
[status-im.utils.handlers :as handlers]
[status-im.utils.money :as money]

31
src/status_im/ui/screens/wallet/send/views.cljs
View File

@ -1,10 +1,13 @@
(ns status-im.ui.screens.wallet.send.views
(:require-macros [status-im.utils.views :refer [defview letsubs]])
(:require [re-frame.core :as re-frame]
[reagent.core :as reagent]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.tokens :as tokens]
[status-im.i18n :as i18n]
[status-im.ui.components.animation :as animation]
[status-im.ui.components.bottom-buttons.view :as bottom-buttons]
[status-im.ui.components.button.view :as button]
[status-im.ui.components.colors :as colors]
[status-im.ui.components.common.common :as common]
[status-im.ui.components.icons.vector-icons :as vector-icons]
[status-im.ui.components.react :as react]
@ -13,23 +16,20 @@
[status-im.ui.components.toolbar.actions :as actions]
[status-im.ui.components.toolbar.view :as toolbar]
[status-im.ui.components.tooltip.views :as tooltip]
[status-im.ui.screens.wallet.components.styles :as wallet.components.styles]
[status-im.ui.screens.wallet.components.views :as components]
[status-im.ui.screens.wallet.components.styles
:as
wallet.components.styles]
[status-im.ui.screens.wallet.components.views :as wallet.components]
[status-im.ui.screens.wallet.main.views :as wallet.main.views]
[status-im.ui.screens.wallet.send.animations :as send.animations]
[status-im.ui.screens.wallet.send.styles :as styles]
[status-im.ui.screens.wallet.styles :as wallet.styles]
[status-im.ui.screens.wallet.main.views :as wallet.main.views]
[status-im.ui.screens.wallet.utils :as wallet.utils]
[status-im.utils.money :as money]
[status-im.utils.security :as security]
[status-im.utils.utils :as utils]
[status-im.utils.ethereum.tokens :as tokens]
[status-im.utils.ethereum.core :as ethereum]
[status-im.transport.utils :as transport.utils]
[taoensso.timbre :as log]
[reagent.core :as reagent]
[status-im.ui.components.colors :as colors]
[status-im.ui.screens.wallet.utils :as wallet.utils]))
[taoensso.timbre :as log])
(:require-macros [status-im.utils.views :refer [defview letsubs]]))
(defn- toolbar [modal? title]
(let [action (if modal? actions/close-white actions/back-white)]
@ -168,15 +168,18 @@
(when-not online?
[wallet.main.views/snackbar :t/error-cant-send-transaction-offline])
[react/view styles/send-transaction-form
[components/recipient-selector {:disabled? (or from-chat? modal? show-password-input?)
[wallet.components/recipient-selector
{:disabled? (or from-chat? modal? show-password-input?)
:address to
:name to-name
:modal? modal?}]
[components/asset-selector {:disabled? (or from-chat? modal? show-password-input?)
[wallet.components/asset-selector
{:disabled? (or from-chat? modal? show-password-input?)
:error asset-error
:type :send
:symbol symbol}]
[components/amount-selector {:disabled? (or from-chat? modal? show-password-input?)
[wallet.components/amount-selector
{:disabled? (or from-chat? modal? show-password-input?)
:error (or amount-error
(when-not sufficient-funds? (i18n/label :t/wallet-insufficient-funds))
(when-not sufficient-gas? (i18n/label :t/wallet-insufficient-gas)))

19
src/status_im/ui/screens/wallet/settings/views.cljs
View File

@ -1,25 +1,24 @@
(ns status-im.ui.screens.wallet.settings.views
(:require-macros [status-im.utils.views :refer [defview letsubs]])
(:require [re-frame.core :as re-frame]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.tokens :as tokens]
[status-im.i18n :as i18n]
[status-im.ui.components.action-button.action-button :as action-button]
[status-im.ui.components.chat-icon.screen :as chat-icon]
[status-im.ui.components.colors :as colors]
[status-im.ui.components.list-header.views :as list-header]
[status-im.ui.components.list.views :as list]
[status-im.ui.components.react :as react]
[status-im.ui.components.styles :as components.styles]
[status-im.ui.components.toolbar.view :as toolbar]
[status-im.ui.components.toolbar.actions :as toolbar.actions]
[status-im.ui.components.status-bar.view :as status-bar]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.tokens :as tokens]
[status-im.ui.components.styles :as components.styles]
[status-im.ui.components.toolbar.actions :as actions]
[status-im.ui.components.action-button.action-button :as action-button]
[status-im.ui.components.list-header.views :as list-header]
[status-im.ui.components.chat-icon.screen :as chat-icon]))
[status-im.ui.components.toolbar.view :as toolbar])
(:require-macros [status-im.utils.views :refer [defview letsubs]]))
(defn toolbar []
[toolbar/toolbar nil
[toolbar/nav-button
(toolbar.actions/back #(re-frame/dispatch
(actions/back #(re-frame/dispatch
[:wallet.settings.ui/navigate-back-pressed]))]
[toolbar/content-title
(i18n/label :t/wallet-assets)]])

13
src/status_im/ui/screens/wallet/transaction_fee/views.cljs
View File

@ -1,9 +1,11 @@
(ns status-im.ui.screens.wallet.transaction-fee.views
(:require-macros [status-im.utils.views :refer [defview letsubs]])
(:require [re-frame.core :as re-frame]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.tokens :as tokens]
[status-im.i18n :as i18n]
[status-im.ui.components.bottom-buttons.view :as bottom-buttons]
[status-im.ui.components.button.view :as button]
[status-im.ui.components.colors :as colors]
[status-im.ui.components.react :as react]
[status-im.ui.components.styles :as components.styles]
[status-im.ui.components.toolbar.actions :as act]
@ -11,12 +13,9 @@
[status-im.ui.components.tooltip.views :as tooltip]
[status-im.ui.screens.wallet.components.views :as components]
[status-im.ui.screens.wallet.send.styles :as styles]
[status-im.ui.screens.wallet.styles :as wallet.styles]
[status-im.utils.money :as money]
[status-im.utils.ethereum.tokens :as tokens]
[status-im.utils.ethereum.core :as ethereum]
[status-im.ui.components.colors :as colors]
[status-im.ui.screens.wallet.utils :as wallet.utils]))
[status-im.ui.screens.wallet.utils :as wallet.utils]
[status-im.utils.money :as money])
(:require-macros [status-im.utils.views :refer [defview letsubs]]))
(defn- toolbar [title]
[toolbar/toolbar

6
src/status_im/ui/screens/wallet/transactions/views.cljs
View File

@ -8,11 +8,7 @@
[status-im.ui.components.styles :as components.styles]
[status-im.ui.components.toolbar.actions :as actions]
[status-im.ui.components.toolbar.view :as toolbar]
[status-im.ui.screens.wallet.transactions.styles :as styles]
[status-im.ui.screens.wallet.utils :as wallet.utils]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.tokens :as tokens]
[status-im.utils.money :as money])
[status-im.ui.screens.wallet.transactions.styles :as styles])
(:require-macros [status-im.utils.views :refer [defview letsubs]]))
;;;;;;;;;;;;;;;;;;;;;;;;;;;

6
src/status_im/utils/db.cljs
View File

@ -1,8 +1,6 @@
(ns status-im.utils.db
(:require [clojure.string :as string]
[cljs.spec.alpha :as spec]
[status-im.js-dependencies :as dependencies]
[status-im.utils.ethereum.core :as ethereum]))
(:require [cljs.spec.alpha :as spec]
[status-im.ethereum.core :as ethereum]))
(defn valid-public-key? [s]
(boolean (re-matches #"0x04[0-9a-f]{128}" s)))

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

@ -1,12 +1,13 @@
(ns status-im.utils.universal-links.core
(:require [cljs.spec.alpha :as spec]
[goog.string :as gstring]
[goog.string.format]
[re-frame.core :as re-frame]
[status-im.accounts.db :as accounts.db]
[status-im.chat.models :as chat]
[status-im.pairing.core :as pairing]
[status-im.constants :as constants]
[status-im.ethereum.eip681 :as eip681]
[status-im.extensions.registry :as extensions.registry]
[status-im.pairing.core :as pairing]
[status-im.ui.components.list-selection :as list-selection]
[status-im.ui.components.react :as react]
[status-im.ui.screens.add-new.new-chat.db :as new-chat.db]
@ -14,10 +15,8 @@
[status-im.ui.screens.navigation :as navigation]
[status-im.utils.config :as config]
[status-im.utils.fx :as fx]
[status-im.utils.ethereum.eip681 :as eip681]
[taoensso.timbre :as log]
[status-im.utils.platform :as platform]
[status-im.constants :as constants]))
[taoensso.timbre :as log]))
;; TODO(yenda) investigate why `handle-universal-link` event is
;; dispatched 7 times for the same link

2
src/status_im/utils/varint.cljs
View File

@ -1,6 +1,6 @@
(ns ^{:doc "Implementation of varint based on https://github.com/chrisdickinson/varint"}
status-im.utils.varint
(:require [status-im.utils.ethereum.abi-spec :as abi-spec]
(:require [status-im.ethereum.abi-spec :as abi-spec]
[status-im.js-dependencies :as dependencies]))
(def utils dependencies/web3-utils)

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

@ -3,15 +3,15 @@
[re-frame.core :as re-frame]
[status-im.accounts.update.core :as accounts.update]
[status-im.constants :as constants]
[status-im.ethereum.abi-spec :as abi-spec]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.json-rpc :as json-rpc]
[status-im.ethereum.tokens :as tokens]
[status-im.i18n :as i18n]
[status-im.ui.screens.navigation :as navigation]
[status-im.ui.screens.wallet.utils :as wallet.utils]
[status-im.utils.config :as config]
[status-im.utils.core :as utils.core]
[status-im.utils.ethereum.abi-spec :as abi-spec]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.tokens :as tokens]
[status-im.utils.fx :as fx]
[status-im.utils.hex :as utils.hex]
[status-im.utils.money :as money]

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

@ -1,14 +1,14 @@
(ns status-im.wallet.custom-tokens.core
(:require [clojure.string :as string]
[re-frame.core :as re-frame]
[status-im.ethereum.core :as ethereum]
[status-im.ethereum.decode :as decode]
[status-im.ethereum.json-rpc :as json-rpc]
[status-im.i18n :as i18n]
[status-im.ui.components.colors :as colors]
[status-im.ui.components.react :as react]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.money :as money]
[status-im.utils.fx :as fx]
[status-im.utils.money :as money]
[status-im.wallet.core :as wallet]))
(re-frame/reg-fx

2
src/status_im/web3/core.cljs
View File

@ -2,7 +2,7 @@
(:require [re-frame.core :as re-frame]
[status-im.utils.fx :as fx]
[status-im.js-dependencies :as dependencies]
[status-im.utils.ethereum.core :as ethereum]
[status-im.ethereum.core :as ethereum]
[status-im.node.core :as node]
[status-im.protocol.core :as protocol]
[taoensso.timbre :as log]

2
test/appium/tests/test_api.py
View File

@ -11,7 +11,7 @@ from tests import marks
def get_parameters():
directory = os.sep.join(__file__.split(os.sep)[:-4])
file_path = path.join(directory, 'src/status_im/utils/ethereum/tokens.cljs')
file_path = path.join(directory, 'src/status_im/ethereum/tokens.cljs')
with open(file_path, 'r') as f:
data = f.read()
return re.findall('{:symbol\s*:(.*)\n\s*:name\s*"(.*)"\n\s*:address\s*"(.*)"\n\s*:decimals\s*(.*)}', data)

4
test/cljs/status_im/test/utils/ethereum/abi_spec.cljs → test/cljs/status_im/test/ethereum/abi_spec.cljs
View File

@ -1,6 +1,6 @@
(ns status-im.test.utils.ethereum.abi-spec
(ns status-im.test.ethereum.abi-spec
(:require [cljs.test :refer-macros [deftest is testing]]
[status-im.utils.ethereum.abi-spec :as abi-spec]))
[status-im.ethereum.abi-spec :as abi-spec]))
(deftest hex-to-number
(testing "hex number is less than 53 bits, it returns a number")

4
test/cljs/status_im/test/utils/ethereum/core.cljs → test/cljs/status_im/test/ethereum/core.cljs
View File

@ -1,6 +1,6 @@
(ns status-im.test.utils.ethereum.core
(ns status-im.test.ethereum.core
(:require [cljs.test :refer-macros [deftest is]]
[status-im.utils.ethereum.core :as ethereum]))
[status-im.ethereum.core :as ethereum]))
(deftest chain-id->chain-keyword
(is (= (ethereum/chain-id->chain-keyword 1) :mainnet))

6
test/cljs/status_im/test/utils/ethereum/eip55.cljs → test/cljs/status_im/test/ethereum/eip55.cljs
View File

@ -1,6 +1,6 @@
(ns status-im.test.utils.ethereum.eip55
(:require [cljs.test :refer-macros [deftest is testing]]
[status-im.utils.ethereum.eip55 :as eip55]))
(ns status-im.test.ethereum.eip55
(:require [cljs.test :refer-macros [deftest is]]
[status-im.ethereum.eip55 :as eip55]))
(deftest valid-address-checksum?
(is (= true (eip55/valid-address-checksum? "0x52908400098527886E0F7030069857D2E4169EE7")))

4
test/cljs/status_im/test/utils/ethereum/eip681.cljs → test/cljs/status_im/test/ethereum/eip681.cljs
View File

@ -1,6 +1,6 @@
(ns status-im.test.utils.ethereum.eip681
(ns status-im.test.ethereum.eip681
(:require [cljs.test :refer-macros [deftest is testing]]
[status-im.utils.ethereum.eip681 :as eip681]
[status-im.ethereum.eip681 :as eip681]
[status-im.utils.money :as money]))
(deftest parse-uri

4
test/cljs/status_im/test/utils/ethereum/ens.cljs → test/cljs/status_im/test/ethereum/ens.cljs
View File

@ -1,6 +1,6 @@
(ns status-im.test.utils.ethereum.ens
(ns status-im.test.ethereum.ens
(:require [cljs.test :refer-macros [deftest is testing]]
[status-im.utils.ethereum.ens :as ens]))
[status-im.ethereum.ens :as ens]))
(deftest namehash
(is (= (str "0x" ens/default-namehash) (ens/namehash nil)))

4
test/cljs/status_im/test/utils/ethereum/mnemonic.cljs → test/cljs/status_im/test/ethereum/mnemonic.cljs
View File

@ -1,6 +1,6 @@
(ns status-im.test.utils.ethereum.mnemonic
(ns status-im.test.ethereum.mnemonic
(:require [cljs.test :refer-macros [deftest is testing]]
[status-im.utils.ethereum.mnemonic :as mnemonic]))
[status-im.ethereum.mnemonic :as mnemonic]))
(deftest valid-words?
(is (not (mnemonic/valid-words? ["rate" "rate"])))

208
test/cljs/status_im/test/runner.cljs
View File

@ -1,70 +1,70 @@
(ns status-im.test.runner
(:require [doo.runner :refer-macros [doo-tests]]
[status-im.test.contacts.db]
[status-im.test.accounts.recover.core]
[status-im.test.browser.core]
[status-im.test.browser.permissions]
[status-im.test.chat.commands.core]
[status-im.test.chat.commands.impl.transactions]
[status-im.test.chat.commands.input]
[status-im.test.chat.db]
[status-im.test.chat.models.input]
[status-im.test.chat.models.loading]
[status-im.test.chat.models.message-content]
[status-im.test.chat.models.message]
[status-im.test.chat.models]
[status-im.test.chat.views.photos]
[status-im.test.contact-code.core]
[status-im.test.contact-recovery.core]
[status-im.test.contacts.device-info]
[status-im.test.data-store.chats]
[status-im.test.data-store.core]
[status-im.test.data-store.realm.core]
[status-im.test.ethereum.abi-spec]
[status-im.test.ethereum.core]
[status-im.test.ethereum.eip55]
[status-im.test.ethereum.eip681]
[status-im.test.ethereum.ens]
[status-im.test.ethereum.mnemonic]
[status-im.test.extensions.core]
[status-im.test.extensions.ethereum]
[status-im.test.browser.core]
[status-im.test.browser.permissions]
[status-im.test.wallet.subs]
[status-im.test.wallet.transactions]
[status-im.test.wallet.transactions.subs]
[status-im.test.mailserver.core]
[status-im.test.fleet.core]
[status-im.test.group-chats.core]
[status-im.test.pairing.core]
[status-im.test.node.core]
[status-im.test.models.bootnode]
[status-im.test.hardwallet.core]
[status-im.test.i18n]
[status-im.test.init.core]
[status-im.test.mailserver.core]
[status-im.test.models.account]
[status-im.test.models.bootnode]
[status-im.test.models.contact]
[status-im.test.models.network]
[status-im.test.models.wallet]
[status-im.test.node.core]
[status-im.test.pairing.core]
[status-im.test.search.core]
[status-im.test.sign-in.flow]
[status-im.test.transport.core]
[status-im.test.chat.models]
[status-im.test.chat.models.input]
[status-im.test.chat.models.loading]
[status-im.test.chat.models.message]
[status-im.test.chat.models.message-content]
[status-im.test.chat.db]
[status-im.test.chat.views.photos]
[status-im.test.chat.commands.core]
[status-im.test.chat.commands.input]
[status-im.test.chat.commands.impl.transactions]
[status-im.test.i18n]
[status-im.test.utils.utils]
[status-im.test.utils.money]
[status-im.test.utils.clocks]
[status-im.test.utils.contenthash]
[status-im.test.utils.ethereum.eip55]
[status-im.test.utils.ethereum.eip681]
[status-im.test.utils.ethereum.core]
[status-im.test.utils.ethereum.abi-spec]
[status-im.test.utils.ethereum.ens]
[status-im.test.utils.ethereum.mnemonic]
[status-im.test.utils.random]
[status-im.test.utils.gfycat.core]
[status-im.test.utils.signing-phrase.core]
[status-im.test.utils.transducers]
[status-im.test.utils.async]
[status-im.test.utils.datetime]
[status-im.test.utils.prices]
[status-im.test.utils.keychain.core]
[status-im.test.utils.universal-links.core]
[status-im.test.utils.http]
[status-im.test.init.core]
[status-im.test.ui.screens.add-new.models]
[status-im.test.utils.fx]
[status-im.test.accounts.recover.core]
[status-im.test.hardwallet.core]
[status-im.test.contact-recovery.core]
[status-im.test.contact-code.core]
[status-im.test.ui.screens.currency-settings.models]
[status-im.test.ui.screens.wallet.db]
[status-im.test.sign-in.flow]))
[status-im.test.utils.async]
[status-im.test.utils.clocks]
[status-im.test.utils.contenthash]
[status-im.test.utils.datetime]
[status-im.test.utils.fx]
[status-im.test.utils.gfycat.core]
[status-im.test.utils.http]
[status-im.test.utils.keychain.core]
[status-im.test.utils.money]
[status-im.test.utils.prices]
[status-im.test.utils.random]
[status-im.test.utils.signing-phrase.core]
[status-im.test.utils.transducers]
[status-im.test.utils.universal-links.core]
[status-im.test.utils.utils]
[status-im.test.wallet.subs]
[status-im.test.wallet.transactions.subs]
[status-im.test.wallet.transactions]
[status-im.test.contacts.db]))
(enable-console-print!)
@ -75,68 +75,68 @@
(set! goog.DEBUG false)
(doo-tests
'status-im.test.utils.async
'status-im.test.accounts.recover.core
'status-im.test.browser.core
'status-im.test.browser.permissions
'status-im.test.chat.commands.core
'status-im.test.chat.commands.impl.transactions
'status-im.test.chat.commands.input
'status-im.test.chat.db
'status-im.test.contacts.db
'status-im.test.contacts.device-info
'status-im.test.chat.models
'status-im.test.init.core
'status-im.test.data-store.chats
'status-im.test.data-store.core
'status-im.test.data-store.realm.core
'status-im.test.extensions.core
'status-im.test.mailserver.core
'status-im.test.fleet.core
'status-im.test.group-chats.core
'status-im.test.pairing.core
'status-im.test.node.core
'status-im.test.models.bootnode
'status-im.test.models.account
'status-im.test.models.contact
'status-im.test.models.network
'status-im.test.models.wallet
'status-im.test.wallet.subs
'status-im.test.wallet.transactions
'status-im.test.wallet.transactions.subs
'status-im.test.chat.models.loading
'status-im.test.chat.models.input
'status-im.test.chat.models.loading
'status-im.test.chat.models.message
'status-im.test.chat.models.message-content
'status-im.test.chat.views.photos
'status-im.test.chat.commands.core
'status-im.test.chat.commands.input
'status-im.test.chat.commands.impl.transactions
'status-im.test.i18n
'status-im.test.search.core
'status-im.test.transport.core
'status-im.test.utils.utils
'status-im.test.utils.money
'status-im.test.utils.clocks
'status-im.test.utils.contenthash
'status-im.test.utils.ethereum.eip55
'status-im.test.utils.ethereum.eip681
'status-im.test.utils.ethereum.core
'status-im.test.utils.ethereum.mnemonic
'status-im.test.utils.ethereum.abi-spec
'status-im.test.utils.ethereum.ens
'status-im.test.utils.random
'status-im.test.utils.gfycat.core
'status-im.test.utils.signing-phrase.core
'status-im.test.utils.transducers
'status-im.test.utils.datetime
'status-im.test.utils.prices
'status-im.test.utils.keychain.core
'status-im.test.utils.universal-links.core
'status-im.test.utils.http
'status-im.test.utils.fx
'status-im.test.ui.screens.add-new.models
'status-im.test.accounts.recover.core
'status-im.test.contact-code.core
'status-im.test.contact-recovery.core
'status-im.test.contacts.db
'status-im.test.contacts.device-info
'status-im.test.data-store.chats
'status-im.test.data-store.core
'status-im.test.data-store.realm.core
'status-im.test.ethereum.abi-spec
'status-im.test.ethereum.core
'status-im.test.ethereum.eip55
'status-im.test.ethereum.eip681
'status-im.test.ethereum.ens
'status-im.test.ethereum.mnemonic
'status-im.test.extensions.core
'status-im.test.extensions.ethereum
'status-im.test.fleet.core
'status-im.test.group-chats.core
'status-im.test.hardwallet.core
'status-im.test.i18n
'status-im.test.init.core
'status-im.test.mailserver.core
'status-im.test.models.account
'status-im.test.models.bootnode
'status-im.test.models.contact
'status-im.test.models.network
'status-im.test.models.wallet
'status-im.test.node.core
'status-im.test.pairing.core
'status-im.test.search.core
'status-im.test.sign-in.flow
'status-im.test.transport.core
'status-im.test.ui.screens.add-new.models
'status-im.test.ui.screens.currency-settings.models
'status-im.test.ui.screens.wallet.db
'status-im.test.browser.core
'status-im.test.contact-recovery.core
'status-im.test.contact-code.core
'status-im.test.extensions.ethereum
'status-im.test.browser.permissions
'status-im.test.sign-in.flow)
'status-im.test.utils.async
'status-im.test.utils.clocks
'status-im.test.utils.contenthash
'status-im.test.utils.datetime
'status-im.test.utils.fx
'status-im.test.utils.gfycat.core
'status-im.test.utils.http
'status-im.test.utils.keychain.core
'status-im.test.utils.money
'status-im.test.utils.prices
'status-im.test.utils.random
'status-im.test.utils.signing-phrase.core
'status-im.test.utils.transducers
'status-im.test.utils.universal-links.core
'status-im.test.utils.utils
'status-im.test.wallet.subs
'status-im.test.wallet.transactions
'status-im.test.wallet.transactions.subs)