Vergara_Tech/zgo-backend
Vergara_Tech/zgo-backend
2
1
Fork 0
Code Issues Pull requests Projects Releases 4 Packages Wiki Activity

Unified Address support #8

Merged
pitmutt merged 61 commits from dev18 into master 2023-10-28 12:24:28 +00:00
Conversation 0 Commits 61 Files changed 11 +5 -12
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5788a26880 - Show all commits

3
app/Tasks.hs
View file

@ -23,7 +23,8 @@ main = do
putStrLn "Connected to MongoDB!" putStrLn "Connected to MongoDB!"
checkZcashPrices pipe (c_dbName loadedConfig) checkZcashPrices pipe (c_dbName loadedConfig)
scanZcash' loadedConfig pipe scanZcash' loadedConfig pipe
scanPayments loadedConfig pipe {-scanPayments loadedConfig pipe-}
scanTxNative loadedConfig pipe
checkPayments pipe (c_dbName loadedConfig) checkPayments pipe (c_dbName loadedConfig)
expireOwners pipe (c_dbName loadedConfig) expireOwners pipe (c_dbName loadedConfig)
updateLogins pipe loadedConfig updateLogins pipe loadedConfig

10
src/ZGoBackend.hs
View file

@ -2024,10 +2024,6 @@ scanTxNative config pipe = do
case xOrder of case xOrder of
Nothing -> error "Failed to retrieve order from database" Nothing -> error "Failed to retrieve order from database"
Just xO -> do Just xO -> do
print $ qtotalZec xO
print $ zamount x
print z
print $ qaddress xO
when when
(not (qpaid xO) && (not (qpaid xO) &&
qtotalZec xO == zamount x && z == qaddress xO) $ do qtotalZec xO == zamount x && z == qaddress xO) $ do
@ -2093,11 +2089,7 @@ scanTxNative config pipe = do
else error else error
"Couldn't parse externalInvoice for WooCommerce" "Couldn't parse externalInvoice for WooCommerce"
_ -> putStrLn "Not an integration order" _ -> putStrLn "Not an integration order"
else do else liftIO $
print $
"Regular order" ++
T.unpack orderId ++ " " ++ show (zamount x)
liftIO $
access p master dbName $ access p master dbName $
markOrderPaid (T.unpack orderId, zamount x) markOrderPaid (T.unpack orderId, zamount x)
Left e -> print "Unable to parse order memo" Left e -> print "Unable to parse order memo"