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

Separate out collection creator and owner permissions #14307

Merged
merged 3 commits into from
Aug 21, 2024

Conversation

JohnChangUK
Copy link
Member

@JohnChangUK JohnChangUK commented Aug 17, 2024

Description

Separate out collections permissions from creator and collection owner. 2 points:

  1. Cannot transfer collections created by creator by default.
  2. Can transfer collections created by collection owner by default.

Feature gated

Notes

  • Existing collection and token functionality remains
  • New functions for creating collections with owner
  • Minting via collection owner are added

New Functions

  1. collection.move
    • create_fixed_collection_as_owner
    • create_unlimited_collection_as_owner
  2. token.move
    • create_token_as_collection_owner
    • create_numbered_token_as_collection_owner
    • create_named_token_as_collection_owner
    • create_named_token_from_seed_as_collection_owner

Copy link

trunk-io bot commented Aug 17, 2024

⏱️ 7h 22m total CI duration on this PR
Job Cumulative Duration Recent Runs
execution-performance / single-node-performance 1h 12m 🟩🟥🟩🟩
forge-compat-test / forge 49m 🟩🟥🟩
forge-framework-upgrade-test / forge 49m 🟥🟩🟩
forge-e2e-test / forge 45m 🟩🟩🟩
execution-performance / test-target-determinator 18m 🟩🟩🟩🟩
test-target-determinator 17m 🟩🟩🟩🟩
check 14m 🟩🟩🟩🟩
rust-images / rust-all 14m 🟩
rust-cargo-deny 12m 🟩🟩🟩🟩🟩 (+2 more)
general-lints 12m 🟩🟩🟩🟩🟩 (+2 more)
rust-move-unit-coverage 10m 🟩
rust-move-unit-coverage 9m 🟩
rust-move-unit-coverage 9m 🟩
rust-move-tests 9m 🟩
rust-move-tests 9m 🟩
rust-move-tests 8m 🟩
rust-move-tests 8m 🟩
rust-move-tests 8m 🟩
rust-move-tests 8m 🟩
rust-move-tests 8m 🟩
rust-move-unit-coverage 8m 🟩
check-dynamic-deps 8m 🟩🟩🟩🟩🟩 (+2 more)
rust-move-unit-coverage 8m 🟩
rust-doc-tests 5m 🟩
rust-doc-tests 5m 🟩
rust-doc-tests 5m 🟩
rust-doc-tests 4m 🟩
semgrep/ci 3m 🟩🟩🟩🟩🟩 (+2 more)
file_change_determinator 1m 🟩🟩🟩🟩🟩 (+2 more)
file_change_determinator 1m 🟩🟩🟩🟩🟩 (+2 more)
file_change_determinator 45s 🟩🟩🟩🟩
Backport PR 42s 🟥🟩
permission-check 27s 🟩🟩🟩🟩🟩 (+2 more)
permission-check 21s 🟩🟩🟩🟩🟩 (+2 more)
permission-check 19s 🟩🟩🟩🟩🟩 (+2 more)
permission-check 19s 🟩🟩🟩🟩🟩 (+2 more)
permission-check 13s 🟩🟩🟩🟩
determine-docker-build-metadata 9s 🟩🟩🟩🟩
permission-check 4s 🟩🟩

🚨 1 job on the last run was significantly faster/slower than expected

Job Duration vs 7d avg Delta
forge-framework-upgrade-test / forge 17m 14m +23%

settingsfeedbackdocs ⋅ learn more about trunk.io

Copy link

codecov bot commented Aug 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.4%. Comparing base (432b972) to head (65156b8).
Report is 2 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #14307   +/-   ##
=======================================
  Coverage    59.4%    59.4%           
=======================================
  Files         838      838           
  Lines      204587   204587           
=======================================
  Hits       121572   121572           
  Misses      83015    83015           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

@msmouse msmouse added the v1.18 label Aug 21, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Copy link
Contributor

✅ Forge suite realistic_env_max_load success on 65156b88d2c52c6c1a4c0363a88edcdcddb2e4e4

two traffics test: inner traffic : committed: 11891.36 txn/s, latency: 3346.70 ms, (p50: 3300 ms, p90: 3900 ms, p99: 5400 ms), latency samples: 4521340
two traffics test : committed: 99.96 txn/s, latency: 3046.16 ms, (p50: 2800 ms, p90: 3600 ms, p99: 9900 ms), latency samples: 1720
Latency breakdown for phase 0: ["QsBatchToPos: max: 0.264, avg: 0.226", "QsPosToProposal: max: 0.557, avg: 0.465", "ConsensusProposalToOrdered: max: 0.353, avg: 0.335", "ConsensusOrderedToCommit: max: 0.727, avg: 0.653", "ConsensusProposalToCommit: max: 1.060, avg: 0.987"]
Max non-epoch-change gap was: 0 rounds at version 0 (avg 0.00) [limit 4], 1.12s no progress at version 2455666 (avg 0.24s) [limit 15].
Max epoch-change gap was: 0 rounds at version 0 (avg 0.00) [limit 4], 7.30s no progress at version 2455664 (avg 7.30s) [limit 15].
Test Ok

Copy link
Contributor

✅ Forge suite framework_upgrade success on d1bf834728a0cf166d993f4728dfca54f3086fb0 ==> 65156b88d2c52c6c1a4c0363a88edcdcddb2e4e4

Compatibility test results for d1bf834728a0cf166d993f4728dfca54f3086fb0 ==> 65156b88d2c52c6c1a4c0363a88edcdcddb2e4e4 (PR)
Upgrade the nodes to version: 65156b88d2c52c6c1a4c0363a88edcdcddb2e4e4
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1197.02 txn/s, submitted: 1198.64 txn/s, failed submission: 1.62 txn/s, expired: 1.62 txn/s, latency: 2691.43 ms, (p50: 2100 ms, p90: 5100 ms, p99: 6600 ms), latency samples: 103460
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1148.76 txn/s, submitted: 1151.02 txn/s, failed submission: 2.26 txn/s, expired: 2.26 txn/s, latency: 3014.04 ms, (p50: 2400 ms, p90: 6400 ms, p99: 7800 ms), latency samples: 101640
5. check swarm health
Compatibility test for d1bf834728a0cf166d993f4728dfca54f3086fb0 ==> 65156b88d2c52c6c1a4c0363a88edcdcddb2e4e4 passed
Upgrade the remaining nodes to version: 65156b88d2c52c6c1a4c0363a88edcdcddb2e4e4
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1258.83 txn/s, submitted: 1260.92 txn/s, failed submission: 2.09 txn/s, expired: 2.09 txn/s, latency: 2638.10 ms, (p50: 2100 ms, p90: 5100 ms, p99: 6400 ms), latency samples: 108320
Test Ok

Copy link
Contributor

✅ Forge suite compat success on d1bf834728a0cf166d993f4728dfca54f3086fb0 ==> 65156b88d2c52c6c1a4c0363a88edcdcddb2e4e4

Compatibility test results for d1bf834728a0cf166d993f4728dfca54f3086fb0 ==> 65156b88d2c52c6c1a4c0363a88edcdcddb2e4e4 (PR)
1. Check liveness of validators at old version: d1bf834728a0cf166d993f4728dfca54f3086fb0
compatibility::simple-validator-upgrade::liveness-check : committed: 10870.01 txn/s, latency: 2694.71 ms, (p50: 2400 ms, p90: 3000 ms, p99: 15700 ms), latency samples: 423260
2. Upgrading first Validator to new version: 65156b88d2c52c6c1a4c0363a88edcdcddb2e4e4
compatibility::simple-validator-upgrade::single-validator-upgrading : committed: 6863.68 txn/s, latency: 4017.71 ms, (p50: 4500 ms, p90: 4900 ms, p99: 5000 ms), latency samples: 128560
compatibility::simple-validator-upgrade::single-validator-upgrade : committed: 7554.45 txn/s, latency: 4236.09 ms, (p50: 4400 ms, p90: 4700 ms, p99: 5000 ms), latency samples: 252980
3. Upgrading rest of first batch to new version: 65156b88d2c52c6c1a4c0363a88edcdcddb2e4e4
compatibility::simple-validator-upgrade::half-validator-upgrading : committed: 7281.03 txn/s, latency: 3754.28 ms, (p50: 4200 ms, p90: 4500 ms, p99: 4800 ms), latency samples: 136580
compatibility::simple-validator-upgrade::half-validator-upgrade : committed: 6496.91 txn/s, latency: 4839.97 ms, (p50: 4700 ms, p90: 7400 ms, p99: 7800 ms), latency samples: 236880
4. upgrading second batch to new version: 65156b88d2c52c6c1a4c0363a88edcdcddb2e4e4
compatibility::simple-validator-upgrade::rest-validator-upgrading : committed: 11507.54 txn/s, latency: 2327.78 ms, (p50: 2400 ms, p90: 3000 ms, p99: 3400 ms), latency samples: 202080
compatibility::simple-validator-upgrade::rest-validator-upgrade : committed: 10976.93 txn/s, latency: 2940.89 ms, (p50: 2800 ms, p90: 3900 ms, p99: 4700 ms), latency samples: 362200
5. check swarm health
Compatibility test for d1bf834728a0cf166d993f4728dfca54f3086fb0 ==> 65156b88d2c52c6c1a4c0363a88edcdcddb2e4e4 passed
Test Ok

@JohnChangUK JohnChangUK merged commit 15c641a into main Aug 21, 2024
51 checks passed
@JohnChangUK JohnChangUK deleted the collection-permission branch August 21, 2024 23:50
github-actions bot pushed a commit that referenced this pull request Aug 21, 2024
* Separate out collection creator and owner permissions

* Separate out collection creator and owner permissions

(cherry picked from commit 15c641a)

# Conflicts:
#	aptos-move/aptos-release-builder/src/components/feature_flags.rs
#	aptos-move/framework/move-stdlib/doc/features.md
#	aptos-move/framework/move-stdlib/sources/configs/features.move
#	types/src/on_chain_config/aptos_features.rs
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
aptos-release-v1.18

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants