Merge pull request #59 from EOSIO/rc-bump

Version bump
EOSIO · Jan 17, 2020 · d5af79a · d5af79a
2 parents ec2a285 + 8e2c386
commit d5af79a
Show file tree

Hide file tree

Showing 4 changed files with 205 additions and 222 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ual-scatter",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "main": "dist/index.js",
   "license": "MIT",
   "author": {
@@ -21,10 +21,10 @@
     "test": "jest"
   },
   "dependencies": {
-    "@scatterjs/core": "2.7.46",
-    "@scatterjs/eosjs2": "^1.5.29",
+    "@scatterjs/core": "2.7.51",
+    "@scatterjs/eosjs2": "1.5.33",
     "elliptic": "6.5.2",
-    "eosjs": "20.0.4-e2c667e.0",
+    "eosjs": "21.0.1-rc1",
     "universal-authenticator-library": "0.1.4"
   },
   "resolutions": {

diff --git a/src/ScatterUser.test.ts b/src/ScatterUser.test.ts
@@ -2,6 +2,9 @@ import { ec as EC } from 'elliptic'
 import { Chain, RpcEndpoint, UALError, UALErrorType } from 'universal-authenticator-library'
 import { ScatterUser } from './ScatterUser'
 import { Signature, PrivateKey } from 'eosjs/dist/eosjs-jssig'
+import { Numeric } from 'eosjs'
+
+const { KeyType } = Numeric
 
 const endpoint: RpcEndpoint = {
   protocol: 'https',
@@ -133,7 +136,7 @@ describe('ScatterUser', () => {
       const ellipticHashedString = ec.hash().update(dataAsString).digest()
 
       const ellipticSig = KPrivElliptic.sign(ellipticHashedString)
-      const ellipticSigString = Signature.fromElliptic(ellipticSig).toString()
+      const ellipticSigString = Signature.fromElliptic(ellipticSig, KeyType.k1).toString()
 
       const eosioPubKey = user.getPublicKey(dataAsString, ellipticSigString)
       expect(eosioPubKey.toString()).toEqual(publicKeys[0])
@@ -148,7 +151,7 @@ describe('ScatterUser', () => {
       const ellipticHashedString = ec.hash().update(dataAsString).digest()
 
       const ellipticSig = KPrivElliptic.sign(ellipticHashedString)
-      const ellipticSigString = Signature.fromElliptic(ellipticSig).toString()
+      const ellipticSigString = Signature.fromElliptic(ellipticSig, KeyType.k1).toString()
 
       const eosioPubKey = user.getPublicKey('other string', ellipticSigString)
       expect(eosioPubKey.toString()).not.toEqual(publicKeys[0])

diff --git a/src/ScatterUser.ts b/src/ScatterUser.ts
@@ -1,9 +1,10 @@
-import { Api, JsonRpc } from 'eosjs'
+import { Api, JsonRpc, Numeric } from 'eosjs'
 import { ec as EC } from 'elliptic'
 import { Signature, PublicKey } from 'eosjs/dist/eosjs-jssig'
 import { Chain, SignTransactionResponse, UALErrorType, User } from 'universal-authenticator-library'
 import { UALScatterError } from './UALScatterError'
 
+const { KeyType } = Numeric
 const ec = new EC('secp256k1')
 
 export class ScatterUser extends User {
@@ -132,6 +133,6 @@ export class ScatterUser extends User {
         'hex'
       )
     const ellipticPublicKey = ec.keyFromPublic(ellipticRecoveredPublicKey)
-    return PublicKey.fromElliptic(ellipticPublicKey).toString()
+    return PublicKey.fromElliptic(ellipticPublicKey, KeyType.k1).toString()
   }
 }