Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ starknet-contract = { version = "0.16.0-rc.1", path = "./starknet-contract" }
starknet-signers = { version = "0.14.0-rc.1", path = "./starknet-signers" }
starknet-accounts = { version = "0.16.0-rc.1", path = "./starknet-accounts" }
starknet-macros = { version = "0.2.5-rc.1", path = "./starknet-macros" }
secrecy = "0.10.3"


[dev-dependencies]
serde_json = "1.0.74"
Expand Down
8 changes: 4 additions & 4 deletions examples/declare_cairo1_contract.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::sync::Arc;

use secrecy::SecretString;
use starknet::{
accounts::{Account, ExecutionEncoding, SingleOwnerAccount},
core::{
Expand Down Expand Up @@ -27,9 +27,9 @@ async fn main() {
Url::parse("https://starknet-sepolia.public.blastapi.io/rpc/v0_9").unwrap(),
));

let signer = LocalWallet::from(SigningKey::from_secret_scalar(
Felt::from_hex("YOUR_PRIVATE_KEY_IN_HEX_HERE").unwrap(),
));
let signer = LocalWallet::from(SigningKey::from_secret(
SecretString::new("YOUR_PRIVATE_KEY_IN_HEX_HERE".into()),
).unwrap());
let address = Felt::from_hex("YOUR_ACCOUNT_CONTRACT_ADDRESS_IN_HEX_HERE").unwrap();

let account = SingleOwnerAccount::new(
Expand Down
7 changes: 4 additions & 3 deletions examples/deploy_argent_account.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use secrecy::SecretString;
use starknet::{
accounts::{AccountFactory, ArgentAccountFactory},
core::{chain_id, types::Felt},
Expand All @@ -21,9 +22,9 @@ async fn main() {
Url::parse("https://starknet-sepolia.public.blastapi.io/rpc/v0_9").unwrap(),
));

let signer = LocalWallet::from(SigningKey::from_secret_scalar(
Felt::from_hex("YOUR_PRIVATE_KEY_IN_HEX_HERE").unwrap(),
));
let signer = LocalWallet::from(SigningKey::from_secret(
SecretString::new("YOUR_PRIVATE_KEY_IN_HEX_HERE".into()),
).unwrap());

let factory = ArgentAccountFactory::new(class_hash, chain_id::SEPOLIA, None, signer, provider)
.await
Expand Down
8 changes: 4 additions & 4 deletions examples/deploy_contract.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::sync::Arc;

use secrecy::SecretString;
use starknet::{
accounts::{ExecutionEncoding, SingleOwnerAccount},
contract::ContractFactory,
Expand Down Expand Up @@ -27,9 +27,9 @@ async fn main() {
Url::parse("https://starknet-sepolia.public.blastapi.io/rpc/v0_9").unwrap(),
));

let signer = LocalWallet::from(SigningKey::from_secret_scalar(
Felt::from_hex("YOUR_PRIVATE_KEY_IN_HEX_HERE").unwrap(),
));
let signer = LocalWallet::from(SigningKey::from_secret(
SecretString::new("YOUR_PRIVATE_KEY_IN_HEX_HERE".into()),
).unwrap());
let address = Felt::from_hex("YOUR_ACCOUNT_CONTRACT_ADDRESS_IN_HEX_HERE").unwrap();
let account = SingleOwnerAccount::new(
provider,
Expand Down
7 changes: 4 additions & 3 deletions examples/mint_tokens.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use secrecy::SecretString;
use starknet::{
accounts::{Account, ExecutionEncoding, SingleOwnerAccount},
core::{
Expand All @@ -18,9 +19,9 @@ async fn main() {
Url::parse("https://starknet-sepolia.public.blastapi.io/rpc/v0_9").unwrap(),
));

let signer = LocalWallet::from(SigningKey::from_secret_scalar(
Felt::from_hex("YOUR_PRIVATE_KEY_IN_HEX_HERE").unwrap(),
));
let signer = LocalWallet::from(SigningKey::from_secret(
SecretString::new("YOUR_PRIVATE_KEY_IN_HEX_HERE".into()),
).unwrap());
let address = Felt::from_hex("YOUR_ACCOUNT_CONTRACT_ADDRESS_IN_HEX_HERE").unwrap();
let tst_token_address =
Felt::from_hex("07394cbe418daa16e42b87ba67372d4ab4a5df0b05c6e554d158458ce245bc10").unwrap();
Expand Down
1 change: 1 addition & 0 deletions starknet-accounts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ starknet-signers = { version = "0.14.0-rc.1", path = "../starknet-signers" }
async-trait = "0.1.68"
auto_impl = "1.0.1"
thiserror = "1.0.40"
secrecy = "0.10.3"

[dev-dependencies]
serde = { version = "1.0.160", features = ["derive"] }
Expand Down
43 changes: 22 additions & 21 deletions starknet-accounts/tests/single_owner_account.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use starknet_providers::{
};
use starknet_signers::{LocalWallet, SigningKey};
use std::sync::Arc;
use secrecy::SecretString;

/// Cairo short string encoding for `SN_SEPOLIA`.
const CHAIN_ID: Felt = Felt::from_raw([
Expand Down Expand Up @@ -107,9 +108,9 @@ async fn can_declare_cairo1_contract_v3_with_jsonrpc() {
}

async fn can_get_nonce_inner<P: Provider + Send + Sync>(provider: P, address: &str) {
let signer = LocalWallet::from(SigningKey::from_secret_scalar(
Felt::from_hex("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap(),
));
let signer = LocalWallet::from(SigningKey::from_secret(
SecretString::new("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".into()),
).unwrap());
let address = Felt::from_hex(address).unwrap();

let account =
Expand All @@ -119,9 +120,9 @@ async fn can_get_nonce_inner<P: Provider + Send + Sync>(provider: P, address: &s
}

async fn can_estimate_invoke_v3_fee_inner<P: Provider + Send + Sync>(provider: P, address: &str) {
let signer = LocalWallet::from(SigningKey::from_secret_scalar(
Felt::from_hex("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap(),
));
let signer = LocalWallet::from(SigningKey::from_secret(
SecretString::new("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".into()),
).unwrap());
let address = Felt::from_hex(address).unwrap();
let eth_token_address =
Felt::from_hex("049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7").unwrap();
Expand All @@ -146,9 +147,9 @@ async fn can_parse_fee_estimation_error_inner<P: Provider + Send + Sync>(
provider: P,
address: &str,
) {
let signer = LocalWallet::from(SigningKey::from_secret_scalar(
Felt::from_hex("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap(),
));
let signer = LocalWallet::from(SigningKey::from_secret(
SecretString::new("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".into()),
).unwrap());
let address = Felt::from_hex(address).unwrap();
let eth_token_address =
Felt::from_hex("049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7").unwrap();
Expand Down Expand Up @@ -193,9 +194,9 @@ async fn can_execute_eth_transfer_invoke_v3_inner<P: Provider + Send + Sync>(
// - change to use a local testing network similar to Ganacha for Ethereum; or
// - poll the transaction hash until it's processed.

let signer = LocalWallet::from(SigningKey::from_secret_scalar(
Felt::from_hex("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap(),
));
let signer = LocalWallet::from(SigningKey::from_secret(
SecretString::new("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".into()),
).unwrap());
let address = Felt::from_hex(address).unwrap();
let eth_token_address =
Felt::from_hex("049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7").unwrap();
Expand Down Expand Up @@ -224,9 +225,9 @@ async fn can_execute_eth_transfer_invoke_v3_with_manual_gas_inner<P: Provider +
// is to test that a fee estimation is _not_ performed when `gas` is specified. A fee estimation
// performed on this call would have thrown.

let signer = LocalWallet::from(SigningKey::from_secret_scalar(
Felt::from_hex("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap(),
));
let signer = LocalWallet::from(SigningKey::from_secret(
SecretString::new("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".into()),
).unwrap());
let address = Felt::from_hex(address).unwrap();
let eth_token_address =
Felt::from_hex("049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7").unwrap();
Expand Down Expand Up @@ -263,9 +264,9 @@ async fn can_estimate_declare_v3_fee_inner<P: Provider + Send + Sync>(provider:
compiled_class_hash: String,
}

let signer = LocalWallet::from(SigningKey::from_secret_scalar(
Felt::from_hex("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap(),
));
let signer = LocalWallet::from(SigningKey::from_secret(
SecretString::new("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".into()),
).unwrap());
let address = Felt::from_hex(address).unwrap();
let account =
SingleOwnerAccount::new(provider, signer, address, CHAIN_ID, ExecutionEncoding::New);
Expand Down Expand Up @@ -313,9 +314,9 @@ async fn can_declare_cairo1_contract_v3_inner<P: Provider + Send + Sync>(
compiled_class_hash: String,
}

let signer = LocalWallet::from(SigningKey::from_secret_scalar(
Felt::from_hex("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap(),
));
let signer = LocalWallet::from(SigningKey::from_secret(
SecretString::new("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".into()),
).unwrap());
let address = Felt::from_hex(address).unwrap();
let account =
SingleOwnerAccount::new(provider, signer, address, CHAIN_ID, ExecutionEncoding::New);
Expand Down
1 change: 1 addition & 0 deletions starknet-contract/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ serde = { version = "1.0.160", features = ["derive"] }
serde_json = "1.0.96"
serde_with = "3.9.0"
thiserror = "1.0.40"
secrecy = "0.10.3"

[dev-dependencies]
rand = { version = "0.8.5", features=["std_rng"] }
Expand Down
10 changes: 7 additions & 3 deletions starknet-contract/tests/contract_deployment.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use rand::{rngs::StdRng, RngCore, SeedableRng};
use secrecy::SecretString;
use starknet_accounts::{ExecutionEncoding, SingleOwnerAccount};
use starknet_contract::ContractFactory;
use starknet_core::types::{contract::legacy::LegacyContractClass, Felt};
Expand All @@ -19,9 +20,12 @@ async fn can_deploy_contract_to_alpha_sepolia_with_invoke_v3() {
let rpc_url = std::env::var("STARKNET_RPC")
.unwrap_or_else(|_| "https://pathfinder.rpc.sepolia.starknet.rs/rpc/v0_9".into());
let provider = JsonRpcClient::new(HttpTransport::new(Url::parse(&rpc_url).unwrap()));
let signer = LocalWallet::from(SigningKey::from_secret_scalar(
Felt::from_hex("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap(),
));
let signer = LocalWallet::from(
SigningKey::from_secret(SecretString::new(
"00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff".into(),
))
.unwrap(),
);
let address =
Felt::from_hex("0x034dd51aa591d174b60d1cb45e46dfcae47946fae1c5e62933bbf48effedde4d")
.unwrap();
Expand Down
2 changes: 1 addition & 1 deletion starknet-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ serde_json = { version = "1.0.96", default-features = false, features = ["alloc"
serde_json_pythonic = { version = "0.1.2", default-features = false, features = ["alloc", "raw_value"] }
serde_with = { version = "3.9.0", default-features = false, features = ["alloc", "macros"] }
sha3 = { version = "0.10.7", default-features = false }
starknet-types-core = { version = "0.1.7", default-features = false, features = ["curve", "serde", "num-traits"] }
starknet-types-core = { version = "0.1.8", default-features = false, features = ["curve", "serde", "num-traits", "zeroize"] }

[dev-dependencies]
bincode = "1.3.3"
Expand Down
4 changes: 2 additions & 2 deletions starknet-crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ rfc6979 = { version = "0.4.0", default-features = false }
sha2 = { version = "0.10.6", default-features = false }
zeroize = { version = "1.6.0", default-features = false }
hex = { version = "0.4.3", default-features = false, optional = true }
starknet-types-core = { version = "0.1.7", default-features = false, features = ["curve", "hash"] }
starknet-types-core = { version = "0.1.8", default-features = false, features = ["curve", "hash"] }

[features]
default = ["std", "signature-display"]
Expand All @@ -39,7 +39,7 @@ hex = "0.4.3"
hex-literal = "0.4.1"
serde = { version = "1.0.160", features = ["derive"] }
serde_json = "1.0.96"
starknet-types-core = { version = "0.1.7", default-features = false, features = ["alloc"] }
starknet-types-core = { version = "0.1.8", default-features = false, features = ["alloc"] }

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen-test = "0.3.50"
Expand Down
2 changes: 1 addition & 1 deletion starknet-curve/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Stark curve
keywords = ["ethereum", "starknet", "web3", "no_std"]

[dependencies]
starknet-types-core = { version = "0.1.7", default-features = false, features = ["curve"] }
starknet-types-core = { version = "0.1.8", default-features = false, features = ["curve"] }
Copy link
Author

Choose a reason for hiding this comment

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

Latest version of starknet-types-core support operations on EC points as well starknet-io/types-rs@e0eff28


[lints]
workspace = true
7 changes: 7 additions & 0 deletions starknet-signers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ rand = { version = "0.8.5", features = ["std_rng"] }
coins-bip32 = { version = "0.11.1", optional = true }
coins-ledger = { version = "0.12.0", default-features = false, optional = true }
semver = { version = "1.0.23", optional = true }
zeroize = { version = "1.8.1", features = ["derive", "zeroize_derive"] }
hex = "0.4.3"
secrecy = "0.10.3"

[dev-dependencies]
tempdir = "0.3.7"


[target.'cfg(not(all(target_arch = "wasm32", target_os = "unknown")))'.dependencies]
eth-keystore = { version = "0.5.0", default-features = false }
Expand Down
Loading