deps: Replace ethjs packages with @metamask/ forks (#115)

- Replace ethjs with bn.js - it was only used for re-export - ethjs-contract@^0.2.3 -> @metamask/ethjs-contract@^0.3.4 - [email protected] -> @metamask/ethjs-query@^0.5.2
MetaMask · Nov 29, 2023 · 8e9405c · 8e9405c
1 parent 6633512
commit 8e9405c
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 215 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -1,5 +1,5 @@
-const Eth = require('ethjs-query')
-const EthContract = require('ethjs-contract')
+const Eth = require('@metamask/ethjs-query')
+const EthContract = require('@metamask/ethjs-contract')
 const Token = require('./token')
 const { PollingBlockTracker } = require('eth-block-tracker')
 const abi = require('human-standard-token-abi')

diff --git a/lib/token.js b/lib/token.js
@@ -1,4 +1,4 @@
-const BN = require('ethjs').BN
+const BN = require('bn.js')
 const util = require('./util')
 
 /**

diff --git a/lib/util.js b/lib/util.js
@@ -1,4 +1,4 @@
-const BN = require('ethjs').BN
+const BN = require('bn.js')
 const zero = new BN(0)
 
 module.exports = {

diff --git a/package.json b/package.json
@@ -36,12 +36,12 @@
     "/lib"
   ],
   "dependencies": {
+    "@metamask/ethjs-contract": "^0.3.4",
+    "@metamask/ethjs-query": "^0.5.2",
     "@metamask/safe-event-emitter": "^3.0.0",
+    "bn.js": "^4.12.0",
     "deep-equal": "^2.2.0",
     "eth-block-tracker": "^8.0.0",
-    "ethjs": "^0.4.0",
-    "ethjs-contract": "^0.2.3",
-    "ethjs-query": "^0.3.8",
     "human-standard-token-abi": "^2.0.0"
   },
   "devDependencies": {

diff --git a/test/helper.js b/test/helper.js
@@ -2,8 +2,8 @@ const assert = require('assert').strict
 const fs = require('fs')
 const path = require('path')
 const ganache = require('ganache')
-const Eth = require('ethjs-query')
-const EthContract = require('ethjs-contract')
+const Eth = require('@metamask/ethjs-query')
+const EthContract = require('@metamask/ethjs-contract')
 const solc = require('solc')
 
 const source = fs.readFileSync(path.resolve(__dirname, 'contracts/Token.sol')).toString();

diff --git a/test/integration/human-standard-token.js b/test/integration/human-standard-token.js
@@ -6,10 +6,10 @@ const provider = ganache.provider()
 
 const solc = require('solc')
 const TokenTracker = require('../../lib')
-const BN = require('ethjs').BN
+const BN = ('bn.js')
 
-const Eth = require('ethjs-query')
-const EthContract = require('ethjs-contract')
+const Eth = require('@metamask/ethjs-query')
+const EthContract = require('@metamask/ethjs-contract')
 const eth = new Eth(provider)
 const contract = new EthContract(eth)
 

diff --git a/test/integration/simple-token.js b/test/integration/simple-token.js
@@ -1,6 +1,6 @@
 const test = require('tape')
 
-const BN = require('ethjs').BN
+const BN = require('bn.js')
 
 const TokenTracker = require('../../lib')
 const { setupSimpleTokenEnvironment } = require('../helper')

diff --git a/test/integration/token-precision.js b/test/integration/token-precision.js
@@ -5,11 +5,11 @@ const ganache = require('ganache')
 const provider = ganache.provider()
 const solc = require('solc')
 const TokenTracker = require('../../lib')
-const BN = require('ethjs').BN
+const BN = require('bn.js')
 const util = require('../../lib/util')
 
-const Eth = require('ethjs-query')
-const EthContract = require('ethjs-contract')
+const Eth = require('@metamask/ethjs-query')
+const EthContract = require('@metamask/ethjs-contract')
 const eth = new Eth(provider)
 const contract = new EthContract(eth)
 let count = 0

diff --git a/test/unit/token.js b/test/unit/token.js
@@ -1,5 +1,5 @@
 const test = require('tape')
-const BN = require('ethjs').BN
+const BN = require('bn.js')
 
 const Token = require('../../lib/token')
 const { setupSimpleTokenEnvironment } = require('../helper')

diff --git a/test/unit/util.js b/test/unit/util.js
@@ -1,5 +1,5 @@
 const test = require('tape')
-const BN = require('ethjs').BN
+const BN = require('bn.js')
 const util = require('../../lib/util')
 
 test('token balance stringify 1', function (t) {