Merge pull request #37 from avolabs-io/pf/remove-web3

remove web3 (#34)
avolabs-io · Mar 16, 2021 · 3aa47c4 · 3aa47c4
2 parents 24def13 + f69f692
commit 3aa47c4
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 332 deletions.
diff --git a/dApp/user/package.json b/dApp/user/package.json
@@ -46,8 +46,7 @@
     "react-app-rewired": "^2.1.8",
     "react-scripts": "^4.0.1",
     "reason-react": "^0.9.1",
-    "rescript-apollo-client": "^1.0.0",
-    "web3": "^1.3.3"
+    "rescript-apollo-client": "^1.0.0"
   },
   "browserslist": {
     "production": [

diff --git a/dApp/user/src/lib/Old/BN.bs.js b/dApp/user/src/lib/Old/BN.bs.js
diff --git a/dApp/user/src/lib/Old/BN.res b/dApp/user/src/lib/Old/BN.res
diff --git a/dApp/user/src/lib/Old/Eth.bs.js b/dApp/user/src/lib/Old/Eth.bs.js
diff --git a/dApp/user/src/lib/Old/Eth.res b/dApp/user/src/lib/Old/Eth.res
diff --git a/dApp/user/src/lib/Old/Helper.res b/dApp/user/src/lib/Old/Helper.res
@@ -29,6 +29,6 @@ let elipsifyMiddle: (string, int, int) => string = (inputString, maxLength, trai
 
 let bnToMoment = bn =>
   bn
-  ->BN.toString
+  ->Ethers.BigNumber.toString
   ->int_of_string /* trusting that gql will be reliable here */
   ->MomentRe.momentWithUnix
diff --git a/dApp/user/src/lib/Old/RootProvider.bs.js b/dApp/user/src/lib/Old/RootProvider.bs.js
diff --git a/dApp/user/src/lib/Old/RootProvider.res b/dApp/user/src/lib/Old/RootProvider.res
@@ -113,7 +113,7 @@ module RootWithWeb3 = {
             dispatch(
               LoadAddress(
                 account,
-                newBalance->Option.flatMap(balance => Eth.make(balance->Ethers.BigNumber.toString)),
+                newBalance,
               ),
             )
           )
@@ -147,7 +147,7 @@ let useIsAddressCurrentUser: Ethers.ethAddress => bool = address => {
   }
 }
 
-let useEthBalance: unit => option<Eth.t> = () => {
+let useEthBalance: unit => option<Ethers.BigNumber.t> = () => {
   let (state, _) = React.useContext(RootContext.context)
   switch state.ethState {
   | Connected(_address, balance) => balance

diff --git a/dApp/user/src/lib/Old/RootProviderTypes.res b/dApp/user/src/lib/Old/RootProviderTypes.res
@@ -10,9 +10,9 @@ type web3reactContext = {
 
 type rec rootActions =
   | Logout
-  | LoadAddress(Ethers.ethAddress, option<Eth.t>)
+  | LoadAddress(Ethers.ethAddress, option<Ethers.BigNumber.t>)
 type ethState =
   | Disconnected
-  | Connected(Ethers.ethAddress, option<Eth.t>)
+  | Connected(Ethers.ethAddress, option<Ethers.BigNumber.t>)
 
 type state = {ethState: ethState}
diff --git a/dApp/user/src/lib/Old/Web3.bs.js b/dApp/user/src/lib/Old/Web3.bs.js
diff --git a/dApp/user/src/lib/Old/Web3.res b/dApp/user/src/lib/Old/Web3.res