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

Refactor container chain spawning logic to not need require embeded node outside of collation #627

Merged
merged 13 commits into from
Jul 23, 2024
Merged

Refactor container chain spawning logic to not need require embeded node outside of collation #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b726aff
move in/out crates between tanssi and dancekit
nanocryk Jul 15, 2024
03f67bd
remove generic MaxLengthTokenSymbol
nanocryk Jul 16, 2024
395b7f9
remove need for embeded node + fmt
nanocryk Jul 16, 2024
49e6425
update OrchestratorChainInterface
nanocryk Jul 16, 2024
a2c7a5d
docs
nanocryk Jul 16, 2024
f12fbef
fix issues following dancekit bump
nanocryk Jul 17, 2024
abb8684
fix polkadot-sdk commit hash in lock
nanocryk Jul 17, 2024
a6d0ef5
clippy + try to fix ts tests
nanocryk Jul 17, 2024
45a16d8
fmt
nanocryk Jul 17, 2024
91527ce
fix not getting genesis data in best block
nanocryk Jul 19, 2024
e5ff9c6
add back removed log
nanocryk Jul 19, 2024
e80e9c0
Merge remote-tracking branch 'origin/master' into jeremy-orchestrator…
nanocryk Jul 19, 2024
01f5df8
Merge remote-tracking branch 'origin/master' into jeremy-orchestrator…
nanocryk Jul 22, 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
136 changes: 70 additions & 66 deletions Cargo.lock
View file
Open in desktop

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

7 changes: 5 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ tanssi-relay-encoder = { path = "runtime/relay-encoder", default-features = fals
tanssi-relay-service = { path = "solo-chains/node/tanssi-relay-service", default-features = false }
tanssi-runtime-common = { path = "runtime/common", default-features = false }
tc-consensus = { path = "client/consensus" }
tc-orchestrator-chain-rpc-interface = { path = "client/orchestrator-chain-rpc-interface" }
tp-author-noting-inherent = { path = "primitives/author-noting-inherent", default-features = false }
tp-container-chain-genesis-data = { path = "primitives/container-chain-genesis-data", default-features = false }
tp-fungibles-ext = { path = "primitives/fungibles-ext", default-features = false }
tp-maths = { path = "primitives/maths", default-features = false }
tp-traits = { path = "primitives/traits", default-features = false }
Expand All @@ -108,9 +108,10 @@ pallet-cc-authorities-noting = { git = "https://github.com/moondance-labs/dancek
pallet-xcm-executor-utils = { git = "https://github.com/moondance-labs/dancekit", branch = "tanssi-polkadot-v1.11.0", default-features = false }
test-relay-sproof-builder = { git = "https://github.com/moondance-labs/dancekit", branch = "tanssi-polkadot-v1.11.0", default-features = false }

dp-container-chain-genesis-data = { git = "https://github.com/moondance-labs/dancekit", branch = "tanssi-polkadot-v1.11.0", default-features = false }

# Dancekit (client)
dc-orchestrator-chain-interface = { git = "https://github.com/moondance-labs/dancekit", branch = "tanssi-polkadot-v1.11.0" }
dc-orchestrator-chain-rpc-interface = { git = "https://github.com/moondance-labs/dancekit", branch = "tanssi-polkadot-v1.11.0" }

# Moonkit (wasm)
async-backing-primitives = { git = "https://github.com/moondance-labs/moonkit", branch = "tanssi-polkadot-v1.11.0", default-features = false }
Expand Down Expand Up @@ -206,6 +207,7 @@ sc-network-test = { git = "https://github.com/moondance-labs/polkadot-sdk", bran
sc-network-transactions = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.11.0" }
sc-offchain = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.11.0" }
sc-rpc = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.11.0" }
sc-rpc-api = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.11.0", default-features = false }
sc-service = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.11.0" }
sc-sysinfo = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.11.0" }
sc-telemetry = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.11.0" }
Expand Down Expand Up @@ -342,6 +344,7 @@ similar-asserts = "1.1.0"
tempfile = "3.1.0"
thiserror = { version = "1.0.48" }
tokio = { version = "1.32.0", default-features = false }
tokio-stream = "0.1.15"
tokio-util = { version = "0.7.10", default-features = false }
tracing = { version = "0.1.37", default-features = false }
tracing-subscriber = { version = "0.3.18" }
Expand Down
5 changes: 2 additions & 3 deletions client/consensus/src/collators/basic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with Tanssi. If not, see <http://www.gnu.org/licenses/>.

use crate::collators::ClaimMode;
use {
crate::{
collators as collator_util, consensus_orchestrator::RetrieveAuthoritiesFromOrchestrator,
OrchestratorAuraWorkerAuxData,
collators as collator_util, collators::ClaimMode,
consensus_orchestrator::RetrieveAuthoritiesFromOrchestrator, OrchestratorAuraWorkerAuxData,
},
cumulus_client_collator::{
relay_chain_driven::CollationRequest, service::ServiceInterface as CollatorServiceInterface,
Expand Down
Loading
Loading