diff --git a/locksmith/__tests__/controllers/eventController.test.ts b/locksmith/__tests__/controllers/eventController.test.ts index fda417a6c7a..8d1e586df27 100644 --- a/locksmith/__tests__/controllers/eventController.test.ts +++ b/locksmith/__tests__/controllers/eventController.test.ts @@ -156,6 +156,7 @@ describe('Event Controller', () => { let typedData = generateTypedData(message) const sig = sigUtil.signTypedData(privateKey, { data: typedData, + from: '', }) let response = await request(app) @@ -174,6 +175,7 @@ describe('Event Controller', () => { let typedData = generateTypedData(message) const sig = sigUtil.signTypedData(privateKey, { data: typedData, + from: '', }) let response = await request(app) @@ -206,6 +208,7 @@ describe('Event Controller', () => { let typedData = generateTypedData(message) const sig = sigUtil.signTypedData(privateKey, { data: typedData, + from: '', }) let response = await request(app) @@ -223,6 +226,7 @@ describe('Event Controller', () => { let typedData = generateTypedData(badOwnerMessage) const sig = sigUtil.signTypedData(privateKey, { data: typedData, + from: '', }) let response = await request(app) @@ -253,6 +257,7 @@ describe('adding event links', () => { let typedData = generateTypedData2(newLinks) const sig = sigUtil.signTypedData(privateKey, { data: typedData, + from: '', }) let response = await request(app) @@ -272,6 +277,7 @@ describe('overwritting event links', () => { let typedData = generateTypedData(overWritingLinks) const sig = sigUtil.signTypedData(privateKey, { data: typedData, + from: '', }) let response = await request(app) diff --git a/locksmith/__tests__/controllers/metadataController.test.ts b/locksmith/__tests__/controllers/metadataController.test.ts index 505ce4872c0..f02f4fb876e 100644 --- a/locksmith/__tests__/controllers/metadataController.test.ts +++ b/locksmith/__tests__/controllers/metadataController.test.ts @@ -214,6 +214,7 @@ describe('Metadata Controller', () => { expect.assertions(1) const sig = sigUtil.signTypedData(privateKey, { data: typedData, + from: '', }) let response = await request(app) @@ -237,6 +238,7 @@ describe('Metadata Controller', () => { expect.assertions(1) const sig = sigUtil.signTypedData(privateKey, { data: typedData, + from: '', }) let response = await request(app) @@ -253,6 +255,7 @@ describe('Metadata Controller', () => { expect.assertions(1) const sig = sigUtil.signTypedData(privateKey2, { data: typedData, + from: '', }) let response = await request(app) @@ -290,6 +293,7 @@ describe('Metadata Controller', () => { const sig = sigUtil.signTypedData(privateKey, { data: typedData, + from: '', }) let response = await request(app) @@ -337,6 +341,7 @@ describe('Metadata Controller', () => { const sig = sigUtil.signTypedData(privateKey, { data: typedData, + from: '', }) let response = await request(app) diff --git a/locksmith/__tests__/controllers/purchaseController.test.ts b/locksmith/__tests__/controllers/purchaseController.test.ts index 528d071a371..1e69787cd29 100644 --- a/locksmith/__tests__/controllers/purchaseController.test.ts +++ b/locksmith/__tests__/controllers/purchaseController.test.ts @@ -82,6 +82,7 @@ describe('Purchase Controller', () => { let typedData = generateTypedData(message) const sig = sigUtil.signTypedData(privateKey, { + from: '', data: typedData, }) @@ -111,6 +112,7 @@ describe('Purchase Controller', () => { let typedData = generateTypedData(message) const sig = sigUtil.signTypedData(privateKey, { + from: '', data: typedData, }) it('responds with a 412', async () => { @@ -135,6 +137,7 @@ describe('Purchase Controller', () => { let typedData = generateTypedData(message) const sig = sigUtil.signTypedData(privateKey, { + from: '', data: typedData, }) it('rejects the purchase', async () => { diff --git a/locksmith/package-lock.json b/locksmith/package-lock.json index 9fd7fc2a5c3..e785e75fcdd 100644 --- a/locksmith/package-lock.json +++ b/locksmith/package-lock.json @@ -1158,6 +1158,49 @@ "inherits": "^2.0.1" } }, + "eth-sig-util": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-2.2.0.tgz", + "integrity": "sha512-bAxW35bL4U2lrtjjV8rFGJ8B27z4Sn5v9eIaNdpPUnPfUAtrvx5j8atfyV+k+JOnbppcvKhWCO1rQSBk4kkAhw==", + "requires": { + "buffer": "^5.2.1", + "elliptic": "^6.4.0", + "ethereumjs-abi": "0.6.5", + "ethereumjs-util": "^5.1.1", + "tweetnacl": "^1.0.0", + "tweetnacl-util": "^0.15.0" + }, + "dependencies": { + "elliptic": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz", + "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==", + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" + } + } + } + }, + "ethereumjs-util": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", + "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", + "requires": { + "bn.js": "^4.11.0", + "create-hash": "^1.1.2", + "ethjs-util": "^0.1.3", + "keccak": "^1.0.2", + "rlp": "^2.0.0", + "safe-buffer": "^5.1.1", + "secp256k1": "^3.0.1" + } + }, "ethers": { "version": "4.0.27", "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.27.tgz", @@ -3489,9 +3532,9 @@ } }, "eth-sig-util": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-2.2.0.tgz", - "integrity": "sha512-bAxW35bL4U2lrtjjV8rFGJ8B27z4Sn5v9eIaNdpPUnPfUAtrvx5j8atfyV+k+JOnbppcvKhWCO1rQSBk4kkAhw==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-2.4.4.tgz", + "integrity": "sha512-iWGqEJwsUMgtk8AqQQqIDTjMz+pW8s2Sq8gN640dh9U9HoEFQJO3m6ro96DgV6hMB2LYu8F5812LQyynOgCbEw==", "requires": { "buffer": "^5.2.1", "elliptic": "^6.4.0", @@ -4235,8 +4278,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -4254,13 +4296,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4273,18 +4313,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -4387,8 +4424,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -4398,7 +4434,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4411,20 +4446,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.3.5", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -4441,7 +4473,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -4514,8 +4545,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -4525,7 +4555,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -4601,8 +4630,7 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -4632,7 +4660,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4650,7 +4677,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4689,13 +4715,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.3", - "bundled": true, - "optional": true + "bundled": true } } }, @@ -11426,7 +11450,7 @@ "requires": { "underscore": "1.9.1", "web3-core-helpers": "1.2.1", - "websocket": "github:web3-js/WebSocket-Node#polyfill/globalThis" + "websocket": "github:web3-js/WebSocket-Node#905deb4812572b344f5801f8c9ce8bb02799d82e" }, "dependencies": { "nan": { diff --git a/locksmith/package.json b/locksmith/package.json index e562190cf54..b5596c3ab2c 100644 --- a/locksmith/package.json +++ b/locksmith/package.json @@ -55,7 +55,7 @@ "cors": "2.8.5", "cross-env": "6.0.0", "dotenv": "8.1.0", - "eth-sig-util": "2.2.0", + "eth-sig-util": "2.4.4", "ethereumjs-util": "6.1.0", "ethers": "4.0.36", "express": "4.17.1", diff --git a/locksmith/scripts/metadataUpload/metadata_upload.ts b/locksmith/scripts/metadataUpload/metadata_upload.ts index 194bb1f4251..59c4993001f 100644 --- a/locksmith/scripts/metadataUpload/metadata_upload.ts +++ b/locksmith/scripts/metadataUpload/metadata_upload.ts @@ -11,7 +11,8 @@ function generateSignature(privateKey: string, data: any) { let pk = ethJsUtil.toBuffer(privateKey) return sigUtil.signTypedData(pk, { - data: data, + from: '', + data, }) }