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

[sozo] Deploy Account #1601

Merged
merged 21 commits into from
Apr 21, 2024
Merged

[sozo] Deploy Account #1601

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
44b6bb0
sozo keystore, sozo account
JimmyFate Mar 21, 2024
5b27b62
STARKNET_POLL_INTERVAL default 5000 -> 1000
JimmyFate Mar 21, 2024
44f4cb2
Prompt password instead of error
JimmyFate Mar 21, 2024
75e188a
Remove num-bigint dependency
JimmyFate Mar 21, 2024
bb7eca6
Mention starkli license in sozo README
JimmyFate Mar 21, 2024
d313435
Remove dead code
JimmyFate Mar 21, 2024
43a1f6e
Add dojo-utils crate
JimmyFate Mar 21, 2024
1580b16
Revert "Add dojo-utils crate"
JimmyFate Mar 22, 2024
550b658
Use TransactionWaiter
JimmyFate Mar 21, 2024
5b8c1fc
Remove unwraps
JimmyFate Mar 22, 2024
60f62e1
Add sozo account fetch
JimmyFate Mar 22, 2024
2a22580
Add keystore tests
JimmyFate Mar 23, 2024
3aeb70b
Add account tests
JimmyFate Mar 23, 2024
692869b
Remove test_account_deploy
JimmyFate Mar 23, 2024
a2ce9b4
Merge branch 'main' into feat/sozo-account-deploy
JimmyFate Mar 29, 2024
a6d963c
output -> file
JimmyFate Mar 30, 2024
25c729a
add --no-confirmation flag and refactor deploy function
lambda-0x Apr 11, 2024
9e955c4
Merge branch 'main' into feat/sozo-account-deploy
lambda-0x Apr 11, 2024
f10c7ee
fix typo
lambda-0x Apr 11, 2024
cc75f82
Merge branch 'main' into feat/sozo-account-deploy
lambda-0x Apr 20, 2024
64271ff
add `no_wait` for test
lambda-0x Apr 20, 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
55 changes: 54 additions & 1 deletion Cargo.lock
View file
Open in desktop

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

47 changes: 31 additions & 16 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ saya-core = { path = "crates/saya/core" }
saya-provider = { path = "crates/saya/provider" }

# sozo
sozo-signers = { path = "crates/sozo/signers" }
sozo-ops = { path = "crates/sozo/ops" }
sozo-signers = { path = "crates/sozo/signers" }

anyhow = "1.0.75"
assert_matches = "1.5.0"
Expand All @@ -111,9 +111,9 @@ cairo-lang-formatter = "=2.5.4"
cairo-lang-language-server = "=2.5.4"
cairo-lang-lowering = "=2.5.4"
cairo-lang-parser = "=2.5.4"
cairo-lang-plugins = { version = "=2.5.4", features = [ "testing" ] }
cairo-lang-plugins = { version = "=2.5.4", features = ["testing"] }
cairo-lang-project = "=2.5.4"
cairo-lang-semantic = { version = "=2.5.4", features = [ "testing" ] }
cairo-lang-semantic = { version = "=2.5.4", features = ["testing"] }
cairo-lang-sierra = "=2.5.4"
cairo-lang-sierra-generator = "=2.5.4"
cairo-lang-sierra-to-casm = "=2.5.4"
Expand All @@ -124,13 +124,13 @@ cairo-lang-test-runner = "=2.5.4"
cairo-lang-test-utils = "=2.5.4"
cairo-lang-utils = "=2.5.4"
cairo-vm = "0.9.2"
camino = { version = "1.1.2", features = [ "serde1" ] }
chrono = { version = "0.4.24", features = [ "serde" ] }
clap = { version = "4.2", features = [ "derive" ] }
camino = { version = "1.1.2", features = ["serde1"] }
chrono = { version = "0.4.24", features = ["serde"] }
clap = { version = "4.2", features = ["derive"] }
clap_complete = "4.3"
console = "0.15.7"
convert_case = "0.6.0"
crypto-bigint = { version = "0.5.3", features = [ "serde" ] }
crypto-bigint = { version = "0.5.3", features = ["serde"] }
derive_more = "0.99.17"
flate2 = "1.0.24"
futures = "0.3.28"
Expand All @@ -146,28 +146,37 @@ parking_lot = "0.12.1"
pretty_assertions = "1.2.1"
rayon = "1.8.0"
regex = "1.10.3"
rpassword = "7.2.0"
salsa = "0.16.1"
scarb = { git = "https://github.com/software-mansion/scarb", tag = "v2.5.4" }
scarb-ui = { git = "https://github.com/software-mansion/scarb", tag = "v2.5.4" }
semver = "1.0.5"
serde = { version = "1.0.192", features = [ "derive" ] }
serde_json = { version = "1.0", features = [ "arbitrary_precision" ] }
serde = { version = "1.0.192", features = ["derive"] }
serde_json = { version = "1.0", features = ["arbitrary_precision"] }
serde_with = "2.3.1"
similar-asserts = "1.5.0"
smol_str = { version = "0.2.0", features = [ "serde" ] }
sqlx = { version = "0.7.2", features = [ "chrono", "macros", "regexp", "runtime-async-std", "runtime-tokio", "sqlite", "uuid" ] }
smol_str = { version = "0.2.0", features = ["serde"] }
sqlx = { version = "0.7.2", features = [
"chrono",
"macros",
"regexp",
"runtime-async-std",
"runtime-tokio",
"sqlite",
"uuid",
] }
Copy link
Contributor

Choose a reason for hiding this comment

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

any idea why this formatting changed? on main even after running cargo +nightly fmt it stays the same.

Copy link
Contributor

Choose a reason for hiding this comment

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

while merging with main switched back to formatting we have on main to be consistent

starknet = "0.9.0"
starknet-crypto = "0.6.1"
starknet_api = "0.7.0-dev.0"
strum = "0.25"
strum_macros = "0.25"
test-log = "0.2.11"
thiserror = "1.0.32"
tokio = { version = "1.32.0", features = [ "full" ] }
tokio = { version = "1.32.0", features = ["full"] }
toml = "0.7.4"
tracing = "0.1.34"
tracing-subscriber = { version = "0.3.16", features = [ "env-filter", "json" ] }
url = { version = "2.4.0", features = [ "serde" ] }
tracing-subscriber = { version = "0.3.16", features = ["env-filter", "json"] }
url = { version = "2.4.0", features = ["serde"] }

rstest = "0.18.2"
rstest_reuse = "0.6.0"
Expand All @@ -186,8 +195,14 @@ tonic-web = "0.10.1"
# WASM-compatible gRPC deps
tonic-web-wasm-client = "0.4.0"
wasm-prost = { version = "0.11.9", package = "prost" }
wasm-tonic = { version = "0.9.2", default-features = false, features = [ "codegen", "gzip", "prost" ], package = "tonic" }
wasm-tonic-build = { version = "0.9.2", default-features = false, features = [ "prost" ], package = "tonic-build" }
wasm-tonic = { version = "0.9.2", default-features = false, features = [
"codegen",
"gzip",
"prost",
], package = "tonic" }
wasm-tonic-build = { version = "0.9.2", default-features = false, features = [
"prost",
], package = "tonic-build" }

[patch.crates-io]
cairo-felt = { git = "https://github.com/dojoengine/cairo-rs.git", rev = "1031381" }
Expand Down
5 changes: 4 additions & 1 deletion bin/sozo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ version.workspace = true
[dependencies]
anyhow.workspace = true
async-trait.workspace = true
bigdecimal = "0.4.1"
cairo-lang-compiler.workspace = true
cairo-lang-defs.workspace = true
cairo-lang-filesystem.workspace = true
Expand All @@ -31,20 +32,22 @@ dojo-world = { workspace = true, features = [ "contracts", "metadata", "migratio
futures.workspace = true
notify = "6.0.1"
notify-debouncer-mini = "0.3.0"
num-integer = "0.1.45"
rpassword.workspace = true
scarb-ui.workspace = true
scarb.workspace = true
semver.workspace = true
serde.workspace = true
serde_json.workspace = true
smol_str.workspace = true
sozo-ops.workspace = true
starknet-crypto.workspace = true
starknet.workspace = true
thiserror.workspace = true
tokio.workspace = true
tracing-log = "0.1.3"
tracing.workspace = true
url.workspace = true
sozo-ops.workspace = true

cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.2.2" }

Expand Down
3 changes: 3 additions & 0 deletions bin/sozo/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ curl -L https://install.dojoengine.org | bash
```

[Documentation](https://book.dojoengine.org/toolchain/sozo/overview)

Some parts of sozo were inspired by [starkli](https://github.com/xJonathanLEI/starkli) created by Jonathan LEI.
It is licensed under Apache 2.0 / MIT License.
6 changes: 6 additions & 0 deletions bin/sozo/src/args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use smol_str::SmolStr;
use tracing::level_filters::LevelFilter;
use tracing_log::AsTrace;

use crate::commands::account::AccountArgs;
use crate::commands::auth::AuthArgs;
use crate::commands::build::BuildArgs;
use crate::commands::call::CallArgs;
Expand All @@ -16,6 +17,7 @@ use crate::commands::dev::DevArgs;
use crate::commands::events::EventsArgs;
use crate::commands::execute::ExecuteArgs;
use crate::commands::init::InitArgs;
use crate::commands::keystore::KeystoreArgs;
use crate::commands::migrate::MigrateArgs;
use crate::commands::model::ModelArgs;
use crate::commands::register::RegisterArgs;
Expand Down Expand Up @@ -65,6 +67,8 @@ pub struct SozoArgs {

#[derive(Subcommand)]
pub enum Commands {
#[command(about = "Manage accounts")]
Account(AccountArgs),
#[command(about = "Build the world, generating the necessary artifacts for deployment")]
Build(BuildArgs),
#[command(about = "Initialize a new project")]
Expand All @@ -90,6 +94,8 @@ pub enum Commands {
Events(EventsArgs),
#[command(about = "Manage world authorization")]
Auth(AuthArgs),
#[clap(about = "Manage keystore files")]
Keystore(KeystoreArgs),
#[command(about = "Generate shell completion file for specified shell")]
Completions(CompletionsArgs),
}
Expand Down
Loading
Loading