Skip to content

Commit

Permalink
chore: updated near-* crates to allow 0.24.0 in addition to all the p…
Browse files Browse the repository at this point in the history
…reviously supported versions (#18)
  • Loading branch information
akorchyn authored Aug 8, 2024
1 parent d728cc7 commit 160d1b8
Show file tree
Hide file tree
Showing 18 changed files with 24 additions and 24 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ ledger-apdu = "0.11.0"
slipped10 = { version = "0.4.6" }
log = "0.4.20"
hex = "0.4.3"
near-primitives-core = ">0.22,<0.24"
near-primitives = ">0.22,<0.24"
near-primitives-core = ">0.22,<0.25"
near-primitives = ">0.22,<0.25"

[dev-dependencies]
env_logger = "0.11.0"
near-crypto = ">0.22,<0.24"
near-primitives = ">0.22,<0.24"
near-crypto = ">0.22,<0.25"
near-primitives = ">0.22,<0.25"
near-account-id = { version = "1.0.0", features = ["internal_unstable"] }
4 changes: 2 additions & 2 deletions examples/common/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub fn display_pub_key(public_key: ed25519_dalek::VerifyingKey) {

pub fn tx_template(
ledger_pub_key: ed25519_dalek::VerifyingKey,
) -> near_primitives::transaction::Transaction {
) -> near_primitives::transaction::TransactionV0 {
let public_key = near_crypto::PublicKey::ED25519(near_crypto::ED25519PublicKey::from(
ledger_pub_key.to_bytes(),
));
Expand All @@ -38,7 +38,7 @@ pub fn tx_template(
let signer_account_str = hex::encode(ledger_pub_key.to_bytes());
let receiver_account_str = "dc7e34eecec3096a4a661e10932834f801149c49dba9b93322f6d9de18047f9c";

near_primitives::transaction::Transaction {
near_primitives::transaction::TransactionV0 {
public_key,
block_hash,
nonce: 103595482000005,
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_transaction/add_key_fullaccess.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fn tx(ledger_pub_key: ed25519_dalek::VerifyingKey) -> near_primitives::transacti
},
},
))];
tx
near_primitives::transaction::Transaction::V0(tx)
}

fn main() -> Result<(), NEARLedgerError> {
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_transaction/add_key_functioncall.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fn tx(ledger_pub_key: ed25519_dalek::VerifyingKey) -> near_primitives::transacti
},
},
))];
tx
near_primitives::transaction::Transaction::V0(tx)
}

fn main() -> Result<(), NEARLedgerError> {
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_transaction/batch_all_actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ mod common;
fn tx(ledger_pub_key: ed25519_dalek::VerifyingKey) -> near_primitives::transaction::Transaction {
let mut tx = common::tx_template(ledger_pub_key);
tx.actions = common::batch_of_all_types_of_actions(ledger_pub_key);
tx
near_primitives::transaction::Transaction::V0(tx)
}

fn main() -> Result<(), NEARLedgerError> {
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_transaction/create_account.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fn tx(ledger_pub_key: ed25519_dalek::VerifyingKey) -> near_primitives::transacti
tx.actions = vec![near_primitives::transaction::Action::CreateAccount(
near_primitives::transaction::CreateAccountAction {},
)];
tx
near_primitives::transaction::Transaction::V0(tx)
}

fn main() -> Result<(), NEARLedgerError> {
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_transaction/delete_account_long.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fn tx(ledger_pub_key: ed25519_dalek::VerifyingKey) -> near_primitives::transacti
"dc7e34eecec3096a4a661e10932834f801149c49dba9b93322f6d9de18047f9c1b11b3b31673033936ad07bddc01f9da27d974811e480fb197c799e23480a489".to_string()),
},
)];
tx
near_primitives::transaction::Transaction::V0(tx)
}

fn main() -> Result<(), NEARLedgerError> {
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_transaction/delete_account_short.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fn tx(ledger_pub_key: ed25519_dalek::VerifyingKey) -> near_primitives::transacti
beneficiary_id: AccountId::from_str("bob.near").unwrap(),
},
)];
tx
near_primitives::transaction::Transaction::V0(tx)
}

fn main() -> Result<(), NEARLedgerError> {
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_transaction/delete_key_ed25519.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fn tx(ledger_pub_key: ed25519_dalek::VerifyingKey) -> near_primitives::transacti
tx.actions = vec![near_primitives::transaction::Action::DeleteKey(Box::new(
near_primitives::transaction::DeleteKeyAction { public_key },
))];
tx
near_primitives::transaction::Transaction::V0(tx)
}

fn main() -> Result<(), NEARLedgerError> {
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_transaction/delete_key_secp256k1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fn tx(ledger_pub_key: ed25519_dalek::VerifyingKey) -> near_primitives::transacti
tx.actions = vec![near_primitives::transaction::Action::DeleteKey(Box::new(
near_primitives::transaction::DeleteKeyAction { public_key },
))];
tx
near_primitives::transaction::Transaction::V0(tx)
}

fn main() -> Result<(), NEARLedgerError> {
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_transaction/deploy_contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fn tx(ledger_pub_key: ed25519_dalek::VerifyingKey) -> near_primitives::transacti
tx.actions = vec![near_primitives::transaction::Action::DeployContract(
DeployContractAction { code },
)];
tx
near_primitives::transaction::Transaction::V0(tx)
}

fn main() -> Result<(), NEARLedgerError> {
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_transaction/functioncall_bin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fn tx(ledger_pub_key: ed25519_dalek::VerifyingKey) -> near_primitives::transacti
tx.actions = vec![near_primitives::transaction::Action::FunctionCall(
Box::new(f_call),
)];
tx
near_primitives::transaction::Transaction::V0(tx)
}

fn main() -> Result<(), NEARLedgerError> {
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_transaction/functioncall_str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fn tx(ledger_pub_key: ed25519_dalek::VerifyingKey) -> near_primitives::transacti
tx.actions = vec![near_primitives::transaction::Action::FunctionCall(
Box::new(f_call),
)];
tx
near_primitives::transaction::Transaction::V0(tx)
}

fn main() -> Result<(), NEARLedgerError> {
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_transaction/functioncall_str_parse_err.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fn tx(ledger_pub_key: ed25519_dalek::VerifyingKey) -> near_primitives::transacti
tx.actions = vec![near_primitives::transaction::Action::FunctionCall(
Box::new(f_call),
)];
tx
near_primitives::transaction::Transaction::V0(tx)
}

fn main() -> Result<(), NEARLedgerError> {
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_transaction/stake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fn tx(ledger_pub_key: ed25519_dalek::VerifyingKey) -> near_primitives::transacti
public_key,
},
))];
tx
near_primitives::transaction::Transaction::V0(tx)
}

fn main() -> Result<(), NEARLedgerError> {
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_transaction/transfer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fn tx(ledger_pub_key: ed25519_dalek::VerifyingKey) -> near_primitives::transacti
deposit: 150000000000000000000000, // 0.15 NEAR
},
)];
tx
near_primitives::transaction::Transaction::V0(tx)
}

fn main() -> Result<(), NEARLedgerError> {
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.78
1.80
6 changes: 3 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ fn log_command(index: usize, is_last_chunk: bool, command: &APDUCommand<Vec<u8>>
/// # Returns
///
/// * A `Result` whose `Ok` value is an `NEARLedgerAppVersion` (just a `Vec<u8>` for now, where first value is a major version, second is a minor and the last is the path)
/// and whose `Err` value is a `NEARLedgerError` containing an error which occurred.
/// and whose `Err` value is a `NEARLedgerError` containing an error which occurred.
pub fn get_version() -> Result<NEARLedgerAppVersion, NEARLedgerError> {
// instantiate the connection to Ledger
// will return an error if Ledger is not connected
Expand Down Expand Up @@ -269,13 +269,13 @@ fn get_transport() -> Result<TransportNativeHID, NEARLedgerError> {
///
/// # Inputs
/// * `unsigned_transaction_borsh_serializer` - unsigned transaction `near_primitives::transaction::Transaction`
/// which is serialized with `BorshSerializer` and basically is just `Vec<u8>`
/// which is serialized with `BorshSerializer` and basically is just `Vec<u8>`
/// * `seed_phrase_hd_path` - seed phrase hd path `slipped10::BIP32Path` with which to sign
///
/// # Returns
///
/// * A `Result` whose `Ok` value is an `Signature` (bytes) and whose `Err` value is a
/// `NEARLedgerError` containing an error which occurred.
/// `NEARLedgerError` containing an error which occurred.
///
/// # Examples
///
Expand Down

0 comments on commit 160d1b8

Please sign in to comment.