Merge pull request #149 from protofire/hotfix/fixSDKBug

(Hotfix) Updates livepeerSDK version
protofire · Nov 26, 2019 · 699b2f6 · 699b2f6
2 parents ca89543 + 22a68cf
commit 699b2f6
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 48 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "livepeer"
   ],
   "dependencies": {
-    "@livepeer/sdk": "^1.0.0-alpha.6",
+    "@livepeer/sdk": "^1.0.0-alpha.7",
     "@sendgrid/mail": "^6.3.1",
     "apollo-boost": "^0.4.2",
     "apollo-cache-inmemory": "^1.6.2",

diff --git a/server/helpers/sdk/delegate.js b/server/helpers/sdk/delegate.js
@@ -1,15 +1,19 @@
 const LivepeerSDK = require('@livepeer/sdk')
 
+const getLivepeerSDKInstance = () =>{
+  return LivepeerSDK.default({gas: 2.1 * 1000000})
+}
+
 const getLivepeerDelegates = async () => {
-  const { rpc } = await LivepeerSDK.default()
+  const { rpc } = await getLivepeerSDKInstance()
   return await rpc.getTranscoders()
 }
 
 const getLivepeerDelegateAccount = async address => {
   if (!address) {
     return null
   }
-  const { rpc } = await LivepeerSDK.default()
+  const { rpc } = await getLivepeerSDKInstance()
   return await rpc.getTranscoder(address)
 }
 

diff --git a/server/helpers/sdk/delegator.js b/server/helpers/sdk/delegator.js
@@ -4,7 +4,7 @@ let rpcInstance = null
 
 const getLivepeerRpc = async () => {
   if (!rpcInstance) {
-    const { rpc } = await LivepeerSDK.default()
+    const { rpc } = await LivepeerSDK.default({gas: 2.1 * 1000000})
     rpcInstance = rpc
     // Sets an interval that will reset the cached values periodically
     setInterval(() => {
@@ -29,15 +29,17 @@ const getLivepeerDelegatorTokenBalance = async address => {
   if (!address) {
     return null
   }
-  const { rpc } = await LivepeerSDK.default()
+
+  const rpc = await getLivepeerRpc()
   return await rpc.getTokenBalance(address)
 }
 
 const getLivepeerDelegatorStake = async address => {
   if (!address) {
     return null
   }
-  const { rpc } = await LivepeerSDK.default()
+
+  const rpc = await getLivepeerRpc()
   const summary = await rpc.getDelegator(address)
   console.log(`Calculate summary for address ${address}`)
   return getTotalStakeFromSummary(summary)

diff --git a/server/helpers/sdk/protocol.js b/server/helpers/sdk/protocol.js
@@ -1,60 +1,64 @@
 const LivepeerSDK = require('@livepeer/sdk')
 
+const getLivepeerSDKInstance = () =>{
+  return LivepeerSDK.default({gas: 2.1 * 1000000})
+}
+
 const getLivepeerCurrentRound = async () => {
-  const { rpc } = await LivepeerSDK.default()
+  const { rpc } = await getLivepeerSDKInstance()
   return await rpc.getCurrentRound()
 }
 
 const getLivepeerLastInitializedRound = async () => {
-  const { rpc } = await LivepeerSDK.default()
+  const { rpc } = await getLivepeerSDKInstance()
   return await rpc.getLastInitializedRound()
 }
 
 const getLivepeerCurrentRoundInfo = async () => {
-  const { rpc } = await LivepeerSDK.default()
+  const { rpc } = await getLivepeerSDKInstance()
   return await rpc.getCurrentRoundInfo()
 }
 
 const getLivepeerRoundLength = async () => {
-  const { rpc } = await LivepeerSDK.default()
+  const { rpc } = await getLivepeerSDKInstance()
   return await rpc.getRoundLength()
 }
 
 const getLivepeerRoundsPerYear = async () => {
-  const { rpc } = await LivepeerSDK.default()
+  const { rpc } = await getLivepeerSDKInstance()
   return await rpc.getRoundsPerYear()
 }
 const getTokenTotalSupply = async () => {
-  const { rpc } = await LivepeerSDK.default()
+  const { rpc } = await getLivepeerSDKInstance()
   return rpc.getTokenTotalSupply()
 }
 
 // Returns the inflation of the current round, the value should be divided by 1.000.000 in order to make it a ratio
 const getInflationRate = async () => {
-  const { rpc } = await LivepeerSDK.default()
+  const { rpc } = await getLivepeerSDKInstance()
   return await rpc.getInflation()
 }
 
 // Returns the change of inflation for the next round, the value should be divided by 1.000.000 in order to make it a ratio
 const getInflationChange = async () => {
-  const { rpc } = await LivepeerSDK.default()
+  const { rpc } = await getLivepeerSDKInstance()
   return await rpc.getInflationChange()
 }
 
 // Returns the targetBondingRate, the value should be divided by 1.000.000 in order to make it a ratio
 const getTargetBondingRate = async () => {
-  const { rpc } = await LivepeerSDK.default()
+  const { rpc } = await getLivepeerSDKInstance()
   return await rpc.getTargetBondingRate()
 }
 
 // Returns the total amount of tokens bonded in the protocol
 const getTotalBonded = async () => {
-  const { rpc } = await LivepeerSDK.default()
+  const { rpc } = await getLivepeerSDKInstance()
   return await rpc.getTotalBonded()
 }
 
 const getLivepeerDefaultConstants = async () => {
-  const { constants } = await LivepeerSDK.default()
+  const { constants } = await getLivepeerSDKInstance()
   const { Bonded, Pending, Unbonded, Unbonding } = constants.DELEGATOR_STATUS
   return {
     DELEGATOR_STATUS: {
@@ -71,7 +75,7 @@ const getLivepeerDefaultConstants = async () => {
 }
 
 const getLivepeerLatestBlock = async () => {
-  const { rpc } = await LivepeerSDK.default()
+  const { rpc } = await getLivepeerSDKInstance()
   return await rpc.getBlock('latest')
 }