From af22c79a6f176a53d82659d9b1bec66b3c15906a Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Mon, 15 Feb 2021 18:35:03 +0000 Subject: [PATCH 1/3] chore: add graphql dependency and version bump (#601) --- package-lock.json | 8 ++++---- package.json | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9a9c9079..fec1fb58 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "lamassu-server", - "version": "7.5.0-beta.1", + "version": "7.5.0-beta.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -6946,9 +6946,9 @@ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" }, "graphql": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.3.0.tgz", - "integrity": "sha512-GTCJtzJmkFLWRfFJuoo9RWWa/FfamUHgiFosxi/X1Ani4AVWbeyBenZTNX6dM+7WSbbFfTo/25eh0LLkwHMw2w==" + "version": "15.5.0", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.5.0.tgz", + "integrity": "sha512-OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA==" }, "graphql-extensions": { "version": "0.12.5", diff --git a/package.json b/package.json index 3cf9493d..361da2b2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "lamassu-server", "description": "bitcoin atm client server protocol module", "keywords": [], - "version": "7.5.0-beta.1", + "version": "7.5.0-beta.2", "license": "Unlicense", "author": "Lamassu (https://lamassu.is)", "dependencies": { @@ -33,6 +33,7 @@ "express-ws": "^3.0.0", "futoin-hkdf": "^1.0.2", "got": "^7.1.0", + "graphql": "^15.5.0", "graphql-iso-date": "^3.6.1", "graphql-type-json": "^0.3.1", "helmet": "^3.8.1", From deae0cb2e413de733b1ff9cc9b9e397d00bd9df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Wed, 17 Feb 2021 17:29:39 +0000 Subject: [PATCH 2/3] chore: pin ed25519 dependency --- package-lock.json | 20 ++++++++++++++------ package.json | 1 + 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index fec1fb58..db71ca30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5215,13 +5215,11 @@ } }, "ed25519": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/ed25519/-/ed25519-0.0.4.tgz", - "integrity": "sha1-5WIYrOL8kD0llZOu8LKpY59HW+s=", - "optional": true, + "version": "git+https://github.com/dazoe/ed25519.git#3140c985fee9828ce6707202f9f7d55cb1f0b46d", + "from": "git+https://github.com/dazoe/ed25519.git#3140c985fee9828ce6707202f9f7d55cb1f0b46d", "requires": { - "bindings": "^1.2.1", - "nan": "^2.0.9" + "bindings": "^1.5.0", + "nan": "^2.14.1" } }, "ee-first": { @@ -14203,6 +14201,16 @@ "tweetnacl": "^1.0.0" }, "dependencies": { + "ed25519": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/ed25519/-/ed25519-0.0.4.tgz", + "integrity": "sha1-5WIYrOL8kD0llZOu8LKpY59HW+s=", + "optional": true, + "requires": { + "bindings": "^1.2.1", + "nan": "^2.0.9" + } + }, "tweetnacl": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", diff --git a/package.json b/package.json index 361da2b2..81628ffb 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "cookie-parser": "^1.4.3", "cors": "^2.8.5", "dataloader": "^2.0.0", + "ed25519": "git+https://github.com/dazoe/ed25519#3140c985fee9828ce6707202f9f7d55cb1f0b46d", "ethereumjs-tx": "^1.3.3", "ethereumjs-util": "^5.2.0", "ethereumjs-wallet": "^0.6.3", From a4c49fcbc45c6e8291a7147ce1cca52be76e7302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Thu, 18 Feb 2021 18:31:40 +0000 Subject: [PATCH 3/3] chore: point towards lamassu repo --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index db71ca30..9ab731f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5215,8 +5215,8 @@ } }, "ed25519": { - "version": "git+https://github.com/dazoe/ed25519.git#3140c985fee9828ce6707202f9f7d55cb1f0b46d", - "from": "git+https://github.com/dazoe/ed25519.git#3140c985fee9828ce6707202f9f7d55cb1f0b46d", + "version": "git+https://github.com/lamassu/ed25519.git#3140c985fee9828ce6707202f9f7d55cb1f0b46d", + "from": "git+https://github.com/lamassu/ed25519.git#3140c985fee9828ce6707202f9f7d55cb1f0b46d", "requires": { "bindings": "^1.5.0", "nan": "^2.14.1" diff --git a/package.json b/package.json index 81628ffb..f5fa99b3 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "cookie-parser": "^1.4.3", "cors": "^2.8.5", "dataloader": "^2.0.0", - "ed25519": "git+https://github.com/dazoe/ed25519#3140c985fee9828ce6707202f9f7d55cb1f0b46d", + "ed25519": "git+https://github.com/lamassu/ed25519#3140c985fee9828ce6707202f9f7d55cb1f0b46d", "ethereumjs-tx": "^1.3.3", "ethereumjs-util": "^5.2.0", "ethereumjs-wallet": "^0.6.3",