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

chore: bump sha2 from 0.8.2 to 0.9.2 #7

Closed
wants to merge 2 commits into from
Closed

chore: bump sha2 from 0.8.2 to 0.9.2 #7

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
ac88662
Template for an Inflation Candidate nomination
mvines Jan 21, 2021
dbd3c1d
chore: bump sha2 from 0.8.2 to 0.9.2
dependabot[bot] Jan 21, 2021
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
37 changes: 28 additions & 9 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frozen-abi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ bv = { version = "0.11.1", features = ["serde"] }
log = "0.4.11"
serde = "1.0.112"
serde_derive = "1.0.103"
sha2 = "0.8.2"
sha2 = "0.9.2"
solana-frozen-abi-macro = { path = "macro", version = "1.6.0" }
thiserror = "1.0"

Expand Down
2 changes: 1 addition & 1 deletion ledger/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ rayon = "1.5.0"
reed-solomon-erasure = { version = "4.0.2", features = ["simd-accel"] }
serde = "1.0.112"
serde_bytes = "0.11.4"
sha2 = "0.8.2"
sha2 = "0.9.2"
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.6.0" }
solana-frozen-abi = { path = "../frozen-abi", version = "1.6.0" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "1.6.0" }
Expand Down
2 changes: 1 addition & 1 deletion sdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ serde = "1.0.112"
serde_bytes = "0.11"
serde_derive = "1.0.103"
serde_json = { version = "1.0.56", optional = true }
sha2 = "0.8.2"
sha2 = "0.9.2"
thiserror = "1.0"
ed25519-dalek = { version = "=1.0.0-pre.4", optional = true }
solana-crate-features = { path = "../crate-features", version = "1.6.0", optional = true }
Expand Down
26 changes: 26 additions & 0 deletions sdk/src/feature_set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,26 @@ pub mod full_inflation {
solana_sdk::declare_id!("DummyEnab1eAddress1111111111111111111111111");
}
}

pub mod my_name {
pub mod vote {
// TODO: Contact the Solana Foundation by emailing [email protected] and
// replace "MyVoteAddress111111111111111111111111111111" with the pubkey provided to
// you.
//
// Once completed remove this TODO comment
solana_sdk::declare_id!("MyVoteAddress111111111111111111111111111111");
}
pub mod enable {
// TODO: Run `solana-keygen new -o inflation.json` and replace
// "MyEnab1eAddress1111111111111111111111111111" with your pubkey.
// Be sure you copy the pubkey correctly or you won't be able to enable
// inflation.
//
// Once completed remove this TODO comment
solana_sdk::declare_id!("MyEnab1eAddress1111111111111111111111111111");
}
}
}

pub mod spl_token_v2_multisig_fix {
Expand Down Expand Up @@ -206,6 +226,8 @@ lazy_static! {
(prevent_upgrade_and_invoke::id(), "Prevent upgrade and invoke in same tx batch"),
(full_inflation::candidate_example::vote::id(), "Community vote allowing candidate_example to enable full inflation"),
(full_inflation::candidate_example::enable::id(), "Full inflation enabled by candidate_example"),
(full_inflation::my_name::vote::id(), "Community vote allowing my_name to enable full inflation"),
(full_inflation::my_name::enable::id(), "Full inflation enabled by my_name"),
/*************** ADD NEW FEATURES HERE ***************/
]
.iter()
Expand Down Expand Up @@ -237,6 +259,10 @@ lazy_static! {
vote_id: full_inflation::candidate_example::vote::id(),
enable_id: full_inflation::candidate_example::enable::id(),
},
FullInflationFeaturePair {
vote_id: full_inflation::my_name::vote::id(),
enable_id: full_inflation::my_name::enable::id(),
},
]
.iter()
.cloned()
Expand Down