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.

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

bump starknet deps #578

Closed
wants to merge 1 commit into from
Closed
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
60 changes: 25 additions & 35 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,69 +1,59 @@
[workspace]
members = [ "packages/account_sdk", "packages/account-wasm" ]
resolver = "2"
members = ["packages/account_sdk", "packages/account-wasm"]

[workspace.package]
edition = "2021"
version = "0.1.0"

[workspace.dependencies]
account_sdk = { path = "packages/account_sdk" }
account-wasm = { path = "packages/account-wasm" }
account_sdk = { path = "packages/account_sdk" }

anyhow = "1"
async-trait = "0.1"
base64 = "0.22"
cainome = { git = "https://github.com/cartridge-gg/cainome", branch = "main", features = [
"abigen-rs",
] }
base64urlsafedata = { git = "https://github.com/cartridge-gg/webauthn-rs", rev = "a6cea88" }
cainome = { git = "https://github.com/cartridge-gg/cainome", rev = "fb91215", features = [ "abigen-rs" ] }
cairo-lang-starknet = "2.4.0"
coset = { version = "0.3.4", features = ["std"] }
coset = { version = "0.3.4", features = [ "std" ] }
ecdsa = "0.16.9"
futures = "0.3"
getrandom = { version = "0.2", features = [ "js" ] }
hex = "0.4.3"
indexmap = { version = "2.2.6", features = ["serde"] }
indexmap = { version = "2.2.6", features = [ "serde" ] }
lazy_static = "1"
num-traits = "0.2.19"
once_cell = "1.19.0"
p256 = "0.13"
primitive-types = { version = "0.12", default-features = false }
getrandom = { version = "0.2", features = ["js"] }
rand = { version = "0.8", features = ["getrandom"] }
reqwest = { version = "0.11.16", default-features = false, features = [
"json",
"rustls-tls",
] }
serde = { version = "1.0.160", default-features = false, features = ["derive"] }
serde_json = { version = "1.0.96", default-features = false, features = [
"alloc",
"raw_value",
] }
serde_with = { version = "3.9.0", default-features = false, features = [
"alloc",
"macros",
] }
rand = { version = "0.8", features = [ "getrandom" ] }
reqwest = { version = "0.11.16", default-features = false, features = [ "json", "rustls-tls" ] }
serde = { version = "1.0.160", default-features = false, features = [ "derive" ] }
serde_cbor_2 = { version = "0.12.0-dev" }
serde_json = { version = "1.0.96", default-features = false, features = [ "alloc", "raw_value" ] }
serde_with = { version = "3.9.0", default-features = false, features = [ "alloc", "macros" ] }
sha2 = "0.10"
starknet = { git = "https://github.com/xJonathanLEI/starknet-rs", rev = "2ddc694" }
starknet-crypto = { git = "https://github.com/xJonathanLEI/starknet-rs", rev = "2ddc694" }
starknet-types-core = { version = "0.1.3", default-features = false, features = [
"curve",
"hash",
] }
thiserror = "1"
tokio = { version = "1", features = [ "macros", "time" ] }
toml = "0.8"
u256-literal = "1"
url = { version = "2.3.1", default-features = false }
num-traits = "0.2.19"
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4.42"
wasm-webauthn = { git = "https://github.com/cartridge-gg/wasm-webauthn", rev = "972693f" }
tokio = { version = "1", features = ["macros", "time"] }
base64urlsafedata = { git = "https://github.com/cartridge-gg/webauthn-rs", rev = "a6cea88" }
serde_cbor_2 = { version = "0.12.0-dev" }
webauthn-authenticator-rs = { git = "https://github.com/cartridge-gg/webauthn-rs", rev = "a6cea88", features = [ "softpasskey" ] }
webauthn-rs-core = { git = "https://github.com/cartridge-gg/webauthn-rs", rev = "a6cea88" }
webauthn-rs-proto = { git = "https://github.com/cartridge-gg/webauthn-rs", rev = "a6cea88" }
webauthn-authenticator-rs = { git = "https://github.com/cartridge-gg/webauthn-rs", rev = "a6cea88", features = [
"softpasskey",
] }

starknet = "0.11.0"
starknet-crypto = "0.7.1"
starknet-types-core = { version = "~0.1.4", features = [ "curve", "hash" ] }

[patch.crates-io]
starknet = { git = "https://github.com/xJonathanLEI/starknet-rs", rev = "2ddc694" }
starknet-types-core = { git = "https://github.com/starknet-io/types-rs", rev = "f98f048" }


# Compiler optimization when running test to prevent ‘locals exceed maximum’ error,
# where a function is using more that the maximum allowed local variables.
Expand Down
16 changes: 8 additions & 8 deletions packages/account_sdk/src/account/session/hash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ use super::raw_session::RawSession;

#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub struct ProvedMethod {
pub(crate) method: AllowedMethod,
pub(crate) proof: Vec<Felt>,
pub method: AllowedMethod,
pub proof: Vec<Felt>,
}

#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Default)]
pub struct Session {
expires_at: u64,
allowed_methods: Vec<ProvedMethod>,
allowed_methods_root: Felt,
metadata: String,
session_key_guid: Felt,
pub expires_at: u64,
pub allowed_methods: Vec<ProvedMethod>,
pub allowed_methods_root: Felt,
pub metadata: String,
pub session_key_guid: Felt,
}

impl Session {
Expand Down
4 changes: 2 additions & 2 deletions packages/account_sdk/src/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ use crate::{
};
use starknet::core::types::Felt;

#[derive(Debug, Clone, Serialize, Deserialize)]
#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq)]
pub struct SessionMetadata {
pub session: Session,
pub max_fee: Option<Felt>,
pub credentials: Credentials,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq)]
pub struct Credentials {
pub authorization: Vec<Felt>,
pub private_key: Felt,
Expand Down
Loading