Skip to content

Solana upgrades to get reward manager cli working #12926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Solana upgrades to get reward manager cli working #12926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfd4624
E2E reward disbursement for
dharit-tan Sep 10, 2025
4f78da9
remove logs
dharit-tan Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,997 changes: 3,563 additions & 1,434 deletions solana-programs/Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions solana-programs/audius_eth_registry/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ arrayref = "0.3.6"
num-derive = "0.3"
num-traits = "0.2"
num_enum = "0.5.1"
solana-program = "=1.8.14"
solana-program = "=1.16.27"
Copy link
Contributor

@alecsavvy alecsavvy Sep 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

holy upgrade batman

thiserror = "1.0"
borsh = "0.9.0"
borsh-derive = "0.9.0"

[dev-dependencies]
solana-program-test = "1.6.1"
solana-sdk = "=1.8.14"
libsecp256k1 = { version = "0.5.0" }
solana-sdk = "=1.16.27"
libsecp256k1 = { version = "0.6.0" }
rand-073 = { package = "rand", version = "0.7.3" }
rand = { version = "0.8.3" }
sha3 = { version = "0.9.1" }
bincode = "1.3.3"
chrono = "0.4"

[lib]
crate-type = ["cdylib", "lib"]
crate-type = ["cdylib", "lib"]
14 changes: 7 additions & 7 deletions solana-programs/claimable-tokens/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ edition = "2018"

[dependencies]
clap = "2.33.3"
solana-cli-config = "=1.8.14"
solana-clap-utils = "=1.8.14"
solana-logger = "=1.8.14"
solana-client = "=1.8.14"
solana-sdk = "=1.8.14"
solana-program = "=1.8.14"
solana-cli-config = "=1.16.27"
solana-clap-utils = "=1.16.27"
solana-logger = "=1.16.27"
solana-client = "=1.16.27"
solana-sdk = "=1.16.27"
solana-program = "=1.16.27"
borsh = "0.9.0"
anyhow = "1.0.40"
claimable-tokens = { path="../program", features = [ "no-entrypoint" ] }
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
libsecp256k1 = "0.5.0"
libsecp256k1 = "0.6.0"
spl-associated-token-account = "1.0.2"
hex = "0.4.3"
10 changes: 5 additions & 5 deletions solana-programs/claimable-tokens/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ test-bpf = []
num-derive = "0.3.3"
num-traits = "0.2.14"
num_enum = "0.5.1"
solana-program = "=1.8.14"
solana-program = "=1.16.27"
thiserror = "1.0.25"
borsh = "0.9.0"
bs58 = "0.4.0"
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }

[dev-dependencies]
solana-program-test = "=1.8.14"
solana-sdk = "=1.8.14"
libsecp256k1 = { version = "0.5.0" }
solana-program-test = "=1.16.27"
solana-sdk = "=1.16.27"
libsecp256k1 = { version = "0.6.0" }
rand = { version = "0.8.3" }
rand-073 = { package = "rand", version = "0.7.3" }
sha3 = "0.9.1"
bincode = "1.3.3"

[lib]
crate-type = ["cdylib", "lib"]
crate-type = ["cdylib", "lib"]
18 changes: 9 additions & 9 deletions solana-programs/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ edition = "2018"
[dependencies]
clap = "2.33.3"
serde_json = "1.0.61"
solana-account-decoder = "1.6.4"
solana-clap-utils = "1.6.4"
solana-cli-config = "1.6.4"
solana-client = "1.6.4"
solana-logger = "1.6.4"
solana-sdk = "1.7.4"
solana-program = "1.7.4"
hex = "0.4.2"
libsecp256k1 = "0.5.0"
solana-account-decoder = "=1.16.27"
solana-clap-utils = "=1.16.27"
solana-cli-config = "=1.16.27"
solana-client = "=1.16.27"
solana-logger = "=1.16.27"
solana-sdk = "=1.16.27"
solana-program = "=1.16.27"
hex = "0.4.3"
libsecp256k1 = "0.6.0"
sha3 = "0.9.1"
borsh = "0.9.0"
audius_eth_registry = { path="../audius_eth_registry", features = [ "no-entrypoint" ] }
16 changes: 8 additions & 8 deletions solana-programs/reward-manager/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ edition = "2018"
[dependencies]
clap = "2.33.3"
serde_json = "1.0.61"
solana-account-decoder = "=1.8.14"
solana-clap-utils = "=1.8.14"
solana-cli-config = "=1.8.14"
solana-client = "=1.8.14"
solana-logger = "=1.8.14"
solana-sdk = "=1.8.14"
solana-program = "=1.8.14"
solana-account-decoder = "=1.16.27"
solana-clap-utils = "=1.16.27"
solana-cli-config = "=1.16.27"
solana-client = "=1.16.27"
solana-logger = "=1.16.27"
solana-sdk = "=1.16.27"
solana-program = "=1.16.27"
borsh = "0.8.2"
regex = "1.5.4"
bincode = "1.3.1"
serde = "1.0.55"
csv = "1.1.6"
hex = "0.4.3"
sha3 = "0.9.1"
libsecp256k1 = "0.5.0"
libsecp256k1 = "0.6.0"
audius-reward-manager = { path="../program", features = [ "no-entrypoint" ] }
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
claimable-tokens = { path = "../../claimable-tokens/program", features = [ "no-entrypoint" ] }
4 changes: 2 additions & 2 deletions solana-programs/reward-manager/cli/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ impl<'a> Transaction<'a> {
Some(&config.fee_payer.pubkey()),
);

let (recent_blockhash, fee_calculator) = config.rpc_client.get_recent_blockhash()?;
let recent_blockhash = config.rpc_client.get_latest_blockhash()?;
check_fee_payer_balance(
config,
fee_calculator.calculate_fee(&transaction.message()) + additional_balance_required,
5000 * transaction.message().header.num_required_signatures as u64 + additional_balance_required,
Copy link
Contributor

@alecsavvy alecsavvy Sep 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

magic number?

Copy link
Contributor

@schottra schottra Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah also curious about this. Do we want to be hard-coding a fee here?

)?;

transaction.sign(&self.signers, recent_blockhash);
Expand Down
10 changes: 5 additions & 5 deletions solana-programs/reward-manager/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ arrayref = "0.3.6"
num-derive = "0.3.3"
num-traits = "0.2.14"
num_enum = "0.5.1"
solana-program = "=1.8.14"
solana-program = "=1.16.27"
thiserror = "1.0.25"
borsh = "0.9.0"
spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
bs58 = "0.4.0"
claimable-tokens = { path = "../../claimable-tokens/program", features = [ "no-entrypoint" ] }

[dev-dependencies]
solana-program-test = "=1.8.14"
solana-sdk = "=1.8.14"
libsecp256k1 = "0.5.0"
solana-program-test = "=1.16.27"
solana-sdk = "=1.16.27"
libsecp256k1 = "0.6.0"
rand = "0.8.3"
rand_073 = { package = "rand", version = "0.7.3" }
sha3 = "0.9.1"
Expand All @@ -33,4 +33,4 @@ serde_derive = "1.0.103"
serde_json = "1.0.64"

[lib]
crate-type = ["cdylib", "lib"]
crate-type = ["cdylib", "lib"]