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

[Nara] Restric curators deletion powers #4874

Merged
merged 23 commits into from
Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b4efb82
fix(#4589) restric content curation deletion powers
mnaamani Sep 15, 2023
615713d
fix(content benchmarks) fix weights for content pallet
mnaamani Sep 16, 2023
6c944c4
chore(integration tests) include missing content flows from full scen…
mnaamani Sep 16, 2023
8802a1e
correct permission to delete video assets
mnaamani Sep 18, 2023
27ebbd4
fix(github workflow) github runner running out of space, run docker s…
mnaamani Sep 18, 2023
3c91e99
drop ContentModerationAction DeleteChannel, DeleteVideo enum variants
mnaamani Sep 19, 2023
985fad1
Merge branch 'nara' into nara-restric-curators-del-powers
mnaamani Sep 19, 2023
7ad10a7
add missing import for StorageVersion trait
mnaamani Sep 19, 2023
7c2ebba
content pallet: drop enum variants DeleteVideo, DeleteChannel from cu…
mnaamani Sep 20, 2023
a60933f
content-pallet: clippy fixes
mnaamani Sep 20, 2023
e759b32
content pallet migrations: log level/permission migrations
mnaamani Sep 26, 2023
a2c62eb
Merge branch 'nara' into nara-restric-curators-del-powers
mnaamani Sep 26, 2023
4c3ebc7
Merge branch 'nara_remove_channel_and_video_deletion_mappings_and_cli…
mnaamani Sep 26, 2023
20bbf7f
runtime upgrade test pre-post tests only
mnaamani Sep 27, 2023
79e9d70
Merge branch 'nara' into nara-restric-curators-del-powers
mnaamani Sep 27, 2023
60364d1
update chain metadata
mnaamani Sep 27, 2023
f59e6d3
runtime upgrade test pre-upgrade create curator groups
mnaamani Sep 27, 2023
8170034
hire content lead before pre-upgrade runtime tests
mnaamani Sep 27, 2023
8bff348
use tx instead of call to construct extrinsic
mnaamani Sep 27, 2023
89e4320
Merge branch 'nara' into nara-restric-curators-del-powers
mnaamani Sep 28, 2023
9b70ead
integration tests additional checks on curator permissions migrations
mnaamani Sep 28, 2023
fa21827
content migrations - try-runtime log curator groups after migration
mnaamani Sep 28, 2023
65cd38c
make some diskspace for github runner for docker builds of joystream/…
mnaamani Sep 30, 2023
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
10 changes: 9 additions & 1 deletion .github/workflows/joystream-apps-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ jobs:
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Build joystream-node
run: RUNTIME_PROFILE=TESTING ./build-node-docker.sh
run: |
RUNTIME_PROFILE=TESTING ./build-node-docker.sh
# reclaim some disk space
docker system prune --force

# docker/build-push-action doc:
# Be careful because any file mutation in the steps that precede the
Expand All @@ -59,6 +62,8 @@ jobs:
push: false
load: true
tags: joystream/storage-node:latest
- name: reclaim disk space
run: docker system prune --force
- name: Build distributor-node
uses: docker/build-push-action@v3
with:
Expand All @@ -68,6 +73,8 @@ jobs:
push: false
load: true
tags: joystream/distributor-node:latest
- name: reclaim disk space
run: docker system prune --force
- name: Build query-node
uses: docker/build-push-action@v3
with:
Expand All @@ -80,6 +87,7 @@ jobs:

- name: Test with latest images
run: |
docker system prune --force
yarn build:packages
cp docker-compose-no-bind-volumes.yml docker-compose.yml
./tests/network-tests/run-tests.sh content-directory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/joystream-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
if: env.GIT_DIFF
- name: run_migrations test
run: |
RUN_MIGRATION_TESTS=true RUST_LOG=info cargo +nightly-2022-11-15 test --release --features try-runtime
RUN_MIGRATION_TESTS=true RUST_LOG=info cargo +nightly-2022-11-15 test remote_tests::run_migrations --release --features try-runtime
if: env.GIT_DIFF
- name: Staging Runtime
env:
Expand Down
1 change: 1 addition & 0 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion chain-metadata.json

Large diffs are not rendered by default.

88 changes: 0 additions & 88 deletions cli/src/commands/content/deleteChannelAsModerator.ts

This file was deleted.

98 changes: 0 additions & 98 deletions cli/src/commands/content/deleteVideoAsModerator.ts

This file was deleted.

2 changes: 1 addition & 1 deletion distributor-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@joystream/metadata-protobuf": "^2.8.0",
"@joystream/opentelemetry": "1.0.0",
"@joystream/storage-node-client": "^3.0.0",
"@joystream/types": "^2.0.0",
"@joystream/types": "^3.0.0",
"@oclif/command": "^1",
"@oclif/config": "^1",
"@oclif/plugin-help": "^3",
Expand Down
3 changes: 2 additions & 1 deletion docker-compose-no-bind-volumes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ services:
container_name: joystream-node
volumes:
- chain-data:/data
command: --dev --alice --validator --pruning=archive --unsafe-ws-external --unsafe-rpc-external --rpc-methods Safe --rpc-cors=all --log runtime --base-path /data
command: "--dev --alice --validator --pruning=archive --unsafe-ws-external --unsafe-rpc-external
--rpc-methods Safe --rpc-cors=all --log runtime --base-path /data --no-hardware-benchmarks"
ports:
- 9944:9944
- 9933:9933
Expand Down
2 changes: 1 addition & 1 deletion joystreamjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"dependencies": {
"@joystream/metadata-protobuf": "^2.8.1",
"@joystream/types": "^2.0.0",
"@joystream/types": "^3.0.0",
"@polkadot/util-crypto": "9.5.1",
"axios": "^1.2.1",
"buffer": "^6.0.3",
Expand Down
2 changes: 1 addition & 1 deletion query-node/chain-metadata/2002.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions query-node/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ typegen:
- content.VideoUpdated
- content.VideoDeleted
- content.ChannelDeleted
# Channel,Video deletion by Moderator deprecated in spec 2002 (nara) but keeping here
# to be able to process events from older runtime
- content.ChannelDeletedByModerator
- content.VideoDeletedByModerator
- content.ChannelAssetsDeletedByModerator
Expand Down
3 changes: 3 additions & 0 deletions runtime-modules/content/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ frame-benchmarking = { package = 'frame-benchmarking', default-features = false,
working-group = { package = 'pallet-working-group', default-features = false, path = '../working-group', optional = true}
sp-core = { package = 'sp-core', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '50cf239147a6f569e563bcadec6c7a1c5ad5c67e'}

# util
log = { version = "0.4.17", default-features = false }

[dev-dependencies]
sp-io = { package = 'sp-io', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '50cf239147a6f569e563bcadec6c7a1c5ad5c67e'}
pallet-timestamp = { package = 'pallet-timestamp', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '50cf239147a6f569e563bcadec6c7a1c5ad5c67e'}
Expand Down
Loading
Loading