From baa4694ea63866fa2aea40ff43733a6f1f75a83f Mon Sep 17 00:00:00 2001
From: Dmitry S <dmitry.tothemoon@gmail.com>
Date: Thu, 28 Sep 2023 11:49:21 +0200
Subject: [PATCH 1/6] Fix posthog reset(); update posthog

---
 ui-dashboard/package-lock.json | 24 +++++++++---------------
 ui-dashboard/package.json      |  2 +-
 ui-dashboard/src/app.tsx       |  9 ---------
 ui-payment/package-lock.json   | 30 +++++++++---------------------
 ui-payment/package.json        |  2 +-
 5 files changed, 20 insertions(+), 47 deletions(-)

diff --git a/ui-dashboard/package-lock.json b/ui-dashboard/package-lock.json
index c5a45b4..8f48d3b 100644
--- a/ui-dashboard/package-lock.json
+++ b/ui-dashboard/package-lock.json
@@ -18,7 +18,7 @@
         "date-fns-tz": "^2.0.0",
         "json5": "^2.2.3",
         "lodash-es": "4.17.21",
-        "posthog-js": "1.57.2",
+        "posthog-js": "1.81.1",
         "react": "18.2.0",
         "react-dom": "18.2.0",
         "react-router-dom": "6.4.4",
@@ -5024,11 +5024,11 @@
       "license": "MIT"
     },
     "node_modules/posthog-js": {
-      "version": "1.57.2",
-      "license": "MIT",
+      "version": "1.81.1",
+      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.81.1.tgz",
+      "integrity": "sha512-pQfG9ZGVn3R7Uh1cC/S02trZ6u4TOLs1NhZG3WiNrqMKDA8MJQjZ/PqdkLO0/BeozRBfIbON6pw3xfOIneIclg==",
       "dependencies": {
-        "fflate": "^0.4.1",
-        "rrweb-snapshot": "^1.1.14"
+        "fflate": "^0.4.1"
       }
     },
     "node_modules/prelude-ls": {
@@ -5926,10 +5926,6 @@
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/rrweb-snapshot": {
-      "version": "1.1.14",
-      "license": "MIT"
-    },
     "node_modules/rtl-css-js": {
       "version": "1.16.0",
       "license": "MIT",
@@ -9826,10 +9822,11 @@
       "dev": true
     },
     "posthog-js": {
-      "version": "1.57.2",
+      "version": "1.81.1",
+      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.81.1.tgz",
+      "integrity": "sha512-pQfG9ZGVn3R7Uh1cC/S02trZ6u4TOLs1NhZG3WiNrqMKDA8MJQjZ/PqdkLO0/BeozRBfIbON6pw3xfOIneIclg==",
       "requires": {
-        "fflate": "^0.4.1",
-        "rrweb-snapshot": "^1.1.14"
+        "fflate": "^0.4.1"
       }
     },
     "prelude-ls": {
@@ -10354,9 +10351,6 @@
         "fsevents": "~2.3.2"
       }
     },
-    "rrweb-snapshot": {
-      "version": "1.1.14"
-    },
     "rtl-css-js": {
       "version": "1.16.0",
       "requires": {
diff --git a/ui-dashboard/package.json b/ui-dashboard/package.json
index 2abc889..b903704 100644
--- a/ui-dashboard/package.json
+++ b/ui-dashboard/package.json
@@ -37,7 +37,7 @@
     "date-fns-tz": "^2.0.0",
     "json5": "^2.2.3",
     "lodash-es": "4.17.21",
-    "posthog-js": "1.57.2",
+    "posthog-js": "1.81.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-router-dom": "6.4.4",
diff --git a/ui-dashboard/src/app.tsx b/ui-dashboard/src/app.tsx
index 6bb4079..e443c95 100644
--- a/ui-dashboard/src/app.tsx
+++ b/ui-dashboard/src/app.tsx
@@ -109,10 +109,6 @@ const App: React.FC = () => {
                 await authProvider.getCookie();
             } catch (e) {
                 if (e instanceof AxiosError && e.response?.status === 401) {
-                    if (isPosthogActive) {
-                        posthog?.reset(true);
-                    }
-
                     navigate("/login", {
                         state: {
                             isNeedLogout: true
@@ -128,10 +124,6 @@ const App: React.FC = () => {
                 setUser(user);
             } catch (e) {
                 if (e instanceof AxiosError && e.response?.status === 401) {
-                    if (isPosthogActive) {
-                        posthog?.reset(true);
-                    }
-
                     navigate("/login", {
                         state: {
                             isNeedLogout: true
@@ -180,7 +172,6 @@ const App: React.FC = () => {
 
     React.useEffect(() => {
         if (user && isPosthogActive) {
-            posthog?.reset(true);
             posthog?.identify(user.email, {
                 email: user.email,
                 uuid: user.uuid
diff --git a/ui-payment/package-lock.json b/ui-payment/package-lock.json
index 81ef743..7701ebc 100644
--- a/ui-payment/package-lock.json
+++ b/ui-payment/package-lock.json
@@ -11,7 +11,7 @@
         "@vitejs/plugin-basic-ssl": "^1.0.1",
         "axios": "^1.1.3",
         "formik": "^2.2.9",
-        "posthog-js": "^1.57.2",
+        "posthog-js": "1.81.1",
         "qrcode.react": "^3.1.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
@@ -4872,12 +4872,11 @@
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
     },
     "node_modules/posthog-js": {
-      "version": "1.57.2",
-      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.57.2.tgz",
-      "integrity": "sha512-ER4gkYZasrd2Zwmt/yLeZ5G/nZJ6tpaYBCpx3CvocDx+3F16WdawJlYMT0IyLKHXDniC5+AsjzFd6fi8uyYlJA==",
+      "version": "1.81.1",
+      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.81.1.tgz",
+      "integrity": "sha512-pQfG9ZGVn3R7Uh1cC/S02trZ6u4TOLs1NhZG3WiNrqMKDA8MJQjZ/PqdkLO0/BeozRBfIbON6pw3xfOIneIclg==",
       "dependencies": {
-        "fflate": "^0.4.1",
-        "rrweb-snapshot": "^1.1.14"
+        "fflate": "^0.4.1"
       }
     },
     "node_modules/prelude-ls": {
@@ -5268,11 +5267,6 @@
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/rrweb-snapshot": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/rrweb-snapshot/-/rrweb-snapshot-1.1.14.tgz",
-      "integrity": "sha512-eP5pirNjP5+GewQfcOQY4uBiDnpqxNRc65yKPW0eSoU1XamDfc4M8oqpXGMyUyvLyxFDB0q0+DChuxxiU2FXBQ=="
-    },
     "node_modules/rtl-css-js": {
       "version": "1.16.0",
       "resolved": "https://registry.npmjs.org/rtl-css-js/-/rtl-css-js-1.16.0.tgz",
@@ -9438,12 +9432,11 @@
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
     },
     "posthog-js": {
-      "version": "1.57.2",
-      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.57.2.tgz",
-      "integrity": "sha512-ER4gkYZasrd2Zwmt/yLeZ5G/nZJ6tpaYBCpx3CvocDx+3F16WdawJlYMT0IyLKHXDniC5+AsjzFd6fi8uyYlJA==",
+      "version": "1.81.1",
+      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.81.1.tgz",
+      "integrity": "sha512-pQfG9ZGVn3R7Uh1cC/S02trZ6u4TOLs1NhZG3WiNrqMKDA8MJQjZ/PqdkLO0/BeozRBfIbON6pw3xfOIneIclg==",
       "requires": {
-        "fflate": "^0.4.1",
-        "rrweb-snapshot": "^1.1.14"
+        "fflate": "^0.4.1"
       }
     },
     "prelude-ls": {
@@ -9711,11 +9704,6 @@
         "fsevents": "~2.3.2"
       }
     },
-    "rrweb-snapshot": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/rrweb-snapshot/-/rrweb-snapshot-1.1.14.tgz",
-      "integrity": "sha512-eP5pirNjP5+GewQfcOQY4uBiDnpqxNRc65yKPW0eSoU1XamDfc4M8oqpXGMyUyvLyxFDB0q0+DChuxxiU2FXBQ=="
-    },
     "rtl-css-js": {
       "version": "1.16.0",
       "resolved": "https://registry.npmjs.org/rtl-css-js/-/rtl-css-js-1.16.0.tgz",
diff --git a/ui-payment/package.json b/ui-payment/package.json
index f349d48..717c9e2 100644
--- a/ui-payment/package.json
+++ b/ui-payment/package.json
@@ -27,7 +27,7 @@
     "@vitejs/plugin-basic-ssl": "^1.0.1",
     "axios": "^1.1.3",
     "formik": "^2.2.9",
-    "posthog-js": "^1.57.2",
+    "posthog-js": "1.81.1",
     "qrcode.react": "^3.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

From 75fb5b4c70e3fa513402b9fc0365cd02a90457a6 Mon Sep 17 00:00:00 2001
From: Dmitry S <dmitry.tothemoon@gmail.com>
Date: Thu, 28 Sep 2023 11:50:49 +0200
Subject: [PATCH 2/6] Fix ui-dashboard web manifest

---
 ui-dashboard/index.html                    |   4 ++--
 ui-dashboard/public/fav/browserconfig.xml  |   9 ---------
 ui-dashboard/public/fav/mstile-150x150.png | Bin 8659 -> 0 bytes
 ui-dashboard/public/fav/site.webmanifest   |  19 -------------------
 ui-dashboard/public/site.webmanifest       |  19 +++++++++++++++++++
 5 files changed, 21 insertions(+), 30 deletions(-)
 delete mode 100644 ui-dashboard/public/fav/browserconfig.xml
 delete mode 100644 ui-dashboard/public/fav/mstile-150x150.png
 delete mode 100644 ui-dashboard/public/fav/site.webmanifest
 create mode 100644 ui-dashboard/public/site.webmanifest

diff --git a/ui-dashboard/index.html b/ui-dashboard/index.html
index c3d8054..f6a38f6 100644
--- a/ui-dashboard/index.html
+++ b/ui-dashboard/index.html
@@ -6,10 +6,10 @@
     <link rel="apple-touch-icon" sizes="180x180" href="/fav/apple-touch-icon.png" />
     <link rel="icon" type="image/png" sizes="32x32" href="/fav/favicon-32x32.png" />
     <link rel="icon" type="image/png" sizes="16x16" href="/fav/favicon-16x16.png" />
-    <link rel="manifest" href="/fav/site.webmanifest" />
+    <link rel="manifest" href="/site.webmanifest" />
     <link rel="mask-icon" href="/fav/safari-pinned-tab.svg" color="#50AF95" />
     <meta name="theme-color" content="#333333" />
-    <title>O2Pay</title>
+    <title>OxygenPay</title>
   </head>
   <body>
     <div id="root"></div>
diff --git a/ui-dashboard/public/fav/browserconfig.xml b/ui-dashboard/public/fav/browserconfig.xml
deleted file mode 100644
index 99f4ca5..0000000
--- a/ui-dashboard/public/fav/browserconfig.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square150x150logo src="/fav/mstile-150x150.png"/>
-            <TileColor>#333333</TileColor>
-        </tile>
-    </msapplication>
-</browserconfig>
diff --git a/ui-dashboard/public/fav/mstile-150x150.png b/ui-dashboard/public/fav/mstile-150x150.png
deleted file mode 100644
index 1dabe03408f80c605526ef28e18254edaf05d641..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8659
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
QKm^EG-(0WpmRrLA0E<o+9smFU

diff --git a/ui-dashboard/public/fav/site.webmanifest b/ui-dashboard/public/fav/site.webmanifest
deleted file mode 100644
index 5619645..0000000
--- a/ui-dashboard/public/fav/site.webmanifest
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "name": "",
-    "short_name": "",
-    "icons": [
-        {
-            "src": "/android-chrome-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-512x512.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        }
-    ],
-    "theme_color": "#333333",
-    "background_color": "#333333",
-    "display": "standalone"
-}
diff --git a/ui-dashboard/public/site.webmanifest b/ui-dashboard/public/site.webmanifest
new file mode 100644
index 0000000..246e073
--- /dev/null
+++ b/ui-dashboard/public/site.webmanifest
@@ -0,0 +1,19 @@
+{
+    "name": "OxygenPay",
+    "short_name": "OxygenPay",
+    "icons": [
+        {
+            "src": "/fav/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/fav/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#50AF95",
+    "background_color": "#50AF95",
+    "display": "standalone"
+}

From cdf7f42a6711127d39ebeb6a7fa10a5f4989451e Mon Sep 17 00:00:00 2001
From: Dmitry S <dmitry.tothemoon@gmail.com>
Date: Thu, 28 Sep 2023 11:53:32 +0200
Subject: [PATCH 3/6] Fix ui-payment web manifest

---
 ui-payment/index.html                    |   2 +-
 ui-payment/public/fav/browserconfig.xml  |   9 ---------
 ui-payment/public/fav/mstile-150x150.png | Bin 8659 -> 0 bytes
 ui-payment/public/fav/site.webmanifest   |  19 -------------------
 ui-payment/public/site.webmanifest       |  19 +++++++++++++++++++
 5 files changed, 20 insertions(+), 29 deletions(-)
 delete mode 100644 ui-payment/public/fav/browserconfig.xml
 delete mode 100644 ui-payment/public/fav/mstile-150x150.png
 delete mode 100644 ui-payment/public/fav/site.webmanifest
 create mode 100644 ui-payment/public/site.webmanifest

diff --git a/ui-payment/index.html b/ui-payment/index.html
index 49da74a..d0f54bf 100644
--- a/ui-payment/index.html
+++ b/ui-payment/index.html
@@ -6,7 +6,7 @@
         <link rel="apple-touch-icon" sizes="180x180" href="/fav/apple-touch-icon.png" />
         <link rel="icon" type="image/png" sizes="32x32" href="/fav/favicon-32x32.png" />
         <link rel="icon" type="image/png" sizes="16x16" href="/fav/favicon-16x16.png" />
-        <link rel="manifest" href="/fav/site.webmanifest" />
+        <link rel="manifest" href="/site.webmanifest" />
         <link rel="mask-icon" href="/fav/safari-pinned-tab.svg" color="#50AF95" />
         <meta name="theme-color" content="#4faf95" />
         <title>OxygenPay</title>
diff --git a/ui-payment/public/fav/browserconfig.xml b/ui-payment/public/fav/browserconfig.xml
deleted file mode 100644
index 99f4ca5..0000000
--- a/ui-payment/public/fav/browserconfig.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square150x150logo src="/fav/mstile-150x150.png"/>
-            <TileColor>#333333</TileColor>
-        </tile>
-    </msapplication>
-</browserconfig>
diff --git a/ui-payment/public/fav/mstile-150x150.png b/ui-payment/public/fav/mstile-150x150.png
deleted file mode 100644
index 1dabe03408f80c605526ef28e18254edaf05d641..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8659
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
QKm^EG-(0WpmRrLA0E<o+9smFU

diff --git a/ui-payment/public/fav/site.webmanifest b/ui-payment/public/fav/site.webmanifest
deleted file mode 100644
index 5619645..0000000
--- a/ui-payment/public/fav/site.webmanifest
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "name": "",
-    "short_name": "",
-    "icons": [
-        {
-            "src": "/android-chrome-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-512x512.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        }
-    ],
-    "theme_color": "#333333",
-    "background_color": "#333333",
-    "display": "standalone"
-}
diff --git a/ui-payment/public/site.webmanifest b/ui-payment/public/site.webmanifest
new file mode 100644
index 0000000..246e073
--- /dev/null
+++ b/ui-payment/public/site.webmanifest
@@ -0,0 +1,19 @@
+{
+    "name": "OxygenPay",
+    "short_name": "OxygenPay",
+    "icons": [
+        {
+            "src": "/fav/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/fav/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#50AF95",
+    "background_color": "#50AF95",
+    "display": "standalone"
+}

From f15a812480dee77121679399091743ea7dad6578 Mon Sep 17 00:00:00 2001
From: Dmitry S <dmitry.tothemoon@gmail.com>
Date: Thu, 28 Sep 2023 21:58:55 +0200
Subject: [PATCH 4/6] Update logger; add more context fields

---
 go.mod                         |  4 ++--
 go.sum                         |  7 +++++++
 internal/server/http/server.go | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index db1e66c..3ff1f1a 100644
--- a/go.mod
+++ b/go.mod
@@ -26,14 +26,14 @@ require (
 	github.com/oxygenpay/tatum-sdk v0.0.0-20230529210116-d986b7743613
 	github.com/pkg/errors v0.9.1
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/rs/zerolog v1.26.1
+	github.com/rs/zerolog v1.29.0
 	github.com/rubenv/sql-migrate v1.2.0
 	github.com/samber/lo v1.37.0
 	github.com/spf13/cobra v1.6.1
 	github.com/stretchr/testify v1.8.1
 	github.com/tidwall/gjson v1.14.4
 	github.com/wemeetagain/go-hdwallet v0.1.0
-	github.com/ziflex/lecho/v3 v3.1.0
+	github.com/ziflex/lecho/v3 v3.5.0
 	go.etcd.io/bbolt v1.3.6
 	go.uber.org/atomic v1.10.0
 	golang.org/x/crypto v0.11.0
diff --git a/go.sum b/go.sum
index 764f8c4..6d7479e 100644
--- a/go.sum
+++ b/go.sum
@@ -104,6 +104,7 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -458,6 +459,7 @@ github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
@@ -541,11 +543,14 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV
 github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
 github.com/rs/zerolog v1.26.0/go.mod h1:yBiM87lvSqX8h0Ww4sdzNSkVYZ8dL2xjZJG1lAuGZEo=
 github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc=
 github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc=
+github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w=
+github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
 github.com/rubenv/sql-migrate v1.2.0 h1:fOXMPLMd41sK7Tg75SXDec15k3zg5WNV6SjuDRiNfcU=
 github.com/rubenv/sql-migrate v1.2.0/go.mod h1:Z5uVnq7vrIrPmHbVFfR4YLHRZquxeHpckCnRq0P/K9Y=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -636,6 +641,8 @@ github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 github.com/ziflex/lecho/v3 v3.1.0 h1:65bSzSc0yw7EEhi44lMnkOI877ZzbE7tGDWfYCQXZwI=
 github.com/ziflex/lecho/v3 v3.1.0/go.mod h1:dwQ6xCAKmSBHhwZ6XmiAiDptD7iklVkW7xQYGUncX0Q=
+github.com/ziflex/lecho/v3 v3.5.0 h1:Z4TBr8SbUUnfaVc8tGJf1Jhu0G9Jxjl77lPW0riXKak=
+github.com/ziflex/lecho/v3 v3.5.0/go.mod h1:+eInrytYHxVPI6NQbua9xXGerB1x0ujj9jAV33yBIko=
 github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
 go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
diff --git a/internal/server/http/server.go b/internal/server/http/server.go
index bd04b22..9b77e69 100644
--- a/internal/server/http/server.go
+++ b/internal/server/http/server.go
@@ -91,6 +91,7 @@ func WithLogger(logger *zerolog.Logger) Opt {
 		s.echo.Use(lecho.Middleware(lecho.Config{
 			Logger:       lecho.From(l, lecho.WithLevel(log.INFO)),
 			RequestIDKey: middleware.RequestIDKey,
+			Enricher:     loggerEnricher,
 			Skipper: func(c echo.Context) bool {
 				path := c.Request().URL.Path
 
@@ -106,6 +107,20 @@ func WithLogger(logger *zerolog.Logger) Opt {
 	}
 }
 
+func loggerEnricher(c echo.Context, logger zerolog.Context) zerolog.Context {
+	merchantID := c.Param("merchantId")
+	if merchantID != "" {
+		logger = logger.Str("merchant_id", merchantID)
+	}
+
+	paymentID := c.Param("paymentId")
+	if paymentID != "" {
+		logger = logger.Str("payment_id", paymentID)
+	}
+
+	return logger.Str("path", c.Path())
+}
+
 const healthcheckPath = "/health"
 
 func withHealthcheck(e *echo.Echo) {

From 221661c86c1128df964e075e76e8a7f0b7770ef8 Mon Sep 17 00:00:00 2001
From: Dmitry S <dmitry.tothemoon@gmail.com>
Date: Thu, 28 Sep 2023 22:09:48 +0200
Subject: [PATCH 5/6] Fix service version in logs

---
 cmd/root.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/root.go b/cmd/root.go
index b1b55ae..51ea361 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -40,7 +40,7 @@ func Execute() {
 
 // resolveConfig or exit with error
 func resolveConfig() *config.Config {
-	cfg, err := config.New(Version, Commit, configPath, skipConfig, EmbedFrontend)
+	cfg, err := config.New(Commit, Version, configPath, skipConfig, EmbedFrontend)
 	if err != nil {
 		fmt.Printf("unable to initialize config: %s\n", err.Error())
 		os.Exit(1)

From 713f062fc92784e4bd2c6281b376083cdd631d05 Mon Sep 17 00:00:00 2001
From: Dmitry S <dmitry.tothemoon@gmail.com>
Date: Thu, 28 Sep 2023 23:02:38 +0200
Subject: [PATCH 6/6] Fix withdrawals blocked by a failed item in a batch

---
 internal/service/payment/service.go           |   5 +
 .../service/payment/service_withdrawal.go     |   3 +-
 .../service/processing/service_withdrawal.go  |  55 +++--
 .../processing/service_withdrawal_test.go     | 212 ++++++++++--------
 4 files changed, 153 insertions(+), 122 deletions(-)

diff --git a/internal/service/payment/service.go b/internal/service/payment/service.go
index 187ec7d..7c84eaa 100644
--- a/internal/service/payment/service.go
+++ b/internal/service/payment/service.go
@@ -580,6 +580,11 @@ func (s *Service) Update(ctx context.Context, merchantID, id int64, props Update
 	return s.entryToPayment(pt)
 }
 
+func (s *Service) Fail(ctx context.Context, pt *Payment) error {
+	_, err := s.Update(ctx, pt.MerchantID, pt.ID, UpdateProps{Status: StatusFailed})
+	return err
+}
+
 func (s *Service) SetWebhookTimestamp(ctx context.Context, merchantID, id int64, sentAt time.Time) error {
 	err := s.repo.UpdatePaymentWebhookInfo(ctx, repository.UpdatePaymentWebhookInfoParams{
 		ID:            id,
diff --git a/internal/service/payment/service_withdrawal.go b/internal/service/payment/service_withdrawal.go
index 51f7163..2293193 100644
--- a/internal/service/payment/service_withdrawal.go
+++ b/internal/service/payment/service_withdrawal.go
@@ -2,6 +2,7 @@ package payment
 
 import (
 	"context"
+	"fmt"
 	"strconv"
 	"time"
 
@@ -33,7 +34,7 @@ func (s *Service) ListWithdrawals(ctx context.Context, status Status, filterByID
 	}
 
 	if len(filterByIDs) > 0 && len(results) != len(filterByIDs) {
-		return nil, errors.New("results len mismatch")
+		return nil, fmt.Errorf("withdrawals filter mismatch for status %q", status)
 	}
 
 	payments := make([]*Payment, len(results))
diff --git a/internal/service/processing/service_withdrawal.go b/internal/service/processing/service_withdrawal.go
index fc9aab2..260f0b1 100644
--- a/internal/service/processing/service_withdrawal.go
+++ b/internal/service/processing/service_withdrawal.go
@@ -23,12 +23,7 @@ func (s *Service) BatchCreateWithdrawals(ctx context.Context, withdrawalIDs []in
 		return nil, err
 	}
 
-	// 1.Validate payments
-	if errValidate := s.validateWithdrawals(withdrawals); errValidate != nil {
-		return nil, errValidate
-	}
-
-	// 2. Get OUTBOUND wallets and balances
+	// 1. Get OUTBOUND wallets and balances
 	outboundWallets, outboundBalances, err := s.getOutboundWalletsWithBalancesAsMap(ctx)
 	if err != nil {
 		return nil, errors.Wrap(err, "unable to get outbound wallets with balances")
@@ -36,7 +31,8 @@ func (s *Service) BatchCreateWithdrawals(ctx context.Context, withdrawalIDs []in
 
 	result := &TransferResult{}
 
-	// 3. For each withdrawal:
+	// 2. For each withdrawal:
+	// - Validate
 	// - Resolve currency
 	// - Resolve outbound system wallet & balance
 	// - Resolve merchant balance & withdrawal address
@@ -47,6 +43,18 @@ func (s *Service) BatchCreateWithdrawals(ctx context.Context, withdrawalIDs []in
 	for i := range withdrawals {
 		withdrawal := withdrawals[i]
 		group.Go(func() error {
+			// Let's validate each withdrawal individually.
+			// By doing so, we can reject it without blocking other withdrawals.
+			if errValidate := validateWithdrawal(withdrawal); errValidate != nil {
+				if errUpdate := s.payments.Fail(ctx, withdrawal); errUpdate != nil {
+					result.registerErr(errors.Wrap(errUpdate, "unable to mark invalid withdrawal as failed"))
+				} else {
+					result.registerErr(errors.Wrap(errValidate, "withdrawal is invalid, marked as failed"))
+				}
+
+				return nil
+			}
+
 			currency, err := s.blockchain.GetCurrencyByTicker(withdrawal.Price.Ticker())
 			if err != nil {
 				result.registerErr(errors.Wrap(err, "unable to get withdrawal currency"))
@@ -540,27 +548,26 @@ func (s *Service) cancelWithdrawal(
 	return nil
 }
 
-func (s *Service) validateWithdrawals(withdrawals []*payment.Payment) error {
-	for _, pt := range withdrawals {
-		if pt.Type != payment.TypeWithdrawal {
-			return errors.Wrap(ErrInvalidInput, "payment is not withdrawal")
-		}
+func validateWithdrawal(pt *payment.Payment) error {
+	if pt.Type != payment.TypeWithdrawal {
+		return errors.Wrap(ErrInvalidInput, "payment is not withdrawal")
+	}
 
-		if pt.Status != payment.StatusPending {
-			return errors.Wrap(ErrInvalidInput, "withdrawal is not pending")
-		}
+	if pt.Status != payment.StatusPending {
+		return errors.Wrap(ErrInvalidInput, "withdrawal is not pending")
+	}
 
-		if pt.MerchantID == 0 {
-			return errors.Wrap(ErrInvalidInput, "invalid merchant id")
-		}
+	if pt.MerchantID == 0 {
+		return errors.Wrap(ErrInvalidInput, "invalid merchant id")
+	}
 
-		if pt.WithdrawalBalanceID() < 1 {
-			return errors.Wrap(ErrInvalidInput, "invalid balance id")
-		}
+	if pt.WithdrawalBalanceID() < 1 {
+		return errors.Wrap(ErrInvalidInput, "invalid balance id")
+	}
 
-		if pt.WithdrawalAddressID() < 1 {
-			return errors.Wrap(ErrInvalidInput, "invalid address id")
-		}
+	// edge-case: a customer can delete the address while withdrawal is pending
+	if pt.WithdrawalAddressID() < 1 {
+		return errors.Wrap(ErrInvalidInput, "invalid address id")
 	}
 
 	return nil
diff --git a/internal/service/processing/service_withdrawal_test.go b/internal/service/processing/service_withdrawal_test.go
index 83e6b1e..e51b984 100644
--- a/internal/service/processing/service_withdrawal_test.go
+++ b/internal/service/processing/service_withdrawal_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/oxygenpay/oxygen/internal/service/blockchain"
 	"github.com/oxygenpay/oxygen/internal/service/merchant"
 	"github.com/oxygenpay/oxygen/internal/service/payment"
+	"github.com/oxygenpay/oxygen/internal/service/processing"
 	"github.com/oxygenpay/oxygen/internal/service/transaction"
 	"github.com/oxygenpay/oxygen/internal/service/wallet"
 	"github.com/oxygenpay/oxygen/internal/test"
@@ -504,7 +505,7 @@ func TestService_BatchCreateWithdrawals(t *testing.T) {
 		})
 	})
 
-	t.Run("Creates 2 ETH transactions, one failed", func(t *testing.T) {
+	t.Run("Creates 2 ETH transactions, one fails due to insufficient balance", func(t *testing.T) {
 		tc.Clear.Wallets(t)
 		isTest := false
 
@@ -607,112 +608,129 @@ func TestService_BatchCreateWithdrawals(t *testing.T) {
 		assert.Equal(t, expectedWalletBalance, outboundBalance.Amount.StringRaw())
 	})
 
-	t.Run("Fails", func(t *testing.T) {
+	t.Run("Validation error", func(t *testing.T) {
 		tc.Clear.Wallets(t)
-		t.Run("Validation error", func(t *testing.T) {
-			mt, _ := tc.Must.CreateMerchant(t, 1)
+		mt, _ := tc.Must.CreateMerchant(t, 1)
 
-			merchantBalance := tc.Must.CreateBalance(t, wallet.EntityTypeMerchant, mt.ID, withBalance(eth, "123_000_000_000_000_000", false))
-			merchantAddress, err := tc.Services.Merchants.CreateMerchantAddress(ctx, mt.ID, merchant.CreateMerchantAddressParams{
-				Name:       "A1",
-				Blockchain: kmswallet.Blockchain(eth.Blockchain),
-				Address:    "0x95222290dd7278aa3ddd389cc1e1d165cc4bafe5",
+		merchantBalance := tc.Must.CreateBalance(t, wallet.EntityTypeMerchant, mt.ID, withBalance(eth, "123_000_000_000_000_000", false))
+		merchantAddress, err := tc.Services.Merchants.CreateMerchantAddress(ctx, mt.ID, merchant.CreateMerchantAddressParams{
+			Name:       "A1",
+			Blockchain: kmswallet.Blockchain(eth.Blockchain),
+			Address:    "0x95222290dd7278aa3ddd389cc1e1d165cc4bafe5",
+		})
+		require.NoError(t, err)
+
+		makeWithdrawal := func(amount money.Money, meta payment.Metadata) *payment.Payment {
+			entry, err := tc.Repository.CreatePayment(ctx, repository.CreatePaymentParams{
+				PublicID:          uuid.New(),
+				CreatedAt:         time.Now(),
+				UpdatedAt:         time.Now(),
+				Type:              string(payment.TypeWithdrawal),
+				Status:            string(payment.StatusPending),
+				MerchantID:        mt.ID,
+				MerchantOrderUuid: uuid.New(),
+				Price:             repository.MoneyToNumeric(amount),
+				Decimals:          int32(amount.Decimals()),
+				Currency:          amount.Ticker(),
+				Metadata:          meta.ToJSONB(),
+				IsTest:            false,
 			})
 			require.NoError(t, err)
 
-			makeWithdrawal := func(amount money.Money, meta payment.Metadata) *payment.Payment {
-				entry, err := tc.Repository.CreatePayment(ctx, repository.CreatePaymentParams{
-					PublicID:          uuid.New(),
-					CreatedAt:         time.Now(),
-					UpdatedAt:         time.Now(),
-					Type:              string(payment.TypeWithdrawal),
-					Status:            string(payment.StatusPending),
-					MerchantID:        mt.ID,
-					MerchantOrderUuid: uuid.New(),
-					Price:             repository.MoneyToNumeric(amount),
-					Decimals:          int32(amount.Decimals()),
-					Currency:          amount.Ticker(),
-					Metadata:          meta.ToJSONB(),
-					IsTest:            false,
-				})
-				require.NoError(t, err)
-
-				pt, err := tc.Services.Payment.GetByID(ctx, mt.ID, entry.ID)
-				require.NoError(t, err)
-
-				return pt
-			}
-
-			for testCaseIndex, testCase := range []struct {
-				errContains string
-				withdrawals func() []*payment.Payment
-			}{
-				{
-					// actually "payment is not withdrawal"
-					errContains: "results len mismatch",
-					withdrawals: func() []*payment.Payment {
-						return []*payment.Payment{tc.CreateSamplePayment(t, mt.ID)}
-					},
+			pt, err := tc.Services.Payment.GetByID(ctx, mt.ID, entry.ID)
+			require.NoError(t, err)
+
+			return pt
+		}
+
+		for _, tt := range []struct {
+			name        string
+			assert      func(t *testing.T, in []*payment.Payment, result *processing.TransferResult, err error)
+			withdrawals func() []*payment.Payment
+		}{
+			{
+				name: "payment is not withdrawal",
+				withdrawals: func() []*payment.Payment {
+					return []*payment.Payment{tc.CreateSamplePayment(t, mt.ID)}
 				},
-				{
-					// actually "status is not pending"
-					errContains: "results len mismatch",
-					withdrawals: func() []*payment.Payment {
-						withdrawal, err := tc.Services.Payment.CreateWithdrawal(ctx, mt.ID, payment.CreateWithdrawalProps{
-							BalanceID: merchantBalance.UUID,
-							AddressID: merchantAddress.UUID,
-							AmountRaw: "0.1",
-						})
-						require.NoError(t, err)
-
-						_, err = tc.Services.Payment.Update(ctx, mt.ID, withdrawal.ID, payment.UpdateProps{Status: payment.StatusInProgress})
-						require.NoError(t, err)
-
-						return []*payment.Payment{withdrawal}
-					},
+				assert: func(t *testing.T, _ []*payment.Payment, _ *processing.TransferResult, err error) {
+					assert.ErrorContains(t, err, `withdrawals filter mismatch for status "pending"`)
 				},
-				{
-					errContains: "invalid address id",
-					withdrawals: func() []*payment.Payment {
-						return []*payment.Payment{
-							makeWithdrawal(
-								lo.Must(eth.MakeAmount("123_456")),
-								payment.Metadata{payment.MetaBalanceID: strconv.Itoa(int(merchantBalance.ID))},
-							),
-						}
-					},
+			},
+			{
+				name: "status is not pending",
+				withdrawals: func() []*payment.Payment {
+					withdrawal, err := tc.Services.Payment.CreateWithdrawal(ctx, mt.ID, payment.CreateWithdrawalProps{
+						BalanceID: merchantBalance.UUID,
+						AddressID: merchantAddress.UUID,
+						AmountRaw: "0.1",
+					})
+					require.NoError(t, err)
+
+					_, err = tc.Services.Payment.Update(ctx, mt.ID, withdrawal.ID, payment.UpdateProps{Status: payment.StatusInProgress})
+					require.NoError(t, err)
+
+					return []*payment.Payment{withdrawal}
 				},
-				{
-					errContains: "invalid balance id",
-					withdrawals: func() []*payment.Payment {
-						return []*payment.Payment{
-							makeWithdrawal(
-								lo.Must(eth.MakeAmount("123_456")),
-								payment.Metadata{payment.MetaAddressID: strconv.Itoa(int(merchantAddress.ID))},
-							),
-						}
-					},
+				assert: func(t *testing.T, _ []*payment.Payment, _ *processing.TransferResult, err error) {
+					assert.ErrorContains(t, err, `withdrawals filter mismatch for status "pending"`)
 				},
-			} {
-				t.Run(strconv.Itoa(testCaseIndex+1), func(t *testing.T) {
-					// ARRANGE
-					// Given balances
-					input := testCase.withdrawals()
-
-					// ACT
-					// Transfer money
-					ids := util.MapSlice(input, func(p *payment.Payment) int64 { return p.ID })
-					result, err := tc.Services.Processing.BatchCreateWithdrawals(ctx, ids)
-					assert.Nil(t, result)
-
-					// ASSERT
-					// Check that error contain string
-					if testCase.errContains != "" {
-						assert.ErrorContains(t, err, testCase.errContains)
+			},
+			{
+				name: "invalid address id",
+				withdrawals: func() []*payment.Payment {
+					return []*payment.Payment{
+						makeWithdrawal(
+							lo.Must(eth.MakeAmount("123_456")),
+							payment.Metadata{payment.MetaBalanceID: strconv.Itoa(int(merchantBalance.ID))},
+						),
 					}
-				})
-			}
-		})
+				},
+				assert: func(t *testing.T, in []*payment.Payment, result *processing.TransferResult, err error) {
+					assert.NoError(t, err)
+					assert.Equal(t, int64(1), result.TotalErrors)
+					assert.ErrorContains(t, result.UnhandledErrors[0], "withdrawal is invalid, marked as failed")
+
+					pt, _ := tc.Services.Payment.GetByID(ctx, in[0].MerchantID, in[0].ID)
+					require.NoError(t, err)
+					assert.Equal(t, payment.StatusFailed, pt.Status)
+				},
+			},
+			{
+				name: "invalid balance id",
+				withdrawals: func() []*payment.Payment {
+					return []*payment.Payment{
+						makeWithdrawal(
+							lo.Must(eth.MakeAmount("123_456")),
+							payment.Metadata{payment.MetaAddressID: strconv.Itoa(int(merchantAddress.ID))},
+						),
+					}
+				},
+				assert: func(t *testing.T, in []*payment.Payment, result *processing.TransferResult, err error) {
+					assert.NoError(t, err)
+					assert.Equal(t, int64(1), result.TotalErrors)
+					assert.ErrorContains(t, result.UnhandledErrors[0], "withdrawal is invalid, marked as failed")
+
+					pt, _ := tc.Services.Payment.GetByID(ctx, in[0].MerchantID, in[0].ID)
+					require.NoError(t, err)
+					assert.Equal(t, payment.StatusFailed, pt.Status)
+				},
+			},
+		} {
+			t.Run(tt.name, func(t *testing.T) {
+				// ARRANGE
+				// Given balances
+				input := tt.withdrawals()
+
+				// ACT
+				// Create withdrawals
+				ids := util.MapSlice(input, func(p *payment.Payment) int64 { return p.ID })
+				result, err := tc.Services.Processing.BatchCreateWithdrawals(ctx, ids)
+
+				// ASSERT
+				tt.assert(t, input, result, err)
+			})
+		}
 	})
 
 	t.Run("Logic error", func(t *testing.T) {