Skip to content
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

Jump to bottom

Update Solana workspace to use helium-lib #850

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

Update Solana workspace to use helium-lib #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e464e8e
format Cargo.toml for solana
michaeldjeffrey Jul 31, 2024
6faa8a8
Add helium-lib to solana
michaeldjeffrey Jul 31, 2024
36d0dd3
Use helium-lib for checking payer balances
michaeldjeffrey Jul 31, 2024
b6bb75e
Point at published helium-lib branch
michaeldjeffrey Aug 2, 2024
c54dba0
re-export some helpers from helium-lib
michaeldjeffrey Aug 2, 2024
a3058ee
Use helium-lib for burn transactions
michaeldjeffrey Aug 2, 2024
8486c80
Use helium-lib for start_boost transactions
michaeldjeffrey Aug 2, 2024
4a0a0b0
use helium-lib ReadWrite trait to read keypair
michaeldjeffrey Oct 22, 2024
d1e6005
use shared read_keypair_from_file helper in solana workspace
michaeldjeffrey Oct 22, 2024
a62bc2f
qualify Duration usage in macro, it may not be imported where used
michaeldjeffrey Oct 22, 2024
ade2d6a
update from helium-lib that has gone back to anchor-lang@0.29
michaeldjeffrey Oct 23, 2024
7046abb
send more deps back to 0.29
michaeldjeffrey Oct 23, 2024
1212eb7
solana dep hell
michaeldjeffrey Oct 23, 2024
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
534 changes: 135 additions & 399 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ license = "Apache-2.0"
edition = "2021"

[workspace.dependencies]
anchor-client = { version = "0.30.0", features = ["async"] }
anchor-client = { version = "0.29.0", features = ["async"] }
anyhow = { version = "1", features = ["backtrace"] }
bs58 = { version = "0.4", features = ["check"] }
thiserror = "1"
Expand Down Expand Up @@ -66,7 +66,7 @@ sqlx = { version = "0", features = [
] }
helium-anchor-gen = { git = "https://github.com/helium/helium-anchor-gen.git" }
helium-crypto = { version = "0.8.4", features = ["multisig"] }
helium-lib = { git = "https://github.com/helium/helium-wallet-rs.git", branch = "master" }
helium-lib = { git = "https://github.com/helium/helium-wallet-rs.git", branch = "mj/oracles-updates" }
hextree = { git = "https://github.com/jaykickliter/HexTree", branch = "main", features = [
"disktree",
] }
Expand Down
2 changes: 1 addition & 1 deletion iot_packet_verifier/src/daemon.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ impl Cmd {
bail!("Missing solana section in settings");
};
// Set up the solana RpcClient:
Some(SolanaRpc::new(solana_settings).await?)
Some(SolanaRpc::new(solana_settings, solana::SubDao::Iot).await?)
} else {
None
};
Expand Down
2 changes: 1 addition & 1 deletion mobile_packet_verifier/src/daemon.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ impl Cmd {
bail!("Missing solana section in settings");
};
// Set up the solana RpcClient:
Some(SolanaRpc::new(solana_settings).await?)
Some(SolanaRpc::new(solana_settings, solana::SubDao::Mobile).await?)
} else {
None
};
Expand Down
37 changes: 19 additions & 18 deletions solana/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,23 @@ license.workspace = true

[dependencies]
anyhow = { workspace = true }
async-trait = {workspace = true}
async-trait = { workspace = true }
anchor-client = { workspace = true }
clap = {workspace = true}
chrono = {workspace = true}
file-store = {path = "../file_store"}
futures = {workspace = true}
helium-anchor-gen = {workspace = true}
helium-crypto = {workspace = true}
itertools = {workspace = true}
metrics = {workspace = true}
serde = {workspace = true}
sha2 = {workspace = true}
solana-client = {workspace = true}
solana-program = {workspace = true}
solana-sdk = {workspace = true}
spl-token = {workspace = true}
thiserror = {workspace = true}
tokio = {workspace = true}
tracing = {workspace = true}
clap = { workspace = true }
chrono = { workspace = true }
file-store = { path = "../file_store" }
futures = { workspace = true }
helium-anchor-gen = { workspace = true }
helium-crypto = { workspace = true }
helium-lib = { workspace = true }
itertools = { workspace = true }
metrics = { workspace = true }
serde = { workspace = true }
sha2 = { workspace = true }
solana-client = { workspace = true }
solana-program = { workspace = true }
solana-sdk = { workspace = true }
spl-token = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true }
tracing = { workspace = true }
Loading