[#13006] Use token list from status-go
Signed-off-by: andrey <motor4ik@gmail.com>
This commit is contained in:
andrey
parent
b63117845a
commit
c0e30b459f
|
|
@ -196,6 +196,8 @@
|
|||
"wallet_getOpenseaCollectionsByOwner" {}
|
||||
"wallet_getOpenseaAssetsByOwnerAndCollection" {}
|
||||
"wallet_loadTransferByHash" {}
|
||||
"wallet_getTokens" {};, %* [chainId]}
|
||||
"wallet_getTokensBalancesForChainIDs" {};, %* [@[chainId], accounts, tokens]
|
||||
"browsers_getBrowsers" {}
|
||||
"browsers_addBrowser" {}
|
||||
"browsers_deleteBrowser" {}
|
||||
|
|
|
|||
|
|
@ -1,37 +1,26 @@
|
|||
(ns status-im.ethereum.macros
|
||||
(:require [clojure.string :as string]
|
||||
[clojure.java.io :as io]))
|
||||
(:require [clojure.java.io :as io]
|
||||
[clojure.string :as cstr]))
|
||||
|
||||
(defn token-icon-path
|
||||
[network symbol]
|
||||
(let [s (str "./resources/images/tokens/" (name network) "/" (name symbol) ".png")
|
||||
s-js (str "." s)
|
||||
image (gensym)]
|
||||
(if (.exists (io/file s))
|
||||
`(let [~image (atom nil)]
|
||||
(fn []
|
||||
(or @~image
|
||||
(reset! ~image (js/require ~s-js)))))
|
||||
`(let [~image (atom nil)]
|
||||
(fn []
|
||||
(or
|
||||
@~image
|
||||
(reset! ~image
|
||||
(js/require "../resources/images/tokens/default-token.png"))))))))
|
||||
|
||||
(defn- token->icon [network {:keys [icon symbol]}]
|
||||
;; Tokens can define their own icons.
|
||||
;; If not try to make one using a local image as resource, if it does not exist fallback to default.
|
||||
(or icon (token-icon-path network symbol)))
|
||||
(defn token-icon-path [path]
|
||||
(fn [el]
|
||||
(let [el (cstr/replace el ".png" "")
|
||||
s (str path el ".png")
|
||||
s-js (str "." s)]
|
||||
(when (.exists (io/file s))
|
||||
[el `(js/require ~s-js)]))))
|
||||
|
||||
(defmacro resolve-icons
|
||||
"In react-native arguments to require must be static strings.
|
||||
Resolve all icons at compilation time so no variable is used."
|
||||
[network tokens]
|
||||
(mapv #(-> %
|
||||
(assoc-in [:icon :source] (token->icon network %))
|
||||
(update :address string/lower-case))
|
||||
tokens))
|
||||
[network]
|
||||
(let [path (str "./resources/images/tokens/" (name network) "/")
|
||||
files (->> (io/file path)
|
||||
file-seq
|
||||
(filter #(cstr/ends-with? % "png"))
|
||||
(map #(first (cstr/split (.getName %) #"@")))
|
||||
distinct)]
|
||||
(into {} (map (token-icon-path path) files))))
|
||||
|
||||
(defn network->icon [network]
|
||||
(let [s (str "./resources/images/tokens/" (name network) "/0-native.png")
|
||||
|
|
|
|||
|
|
@ -52,804 +52,20 @@
|
|||
(defn ethereum? [symbol]
|
||||
(native-currency-symbols symbol))
|
||||
|
||||
;; NOTE(goranjovic) - fields description:
|
||||
;;
|
||||
;; - address - token contract address
|
||||
;; - symbol - token identifier, must be unique within network
|
||||
;; - name - token display name
|
||||
;; - decimals - the maximum number of decimals (raw balance must be divided by 10^decimals to get the actual amount)
|
||||
;; - nft? - set to true when token is an ERC-781 collectible
|
||||
;; - hidden? - when true, token is not displayed in any asset selection screens, but will be displayed properly in
|
||||
;; transaction history (setting this field is a form of "soft" token removal).
|
||||
;; - skip-decimals-check? - some tokens do not include the decimals field, which is compliant with ERC-20 since it is
|
||||
;;; and optional field. In that case we are explicitly skipping this step in order not to raise a false error.
|
||||
;;; We have this explicit flag for decimals and not for name and symbol because we can't tell apart unset decimals
|
||||
;;; from 0 decimals case.
|
||||
|
||||
(def all-default-tokens
|
||||
{:mainnet
|
||||
(resolve-icons :mainnet
|
||||
[{:symbol :DAI
|
||||
:name "Dai Stablecoin"
|
||||
:address "0x6b175474e89094c44da98b954eedeac495271d0f"
|
||||
:decimals 18}
|
||||
{:symbol :SAI
|
||||
:name "Sai Stablecoin v1.0"
|
||||
:address "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359"
|
||||
:decimals 18}
|
||||
{:symbol :MKR
|
||||
:name "MKR"
|
||||
:address "0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2"
|
||||
:decimals 18}
|
||||
{:symbol :EOS
|
||||
:name "EOS"
|
||||
:address "0x86fa049857e0209aa7d9e616f7eb3b3b78ecfdb0"
|
||||
:decimals 18}
|
||||
{:symbol :OMG
|
||||
:name "OMGToken"
|
||||
:address "0xd26114cd6ee289accf82350c8d8487fedb8a0c07"
|
||||
:decimals 18}
|
||||
{:symbol :PPT
|
||||
:name "Populous Platform"
|
||||
:address "0xd4fa1460f537bb9085d22c7bccb5dd450ef28e3a"
|
||||
:decimals 8}
|
||||
{:symbol :REP
|
||||
:name "Reputation"
|
||||
:address "0x1985365e9f78359a9b6ad760e32412f4a445e862"
|
||||
:decimals 18}
|
||||
{:symbol :POWR
|
||||
:name "PowerLedger"
|
||||
:address "0x595832f8fc6bf59c85c527fec3740a1b7a361269"
|
||||
:decimals 6}
|
||||
{:symbol :PAY
|
||||
:name "TenX Pay Token"
|
||||
:address "0xb97048628db6b661d4c2aa833e95dbe1a905b280"
|
||||
:decimals 18}
|
||||
{:symbol :VRS
|
||||
:name "Veros"
|
||||
:address "0x92e78dae1315067a8819efd6dca432de9dcde2e9"
|
||||
:decimals 6}
|
||||
{:symbol :GNT
|
||||
:name "Golem Network Token"
|
||||
:address "0xa74476443119a942de498590fe1f2454d7d4ac0d"
|
||||
:decimals 18}
|
||||
{:symbol :SALT
|
||||
:name "Salt"
|
||||
:address "0x4156d3342d5c385a87d264f90653733592000581"
|
||||
:decimals 8}
|
||||
{:symbol :BNB
|
||||
:name "BNB"
|
||||
:address "0xb8c77482e45f1f44de1745f52c74426c631bdd52"
|
||||
:decimals 18}
|
||||
{:symbol :BAT
|
||||
:name "Basic Attention Token"
|
||||
:address "0x0d8775f648430679a709e98d2b0cb6250d2887ef"
|
||||
:decimals 18}
|
||||
{:symbol :KNC
|
||||
:name "Kyber Network Crystal"
|
||||
:address "0xdd974d5c2e2928dea5f71b9825b8b646686bd200"
|
||||
:decimals 18}
|
||||
{:symbol :BTU
|
||||
:name "BTU Protocol"
|
||||
:address "0xb683D83a532e2Cb7DFa5275eED3698436371cc9f"
|
||||
:decimals 18}
|
||||
{:symbol :DGD
|
||||
:name "Digix DAO"
|
||||
:address "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a"
|
||||
:decimals 9
|
||||
:skip-decimals-check? true}
|
||||
{:symbol :AE
|
||||
:name "Aeternity"
|
||||
:address "0x5ca9a71b1d01849c0a95490cc00559717fcf0d1d"
|
||||
:decimals 18}
|
||||
{:symbol :TRX
|
||||
:name "Tronix"
|
||||
:address "0xf230b790e05390fc8295f4d3f60332c93bed42e2"
|
||||
:decimals 6}
|
||||
{:symbol :RDN
|
||||
:name "Raiden Token"
|
||||
:address "0x255aa6df07540cb5d3d297f0d0d4d84cb52bc8e6"
|
||||
:decimals 18}
|
||||
{:symbol :SNT
|
||||
:name "Status Network Token"
|
||||
:address "0x744d70fdbe2ba4cf95131626614a1763df805b9e"
|
||||
:decimals 18}
|
||||
{:symbol :SNGLS
|
||||
:name "SingularDTV"
|
||||
:address "0xaec2e87e0a235266d9c5adc9deb4b2e29b54d009"
|
||||
:decimals 0}
|
||||
{:symbol :GNO
|
||||
:name "Gnosis Token"
|
||||
:address "0x6810e776880c02933d47db1b9fc05908e5386b96"
|
||||
:decimals 18}
|
||||
{:symbol :STORJ
|
||||
:name "StorjToken"
|
||||
:address "0xb64ef51c888972c908cfacf59b47c1afbc0ab8ac"
|
||||
:decimals 8}
|
||||
{:symbol :ADX
|
||||
:name "AdEx"
|
||||
:address "0x4470bb87d77b963a013db939be332f927f2b992e"
|
||||
:decimals 4}
|
||||
{:symbol :FUN
|
||||
:name "FunFair"
|
||||
:address "0x419d0d8bdd9af5e606ae2232ed285aff190e711b"
|
||||
:decimals 8}
|
||||
{:symbol :CVC
|
||||
:name "Civic"
|
||||
:address "0x41e5560054824ea6b0732e656e3ad64e20e94e45"
|
||||
:decimals 8}
|
||||
{:symbol :ICN
|
||||
:name "ICONOMI"
|
||||
:address "0x888666ca69e0f178ded6d75b5726cee99a87d698"
|
||||
:decimals 18}
|
||||
{:symbol :WTC
|
||||
:name "Walton Token"
|
||||
:address "0xb7cb1c96db6b22b0d3d9536e0108d062bd488f74"
|
||||
:decimals 18}
|
||||
{:symbol :BTM
|
||||
:name "Bytom"
|
||||
:address "0xcb97e65f07da24d46bcdd078ebebd7c6e6e3d750"
|
||||
:decimals 8}
|
||||
{:symbol :ZRX
|
||||
:name "0x Protocol Token"
|
||||
:address "0xe41d2489571d322189246dafa5ebde1f4699f498"
|
||||
:decimals 18}
|
||||
{:symbol :BNT
|
||||
:name "Bancor Network Token"
|
||||
:address "0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c"
|
||||
:decimals 18}
|
||||
{:symbol :MTL
|
||||
:name "Metal"
|
||||
:address "0xf433089366899d83a9f26a773d59ec7ecf30355e"
|
||||
:decimals 8}
|
||||
{:symbol :PPP
|
||||
:name "PayPie"
|
||||
:address "0xc42209accc14029c1012fb5680d95fbd6036e2a0"
|
||||
:decimals 18}
|
||||
{:symbol :LINK
|
||||
:name "ChainLink Token"
|
||||
:address "0x514910771af9ca656af840dff83e8264ecf986ca"
|
||||
:decimals 18}
|
||||
{:symbol :KIN
|
||||
:name "Kin"
|
||||
:address "0x818fc6c2ec5986bc6e2cbf00939d90556ab12ce5"
|
||||
:decimals 18}
|
||||
{:symbol :ANT
|
||||
:name "Aragon Network Token"
|
||||
:address "0x960b236a07cf122663c4303350609a66a7b288c0"
|
||||
:decimals 18}
|
||||
{:symbol :MGO
|
||||
:name "MobileGo Token"
|
||||
:address "0x40395044ac3c0c57051906da938b54bd6557f212"
|
||||
:decimals 8}
|
||||
{:symbol :MCO
|
||||
:name "Monaco"
|
||||
:address "0xb63b606ac810a52cca15e44bb630fd42d8d1d83d"
|
||||
:decimals 8}
|
||||
{:symbol :LRC
|
||||
:name "LoopringCoin V2"
|
||||
:address "0xbbbbca6a901c926f240b89eacb641d8aec7aeafd"
|
||||
:decimals 18}
|
||||
{:symbol :ZSC
|
||||
:name "Zeus Shield Coin"
|
||||
:address "0x7a41e0517a5eca4fdbc7fbeba4d4c47b9ff6dc63"
|
||||
:decimals 18}
|
||||
{:symbol :XDATA
|
||||
:name "Streamr (old)"
|
||||
:address "0x0cf0ee63788a0849fe5297f3407f701e122cc023"
|
||||
:decimals 18}
|
||||
{:symbol :RCN
|
||||
:name "Ripio Credit Network Token"
|
||||
:address "0xf970b8e36e23f7fc3fd752eea86f8be8d83375a6"
|
||||
:decimals 18}
|
||||
{:symbol :WINGS
|
||||
:name "WINGS"
|
||||
:address "0x667088b212ce3d06a1b553a7221e1fd19000d9af"
|
||||
:decimals 18}
|
||||
{:symbol :EDG
|
||||
:name "Edgeless"
|
||||
:address "0x08711d3b02c8758f2fb3ab4e80228418a7f8e39c"
|
||||
:decimals 0}
|
||||
{:symbol :MLN
|
||||
:name "Melon Token"
|
||||
:address "0xbeb9ef514a379b997e0798fdcc901ee474b6d9a1"
|
||||
:decimals 18}
|
||||
{:symbol :MDA
|
||||
:name "Moeda Loyalty Points"
|
||||
:address "0x51db5ad35c671a87207d88fc11d593ac0c8415bd"
|
||||
:decimals 18}
|
||||
{:symbol :PLR
|
||||
:name "PILLAR"
|
||||
:address "0xe3818504c1b32bf1557b16c238b2e01fd3149c17"
|
||||
:decimals 18}
|
||||
{:symbol :QRL
|
||||
:name "QRL"
|
||||
:address "0x697beac28b09e122c4332d163985e8a73121b97f"
|
||||
:decimals 8}
|
||||
{:symbol :MOD
|
||||
:name "Modum Token"
|
||||
:address "0x957c30ab0426e0c93cd8241e2c60392d08c6ac8e"
|
||||
:decimals 0}
|
||||
{:symbol :TAAS
|
||||
:name "Token-as-a-Service"
|
||||
:address "0xe7775a6e9bcf904eb39da2b68c5efb4f9360e08c"
|
||||
:decimals 6}
|
||||
{:symbol :GRID
|
||||
:name "GRID Token"
|
||||
:address "0x12b19d3e2ccc14da04fae33e63652ce469b3f2fd"
|
||||
:decimals 12}
|
||||
{:symbol :SAN
|
||||
:name "SANtiment network token"
|
||||
:address "0x7c5a0ce9267ed19b22f8cae653f198e3e8daf098"
|
||||
:decimals 18}
|
||||
{:symbol :SNM
|
||||
:name "SONM Token"
|
||||
:address "0x983f6d60db79ea8ca4eb9968c6aff8cfa04b3c63"
|
||||
:decimals 18}
|
||||
{:symbol :REQ
|
||||
:name "Request Token"
|
||||
:address "0x8f8221afbb33998d8584a2b05749ba73c37a938a"
|
||||
:decimals 18}
|
||||
{:symbol :SUB
|
||||
:name "Substratum"
|
||||
:address "0x12480e24eb5bec1a9d4369cab6a80cad3c0a377a"
|
||||
:decimals 2}
|
||||
{:symbol :MANA
|
||||
:name "Decentraland MANA"
|
||||
:address "0x0f5d2fb29fb7d3cfee444a200298f468908cc942"
|
||||
:decimals 18}
|
||||
{:symbol :AST
|
||||
:name "AirSwap Token"
|
||||
:address "0x27054b13b1b798b345b591a4d22e6562d47ea75a"
|
||||
:decimals 4}
|
||||
{:symbol :R
|
||||
:name "R token"
|
||||
:address "0x48f775efbe4f5ece6e0df2f7b5932df56823b990"
|
||||
:decimals 0}
|
||||
{:symbol :1ST
|
||||
:name "FirstBlood Token"
|
||||
:address "0xaf30d2a7e90d7dc361c8c4585e9bb7d2f6f15bc7"
|
||||
:decimals 18}
|
||||
{:symbol :CFI
|
||||
:name "Cofoundit"
|
||||
:address "0x12fef5e57bf45873cd9b62e9dbd7bfb99e32d73e"
|
||||
:decimals 18}
|
||||
{:symbol :ENG
|
||||
:name "Enigma"
|
||||
:address "0xf0ee6b27b759c9893ce4f094b49ad28fd15a23e4"
|
||||
:decimals 8}
|
||||
{:symbol :AMB
|
||||
:name "Amber Token"
|
||||
:address "0x4dc3643dbc642b72c158e7f3d2ff232df61cb6ce"
|
||||
:decimals 18}
|
||||
{:symbol :XPA
|
||||
:name "XPlay Token"
|
||||
:address "0x90528aeb3a2b736b780fd1b6c478bb7e1d643170"
|
||||
:decimals 18}
|
||||
{:symbol :OTN
|
||||
:name "Open Trading Network"
|
||||
:address "0x881ef48211982d01e2cb7092c915e647cd40d85c"
|
||||
:decimals 18}
|
||||
{:symbol :TRST
|
||||
:name "Trustcoin"
|
||||
:address "0xcb94be6f13a1182e4a4b6140cb7bf2025d28e41b"
|
||||
:decimals 6}
|
||||
{:symbol :TKN
|
||||
:name "Monolith TKN"
|
||||
:address "0xaaaf91d9b90df800df4f55c205fd6989c977e73a"
|
||||
:decimals 8}
|
||||
{:symbol :RHOC
|
||||
:name "RHOC"
|
||||
:address "0x168296bb09e24a88805cb9c33356536b980d3fc5"
|
||||
:decimals 8}
|
||||
{:symbol :TGT
|
||||
:name "Target Coin"
|
||||
:address "0xac3da587eac229c9896d919abc235ca4fd7f72c1"
|
||||
:decimals 1}
|
||||
{:symbol :EVX
|
||||
:name "Everex"
|
||||
:address "0xf3db5fa2c66b7af3eb0c0b782510816cbe4813b8"
|
||||
:decimals 4}
|
||||
{:symbol :ICOS
|
||||
:name "ICOS"
|
||||
:address "0x014b50466590340d41307cc54dcee990c8d58aa8"
|
||||
:decimals 6}
|
||||
{:symbol :DNT
|
||||
:name "district0x Network Token"
|
||||
:address "0x0abdace70d3790235af448c88547603b945604ea"
|
||||
:decimals 18}
|
||||
{:symbol :DCN
|
||||
:name "Dentacoin"
|
||||
:address "0x08d32b0da63e2c3bcf8019c9c5d849d7a9d791e6"
|
||||
:decimals 0}
|
||||
{:symbol :EDO
|
||||
:name "Eidoo Token"
|
||||
:address "0xced4e93198734ddaff8492d525bd258d49eb388e"
|
||||
:decimals 18}
|
||||
{:symbol :CSNO
|
||||
:name "BitDice"
|
||||
:address "0x29d75277ac7f0335b2165d0895e8725cbf658d73"
|
||||
:decimals 8}
|
||||
{:symbol :COB
|
||||
:name "Cobinhood Token"
|
||||
:address "0xb2f7eb1f2c37645be61d73953035360e768d81e6"
|
||||
:decimals 18}
|
||||
{:symbol :ENJ
|
||||
:name "Enjin Coin"
|
||||
:address "0xf629cbd94d3791c9250152bd8dfbdf380e2a3b9c"
|
||||
:decimals 18}
|
||||
{:symbol :AVT
|
||||
:name "AVENTUS"
|
||||
:address "0x0d88ed6e74bbfd96b831231638b66c05571e824f"
|
||||
:decimals 18}
|
||||
{:symbol :TIME
|
||||
:name "Chronobank TIME"
|
||||
:address "0x6531f133e6deebe7f2dce5a0441aa7ef330b4e53"
|
||||
:decimals 8}
|
||||
{:symbol :CND
|
||||
:name "Cindicator Token"
|
||||
:address "0xd4c435f5b09f855c3317c8524cb1f586e42795fa"
|
||||
:decimals 18}
|
||||
{:symbol :STX
|
||||
:name "Stox"
|
||||
:address "0x006bea43baa3f7a6f765f14f10a1a1b08334ef45"
|
||||
:decimals 18}
|
||||
{:symbol :XAUR
|
||||
:name "Xaurum"
|
||||
:address "0x4df812f6064def1e5e029f1ca858777cc98d2d81"
|
||||
:decimals 8}
|
||||
{:symbol :VIB
|
||||
:name "Vibe"
|
||||
:address "0x2c974b2d0ba1716e644c1fc59982a89ddd2ff724"
|
||||
:decimals 18}
|
||||
{:symbol :PRG
|
||||
:name "PRG"
|
||||
:address "0x7728dfef5abd468669eb7f9b48a7f70a501ed29d"
|
||||
:decimals 6}
|
||||
{:symbol :DPY
|
||||
:name "Delphy Token"
|
||||
:address "0x6c2adc2073994fb2ccc5032cc2906fa221e9b391"
|
||||
:decimals 18}
|
||||
{:symbol :CDT
|
||||
:name "CoinDash Token"
|
||||
:address "0x2fe6ab85ebbf7776fee46d191ee4cea322cecf51"
|
||||
:decimals 18}
|
||||
{:symbol :TNT
|
||||
:name "Tierion Network Token"
|
||||
:address "0x08f5a9235b08173b7569f83645d2c7fb55e8ccd8"
|
||||
:decimals 8}
|
||||
{:symbol :DRT
|
||||
:name "DomRaiderToken"
|
||||
:address "0x9af4f26941677c706cfecf6d3379ff01bb85d5ab"
|
||||
:decimals 8}
|
||||
{:symbol :SPANK
|
||||
:name "SPANK"
|
||||
:address "0x42d6622dece394b54999fbd73d108123806f6a18"
|
||||
:decimals 18}
|
||||
{:symbol :BRLN
|
||||
:name "Berlin Coin"
|
||||
:address "0x80046305aaab08f6033b56a360c184391165dc2d"
|
||||
:decimals 18}
|
||||
{:symbol :USDC
|
||||
:name "USD Coin"
|
||||
:address "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
|
||||
:decimals 6}
|
||||
{:symbol :LPT
|
||||
:name "Livepeer Token"
|
||||
:address "0x58b6a8a3302369daec383334672404ee733ab239"
|
||||
:decimals 18}
|
||||
{:symbol :ST
|
||||
:name "Simple Token"
|
||||
:address "0x2c4e8f2d746113d0696ce89b35f0d8bf88e0aeca"
|
||||
:decimals 18}
|
||||
{:symbol :WBTC
|
||||
:name "Wrapped BTC"
|
||||
:address "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599"
|
||||
:decimals 8}
|
||||
{:symbol :BLT
|
||||
:name "Bloom Token"
|
||||
:address "0x107c4504cd79c5d2696ea0030a8dd4e92601b82e"
|
||||
:decimals 18}
|
||||
{:symbol :OXT
|
||||
:name "Orchid"
|
||||
:address "0x4575f41308EC1483f3d399aa9a2826d74Da13Deb"
|
||||
:decimals 18}
|
||||
;; NOTE(goranjovic): the following three tokens are removed from the Manage Assets list
|
||||
;; and automatically removed from user's selection by a migration. However, we still need
|
||||
;; them listed here in order to correctly display any previous transactions the user had
|
||||
;; in their history prior to the upgrade. So, we're just hiding them, not actually deleting from the
|
||||
;; app.
|
||||
{:symbol :Centra
|
||||
:name "Centra token"
|
||||
:address "0x96a65609a7b84e8842732deb08f56c3e21ac6f8a"
|
||||
:decimals 18
|
||||
:hidden? true}
|
||||
{:symbol :ROL
|
||||
:name "DICE"
|
||||
:address "0x2e071d2966aa7d8decb1005885ba1977d6038a65"
|
||||
:decimals 16
|
||||
:hidden? true}
|
||||
{:symbol :ATM
|
||||
:name "Attention Token of Media"
|
||||
:address "0x9b11efcaaa1890f6ee52c6bb7cf8153ac5d74139"
|
||||
:decimals 8
|
||||
:hidden? true}
|
||||
;; NOTE(goranjovic): the following tokens are collectibles
|
||||
{:symbol :CK
|
||||
:nft? true
|
||||
:name "CryptoKitties"
|
||||
:address "0x06012c8cf97bead5deae237070f9587f8e7a266d"}
|
||||
{:symbol :EMONA
|
||||
:nft? true
|
||||
:name "EtheremonAsset"
|
||||
:address "0xb2c0782ae4a299f7358758b2d15da9bf29e1dd99"}
|
||||
{:symbol :STRK
|
||||
:nft? true
|
||||
:name "CryptoStrikers"
|
||||
:address "0xdcaad9fd9a74144d226dbf94ce6162ca9f09ed7e"}
|
||||
{:symbol :SUPR
|
||||
:nft? true
|
||||
:name "SupeRare"
|
||||
:address "0x41a322b28d0ff354040e2cbc676f0320d8c8850d"}
|
||||
{:symbol :SUPRR
|
||||
:nft? true
|
||||
:name "SuperRare"
|
||||
:address "0xb932a70a57673d89f4acffbe830e8ed7f75fb9e0"}
|
||||
{:symbol :KDO
|
||||
:nft? true
|
||||
:name "KudosToken"
|
||||
:address "0x2aea4add166ebf38b63d09a75de1a7b94aa24163"}
|
||||
{:address "0x99ea4dB9EE77ACD40B119BD1dC4E33e1C070b80d"
|
||||
:decimals 18
|
||||
:symbol :QSP
|
||||
:name "Quantstamp Token"}
|
||||
{:address "0x80fB784B7eD66730e8b1DBd9820aFD29931aab03"
|
||||
:decimals 18
|
||||
:symbol :LEND
|
||||
:name "EthLend Token"}
|
||||
{:address "0xA15C7Ebe1f07CaF6bFF097D8a589fb8AC49Ae5B3"
|
||||
:decimals 18
|
||||
:symbol :NPXS
|
||||
:name "Pundi X Token"}
|
||||
{:address "0xA4e8C3Ec456107eA67d3075bF9e3DF3A75823DB0"
|
||||
:decimals 18
|
||||
:symbol :LOOM
|
||||
:name "LoomToken"}
|
||||
{:address "0x0e0989b1f9B8A38983c2BA8053269Ca62Ec9B195"
|
||||
:decimals 8
|
||||
:symbol :POE
|
||||
:name "Po.et"}
|
||||
{:address "0x5732046A883704404F284Ce41FfADd5b007FD668"
|
||||
:decimals 18
|
||||
:symbol :BLZ
|
||||
:name "Bluzelle Token"}
|
||||
{:address "0xFA1a856Cfa3409CFa145Fa4e20Eb270dF3EB21ab"
|
||||
:decimals 18
|
||||
:symbol :IOST
|
||||
:name "IOSToken"}
|
||||
{:address "0x1776e1F26f98b1A5dF9cD347953a26dd3Cb46671"
|
||||
:decimals 18
|
||||
:symbol :NMR
|
||||
:name "Numeraire"}
|
||||
{:address "0x8E870D67F660D95d5be530380D0eC0bd388289E1"
|
||||
:decimals 18
|
||||
:symbol :USDP
|
||||
:name "Pax Dollar"}
|
||||
{:address "0xEA26c4aC16D4a5A106820BC8AEE85fd0b7b2b664"
|
||||
:decimals 18
|
||||
:symbol :QKC
|
||||
:name "QuarkChain Token"}
|
||||
{:address "0x45804880De22913dAFE09f4980848ECE6EcbAf78"
|
||||
:decimals 18
|
||||
:symbol :PAXG
|
||||
:name "Paxos Gold"}
|
||||
{:address "0x865ec58b06bF6305B886793AA20A2da31D034E68"
|
||||
:decimals 18
|
||||
:symbol :MOC
|
||||
:name "Moss Coin"}
|
||||
{:address "0x408e41876cCCDC0F92210600ef50372656052a38"
|
||||
:decimals 18
|
||||
:symbol :REN
|
||||
:name "Republic Token"}
|
||||
{:address "0x607F4C5BB672230e8672085532f7e901544a7375"
|
||||
:decimals 9
|
||||
:symbol :RLC
|
||||
:name "iEx.ec Network Token"}
|
||||
{:address "0x8400D94A5cb0fa0D041a3788e395285d61c9ee5e"
|
||||
:decimals 8
|
||||
:symbol :UBT
|
||||
:name "UniBright"}
|
||||
{:address "0x4f3AfEC4E5a3F2A6a1A411DEF7D7dFe50eE057bF"
|
||||
:decimals 9
|
||||
:symbol :DGX
|
||||
:name "Digix Gold Token"}
|
||||
{:address "0xEA38eAa3C86c8F9B751533Ba2E562deb9acDED40"
|
||||
:decimals 18
|
||||
:symbol :FUEL
|
||||
:name "Fuel Token"}
|
||||
{:address "0x00000100F2A2bd000715001920eB70D229700085"
|
||||
:decimals 18
|
||||
:symbol :TCAD
|
||||
:name "TrueCAD"}
|
||||
{:address "0x6710c63432A2De02954fc0f851db07146a6c0312"
|
||||
:decimals 18
|
||||
:symbol :MFG
|
||||
:name "SyncFab Smart Manufacturing Blockchain"}
|
||||
{:address "0x543Ff227F64Aa17eA132Bf9886cAb5DB55DCAddf"
|
||||
:decimals 18
|
||||
:symbol :GEN
|
||||
:name "DAOstack"}
|
||||
{:address "0x0E8d6b471e332F140e7d9dbB99E5E3822F728DA6"
|
||||
:decimals 18
|
||||
:symbol :ABYSS
|
||||
:name "ABYSS"}
|
||||
{:address "0xB62132e35a6c13ee1EE0f84dC5d40bad8d815206"
|
||||
:decimals 18
|
||||
:symbol :NEXO
|
||||
:name "Nexo"}
|
||||
{:address "0x0000000000085d4780B73119b644AE5ecd22b376"
|
||||
:decimals 18
|
||||
:symbol :TUSD
|
||||
:name "TrueUSD"}
|
||||
{:address "0xD0a4b8946Cb52f0661273bfbC6fD0E0C75Fc6433"
|
||||
:decimals 18
|
||||
:symbol :STORM
|
||||
:name "Storm Token"}
|
||||
{:address "0xaF4DcE16Da2877f8c9e00544c93B62Ac40631F16"
|
||||
:decimals 5
|
||||
:symbol :MTH
|
||||
:name "Monetha"}
|
||||
{:address "0x00000000441378008EA67F4284A57932B1c000a5"
|
||||
:decimals 18
|
||||
:symbol :TGBP
|
||||
:name "TrueGBP"}
|
||||
{:address "0xbf2179859fc6D5BEE9Bf9158632Dc51678a4100e"
|
||||
:decimals 18
|
||||
:symbol :ELF
|
||||
:name "ELF Token"}
|
||||
{:address "0x9992eC3cF6A55b00978cdDF2b27BC6882d88D1eC"
|
||||
:decimals 18
|
||||
:symbol :POLY
|
||||
:name "Polymath"}
|
||||
{:address "0x20F7A3DdF244dc9299975b4Da1C39F8D5D75f05A"
|
||||
:decimals 6
|
||||
:symbol :SPN
|
||||
:name "Sapien Network"}
|
||||
{:address "0x1a7a8BD9106F2B8D977E08582DC7d24c723ab0DB"
|
||||
:decimals 18
|
||||
:symbol :APPC
|
||||
:name "AppCoins"}
|
||||
{:address "0xdAC17F958D2ee523a2206206994597C13D831ec7"
|
||||
:decimals 6
|
||||
:symbol :USDT
|
||||
:name "Tether USD"}
|
||||
{:address "0xa3d58c4E56fedCae3a7c43A725aeE9A71F0ece4e"
|
||||
:decimals 18
|
||||
:symbol :MET
|
||||
:name "Metronome"}
|
||||
{:address "0x6f259637dcD74C767781E37Bc6133cd6A68aa161"
|
||||
:decimals 18
|
||||
:symbol :HT
|
||||
:name "HuobiToken"}
|
||||
{:address "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
|
||||
:decimals 18
|
||||
:symbol :WETH
|
||||
:name "Wrapped Ether"}
|
||||
{:address "0x8f3470A7388c05eE4e7AF3d01D8C722b0FF52374"
|
||||
:decimals 18
|
||||
:symbol :VERI
|
||||
:name "Veritaseum"}
|
||||
{:address "0x00006100F7090010005F1bd7aE6122c3C2CF0090"
|
||||
:decimals 18
|
||||
:symbol :TAUD
|
||||
:name "TrueAUD"}
|
||||
{:address "0x66497A283E0a007bA3974e837784C6AE323447de"
|
||||
:decimals 18
|
||||
:symbol :PT
|
||||
:name "PornToken"}
|
||||
{:address "0xB24754bE79281553dc1adC160ddF5Cd9b74361a4"
|
||||
:decimals 9
|
||||
:symbol :XRL
|
||||
:name "RIALTO"}
|
||||
{:address "0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F"
|
||||
:decimals 18
|
||||
:symbol :SNX
|
||||
:name "Synthetix Network Token"}
|
||||
{:address "0x07e3c70653548B04f0A75970C1F81B4CBbFB606f"
|
||||
:decimals 18
|
||||
:symbol :DLT
|
||||
:name "Delta"}
|
||||
{:address "0x8207c1FfC5B6804F6024322CcF34F29c3541Ae26"
|
||||
:decimals 18
|
||||
:symbol :OGN
|
||||
:name "OriginToken"}
|
||||
{:address "0x554C20B7c486beeE439277b4540A434566dC4C02"
|
||||
:decimals 18
|
||||
:symbol :HST
|
||||
:name "Decision Token"}
|
||||
{:address "0x286BDA1413a2Df81731D4930ce2F862a35A609fE"
|
||||
:decimals 18
|
||||
:symbol :WaBi
|
||||
:name "WaBi"}
|
||||
{:address "0xE5a3229CCb22b6484594973A03a3851dCd948756"
|
||||
:decimals 18
|
||||
:symbol :RAE
|
||||
:name "RAE Token"}
|
||||
{:address "0x24692791Bc444c5Cd0b81e3CBCaba4b04Acd1F3B"
|
||||
:decimals 18
|
||||
:symbol :UKG
|
||||
:name "UnikoinGold"}
|
||||
{:address "0xD46bA6D942050d489DBd938a2C909A5d5039A161"
|
||||
:decimals 9
|
||||
:symbol :AMPL
|
||||
:name "Ampleforth"}
|
||||
{:address "0xA4Bdb11dc0a2bEC88d24A3aa1E6Bb17201112eBe"
|
||||
:decimals 6
|
||||
:symbol :USDS
|
||||
:name "StableUSD"}
|
||||
{:address "0xB98d4C97425d9908E66E53A6fDf673ACcA0BE986"
|
||||
:decimals 18
|
||||
:symbol :ABT
|
||||
:name "ArcBlock"}
|
||||
{:address "0x81c9151de0C8bafCd325a57E3dB5a5dF1CEBf79c"
|
||||
:decimals 18
|
||||
:symbol :DAT
|
||||
:name "Datum Token"}
|
||||
{:address "0xa6a840E50bCaa50dA017b91A0D86B8b2d41156EE"
|
||||
:decimals 18
|
||||
:symbol :EKO
|
||||
:name "EchoLink"}
|
||||
{:address "0x4a57E687b9126435a9B19E4A802113e266AdeBde"
|
||||
:decimals 18
|
||||
:symbol :FXC
|
||||
:name "Flexacoin"}
|
||||
{:address "0xC86D054809623432210c107af2e3F619DcFbf652"
|
||||
:decimals 18
|
||||
:symbol :UPP
|
||||
:name "SENTINEL PROTOCOL"}
|
||||
{:address "0x5Af2Be193a6ABCa9c8817001F45744777Db30756"
|
||||
:decimals 8
|
||||
:symbol :VGX
|
||||
:name "Voyager"}
|
||||
{:address "0x69b148395ce0015c13e36bffbad63f49ef874e03"
|
||||
:symbol :DTA
|
||||
:name "Data Token"
|
||||
:decimals 18}
|
||||
{:address "0x57Ab1ec28D129707052df4dF418D58a2D46d5f51"
|
||||
:symbol :sUSD
|
||||
:name "Synth sUSD"
|
||||
:decimals 18}
|
||||
{:address "0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643"
|
||||
:symbol :cDAI
|
||||
:name "Compound Dai"
|
||||
:decimals 8}
|
||||
{:address "0xba11d00c5f74255f56a5e366f4f77f5a186d7f55"
|
||||
:symbol :BAND
|
||||
:name "BandToken"
|
||||
:decimals 18}
|
||||
{:address "0xa7fc5d2453e3f68af0cc1b78bcfee94a1b293650"
|
||||
:symbol :SPIKE
|
||||
:name "Spiking"
|
||||
:decimals 10}
|
||||
{:address "0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984"
|
||||
:symbol :UNI
|
||||
:name "Uniswap"
|
||||
:decimals 18}
|
||||
{:address "0xc00e94cb662c3520282e6f5717214004a7f26888"
|
||||
:symbol :COMP
|
||||
:name "Compound"
|
||||
:decimals 18}
|
||||
{:address "0xba100000625a3754423978a60c9317c58a424e3d"
|
||||
:symbol :BAL
|
||||
:name "Balancer"
|
||||
:decimals 18}
|
||||
{:address "0x8ab7404063ec4dbcfd4598215992dc3f8ec853d7"
|
||||
:symbol :AKRO
|
||||
:name "Akropolis"
|
||||
:decimals 18}
|
||||
{:address "0x9ba00d6856a4edf4665bca2c2309936572473b7e"
|
||||
:symbol :aUSDC
|
||||
:name "Aave Interest bearing USDC"
|
||||
:decimals 6}
|
||||
{:address "0xc944e90c64b2c07662a292be6244bdf05cda44a7"
|
||||
:symbol :GRT
|
||||
:name "Graph Token"
|
||||
:decimals 18}
|
||||
{:address "0x7DD9c5Cba05E151C895FDe1CF355C9A1D5DA6429"
|
||||
:symbol :GLM
|
||||
:name "Golem Network Token"
|
||||
:decimals 18}
|
||||
{:address "0x23b608675a2b2fb1890d3abbd85c5775c51691d5"
|
||||
:symbol :SOCKS
|
||||
:name "Unisocks Edition 0"
|
||||
:decimals 18}
|
||||
{:address "0xEEF9f339514298C6A857EfCfC1A762aF84438dEE"
|
||||
:symbol :HEZ
|
||||
:name "Hermez Network Token"
|
||||
:decimals 18}
|
||||
{:address "0xaa6e8127831c9de45ae56bb1b0d4d4da6e5665bd"
|
||||
:symbol :ETH2x-FLI
|
||||
:name "ETH 2x Flexible Leverage Index"
|
||||
:decimals 18}
|
||||
{:address "0xba5BDe662c17e2aDFF1075610382B9B691296350"
|
||||
:symbol :RARE
|
||||
:name "SuperRare"
|
||||
:decimals 18}
|
||||
{:address "0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72"
|
||||
:symbol :ENS
|
||||
:name "Ethereum Name Service"
|
||||
:decimals 18}
|
||||
{:address "0xDd1Ad9A21Ce722C151A836373baBe42c868cE9a4"
|
||||
:symbol :UBI
|
||||
:name "Universal Basic Income"
|
||||
:decimals 18}])
|
||||
:testnet
|
||||
(resolve-icons :testnet
|
||||
[{:name "Status Test Token"
|
||||
:symbol :STT
|
||||
:decimals 18
|
||||
;;NOTE(goranjovic): intentionally checksummed for purposes of testing
|
||||
:address "0xc55cf4b03948d7ebc8b9e8bad92643703811d162"}
|
||||
{:name "Handy Test Token"
|
||||
:symbol :HND
|
||||
:decimals 0
|
||||
:address "0xdee43a267e8726efd60c2e7d5b81552dcd4fa35c"}
|
||||
{:name "Lucky Test Token"
|
||||
:symbol :LXS
|
||||
:decimals 2
|
||||
:address "0x703d7dc0bc8e314d65436adf985dda51e09ad43b"}
|
||||
{:name "Adi Test Token"
|
||||
:symbol :ADI
|
||||
:decimals 7
|
||||
:address "0xe639e24346d646e927f323558e6e0031bfc93581"}
|
||||
{:name "Wagner Test Token"
|
||||
:symbol :WGN
|
||||
:decimals 10
|
||||
:address "0x2e7cd05f437eb256f363417fd8f920e2efa77540"}
|
||||
{:name "Modest Test Token"
|
||||
:symbol :MDS
|
||||
:decimals 18
|
||||
:address "0x57cc9b83730e6d22b224e9dc3e370967b44a2de0"}])
|
||||
|
||||
:rinkeby
|
||||
(resolve-icons :rinkeby
|
||||
[{:name "Moksha Coin"
|
||||
:symbol :MOKSHA
|
||||
:decimals 18
|
||||
:address "0x6ba7dc8dd10880ab83041e60c4ede52bb607864b"}
|
||||
{:symbol :KDO
|
||||
:nft? true
|
||||
:name "KudosToken"
|
||||
:address "0x93bb0afbd0627bbd3a6c72bc318341d3a22e254a"}
|
||||
{:symbol :WIBB
|
||||
:name "WIBB"
|
||||
:address "0x7d4ccf6af2f0fdad48ee7958bcc28bdef7b732c7"
|
||||
:decimals 18}
|
||||
{:name "Status Test Token"
|
||||
:symbol :STT
|
||||
:decimals 18
|
||||
:address "0xc55cf4b03948d7ebc8b9e8bad92643703811d162"}])
|
||||
|
||||
:xdai
|
||||
(resolve-icons :xdai
|
||||
[{:name "buffiDai"
|
||||
:symbol :BUFF
|
||||
:decimals 18
|
||||
:address "0x3e50bf6703fc132a94e4baff068db2055655f11b"}])
|
||||
|
||||
(def token-icons
|
||||
{:mainnet (resolve-icons :mainnet)
|
||||
:testnet (resolve-icons :testnet)
|
||||
:rinkeby (resolve-icons :rinkeby)
|
||||
:xdai (resolve-icons :xdai)
|
||||
:custom []})
|
||||
|
||||
(defn normalize-chain [tokens]
|
||||
(reduce (fn [acc {:keys [address] :as token}]
|
||||
(assoc acc address token))
|
||||
{}
|
||||
tokens))
|
||||
(def default-token (js/require "../resources/images/tokens/default-token.png"))
|
||||
|
||||
(def all-tokens-normalized
|
||||
(reduce-kv (fn [m k v]
|
||||
(assoc m k (normalize-chain v)))
|
||||
{}
|
||||
all-default-tokens))
|
||||
(defn update-icon
|
||||
[network token]
|
||||
(-> token
|
||||
(assoc-in [:icon :source] (get-in token-icons [network (name (:symbol token))] default-token))
|
||||
(update :address string/lower-case)))
|
||||
|
||||
(defn nfts-for [all-tokens]
|
||||
(filter :nft? (vals all-tokens)))
|
||||
|
|
@ -872,7 +88,3 @@
|
|||
(= (:symbol native-coin) symbol))
|
||||
native-coin
|
||||
(symbol->token all-tokens symbol))))
|
||||
|
||||
(defn symbol->icon [sym]
|
||||
(:icon (first (filter #(= sym (:symbol %))
|
||||
(:mainnet all-default-tokens)))))
|
||||
|
|
|
|||
|
|
@ -40,7 +40,8 @@
|
|||
[status-im.data-store.chats :as data-store.chats]
|
||||
[status-im.data-store.visibility-status-updates :as visibility-status-updates-store]
|
||||
[status-im.ui.components.react :as react]
|
||||
[status-im.utils.platform :as platform]))
|
||||
[status-im.utils.platform :as platform]
|
||||
[status-im.ethereum.tokens :as tokens]))
|
||||
|
||||
(re-frame/reg-fx
|
||||
::initialize-communities-enabled
|
||||
|
|
@ -98,7 +99,7 @@
|
|||
|
||||
(fx/defn initialize-wallet
|
||||
{:events [::initialize-wallet]}
|
||||
[{:keys [db] :as cofx} accounts custom-tokens
|
||||
[{:keys [db] :as cofx} accounts tokens custom-tokens
|
||||
favourites scan-all-tokens? new-account?]
|
||||
(fx/merge
|
||||
cofx
|
||||
|
|
@ -106,7 +107,7 @@
|
|||
(rpc->accounts accounts))
|
||||
;; NOTE: Local notifications should be enabled only after wallet was started
|
||||
::enable-local-notifications nil}
|
||||
(wallet/initialize-tokens custom-tokens)
|
||||
(wallet/initialize-tokens tokens custom-tokens)
|
||||
(wallet/initialize-favourites favourites)
|
||||
(wallet/get-pending-transactions)
|
||||
(wallet/fetch-collectibles-collection)
|
||||
|
|
@ -233,10 +234,31 @@
|
|||
:fetched-network-id fetched-network-id})
|
||||
#(re-frame/dispatch [::close-app-confirmed]))))}]})
|
||||
|
||||
(defn normalize-tokens [network-id tokens]
|
||||
(mapv #(-> %
|
||||
(update :symbol keyword)
|
||||
((partial tokens/update-icon (ethereum/chain-id->chain-keyword (int network-id)))))
|
||||
tokens))
|
||||
|
||||
(re-frame/reg-fx
|
||||
::get-tokens
|
||||
(fn [[network-id accounts recovered-account?]]
|
||||
(utils/set-timeout
|
||||
(fn []
|
||||
(json-rpc/call {:method "wallet_getTokens"
|
||||
:params [(int network-id)]
|
||||
:on-success #(re-frame/dispatch [::initialize-wallet
|
||||
accounts
|
||||
(normalize-tokens network-id %)
|
||||
nil nil
|
||||
recovered-account?
|
||||
true])}))
|
||||
2000)))
|
||||
|
||||
(re-frame/reg-fx
|
||||
;;TODO: this could be replaced by a single API call on status-go side
|
||||
::initialize-wallet
|
||||
(fn [callback]
|
||||
(fn [[network-id callback]]
|
||||
(-> (js/Promise.all
|
||||
(clj->js
|
||||
[(js/Promise.
|
||||
|
|
@ -244,6 +266,12 @@
|
|||
(json-rpc/call {:method "accounts_getAccounts"
|
||||
:on-success resolve
|
||||
:on-error reject})))
|
||||
(js/Promise.
|
||||
(fn [resolve reject]
|
||||
(json-rpc/call {:method "wallet_getTokens"
|
||||
:params [(int network-id)]
|
||||
:on-success resolve
|
||||
:on-error reject})))
|
||||
(js/Promise.
|
||||
(fn [resolve reject]
|
||||
(json-rpc/call {:method "wallet_getCustomTokens"
|
||||
|
|
@ -254,8 +282,9 @@
|
|||
(json-rpc/call {:method "wallet_getFavourites"
|
||||
:on-success resolve
|
||||
:on-error reject})))]))
|
||||
(.then (fn [[accounts custom-tokens favourites]]
|
||||
(.then (fn [[accounts tokens custom-tokens favourites]]
|
||||
(callback accounts
|
||||
(normalize-tokens network-id tokens)
|
||||
(mapv #(update % :symbol keyword) custom-tokens)
|
||||
favourites)))
|
||||
(.catch (fn [_]
|
||||
|
|
@ -350,9 +379,10 @@
|
|||
:on-enabled #(log/info "eip1550 is activated")
|
||||
:on-disabled #(log/info "eip1559 is not activated")}
|
||||
::initialize-wallet
|
||||
(fn [accounts custom-tokens favourites]
|
||||
(re-frame/dispatch [::initialize-wallet
|
||||
accounts custom-tokens favourites]))
|
||||
[network-id
|
||||
(fn [accounts tokens custom-tokens favourites]
|
||||
(re-frame/dispatch [::initialize-wallet
|
||||
accounts tokens custom-tokens favourites]))]
|
||||
::open-last-chat (get-in db [:multiaccount :key-uid])}
|
||||
notifications-enabled?
|
||||
(assoc ::notifications/enable nil))
|
||||
|
|
@ -416,23 +446,22 @@
|
|||
(keychain/save-auth-method key-uid (or new-auth-method auth-method keychain/auth-method-none)))))
|
||||
|
||||
(fx/defn create-only-events
|
||||
[{:keys [db] :as cofx}]
|
||||
[{:keys [db] :as cofx} recovered-account?]
|
||||
(let [{:keys [multiaccount
|
||||
:multiaccounts/multiaccounts
|
||||
:multiaccount/accounts]} db
|
||||
{:keys [creating?]} (:multiaccounts/login db)
|
||||
first-account? (and creating?
|
||||
(empty? multiaccounts))
|
||||
tos-accepted? (get db :tos/accepted?)]
|
||||
tos-accepted? (get db :tos/accepted?)
|
||||
{:networks/keys [current-network networks]} db
|
||||
network-id (str (get-in networks [current-network :config :NetworkId]))]
|
||||
(fx/merge cofx
|
||||
{:db (-> db
|
||||
(dissoc :multiaccounts/login)
|
||||
(assoc :tos/next-root :onboarding-notification :chats/loading? false)
|
||||
(assoc-in [:multiaccount :multiaccounts/first-account] first-account?))
|
||||
:dispatch-later [{:ms 2000 :dispatch [::initialize-wallet
|
||||
accounts nil nil
|
||||
(or (get db :recovered-account?) (:recovered multiaccount))
|
||||
true]}]}
|
||||
::get-tokens [network-id accounts recovered-account?]}
|
||||
(finish-keycard-setup)
|
||||
(transport/start-messenger)
|
||||
(communities/fetch)
|
||||
|
|
@ -501,7 +530,7 @@
|
|||
(utils/show-popup (i18n/label :t/migration-successful) (i18n/label :t/migration-successful-text)))
|
||||
(if login-only?
|
||||
(login-only-events key-uid password save-password?)
|
||||
(create-only-events)))))
|
||||
(create-only-events recovered-account?)))))
|
||||
|
||||
;; FIXME(Ferossgp): We should not copy keys as we denormalize the database,
|
||||
;; this create desync between actual accounts and the one on login causing broken state
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
[status-im.utils.utils :as utils]
|
||||
[status-im.utils.types :as types]
|
||||
[status-im.utils.money :as money]
|
||||
[status-im.ethereum.core :as ethereum]
|
||||
[status-im.i18n.i18n :as i18n]
|
||||
[quo.platform :as platform]
|
||||
[re-frame.core :as re-frame]
|
||||
|
|
@ -60,13 +59,13 @@
|
|||
(handle-notification-press (types/json->clj (.-dataJSON data))))))))
|
||||
|
||||
(defn create-transfer-notification
|
||||
[{{:keys [state from to fromAccount toAccount value erc20 contract network]}
|
||||
[{db :db}
|
||||
{{:keys [state from to fromAccount toAccount value erc20 contract network]}
|
||||
:body
|
||||
:as notification}]
|
||||
(let [chain (ethereum/chain-id->chain-keyword network)
|
||||
token (if erc20
|
||||
(get-in tokens/all-tokens-normalized
|
||||
[(keyword chain) (clojure.string/lower-case contract)]
|
||||
(let [token (if erc20
|
||||
(get-in db
|
||||
[:wallet/all-tokens (clojure.string/lower-case contract)]
|
||||
default-erc20-token)
|
||||
(tokens/native-currency network))
|
||||
amount (money/wei->ether (decode/uint value))
|
||||
|
|
@ -112,7 +111,7 @@
|
|||
(assoc
|
||||
(case bodyType
|
||||
"message" (when (show-message-pn? cofx notification) notification)
|
||||
"transaction" (create-transfer-notification notification)
|
||||
"transaction" (create-transfer-notification cofx notification)
|
||||
nil)
|
||||
:body-type bodyType)))
|
||||
|
||||
|
|
|
|||
|
|
@ -166,7 +166,6 @@
|
|||
:margin-bottom 12}}
|
||||
(if icon
|
||||
[react/image (-> icon
|
||||
(update :source #(%))
|
||||
(assoc-in [:style :height] 24)
|
||||
(assoc-in [:style :width] 24))]
|
||||
[react/view {:style {:margin-right 14
|
||||
|
|
|
|||
|
|
@ -273,16 +273,14 @@
|
|||
tokens))
|
||||
|
||||
(fx/defn initialize-tokens
|
||||
[{:keys [db]} custom-tokens]
|
||||
(let [all-default-tokens (get tokens/all-default-tokens
|
||||
(ethereum/chain-keyword db))
|
||||
default-tokens (utils.core/index-by :address all-default-tokens)
|
||||
[{:keys [db]} tokens custom-tokens]
|
||||
(let [default-tokens (utils.core/index-by :address tokens)
|
||||
;;we want to override custom-tokens by default
|
||||
all-tokens (merge (rpc->token custom-tokens) default-tokens)]
|
||||
(merge
|
||||
{:db (assoc db :wallet/all-tokens all-tokens)}
|
||||
(when config/erc20-contract-warnings-enabled?
|
||||
{:wallet/validate-tokens [default-tokens all-default-tokens]}))))
|
||||
{:wallet/validate-tokens [default-tokens tokens]}))))
|
||||
|
||||
(fx/defn initialize-favourites
|
||||
[{:keys [db]} favourites]
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
"_comment": "Instead use: scripts/update-status-go.sh <rev>",
|
||||
"owner": "status-im",
|
||||
"repo": "status-go",
|
||||
"version": "v0.93.2",
|
||||
"commit-sha1": "3a330cc305e97e3f35b490eaf114f06f787df540",
|
||||
"src-sha256": "1gs2z1h7jac264kglcjv194975djr3nfcilp9rq79xs75rdfbsp1"
|
||||
"version": "v0.93.3",
|
||||
"commit-sha1": "2e8007c12de237542f7b29da17122ff60a30ff0d",
|
||||
"src-sha256": "0gw6qkx5v3bf8hlkdw4f02qfvgs5x9h8sc491yxyw11gjjm94gim"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue