[QA-1403] Fix "Not enough signers" simulation error in "Claim All Rewards" flow

.changeset/curly-trainers-act.md

@@ -0,0 +1,6 @@
+---
+'@audius/sdk': patch
+'@audius/spl': patch
+---
+
+Fix instanceof check for version mismatches of @solana/web3.js and skip preflight on evaluateAttestations

dev-tools/compose/docker-compose.discovery.prod.yml

@@ -12,8 +12,6 @@ services:
  deploy:
  mode: replicated
  replicas: '${DISCOVERY_PROVIDER_REPLICAS}'
- ports:
- - '6379:6379'
  profiles:
  - discovery
 

packages/commands/src/claim-reward.mjs

@@ -0,0 +1,45 @@
+
+import chalk from "chalk";
+import { program } from "commander";
+
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
+
+program.command("claim-reward")
+ .description("Claim a challenge reward")
+ .argument("<challengeId>", "The ID of the challenge to claim")
+ .argument("<specifier>", "The specifier of the challenge to claim")
+ .argument("<amount>", "The amount to claim", parseFloat)
+ .option("-f, --from [from]", "The account to claim from")
+ .action(async (challengeId, specifier, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const userId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
+
+ try {
+ const res = await audiusSdk.challenges.claimReward({ userId, challengeId, specifier, amount });
+ console.log(chalk.green("Successfully claimed reward"));
+ console.log(chalk.yellow("Transaction Signature:"), res);
+ } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red('Request ID:'), err.response.headers.get('X-Request-ID'))
+ console.log(chalk.red('Request URL:'), err.response.url)
+ console.log(chalk.red('Response Body:'), await err.response.text())
+ }
+ program.error(err.message);
+ }
+
+ process.exit(0);
+ });

packages/commands/src/index.mjs

@@ -28,6 +28,7 @@ import './purchase-content.mjs'
 import './route-tokens-to-user-bank.mjs'
 import './withdraw-tokens.mjs'
 import './add-manager.mjs'
+import './claim-reward.mjs'
 
 async function main() {
  program.parseAsync(process.argv)

packages/commands/src/tip-audio.mjs

@@ -1,23 +1,40 @@
-import BN from "bn.js";
 import chalk from "chalk";
 import { program } from "commander";
 
-import { parseSplWallet, initializeAudiusLibs } from "./utils.mjs";
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
 
 program.command("tip-audio")
  .description("Send a tip")
- .argument("<account>", "The account to tip tokens to; can be a @handle, #userId, or splWallet")
- .argument("<amount>", "The amount of tokens to tip (in wei)")
+ .argument("<userId>", "The user ID to tip tokens to")
+ .argument("<amount>", "The amount of tokens to tip (in wAUDIO)", parseFloat)
  .option("-f, --from [from]", "The account to tip from")
- .action(async (account, amount, { from }) => {
- const audiusLibs = await initializeAudiusLibs(from);
- const splWallet = await parseSplWallet(account);
+ .action(async (userId, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const senderUserId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
 
  try {
- const { res: tx } = await audiusLibs.solanaWeb3Manager.transferWAudio(splWallet, new BN(amount));
+ const res= await audiusSdk.users.sendTip({ senderUserId, receiverUserId: Utils.encodeHashId(userId), amount });
  console.log(chalk.green("Successfully tipped audio"));
- console.log(chalk.yellow("Transaction Signature:"), tx);
+ console.log(chalk.yellow("Transaction Signature:"), res);
  } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red("Request ID:"), err.response.headers.get('x-request-id'))
+ console.log(chalk.red("Response JSON:"), await err.response.json())
+ }
  program.error(err.message);
  }
 

.changeset/curly-trainers-act.md

@@ -0,0 +1,6 @@
+---
+'@audius/sdk': patch
+'@audius/spl': patch
+---
+
+Fix instanceof check for version mismatches of @solana/web3.js and skip preflight on evaluateAttestations

dev-tools/compose/docker-compose.discovery.prod.yml

@@ -12,8 +12,6 @@ services:
  deploy:
  mode: replicated
  replicas: '${DISCOVERY_PROVIDER_REPLICAS}'
- ports:
- - '6379:6379'
  profiles:
  - discovery
 

packages/commands/src/claim-reward.mjs

@@ -0,0 +1,45 @@
+
+import chalk from "chalk";
+import { program } from "commander";
+
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
+
+program.command("claim-reward")
+ .description("Claim a challenge reward")
+ .argument("<challengeId>", "The ID of the challenge to claim")
+ .argument("<specifier>", "The specifier of the challenge to claim")
+ .argument("<amount>", "The amount to claim", parseFloat)
+ .option("-f, --from [from]", "The account to claim from")
+ .action(async (challengeId, specifier, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const userId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
+
+ try {
+ const res = await audiusSdk.challenges.claimReward({ userId, challengeId, specifier, amount });
+ console.log(chalk.green("Successfully claimed reward"));
+ console.log(chalk.yellow("Transaction Signature:"), res);
+ } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red('Request ID:'), err.response.headers.get('X-Request-ID'))
+ console.log(chalk.red('Request URL:'), err.response.url)
+ console.log(chalk.red('Response Body:'), await err.response.text())
+ }
+ program.error(err.message);
+ }
+
+ process.exit(0);
+ });

packages/commands/src/index.mjs

@@ -28,6 +28,7 @@ import './purchase-content.mjs'
 import './route-tokens-to-user-bank.mjs'
 import './withdraw-tokens.mjs'
 import './add-manager.mjs'
+import './claim-reward.mjs'
 
 async function main() {
  program.parseAsync(process.argv)

packages/commands/src/tip-audio.mjs

@@ -1,23 +1,40 @@
-import BN from "bn.js";
 import chalk from "chalk";
 import { program } from "commander";
 
-import { parseSplWallet, initializeAudiusLibs } from "./utils.mjs";
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
 
 program.command("tip-audio")
  .description("Send a tip")
- .argument("<account>", "The account to tip tokens to; can be a @handle, #userId, or splWallet")
- .argument("<amount>", "The amount of tokens to tip (in wei)")
+ .argument("<userId>", "The user ID to tip tokens to")
+ .argument("<amount>", "The amount of tokens to tip (in wAUDIO)", parseFloat)
  .option("-f, --from [from]", "The account to tip from")
- .action(async (account, amount, { from }) => {
- const audiusLibs = await initializeAudiusLibs(from);
- const splWallet = await parseSplWallet(account);
+ .action(async (userId, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const senderUserId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
 
  try {
- const { res: tx } = await audiusLibs.solanaWeb3Manager.transferWAudio(splWallet, new BN(amount));
+ const res= await audiusSdk.users.sendTip({ senderUserId, receiverUserId: Utils.encodeHashId(userId), amount });
  console.log(chalk.green("Successfully tipped audio"));
- console.log(chalk.yellow("Transaction Signature:"), tx);
+ console.log(chalk.yellow("Transaction Signature:"), res);
  } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red("Request ID:"), err.response.headers.get('x-request-id'))
+ console.log(chalk.red("Response JSON:"), await err.response.json())
+ }
  program.error(err.message);
  }
 

.changeset/curly-trainers-act.md

@@ -0,0 +1,6 @@
+---
+'@audius/sdk': patch
+'@audius/spl': patch
+---
+
+Fix instanceof check for version mismatches of @solana/web3.js and skip preflight on evaluateAttestations

dev-tools/compose/docker-compose.discovery.prod.yml

@@ -12,8 +12,6 @@ services:
  deploy:
  mode: replicated
  replicas: '${DISCOVERY_PROVIDER_REPLICAS}'
- ports:
- - '6379:6379'
  profiles:
  - discovery
 

packages/commands/src/claim-reward.mjs

@@ -0,0 +1,45 @@
+
+import chalk from "chalk";
+import { program } from "commander";
+
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
+
+program.command("claim-reward")
+ .description("Claim a challenge reward")
+ .argument("<challengeId>", "The ID of the challenge to claim")
+ .argument("<specifier>", "The specifier of the challenge to claim")
+ .argument("<amount>", "The amount to claim", parseFloat)
+ .option("-f, --from [from]", "The account to claim from")
+ .action(async (challengeId, specifier, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const userId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
+
+ try {
+ const res = await audiusSdk.challenges.claimReward({ userId, challengeId, specifier, amount });
+ console.log(chalk.green("Successfully claimed reward"));
+ console.log(chalk.yellow("Transaction Signature:"), res);
+ } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red('Request ID:'), err.response.headers.get('X-Request-ID'))
+ console.log(chalk.red('Request URL:'), err.response.url)
+ console.log(chalk.red('Response Body:'), await err.response.text())
+ }
+ program.error(err.message);
+ }
+
+ process.exit(0);
+ });

packages/commands/src/index.mjs

@@ -28,6 +28,7 @@ import './purchase-content.mjs'
 import './route-tokens-to-user-bank.mjs'
 import './withdraw-tokens.mjs'
 import './add-manager.mjs'
+import './claim-reward.mjs'
 
 async function main() {
  program.parseAsync(process.argv)

packages/commands/src/tip-audio.mjs

@@ -1,23 +1,40 @@
-import BN from "bn.js";
 import chalk from "chalk";
 import { program } from "commander";
 
-import { parseSplWallet, initializeAudiusLibs } from "./utils.mjs";
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
 
 program.command("tip-audio")
  .description("Send a tip")
- .argument("<account>", "The account to tip tokens to; can be a @handle, #userId, or splWallet")
- .argument("<amount>", "The amount of tokens to tip (in wei)")
+ .argument("<userId>", "The user ID to tip tokens to")
+ .argument("<amount>", "The amount of tokens to tip (in wAUDIO)", parseFloat)
  .option("-f, --from [from]", "The account to tip from")
- .action(async (account, amount, { from }) => {
- const audiusLibs = await initializeAudiusLibs(from);
- const splWallet = await parseSplWallet(account);
+ .action(async (userId, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const senderUserId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
 
  try {
- const { res: tx } = await audiusLibs.solanaWeb3Manager.transferWAudio(splWallet, new BN(amount));
+ const res= await audiusSdk.users.sendTip({ senderUserId, receiverUserId: Utils.encodeHashId(userId), amount });
  console.log(chalk.green("Successfully tipped audio"));
- console.log(chalk.yellow("Transaction Signature:"), tx);
+ console.log(chalk.yellow("Transaction Signature:"), res);
  } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red("Request ID:"), err.response.headers.get('x-request-id'))
+ console.log(chalk.red("Response JSON:"), await err.response.json())
+ }
  program.error(err.message);
  }
 

.changeset/curly-trainers-act.md

@@ -0,0 +1,6 @@
+---
+'@audius/sdk': patch
+'@audius/spl': patch
+---
+
+Fix instanceof check for version mismatches of @solana/web3.js and skip preflight on evaluateAttestations

dev-tools/compose/docker-compose.discovery.prod.yml

@@ -12,8 +12,6 @@ services:
  deploy:
  mode: replicated
  replicas: '${DISCOVERY_PROVIDER_REPLICAS}'
- ports:
- - '6379:6379'
  profiles:
  - discovery
 

packages/commands/src/claim-reward.mjs

@@ -0,0 +1,45 @@
+
+import chalk from "chalk";
+import { program } from "commander";
+
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
+
+program.command("claim-reward")
+ .description("Claim a challenge reward")
+ .argument("<challengeId>", "The ID of the challenge to claim")
+ .argument("<specifier>", "The specifier of the challenge to claim")
+ .argument("<amount>", "The amount to claim", parseFloat)
+ .option("-f, --from [from]", "The account to claim from")
+ .action(async (challengeId, specifier, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const userId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
+
+ try {
+ const res = await audiusSdk.challenges.claimReward({ userId, challengeId, specifier, amount });
+ console.log(chalk.green("Successfully claimed reward"));
+ console.log(chalk.yellow("Transaction Signature:"), res);
+ } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red('Request ID:'), err.response.headers.get('X-Request-ID'))
+ console.log(chalk.red('Request URL:'), err.response.url)
+ console.log(chalk.red('Response Body:'), await err.response.text())
+ }
+ program.error(err.message);
+ }
+
+ process.exit(0);
+ });

packages/commands/src/index.mjs

@@ -28,6 +28,7 @@ import './purchase-content.mjs'
 import './route-tokens-to-user-bank.mjs'
 import './withdraw-tokens.mjs'
 import './add-manager.mjs'
+import './claim-reward.mjs'
 
 async function main() {
  program.parseAsync(process.argv)

packages/commands/src/tip-audio.mjs

@@ -1,23 +1,40 @@
-import BN from "bn.js";
 import chalk from "chalk";
 import { program } from "commander";
 
-import { parseSplWallet, initializeAudiusLibs } from "./utils.mjs";
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
 
 program.command("tip-audio")
  .description("Send a tip")
- .argument("<account>", "The account to tip tokens to; can be a @handle, #userId, or splWallet")
- .argument("<amount>", "The amount of tokens to tip (in wei)")
+ .argument("<userId>", "The user ID to tip tokens to")
+ .argument("<amount>", "The amount of tokens to tip (in wAUDIO)", parseFloat)
  .option("-f, --from [from]", "The account to tip from")
- .action(async (account, amount, { from }) => {
- const audiusLibs = await initializeAudiusLibs(from);
- const splWallet = await parseSplWallet(account);
+ .action(async (userId, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const senderUserId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
 
  try {
- const { res: tx } = await audiusLibs.solanaWeb3Manager.transferWAudio(splWallet, new BN(amount));
+ const res= await audiusSdk.users.sendTip({ senderUserId, receiverUserId: Utils.encodeHashId(userId), amount });
  console.log(chalk.green("Successfully tipped audio"));
- console.log(chalk.yellow("Transaction Signature:"), tx);
+ console.log(chalk.yellow("Transaction Signature:"), res);
  } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red("Request ID:"), err.response.headers.get('x-request-id'))
+ console.log(chalk.red("Response JSON:"), await err.response.json())
+ }
  program.error(err.message);
  }
 

.changeset/curly-trainers-act.md

@@ -0,0 +1,6 @@
+---
+'@audius/sdk': patch
+'@audius/spl': patch
+---
+
+Fix instanceof check for version mismatches of @solana/web3.js and skip preflight on evaluateAttestations

dev-tools/compose/docker-compose.discovery.prod.yml

@@ -12,8 +12,6 @@ services:
  deploy:
  mode: replicated
  replicas: '${DISCOVERY_PROVIDER_REPLICAS}'
- ports:
- - '6379:6379'
  profiles:
  - discovery
 

packages/commands/src/claim-reward.mjs

@@ -0,0 +1,45 @@
+
+import chalk from "chalk";
+import { program } from "commander";
+
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
+
+program.command("claim-reward")
+ .description("Claim a challenge reward")
+ .argument("<challengeId>", "The ID of the challenge to claim")
+ .argument("<specifier>", "The specifier of the challenge to claim")
+ .argument("<amount>", "The amount to claim", parseFloat)
+ .option("-f, --from [from]", "The account to claim from")
+ .action(async (challengeId, specifier, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const userId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
+
+ try {
+ const res = await audiusSdk.challenges.claimReward({ userId, challengeId, specifier, amount });
+ console.log(chalk.green("Successfully claimed reward"));
+ console.log(chalk.yellow("Transaction Signature:"), res);
+ } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red('Request ID:'), err.response.headers.get('X-Request-ID'))
+ console.log(chalk.red('Request URL:'), err.response.url)
+ console.log(chalk.red('Response Body:'), await err.response.text())
+ }
+ program.error(err.message);
+ }
+
+ process.exit(0);
+ });

packages/commands/src/index.mjs

@@ -28,6 +28,7 @@ import './purchase-content.mjs'
 import './route-tokens-to-user-bank.mjs'
 import './withdraw-tokens.mjs'
 import './add-manager.mjs'
+import './claim-reward.mjs'
 
 async function main() {
  program.parseAsync(process.argv)

packages/commands/src/tip-audio.mjs

@@ -1,23 +1,40 @@
-import BN from "bn.js";
 import chalk from "chalk";
 import { program } from "commander";
 
-import { parseSplWallet, initializeAudiusLibs } from "./utils.mjs";
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
 
 program.command("tip-audio")
  .description("Send a tip")
- .argument("<account>", "The account to tip tokens to; can be a @handle, #userId, or splWallet")
- .argument("<amount>", "The amount of tokens to tip (in wei)")
+ .argument("<userId>", "The user ID to tip tokens to")
+ .argument("<amount>", "The amount of tokens to tip (in wAUDIO)", parseFloat)
  .option("-f, --from [from]", "The account to tip from")
- .action(async (account, amount, { from }) => {
- const audiusLibs = await initializeAudiusLibs(from);
- const splWallet = await parseSplWallet(account);
+ .action(async (userId, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const senderUserId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
 
  try {
- const { res: tx } = await audiusLibs.solanaWeb3Manager.transferWAudio(splWallet, new BN(amount));
+ const res= await audiusSdk.users.sendTip({ senderUserId, receiverUserId: Utils.encodeHashId(userId), amount });
  console.log(chalk.green("Successfully tipped audio"));
- console.log(chalk.yellow("Transaction Signature:"), tx);
+ console.log(chalk.yellow("Transaction Signature:"), res);
  } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red("Request ID:"), err.response.headers.get('x-request-id'))
+ console.log(chalk.red("Response JSON:"), await err.response.json())
+ }
  program.error(err.message);
  }
 

.changeset/curly-trainers-act.md

@@ -0,0 +1,6 @@
+---
+'@audius/sdk': patch
+'@audius/spl': patch
+---
+
+Fix instanceof check for version mismatches of @solana/web3.js and skip preflight on evaluateAttestations

dev-tools/compose/docker-compose.discovery.prod.yml

@@ -12,8 +12,6 @@ services:
  deploy:
  mode: replicated
  replicas: '${DISCOVERY_PROVIDER_REPLICAS}'
- ports:
- - '6379:6379'
  profiles:
  - discovery
 

packages/commands/src/claim-reward.mjs

@@ -0,0 +1,45 @@
+
+import chalk from "chalk";
+import { program } from "commander";
+
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
+
+program.command("claim-reward")
+ .description("Claim a challenge reward")
+ .argument("<challengeId>", "The ID of the challenge to claim")
+ .argument("<specifier>", "The specifier of the challenge to claim")
+ .argument("<amount>", "The amount to claim", parseFloat)
+ .option("-f, --from [from]", "The account to claim from")
+ .action(async (challengeId, specifier, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const userId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
+
+ try {
+ const res = await audiusSdk.challenges.claimReward({ userId, challengeId, specifier, amount });
+ console.log(chalk.green("Successfully claimed reward"));
+ console.log(chalk.yellow("Transaction Signature:"), res);
+ } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red('Request ID:'), err.response.headers.get('X-Request-ID'))
+ console.log(chalk.red('Request URL:'), err.response.url)
+ console.log(chalk.red('Response Body:'), await err.response.text())
+ }
+ program.error(err.message);
+ }
+
+ process.exit(0);
+ });

packages/commands/src/index.mjs

@@ -28,6 +28,7 @@ import './purchase-content.mjs'
 import './route-tokens-to-user-bank.mjs'
 import './withdraw-tokens.mjs'
 import './add-manager.mjs'
+import './claim-reward.mjs'
 
 async function main() {
  program.parseAsync(process.argv)

packages/commands/src/tip-audio.mjs

@@ -1,23 +1,40 @@
-import BN from "bn.js";
 import chalk from "chalk";
 import { program } from "commander";
 
-import { parseSplWallet, initializeAudiusLibs } from "./utils.mjs";
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
 
 program.command("tip-audio")
  .description("Send a tip")
- .argument("<account>", "The account to tip tokens to; can be a @handle, #userId, or splWallet")
- .argument("<amount>", "The amount of tokens to tip (in wei)")
+ .argument("<userId>", "The user ID to tip tokens to")
+ .argument("<amount>", "The amount of tokens to tip (in wAUDIO)", parseFloat)
  .option("-f, --from [from]", "The account to tip from")
- .action(async (account, amount, { from }) => {
- const audiusLibs = await initializeAudiusLibs(from);
- const splWallet = await parseSplWallet(account);
+ .action(async (userId, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const senderUserId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
 
  try {
- const { res: tx } = await audiusLibs.solanaWeb3Manager.transferWAudio(splWallet, new BN(amount));
+ const res= await audiusSdk.users.sendTip({ senderUserId, receiverUserId: Utils.encodeHashId(userId), amount });
  console.log(chalk.green("Successfully tipped audio"));
- console.log(chalk.yellow("Transaction Signature:"), tx);
+ console.log(chalk.yellow("Transaction Signature:"), res);
  } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red("Request ID:"), err.response.headers.get('x-request-id'))
+ console.log(chalk.red("Response JSON:"), await err.response.json())
+ }
  program.error(err.message);
  }
 

.changeset/curly-trainers-act.md

@@ -0,0 +1,6 @@
+---
+'@audius/sdk': patch
+'@audius/spl': patch
+---
+
+Fix instanceof check for version mismatches of @solana/web3.js and skip preflight on evaluateAttestations

dev-tools/compose/docker-compose.discovery.prod.yml

@@ -12,8 +12,6 @@ services:
  deploy:
  mode: replicated
  replicas: '${DISCOVERY_PROVIDER_REPLICAS}'
- ports:
- - '6379:6379'
  profiles:
  - discovery
 

packages/commands/src/claim-reward.mjs

@@ -0,0 +1,45 @@
+
+import chalk from "chalk";
+import { program } from "commander";
+
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
+
+program.command("claim-reward")
+ .description("Claim a challenge reward")
+ .argument("<challengeId>", "The ID of the challenge to claim")
+ .argument("<specifier>", "The specifier of the challenge to claim")
+ .argument("<amount>", "The amount to claim", parseFloat)
+ .option("-f, --from [from]", "The account to claim from")
+ .action(async (challengeId, specifier, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const userId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
+
+ try {
+ const res = await audiusSdk.challenges.claimReward({ userId, challengeId, specifier, amount });
+ console.log(chalk.green("Successfully claimed reward"));
+ console.log(chalk.yellow("Transaction Signature:"), res);
+ } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red('Request ID:'), err.response.headers.get('X-Request-ID'))
+ console.log(chalk.red('Request URL:'), err.response.url)
+ console.log(chalk.red('Response Body:'), await err.response.text())
+ }
+ program.error(err.message);
+ }
+
+ process.exit(0);
+ });

packages/commands/src/index.mjs

@@ -28,6 +28,7 @@ import './purchase-content.mjs'
 import './route-tokens-to-user-bank.mjs'
 import './withdraw-tokens.mjs'
 import './add-manager.mjs'
+import './claim-reward.mjs'
 
 async function main() {
  program.parseAsync(process.argv)

packages/commands/src/tip-audio.mjs

@@ -1,23 +1,40 @@
-import BN from "bn.js";
 import chalk from "chalk";
 import { program } from "commander";
 
-import { parseSplWallet, initializeAudiusLibs } from "./utils.mjs";
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
 
 program.command("tip-audio")
  .description("Send a tip")
- .argument("<account>", "The account to tip tokens to; can be a @handle, #userId, or splWallet")
- .argument("<amount>", "The amount of tokens to tip (in wei)")
+ .argument("<userId>", "The user ID to tip tokens to")
+ .argument("<amount>", "The amount of tokens to tip (in wAUDIO)", parseFloat)
  .option("-f, --from [from]", "The account to tip from")
- .action(async (account, amount, { from }) => {
- const audiusLibs = await initializeAudiusLibs(from);
- const splWallet = await parseSplWallet(account);
+ .action(async (userId, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const senderUserId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
 
  try {
- const { res: tx } = await audiusLibs.solanaWeb3Manager.transferWAudio(splWallet, new BN(amount));
+ const res= await audiusSdk.users.sendTip({ senderUserId, receiverUserId: Utils.encodeHashId(userId), amount });
  console.log(chalk.green("Successfully tipped audio"));
- console.log(chalk.yellow("Transaction Signature:"), tx);
+ console.log(chalk.yellow("Transaction Signature:"), res);
  } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red("Request ID:"), err.response.headers.get('x-request-id'))
+ console.log(chalk.red("Response JSON:"), await err.response.json())
+ }
  program.error(err.message);
  }
 

.changeset/curly-trainers-act.md

@@ -0,0 +1,6 @@
+---
+'@audius/sdk': patch
+'@audius/spl': patch
+---
+
+Fix instanceof check for version mismatches of @solana/web3.js and skip preflight on evaluateAttestations

dev-tools/compose/docker-compose.discovery.prod.yml

@@ -12,8 +12,6 @@ services:
  deploy:
  mode: replicated
  replicas: '${DISCOVERY_PROVIDER_REPLICAS}'
- ports:
- - '6379:6379'
  profiles:
  - discovery
 

packages/commands/src/claim-reward.mjs

@@ -0,0 +1,45 @@
+
+import chalk from "chalk";
+import { program } from "commander";
+
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
+
+program.command("claim-reward")
+ .description("Claim a challenge reward")
+ .argument("<challengeId>", "The ID of the challenge to claim")
+ .argument("<specifier>", "The specifier of the challenge to claim")
+ .argument("<amount>", "The amount to claim", parseFloat)
+ .option("-f, --from [from]", "The account to claim from")
+ .action(async (challengeId, specifier, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const userId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
+
+ try {
+ const res = await audiusSdk.challenges.claimReward({ userId, challengeId, specifier, amount });
+ console.log(chalk.green("Successfully claimed reward"));
+ console.log(chalk.yellow("Transaction Signature:"), res);
+ } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red('Request ID:'), err.response.headers.get('X-Request-ID'))
+ console.log(chalk.red('Request URL:'), err.response.url)
+ console.log(chalk.red('Response Body:'), await err.response.text())
+ }
+ program.error(err.message);
+ }
+
+ process.exit(0);
+ });

packages/commands/src/index.mjs

@@ -28,6 +28,7 @@ import './purchase-content.mjs'
 import './route-tokens-to-user-bank.mjs'
 import './withdraw-tokens.mjs'
 import './add-manager.mjs'
+import './claim-reward.mjs'
 
 async function main() {
  program.parseAsync(process.argv)

packages/commands/src/tip-audio.mjs

@@ -1,23 +1,40 @@
-import BN from "bn.js";
 import chalk from "chalk";
 import { program } from "commander";
 
-import { parseSplWallet, initializeAudiusLibs } from "./utils.mjs";
+import { initializeAudiusLibs, initializeAudiusSdk } from "./utils.mjs";
+import { Utils } from '@audius/sdk'
 
 program.command("tip-audio")
  .description("Send a tip")
- .argument("<account>", "The account to tip tokens to; can be a @handle, #userId, or splWallet")
- .argument("<amount>", "The amount of tokens to tip (in wei)")
+ .argument("<userId>", "The user ID to tip tokens to")
+ .argument("<amount>", "The amount of tokens to tip (in wAUDIO)", parseFloat)
  .option("-f, --from [from]", "The account to tip from")
- .action(async (account, amount, { from }) => {
- const audiusLibs = await initializeAudiusLibs(from);
- const splWallet = await parseSplWallet(account);
+ .action(async (userId, amount, { from }) => {
+ const audiusLibs = await initializeAudiusLibs(from)
+
+ // extract privkey and pubkey from hedgehog
+ // only works with accounts created via audius-cmd
+ const wallet = audiusLibs?.hedgehog?.getWallet()
+ const privKey = wallet?.getPrivateKeyString()
+ const pubKey = wallet?.getAddressString()
+
+ // Get hashID user id of current user
+ const userIdNumber = audiusLibs.userStateManager.getCurrentUserId()
+ const senderUserId = Utils.encodeHashId(userIdNumber)
+
+ // init sdk with priv and pub keys as api keys and secret
+ // this enables writes via sdk
+ const audiusSdk = await initializeAudiusSdk({ apiKey: pubKey, apiSecret: privKey })
 
  try {
- const { res: tx } = await audiusLibs.solanaWeb3Manager.transferWAudio(splWallet, new BN(amount));
+ const res= await audiusSdk.users.sendTip({ senderUserId, receiverUserId: Utils.encodeHashId(userId), amount });
  console.log(chalk.green("Successfully tipped audio"));
- console.log(chalk.yellow("Transaction Signature:"), tx);
+ console.log(chalk.yellow("Transaction Signature:"), res);
  } catch (err) {
+ if ('response' in err) {
+ console.log(chalk.red("Request ID:"), err.response.headers.get('x-request-id'))
+ console.log(chalk.red("Response JSON:"), await err.response.json())
+ }
  program.error(err.message);
  }