Skip to content
This repository has been archived by the owner on May 21, 2024. It is now read-only.

Trappist node refactor #206

Merged
merged 17 commits into from
Jun 1, 2023
Merged

Trappist node refactor #206

merged 17 commits into from
Jun 1, 2023

Conversation

hbulgarini
Copy link
Contributor

Trappist Node Refactor

This PR constitutes a complete node refactor for the Trappist project. The motivation behind this change has been deliberated and documented in issue #177.

General

  • Introduces a clear directory structure similar to the Cumulus project.
  • Consolidates to a single node binary that contains both trappist and stout runtimes, now named trappist-node. The binary was renamed from trappist-collator to trappist-node in line with the more accurate description of it as a node executing the collator function.

service.rs

The functions new_partial, start_node_impl, and start_aura_node now include generics to process different runtimes, thereby avoiding code duplication.

command.rs

  • The macros construct_benchmark_partials and construct_async_run have been added/modified to supply the corresponding runtime API types.

Chain Specifications

A substantial amount of repetitive code has now been moved to node/chain_specs/mod.rs.

Limitations

For simplicity's sake, we assume that the setup of runtime APIs is identical for Trappist and Stout runtimes. Should there be a disparity between the two, the service file would need to be modified in a way that allows for the processing of different service functions, since the RuntimeApi types will differ.

Closes #177.

@stiiifff stiiifff merged commit 1aa9992 into main Jun 1, 2023
5 checks passed
@stiiifff stiiifff deleted the hb-node-refactor branch June 1, 2023 21:04
This was referenced Jun 5, 2023
Closed
Merged
stiiifff pushed a commit that referenced this pull request Jun 6, 2023
@valentinfernandez1 @hbulgarini
[Backport] #206 Trappist node and #207 workspace refactor to v0.9.40 (#…
2e3c910 
…209)

* cherry-picked changes

* WIP fixing node service¨

* Upgrade fixes, missing stout trait bound error

* workspace refactor

* added dex to stout

* fmt

---------

Co-authored-by: Hector Bulgarini <hbulgarini@gmail.com>
@hbulgarini hbulgarini mentioned this pull request Jun 6, 2023
Closed
hbulgarini added a commit that referenced this pull request Jul 31, 2023
@hbulgarini @valentinfernandez1
@kalaninja @brunopgalvao @dependabot
Release 0.9.42 to main. (#250)
f378496 
* Upgrade to v0.9.40 (#171)

* Upgraded to 9-40 missing some fixes

* Added XCM v3 Traits (Need to configure)

* Added fee per MB

* Added XCM V3 Configs

* Fix XCM_config and node service

* Removed chess pallet

* pallet_contracts and pallet_xcm fix

* rust fmt

* Quick fix to contracts on stout and pallet-dex dependancie

* Added hardware check to service

* Fixed stout service

* Review fixes

* run tests on CI (#174)
(cherry picked from commit d826938)

* fmt

* review fix

* review fix

* fmt

* Fixed xcm-playground error

---------

Co-authored-by: Valentin Fernandez <valentin@parity.io>
Co-authored-by: Alexander Kalankhodzhaev <kalansoft@gmail.com>

* Backport Drop Assets (#189)

Backport PR #165 (cherry picked from commit 3f1c483) in Trappist v0.9.40 and updates it to match the changes included in polkadot v0.9.38 to v0.9.40. Weights were re benchmarked to match weightsV2.
---------

Co-authored-by: Valentin Fernandez <valentin@parity.io>

* asset-registry backport (#193)

Backport PR #173 (cherry picked from commit 24552f3) in Trappist v0.9.40 and updates it to match the changes included in polkadot v0.9.38 to v0.9.40. Weights were re benchmarked to match weightsV2.

Co-authored-by: Valentin Fernandez <valentin@parity.io>

* fix CI for substrate version update (#198)

* Backport Zombienet and CI testing (#194)

* zombienet refactor and ci fix

* swap-storage removed from CI

* ci fix

* CI fix

---------

Co-authored-by: Valentin Fernandez <valentin@parity.io>

* Backport Lockdown-pallet  (#191)

* lockdown-pallet backport

* Add lockdown mode activation to lockdown-mode pallet's `GenesisConfig` (#176)

* add activating lockdown mode to GenesisConfig

* add activating lockdown mode to test ext

* add tests for activating lockdown mode in GenesisConfig

* cargo fmt -p pallet-lockdown-mode

* fix linting

* add activated to benchmark

* removing, as this is already in another test

* setting initial state to true, therefore no longer need to manually change state

* rename activated in genesisConfig to initial_status

---------

Co-authored-by: Valentin Fernandez <valentin@parity.io>
Co-authored-by: Bruno Galvao <brunopgalvao@gmail.com>

* [Backport] #185  XCM benchmarks from `pallet_xcm_benchmarks` to v0.9.40 (#201)

* backport xcm_benchmarks

* Co-Authored-By: hbulgarini <hbulgarini@gmail.com>

* fix

* add profile "production" (#187)

---------

Co-authored-by: Alexander Kalankhodzhaev <kalansoft@gmail.com>

* [Backport] #206 Trappist node and #207 workspace refactor to v0.9.40 (#209)

* cherry-picked changes

* WIP fixing node service¨

* Upgrade fixes, missing stout trait bound error

* workspace refactor

* added dex to stout

* fmt

---------

Co-authored-by: Hector Bulgarini <hbulgarini@gmail.com>

* Query account balances using `accounts_common` (#202)

* query_account_balances added

* fmt

* Added assets-common dependency from Cumulus

---------

Co-authored-by: Steve Degosserie <steve@parity.io>

* [Backport] #220 Apache License and #223 Minor Refactoring (#228)

* backport apache license

* backport minor refactoring PR #223

* fmt

* Refactor `WeightToFee` to include ProofSize (#215)

* Removed FixedRateOfFungibles

* fmt

* added comments

* fmt

* removed unused imports

* fmt

* removed allow unpaid execution from rockmine following PR #211

* Include new traders from PR #221

* minor fixes

* minor fixes

* fmt

* [Backport] Asset-registry fix,  Bump Docker and add preimage to benchmarks (#229)

* Validate `MultiLocation` for asset-registry  (#224)

* Validate location for register_reserve_asset

* fmt

* fmt

* fmt

* validator refactor

* fmt

* fix `pallet_xcm_benchmarks::generic::claim_asset` benchmark (#226)

* Bump docker/login-action from 2.1.0 to 2.2.0 (#219)

Bumps [docker/login-action](https://github.com/docker/login-action) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@f4ef78c...465a078)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump docker/metadata-action from 4.4.0 to 4.5.0 (#218)

Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Commits](docker/metadata-action@c4ee3ad...2c0bd77)

---
updated-dependencies:
- dependency-name: docker/metadata-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix network id in tests

* fix network id in tests

* Add missing import

* include preimage to benchmarks

* Bump docker/metadata-action from 4.5.0 to 4.6.0 (#233)

Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Commits](docker/metadata-action@2c0bd77...818d4b7)

---
updated-dependencies:
- dependency-name: docker/metadata-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump docker/build-push-action from 4.0.0 to 4.1.1 (#232)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4.0.0 to 4.1.1.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@3b5e802...2eb1c19)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Alexander Kalankhodzhaev <kalansoft@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* WIP

* WeightToFee updated to use FeePolynomial. Based on the implementation in the asset-hub

* finish upgrade

* update deps

* Addressing check account

* Fix

* fmt

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: valentinfernandez1 <33705477+valentinfernandez1@users.noreply.github.com>
Co-authored-by: Valentin Fernandez <valentin@parity.io>
Co-authored-by: Alexander Kalankhodzhaev <kalansoft@gmail.com>
Co-authored-by: Bruno Galvao <brunopgalvao@gmail.com>
Co-authored-by: Steve Degosserie <steve@parity.io>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Valentin Fernandez <tinchofernandez8@gmail.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@stiiifff stiiifff stiiifff approved these changes

@valentinfernandez1 valentinfernandez1 valentinfernandez1 left review comments

@kalaninja kalaninja Awaiting requested review from kalaninja

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Trappist node refactor
3 participants
@hbulgarini @stiiifff @valentinfernandez1