Merge pull request #150 from GridPlus/cbor-again

Replaces cbor lib again. This time with a real pure-JS version.
GridPlus · Apr 22, 2021 · c108730 · c108730
2 parents 4c03e01 + aeaef87
commit c108730
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gridplus-sdk",
-  "version": "0.7.10",
+  "version": "0.7.11",
   "description": "SDK to interact with GridPlus Lattice1 device",
   "scripts": {
     "commit": "git-cz",
@@ -25,10 +25,10 @@
     "aes-js": "^3.1.1",
     "bignumber.js": "^9.0.1",
     "bitwise": "^2.0.4",
+    "borc": "^2.1.2",
     "bs58": "^4.0.1",
     "bs58check": "^2.1.2",
     "buffer": "^5.6.0",
-    "cbor-web": "^7.0.5",
     "crc-32": "^1.2.0",
     "elliptic": "6.5.4",
     "ethers": "^5.0.31",

diff --git a/src/ethereum.js b/src/ethereum.js
@@ -2,7 +2,7 @@
 // does not have browser (or, by proxy, React-Native) support.
 const BN = require('bignumber.js');
 const Buffer = require('buffer/').Buffer;
-const cbor = require('cbor-web');
+const cbor = require('borc');
 const constants = require('./constants');
 const ethers = require('ethers');
 const eip712 = require('ethers-eip712');