rvv001 - Added currency code to config File
Currency Code is required to get ZEC price from CoinGecho Codes are in IS 4217 alphabetic 3 character format
This commit is contained in:
parent
9e211762e0
commit
c0520bcbc7
5 changed files with 17 additions and 4 deletions
|
@ -210,9 +210,16 @@ main = do
|
||||||
zebraPort <- require config "zebraPort"
|
zebraPort <- require config "zebraPort"
|
||||||
zebraHost <- require config "zebraHost"
|
zebraHost <- require config "zebraHost"
|
||||||
nodePort <- require config "nodePort"
|
nodePort <- require config "nodePort"
|
||||||
|
currencyCode <- require config "currencyCode"
|
||||||
dbFP <- getZenithPath
|
dbFP <- getZenithPath
|
||||||
let dbFilePath = T.pack $ dbFP ++ dbFileName
|
let dbFilePath = T.pack $ dbFP ++ dbFileName
|
||||||
let myConfig = Config dbFilePath zebraHost zebraPort nodeUser nodePwd nodePort
|
let myConfig = Config dbFilePath
|
||||||
|
zebraHost
|
||||||
|
zebraPort
|
||||||
|
nodeUser
|
||||||
|
nodePwd
|
||||||
|
nodePort
|
||||||
|
currencyCode
|
||||||
if not (null args)
|
if not (null args)
|
||||||
then do
|
then do
|
||||||
case head args
|
case head args
|
||||||
|
|
|
@ -35,9 +35,10 @@ main = do
|
||||||
zebraPort <- require config "zebraPort"
|
zebraPort <- require config "zebraPort"
|
||||||
zebraHost <- require config "zebraHost"
|
zebraHost <- require config "zebraHost"
|
||||||
nodePort <- require config "nodePort"
|
nodePort <- require config "nodePort"
|
||||||
|
currencyCode <- require config "currencyCode"
|
||||||
dbFP <- getZenithPath
|
dbFP <- getZenithPath
|
||||||
let dbFilePath = T.pack $ dbFP ++ dbFileName
|
let dbFilePath = T.pack $ dbFP ++ dbFileName
|
||||||
let myConfig = Config dbFilePath zebraHost zebraPort nodeUser nodePwd nodePort
|
let myConfig = Config dbFilePath zebraHost zebraPort nodeUser nodePwd nodePort currencyCode
|
||||||
let ctx = authenticate myConfig :. EmptyContext
|
let ctx = authenticate myConfig :. EmptyContext
|
||||||
w <- try $ checkZebra zebraHost zebraPort :: IO (Either IOError ZebraGetInfo)
|
w <- try $ checkZebra zebraHost zebraPort :: IO (Either IOError ZebraGetInfo)
|
||||||
case w of
|
case w of
|
||||||
|
|
|
@ -245,6 +245,7 @@ data State = State
|
||||||
, _deshieldForm :: !(Form ShDshEntry () Name)
|
, _deshieldForm :: !(Form ShDshEntry () Name)
|
||||||
, _tBalance :: !Integer
|
, _tBalance :: !Integer
|
||||||
, _sBalance :: !Integer
|
, _sBalance :: !Integer
|
||||||
|
, _currencyCode :: !T.Text
|
||||||
}
|
}
|
||||||
|
|
||||||
makeLenses ''State
|
makeLenses ''State
|
||||||
|
@ -948,7 +949,8 @@ appEvent (BT.AppEvent t) = do
|
||||||
(s ^. zebraPort)
|
(s ^. zebraPort)
|
||||||
"user"
|
"user"
|
||||||
"pwd"
|
"pwd"
|
||||||
8080)
|
8080
|
||||||
|
(s ^. currencyCode))
|
||||||
selWallet
|
selWallet
|
||||||
updatedState <- BT.get
|
updatedState <- BT.get
|
||||||
ns <- liftIO $ refreshWallet updatedState
|
ns <- liftIO $ refreshWallet updatedState
|
||||||
|
@ -1703,6 +1705,7 @@ runZenithTUI config = do
|
||||||
let host = c_zebraHost config
|
let host = c_zebraHost config
|
||||||
let port = c_zebraPort config
|
let port = c_zebraPort config
|
||||||
let dbFilePath = c_dbPath config
|
let dbFilePath = c_dbPath config
|
||||||
|
let currencyCode = c_currencyCode config
|
||||||
pool <- runNoLoggingT $ initPool dbFilePath
|
pool <- runNoLoggingT $ initPool dbFilePath
|
||||||
w <- try $ checkZebra host port :: IO (Either IOError ZebraGetInfo)
|
w <- try $ checkZebra host port :: IO (Either IOError ZebraGetInfo)
|
||||||
case w of
|
case w of
|
||||||
|
@ -1800,6 +1803,7 @@ runZenithTUI config = do
|
||||||
(mkDeshieldForm 0 (ShDshEntry 0.0))
|
(mkDeshieldForm 0 (ShDshEntry 0.0))
|
||||||
tBal
|
tBal
|
||||||
sBal
|
sBal
|
||||||
|
currencyCode
|
||||||
Left _e -> do
|
Left _e -> do
|
||||||
print $
|
print $
|
||||||
"No Zebra node available on port " <>
|
"No Zebra node available on port " <>
|
||||||
|
|
|
@ -916,7 +916,7 @@ scanZebra dbPath zHost zPort net = do
|
||||||
updateCommitmentTrees pool zHost zPort $ ZcashNetDB net
|
updateCommitmentTrees pool zHost zPort $ ZcashNetDB net
|
||||||
runNoLoggingT $
|
runNoLoggingT $
|
||||||
mapM_
|
mapM_
|
||||||
(syncWallet (Config dbPath zHost zPort "user" "pwd" 8080))
|
(syncWallet (Config dbPath zHost zPort "user" "pwd" 8080 "usd"))
|
||||||
wals
|
wals
|
||||||
_ <- completeSync pool Successful
|
_ <- completeSync pool Successful
|
||||||
return ()
|
return ()
|
||||||
|
|
|
@ -112,6 +112,7 @@ data Config = Config
|
||||||
, c_zenithUser :: !BS.ByteString
|
, c_zenithUser :: !BS.ByteString
|
||||||
, c_zenithPwd :: !BS.ByteString
|
, c_zenithPwd :: !BS.ByteString
|
||||||
, c_zenithPort :: !Int
|
, c_zenithPort :: !Int
|
||||||
|
, c_currencyCode :: !T.Text
|
||||||
} deriving (Eq, Prelude.Show)
|
} deriving (Eq, Prelude.Show)
|
||||||
|
|
||||||
data ZcashPool
|
data ZcashPool
|
||||||
|
|
Loading…
Reference in a new issue