CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.8.1]
+
+### Changed
+
+- Changed license to MIT
+- Updated to Haskell LTS 21.22
+- Update to new version of `zcash-haskell`
+
 ## [1.8.0]
 
 ### Added

src/ZGoBackend.hs

@@ -15,7 +15,6 @@ import Control.Monad.IO.Class
 import Crypto.RNG (newCryptoRNGState, runCryptoRNGT)
 import Crypto.RNG.Utils (randomString)
 import Data.Aeson
-import Data.Aeson (decodeFileStrict)
 import Data.Array
 import qualified Data.Bson as B
 import qualified Data.ByteArray as BA
@@ -1254,9 +1253,9 @@ routes pipe config = do
               else case decodeUfvk (C.pack q) of
                      Nothing -> status badRequest400
                      Just fvk -> do
-                       if isValidUnifiedAddress $
+                       case isValidUnifiedAddress $
-                          C.pack . T.unpack $ uaddress u'
+                            C.pack . T.unpack $ uaddress u' of
-                         then do
+                         Just uaok -> do
                            if matchOrchardAddress
                                 (C.pack q)
                                 (C.pack . T.unpack $ uaddress u')
@@ -1271,7 +1270,7 @@ routes pipe config = do
                                        run (upsertViewingKey o' q)
                                      status created201
                              else status forbidden403
-                         else do
+                         Nothing -> do
                            if matchSaplingAddress
                                 (s_key fvk)
                                 (bytes . decodeBech32 . C.pack . T.unpack $

src/ZGoTx.hs

@@ -144,9 +144,9 @@ pUnifiedAddress :: Parser MemoToken
 pUnifiedAddress = do
   string "u1"
   a <- some alphaNumChar
-  if isValidUnifiedAddress (E.encodeUtf8 $ "u1" <> T.pack a)
+  case isValidUnifiedAddress (E.encodeUtf8 $ "u1" <> T.pack a) of
-    then pure $ Address $ T.pack ("u1" <> a)
+    Just u -> pure $ Address $ T.pack ("u1" <> a)
-    else fail "Failed to parse Unified Address"
+    Nothing -> fail "Failed to parse Unified Address"
 
 pOrderId :: Parser MemoToken
 pOrderId = do

stack.yaml

@@ -17,7 +17,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-21.17
+resolver: lts-21.22
   #url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/4.yaml
 
 # User packages to be built.
@@ -42,10 +42,12 @@ packages:
 #
 # extra-deps: []
 extra-deps:
-  - git: https://github.com/reach-sh/haskell-hexstring.git
+  #- git: https://github.com/reach-sh/haskell-hexstring.git
+    #commit: 085c16fb21b9f856a435a3faab980e7e0b319341
+  - git: https://git.vergara.tech/Vergara_Tech/haskell-hexstring.git
     commit: 085c16fb21b9f856a435a3faab980e7e0b319341
   - git: https://git.vergara.tech/Vergara_Tech/zcash-haskell.git
-    commit: 1d558fc646a7758d60a721124812070de222c2e1
+    commit: dce171d83043fae0e5c771ff743d31c4ec19c1ae
   - git: https://git.vergara.tech/Vergara_Tech/haskell-foreign-rust.git
     commit: 787c2e813eb3a5d16c375d4b37dfefbd2adcdf05
   - git: https://github.com/well-typed/borsh.git

stack.yaml.lock

@@ -6,7 +6,7 @@
 packages:
 - completed:
     commit: 085c16fb21b9f856a435a3faab980e7e0b319341
-    git: https://github.com/reach-sh/haskell-hexstring.git
+    git: https://git.vergara.tech/Vergara_Tech/haskell-hexstring.git
     name: hexstring
     pantry-tree:
       sha256: 9ecf67856f59dfb382b283eceb42e4fc1865935d1a7e59111556ed381c6a2ffd
@@ -14,17 +14,17 @@ packages:
     version: 0.11.1
   original:
     commit: 085c16fb21b9f856a435a3faab980e7e0b319341
-    git: https://github.com/reach-sh/haskell-hexstring.git
+    git: https://git.vergara.tech/Vergara_Tech/haskell-hexstring.git
 - completed:
-    commit: 1d558fc646a7758d60a721124812070de222c2e1
+    commit: dce171d83043fae0e5c771ff743d31c4ec19c1ae
     git: https://git.vergara.tech/Vergara_Tech/zcash-haskell.git
     name: zcash-haskell
     pantry-tree:
-      sha256: eab3c6817bb3cb5738725824d16eb023cb2967ef3bbaa8f8252524602f606dbb
+      sha256: 000770930e5d50596b82b38984d6e8ab94fd5345c7fcf3cc21682ef8e6348746
-      size: 1229
+      size: 1365
-    version: 0.2.0
+    version: 0.3.0
   original:
-    commit: 1d558fc646a7758d60a721124812070de222c2e1
+    commit: dce171d83043fae0e5c771ff743d31c4ec19c1ae
     git: https://git.vergara.tech/Vergara_Tech/zcash-haskell.git
 - completed:
     commit: 787c2e813eb3a5d16c375d4b37dfefbd2adcdf05
@@ -103,7 +103,7 @@ packages:
     hackage: crypto-rng-0.3.0.1@sha256:04f4ae75943ecad8b794950985054130f272d65a588b6b6528f56df0bfedc4dc,1565
 snapshots:
 - completed:
-    sha256: 85d2382958c178491d3fe50d770a624621f5ab456beef7d31ac7521f780c9bc7
+    sha256: afd5ba64ab602cabc2d3942d3d7e7dd6311bc626dcb415b901eaf576cb62f0ea
-    size: 640042
+    size: 640060
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/17.yaml
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/22.yaml
-  original: lts-21.17
+  original: lts-21.22

zgo-backend.cabal

@@ -1,18 +1,18 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           zgo-backend
-version:        1.8.0
+version:        1.8.1
 synopsis:       Haskell Back-end for the ZGo point-of-sale application
 description:    Please see the README at <https://git.vergara.tech/Vergara_Tech//zgo-backend#readme>
 category:       Web
 author:         Rene Vergara
 maintainer:     rene@vergara.network
-copyright:      Copyright (c) 2023 Vergara Technologies LLC
+copyright:      2022-2024 Vergara Technologies LLC
-license:        BOSL
+license:        MIT
 license-file:   LICENSE
 build-type:     Simple
 extra-source-files: