From 58d32d5a2fb652f7461673826dc1826462239c64 Mon Sep 17 00:00:00 2001 From: CrypticaScriptura <7396812+CrypticaScriptura@users.noreply.github.com> Date: Thu, 22 Aug 2024 17:46:24 -0400 Subject: [PATCH 1/4] chore: v10.0.3-beta.2 (#1716) --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 09c834fc..952dcba4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "lamassu-server", - "version": "10.0.3-beta.1", + "version": "10.0.3-beta.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f27e3e71..0515ebba 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "lamassu-server", "description": "bitcoin atm client server protocol module", "keywords": [], - "version": "10.0.3-beta.1", + "version": "10.0.3-beta.2", "license": "./LICENSE", "author": "Lamassu (https://lamassu.is)", "dependencies": { From 2ea5d6e65c3f66ca8f55a038dc9799e66598e07c Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Tue, 27 Aug 2024 15:17:57 +0100 Subject: [PATCH 2/4] fix: machine_diagnostics doesn't exist --- lib/pairing.js | 1 - migrations/1724242113482-drop-last-used-fkey.js | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/pairing.js b/lib/pairing.js index ebedc001..04a1d818 100644 --- a/lib/pairing.js +++ b/lib/pairing.js @@ -32,7 +32,6 @@ function unpair (deviceId) { const q2 = t.none(`DELETE FROM machine_pings WHERE device_id=$1`, [deviceId]) const q3 = t.none(`DELETE FROM machine_network_heartbeat WHERE device_id=$1`, [deviceId]) const q4 = t.none(`DELETE FROM machine_network_performance WHERE device_id=$1`, [deviceId]) - const q5 = t.none(`DELETE FROM machine_diagnostics WHERE device_id=$1`, [deviceId]) return t.batch([q1, q2, q3, q4, q5]) }) ) diff --git a/migrations/1724242113482-drop-last-used-fkey.js b/migrations/1724242113482-drop-last-used-fkey.js index 3c3b62d7..9459ac51 100644 --- a/migrations/1724242113482-drop-last-used-fkey.js +++ b/migrations/1724242113482-drop-last-used-fkey.js @@ -1,10 +1,7 @@ const db = require('./db') exports.up = function (next) { - db.multi([ - 'ALTER TABLE customers DROP CONSTRAINT customers_last_used_machine_fkey;', - 'ALTER TABLE machine_diagnostics DROP CONSTRAINT machine_diagnostics_device_id_fkey;' - ], next) + db.multi(['ALTER TABLE customers DROP CONSTRAINT customers_last_used_machine_fkey;'], next) } exports.down = function (next) { From 5975baa2945af583ac4871d4c38a3f28b0d7cf7a Mon Sep 17 00:00:00 2001 From: CrypticaScriptura <7396812+CrypticaScriptura@users.noreply.github.com> Date: Tue, 27 Aug 2024 12:43:24 -0400 Subject: [PATCH 3/4] chore: v10.0.3-beta.3 (#1717) --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 952dcba4..b42340d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "lamassu-server", - "version": "10.0.3-beta.2", + "version": "10.0.3-beta.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0515ebba..397f0bd7 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "lamassu-server", "description": "bitcoin atm client server protocol module", "keywords": [], - "version": "10.0.3-beta.2", + "version": "10.0.3-beta.3", "license": "./LICENSE", "author": "Lamassu (https://lamassu.is)", "dependencies": { From 7684a7ba9c9481bef4c475d2d756f9598777fd64 Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Tue, 27 Aug 2024 18:43:24 +0100 Subject: [PATCH 4/4] fix: dangling variable --- lib/pairing.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pairing.js b/lib/pairing.js index 04a1d818..72e88f4c 100644 --- a/lib/pairing.js +++ b/lib/pairing.js @@ -32,7 +32,7 @@ function unpair (deviceId) { const q2 = t.none(`DELETE FROM machine_pings WHERE device_id=$1`, [deviceId]) const q3 = t.none(`DELETE FROM machine_network_heartbeat WHERE device_id=$1`, [deviceId]) const q4 = t.none(`DELETE FROM machine_network_performance WHERE device_id=$1`, [deviceId]) - return t.batch([q1, q2, q3, q4, q5]) + return t.batch([q1, q2, q3, q4]) }) ) }