adding the missing from on signTypedData

unlock-protocol · Sep 23, 2019 · e4867bd · e4867bd
1 parent 08fd2d6
commit e4867bd
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -11,7 +11,8 @@ function generateSignature(privateKey: string, data: any) {
   let pk = ethJsUtil.toBuffer(privateKey)
 
   return sigUtil.signTypedData(pk, {
-    data: data,
+    from: '',
+    data,
   })
 }