Skip to content

Commit

Permalink
Merge branch 'main' into wasm_builder_flags
Browse files Browse the repository at this point in the history
  • Loading branch information
aoyako authored Nov 19, 2024
2 parents 3182ebd + a8cf1c1 commit 5cfe4df
Show file tree
Hide file tree
Showing 55 changed files with 1,099 additions and 1,395 deletions.
14 changes: 1 addition & 13 deletions Cargo.lock

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

2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ iroha_smart_contract_utils = { version = "=2.0.0-rc.1.0", path = "crates/iroha_s
iroha_executor = { version = "=2.0.0-rc.1.0", path = "crates/iroha_executor" }

iroha_data_model = { version = "=2.0.0-rc.1.0", path = "crates/iroha_data_model", default-features = false }
iroha_multisig_data_model = { version = "=2.0.0-rc.1.0", path = "data_model/libs/iroha_multisig_data_model" }
iroha_executor_data_model = { version = "=2.0.0-rc.1.0", path = "crates/iroha_executor_data_model" }

iroha_test_network = { version = "=2.0.0-rc.1.0", path = "crates/iroha_test_network" }
Expand Down Expand Up @@ -199,7 +198,6 @@ clippy.wildcard_dependencies = "deny"
resolver = "2"
members = [
"crates/*",
"data_model/libs/*",
"data_model/samples/*"
]

Expand Down
27 changes: 9 additions & 18 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,24 @@ Maintainers of the Hyperledger Iroha project are supposed to help contributors b

This is the list of maintainers, including their email addresses for direct communication:

| Name | GitHub Id | email | Area of expertise |
| Name | GitHub Id | email | Area of expertise/Role |
|-----------------------|------------------------------------------------------|---------------------------------|-------------------------------------------------------------------------------|
| Makoto Takemiya | [@takemiyamakoto](https://github.com/takemiyamakoto) | [email protected] | Product vision |
| Dmitri Venger | [@dmitrivenger](https://github.com/dmitrivenger) | [email protected] | Project manager |
| Bogdan Mingela | [@Mingela](https://github.com/Mingela) | [email protected] | Iroha Team Lead |
| Aleksandr Petrosyan | [@appetrosyan](https://github.com/appetrosyan) | [email protected] | Iroha 2 architect |
| Daniil Polyakov | [@Arjentix](https://github.com/Arjentix) | [email protected] | Development: Rust, C++ |
| Marin Veršić | [@mversic](https://github.com/mversic) | [email protected] | Tech lead, development: Rust, Java |
| Sam H. Smith | [@SamHSmith](https://github.com/SamHSmith) | [email protected] | Development: Rust, C |
| Shanin Roman | [@Erigara](https://github.com/Erigara) | [email protected] | Development: Rust |
| Makoto Takemiya | [@takemiyamakoto](https://github.com/takemiyamakoto) | [email protected] | Product Owner |
| Dmitri Venger | [@dmitrivenger](https://github.com/dmitrivenger) | [email protected] | Project Manager |
| Bogdan Mingela | [@Mingela](https://github.com/Mingela) | [email protected] | Product Manager |
| Marin Veršić | [@mversic](https://github.com/mversic) | [email protected] | Tech lead; Development: Rust, Java/Kotlin |
| Sam H. Smith | [@SamHSmith](https://github.com/SamHSmith) | [email protected] | Development: Rust, C, Python |
| Dmitry Balashov | [@0x009922](https://github.com/0x009922) | [email protected] | Development: Rust, TypeScript, JavaScript |
| Grzegorz Bazior | [@baziorek](https://github.com/baziorek) | [email protected] | Development: C++, Python |
| Shunkichi Sato | [@s8sato](https://github.com/s8sato) | [email protected] | Development: Rust |
| Andrey Kostiuchenko | [@arndey](https://github.com/arndey) | [email protected] | Developer: Java, Kotlin |
| Timur Guskov | [@gv-timur](https://github.com/gv-timur) | [email protected] | Development: Java |
| Dmitriy Creed | [@Cre-eD](https://github.com/Cre-eD) | [email protected] | DevSecOps |
| Andrey Kostiuchenko | [@arndey](https://github.com/arndey) | [email protected] | Development: Java/Kotlin |
| Vasily Zyabkin | [@BAStos525](https://github.com/BAStos525) | [email protected] | DevOps |
| Insaf Safin | [@safinsaf](https://github.com/safinsaf) | [email protected] | DevOps |
| Ekaterina Mekhnetsova | [@outoftardis](https://github.com/outoftardis) | [email protected] | Documentation |
| Alexandra Zorina | [@a-zorina](https://github.com/a-zorina) | [email protected] | Documentation |
| William Richter | [@WRRicht3r](https://github.com/WRRicht3r) | [email protected] | Documentation |
| Nurzhan Sakén | [@nxsaken](https://github.com/nxsaken) | [email protected] | Community manager, documentation, development: Rust, Kotlin |
| Victor Gridnevsky | [@6r1d](https://github.com/6r1d) | [email protected] | Community manager, documentation, development: JavaScript, TypeScript, Python |
| Alexander Strokov | [@astrokov7](https://github.com/astrokov7) | [email protected] | QA, Python |
| Mykhailo Lohachov | [@mikuyako](https://github.com/aoyako) | [email protected] | Development: Rust |
| Alexander Strokov | [@astrokov7](https://github.com/astrokov7) | [email protected] | QA; Python |
| Michael Timofeev | [@timofeevmd](https://github.com/timofeevmd) | [email protected] | QA |
| Nikita Strygin | [@DCNick3](https://github.com/DCNick3) | [email protected] | Development: Rust |
| Bogdan Yamkovoy | [@yamkovoy](https://github.com/yamkovoy) | [email protected] | Documentation |
| Vladislav Amuzinski | [@VAmuzing](https://github.com/VAmuzing) | [email protected] | Development: Rust |
| Artem Stukalov | [@Stukalov-A-M](https://github.com/Stukalov-A-M) | [email protected] | Documentation: examples |
| Dmitry Murzin | [@dima74](https://github.com/dima74) | [email protected] | Development: Rust |
3 changes: 1 addition & 2 deletions crates/iroha/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ iroha_torii_const = { workspace = true }
iroha_version = { workspace = true }

iroha_data_model = { workspace = true, features = ["http"] }
iroha_multisig_data_model = { workspace = true }
iroha_executor_data_model = { workspace = true }

attohttpc = { version = "0.28.0", default-features = false }
eyre = { workspace = true }
Expand Down Expand Up @@ -88,7 +88,6 @@ iroha_test_network = { workspace = true }

mint_rose_trigger_data_model = { path = "../../data_model/samples/mint_rose_trigger_data_model" }
executor_custom_data_model = { path = "../../data_model/samples/executor_custom_data_model" }
iroha_executor_data_model = { workspace = true }

tokio = { workspace = true, features = ["rt-multi-thread"] }
reqwest = { version = "0.12.7", features = ["json"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/iroha/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ mod secrecy;

pub use iroha_crypto as crypto;
pub use iroha_data_model as data_model;
pub use iroha_multisig_data_model as multisig_data_model;
pub use iroha_executor_data_model as executor_data_model;
Loading

0 comments on commit 5cfe4df

Please sign in to comment.