@audius/sp-actions 1.0.2 → 1.0.4

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @audius/sp-actions
 
+## 1.0.4
+
+### Patch Changes
+
+- Updated dependencies [9b58792]
+- Updated dependencies [9694ea4]
+- Updated dependencies [6ee5f42]
+- Updated dependencies [e28b82b]
+- Updated dependencies [0c3f791]
+  - @audius/sdk@6.0.0
+
+## 1.0.3
+
+### Patch Changes
+
+- Updated dependencies [1c2edae]
+  - @audius/sdk@5.1.0
+
 ## 1.0.2
 
 ### Patch Changes

package/claim.js

@@ -5,17 +5,31 @@ const Web3 = require('web3')
 const HDWalletProvider = require('@truffle/hdwallet-provider')
 const { program } = require('commander')
 
-const { AudiusLibs } = require('@audius/sdk')
+const { AudiusLibs } = require('@audius/sdk/dist/libs')
 
 const defaultRegistryAddress = '0xd976d3b4f4e22a238c1A736b6612D22f17b6f64C'
 const defaultTokenAddress = '0x18aAA7115705e8be94bfFEBDE57Af9BFc265B998'
-const defaultWeb3Provider = 'https://eth-mainnet.g.alchemy.com/v2/4hFRA61i6OFXz2UmkyFsSvgXBQBBOGgW'
+const defaultWeb3Provider =
+  'https://eth-mainnet.g.alchemy.com/v2/4hFRA61i6OFXz2UmkyFsSvgXBQBBOGgW'
 
-async function configureLibs(ethRegistryAddress, ethTokenAddress, web3Provider) {
-  const configuredWeb3 = await AudiusLibs.Utils.configureWeb3(web3Provider, null, false)
+async function configureLibs(
+  ethRegistryAddress,
+  ethTokenAddress,
+  web3Provider
+) {
+  const configuredWeb3 = await AudiusLibs.Utils.configureWeb3(
+    web3Provider,
+    null,
+    false
+  )
 
   const audiusLibsConfig = {
-    ethWeb3Config: AudiusLibs.configEthWeb3(ethTokenAddress, ethRegistryAddress, configuredWeb3, '0x0'),
+    ethWeb3Config: AudiusLibs.configEthWeb3(
+      ethTokenAddress,
+      ethRegistryAddress,
+      configuredWeb3,
+      '0x0'
+    ),
     isServer: true,
   }
 
@@ -25,8 +39,16 @@ async function configureLibs(ethRegistryAddress, ethTokenAddress, web3Provider)
   return libs
 }
 
-async function getClaimsManagerContract(ethRegistryAddress, ethTokenAddress, web3) {
-  const audiusLibs = await configureLibs(ethRegistryAddress, ethTokenAddress, web3.eth.currentProvider)
+async function getClaimsManagerContract(
+  ethRegistryAddress,
+  ethTokenAddress,
+  web3
+) {
+  const audiusLibs = await configureLibs(
+    ethRegistryAddress,
+    ethTokenAddress,
+    web3.eth.currentProvider
+  )
   await audiusLibs.ethContracts.ClaimsManagerClient.init()
   return new web3.eth.Contract(
     audiusLibs.ethContracts.ClaimsManagerClient._contract.options.jsonInterface,
@@ -34,8 +56,16 @@ async function getClaimsManagerContract(ethRegistryAddress, ethTokenAddress, web
   )
 }
 
-async function getDelegateManagerContract(ethRegistryAddress, ethTokenAddress, web3) {
-  const audiusLibs = await configureLibs(ethRegistryAddress, ethTokenAddress, web3.eth.currentProvider)
+async function getDelegateManagerContract(
+  ethRegistryAddress,
+  ethTokenAddress,
+  web3
+) {
+  const audiusLibs = await configureLibs(
+    ethRegistryAddress,
+    ethTokenAddress,
+    web3.eth.currentProvider
+  )
   await audiusLibs.ethContracts.DelegateManagerClient.init()
   return new web3.eth.Contract(
     audiusLibs.ethContracts.DelegateManagerClient._contract.options.jsonInterface,
@@ -43,7 +73,17 @@ async function getDelegateManagerContract(ethRegistryAddress, ethTokenAddress, w
   )
 }
 
-async function initiateRound(privateKey, { ethRegistryAddress, ethTokenAddress, web3Provider, gas, gasPrice, transferRewardsToSolana }) {
+async function initiateRound(
+  privateKey,
+  {
+    ethRegistryAddress,
+    ethTokenAddress,
+    web3Provider,
+    gas,
+    gasPrice,
+    transferRewardsToSolana,
+  }
+) {
   const web3 = new Web3(
     new HDWalletProvider({
       privateKeys: [privateKey],
@@ -52,18 +92,31 @@ async function initiateRound(privateKey, { ethRegistryAddress, ethTokenAddress,
   )
 
   web3.eth.transactionPollingTimeout = 3600
-  const accountAddress = web3.eth.accounts.privateKeyToAccount(privateKey).address
+  const accountAddress =
+    web3.eth.accounts.privateKeyToAccount(privateKey).address
 
-  const claimsManagerContract = await getClaimsManagerContract(ethRegistryAddress, ethTokenAddress, web3)
+  const claimsManagerContract = await getClaimsManagerContract(
+    ethRegistryAddress,
+    ethTokenAddress,
+    web3
+  )
 
-  const lastFundedBlock = await claimsManagerContract.methods.getLastFundedBlock().call()
-  const requiredBlockDiff = await claimsManagerContract.methods.getFundingRoundBlockDiff().call()
+  const lastFundedBlock = await claimsManagerContract.methods
+    .getLastFundedBlock()
+    .call()
+  const requiredBlockDiff = await claimsManagerContract.methods
+    .getFundingRoundBlockDiff()
+    .call()
 
   const currentBlock = await web3.eth.getBlockNumber()
   const blockDiff = currentBlock - lastFundedBlock - 12
 
   if (blockDiff <= requiredBlockDiff) {
-    console.log(`Block difference of ${requiredBlockDiff} not met, ${requiredBlockDiff - blockDiff} blocks remaining`)
+    console.log(
+      `Block difference of ${requiredBlockDiff} not met, ${
+        requiredBlockDiff - blockDiff
+      } blocks remaining`
+    )
     process.exit(1)
   }
 
@@ -76,12 +129,14 @@ async function initiateRound(privateKey, { ethRegistryAddress, ethTokenAddress,
   console.log('Initializing Round')
   await claimsManagerContract.methods.initiateRound().send({
     from: accountAddress,
-    gas
+    gas,
   })
   console.log('Successfully initiated Round')
 
   if (transferRewardsToSolana) {
-    const { transferCommunityRewardsToSolana } = require('@audius/sdk/scripts/communityRewards/transferCommunityRewardsToSolana')
+    const {
+      transferCommunityRewardsToSolana,
+    } = require('@audius/sdk/scripts/communityRewards/transferCommunityRewardsToSolana')
     console.log('Running rewards manager transfer')
     await transferCommunityRewardsToSolana()
     console.log('Successfully transferred rewards to solana')
@@ -101,29 +156,48 @@ async function claimRewards(
   )
 
   web3.eth.transactionPollingTimeout = 3600
-  const accountAddress = web3.eth.accounts.privateKeyToAccount(privateKey).address
+  const accountAddress =
+    web3.eth.accounts.privateKeyToAccount(privateKey).address
 
-  const claimsManagerContract = await getClaimsManagerContract(ethRegistryAddress, ethTokenAddress, web3)
-  const delegateManagerContract = await getDelegateManagerContract(ethRegistryAddress, ethTokenAddress, web3)
+  const claimsManagerContract = await getClaimsManagerContract(
+    ethRegistryAddress,
+    ethTokenAddress,
+    web3
+  )
+  const delegateManagerContract = await getDelegateManagerContract(
+    ethRegistryAddress,
+    ethTokenAddress,
+    web3
+  )
 
-  const claimPending = await claimsManagerContract.methods.claimPending(spOwnerWallet).call()
+  const claimPending = await claimsManagerContract.methods
+    .claimPending(spOwnerWallet)
+    .call()
 
   if (claimPending) {
     if (gas === undefined) {
       console.log('Estimating Gas')
-      gas = await delegateManagerContract.methods.claimRewards(spOwnerWallet).estimateGas()
+      gas = await delegateManagerContract.methods
+        .claimRewards(spOwnerWallet)
+        .estimateGas()
       console.log('Calculated Gas:', gas)
 
       const gasPrice = await web3.eth.getGasPrice()
       const estimatedFee = gas * gasPrice
-      console.log('Estimated Fee:', web3.utils.fromWei(estimatedFee.toString(), 'ether'), 'ETH')
+      console.log(
+        'Estimated Fee:',
+        web3.utils.fromWei(estimatedFee.toString(), 'ether'),
+        'ETH'
+      )
     }
 
     console.log('Claiming Rewards')
     await delegateManagerContract.methods.claimRewards(spOwnerWallet).send({
       from: accountAddress,
       gas,
-      gasPrice: gasPrice ? web3.utils.toWei(gasPrice, 'gwei') : (await web3.eth.getGasPrice()),
+      gasPrice: gasPrice
+        ? web3.utils.toWei(gasPrice, 'gwei')
+        : await web3.eth.getGasPrice(),
     })
     console.log('Claimed Rewards successfully')
   } else {
@@ -135,20 +209,48 @@ async function main() {
   program
     .command('initiate-round <privateKey>')
     .description('Initiates new round for claiming rewards')
-    .option('--eth-registry-address <ethRegistryAddress>', 'Registry contract address', defaultRegistryAddress)
-    .option('--eth-token-address <ethTokenAddress>', 'Token contract address', defaultTokenAddress)
-    .option('--web3-provider <web3Provider>', 'Web3 provider to use', defaultWeb3Provider)
+    .option(
+      '--eth-registry-address <ethRegistryAddress>',
+      'Registry contract address',
+      defaultRegistryAddress
+    )
+    .option(
+      '--eth-token-address <ethTokenAddress>',
+      'Token contract address',
+      defaultTokenAddress
+    )
+    .option(
+      '--web3-provider <web3Provider>',
+      'Web3 provider to use',
+      defaultWeb3Provider
+    )
     .option('--gas <gas>', 'amount of gas to use')
     .option('--gas-price <gasPrice>', 'gas price in gwei')
-    .option('--transfer-rewards-to-solana', 'whether to also transfer rewards to solana rewards manager on success. Requires env vars to be set.', false)
+    .option(
+      '--transfer-rewards-to-solana',
+      'whether to also transfer rewards to solana rewards manager on success. Requires env vars to be set.',
+      false
+    )
     .action(initiateRound)
 
   program
     .command('claim-rewards <spOwnerWallet> <privateKey>')
     .description('Claim rewards for given spOwnerWallet')
-    .option('--eth-registry-address <ethRegistryAddress>', 'Registry contract address', defaultRegistryAddress)
-    .option('--eth-token-address <ethTokenAddress>', 'Token contract address', defaultTokenAddress)
-    .option('--web3-provider <web3Provider>', 'Web3 provider to use', defaultWeb3Provider)
+    .option(
+      '--eth-registry-address <ethRegistryAddress>',
+      'Registry contract address',
+      defaultRegistryAddress
+    )
+    .option(
+      '--eth-token-address <ethTokenAddress>',
+      'Token contract address',
+      defaultTokenAddress
+    )
+    .option(
+      '--web3-provider <web3Provider>',
+      'Web3 provider to use',
+      defaultWeb3Provider
+    )
     .option('--gas <gas>', 'ammount of gas to use')
     .option('--gas-price <gasPrice>', 'gas price in gwei')
     .action(claimRewards)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@audius/sp-actions",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "A utility for audius service providers to claim token rewards.",
   "bin": {
     "claim": "claim.js"
@@ -8,7 +8,7 @@
   "author": "Audius",
   "license": "Apache-2.0",
   "dependencies": {
-    "@audius/sdk": "5.0.0",
+    "@audius/sdk": "6.0.0",
     "@truffle/hdwallet-provider": "^1.2.2",
     "axios": "^0.21.0",
     "commander": "^6.2.1",