Contracts Add deposit for dependencies #14079

pgherveou · 2023-05-04T14:46:41Z

cumulus companion: paritytech/cumulus#2913

To prevent a contract to be removed when it's invoked via delegate_call, this PR introduces two new runtime functions add_delegate_dependency and remove_delegate_dependency.

add_delegate_dependency will increase the refcount for the code hash, and add it to the new delegate_dependencies field of the Contract info. In order to prevent abuse adding a dependency will be protected by a percentage of the storage deposit of the original code.

Likewise, since instantiating a contract, increment the refcount, the same amount will be added to the base deposit for using this code hash.

To make these updates possible we introduce the following new configuration fields:

/// The maximum number of delegate dependencies that a contract can lock with `add_delegate_dependency`.
#[pallet::constant]
type MaxDelegateDependencies: Get<u32>;

/// The percentage of the storage deposit that should be held for using a code hash.
/// Instantiating a contract, or calling `add_delegate_dependency` (for contract delegation) protects
/// the code from being removed. In order to prevent abuse these actions are protected with
/// a percentage of the code deposit.
#[pallet::constant]
type CodeHashLockupDepositPercent: Get<Perbill>;

pgherveou · 2023-05-05T19:54:58Z

bot bench $ pallet dev pallet_contracts

command-bot · 2023-05-05T19:55:03Z

@pgherveou https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2791408 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" pallet dev pallet_contracts. Check out https://gitlab.parity.io/parity/mirrors/substrate/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 13-69bf6ef0-c7b8-4642-929f-baff9a20b46a to cancel this command or bot cancel to cancel all commands in this pull request.

command-bot · 2023-05-06T17:09:39Z

@pgherveou Command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" pallet dev pallet_contracts has finished. Result: https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2791408 has finished. If any artifacts were generated, you can download them from https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2791408/artifacts/download.

frame/contracts/src/exec.rs

pgherveou · 2023-05-09T07:03:47Z

This is going to require a migration as well for adding a property to ContractInfo

pgherveou · 2023-05-09T09:19:37Z

Also since the length of the encoded ContractInfo can vary based on the size of the dependencies, we might need to alter the benchmark to take the worst situation into account (aka fill the map with max dependencies)?

athei

The terminate benchmark needs to be done with max dependencies in order to account for the worst case. We need to check how bad this is. It is 32 transfers. Could be prohibitive.

frame/contracts/src/storage.rs

frame/contracts/src/exec.rs

frame/contracts/src/storage/meter.rs

athei · 2023-05-10T13:22:07Z

Post-merge PR

Add v12 migration step that adds the dependencies to the contract info

I think we should leave that PR open until the new migration system is merged. So we avoid the situation of a master with missing migrations.

pgherveou · 2023-07-03T15:58:23Z

merging master after #14084 , might need to self review a few things before it's ready for review again

pgherveou · 2023-07-25T21:39:42Z

bot bench $ pallet dev pallet_contracts

command-bot · 2023-07-25T21:39:45Z

@pgherveou Positional arguments are not supported anymore. I guess you meant bot bench substrate-pallet --pallet=pallet_contracts, but I could be wrong.
Read docs to find out how to run your command.

pgherveou · 2023-07-25T21:41:01Z

bot bench substrate-pallet --pallet=pallet_contracts

command-bot · 2023-07-25T21:41:05Z

@pgherveou https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/3261305 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" --subcommand=pallet --runtime=dev --target_dir=substrate --pallet=pallet_contracts. Check out https://gitlab.parity.io/parity/mirrors/substrate/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 19-9b158607-97de-4c77-a93b-5b8efd12b4c4 to cancel this command or bot cancel to cancel all commands in this pull request.

… HEAD

…=dev --target_dir=substrate --pallet=pallet_contracts

command-bot · 2023-07-25T23:18:46Z

@pgherveou Command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" --subcommand=pallet --runtime=dev --target_dir=substrate --pallet=pallet_contracts has finished. Result: https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/3261305 has finished. If any artifacts were generated, you can download them from https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/3261305/artifacts/download.

frame/contracts/src/lib.rs

Co-authored-by: Juan <juangirini@gmail.com>

frame/contracts/src/storage/meter.rs

frame/contracts/src/tests.rs

agryaznov · 2023-07-26T10:26:14Z

frame/contracts/src/weights.rs

+		//  Measured:  `709`
+		//  Estimated: `9124`
+		// Minimum execution time: 42_457_000 picoseconds.
+		Weight::from_parts(44_556_000, 9124)


This one increased markedly, on both dimensions. Any ideas why?

We did that when you were off #14523 but did not update the bench

hm but that one changed v12 migration, while the weights change in question is for the v10 one.

ah right 🤔

pgherveou · 2023-07-26T10:34:03Z

bot merge

paritytech-processbot · 2023-07-26T10:34:11Z

Error: "Check reviews" status is not passing for paritytech/cumulus#2913

pgherveou · 2023-07-26T12:08:54Z

bot merge

* Companion PR for paritytech/substrate#14079 * update lockfile for {"substrate", "polkadot"} --------- Co-authored-by: parity-processbot <>

pgherveou changed the title ~~pg/delegate deposit~~ Contracts Add deposit for dependencies May 4, 2023

pgherveou force-pushed the pg/delegate_deposit branch 4 times, most recently from c0069e8 to 51000ec Compare May 5, 2023 12:59

pgherveou marked this pull request as ready for review May 5, 2023 19:53

pgherveou requested a review from athei as a code owner May 5, 2023 19:53

pgherveou commented May 8, 2023

View reviewed changes

frame/contracts/src/exec.rs Outdated Show resolved Hide resolved

pgherveou commented May 8, 2023

View reviewed changes

frame/contracts/src/exec.rs Outdated Show resolved Hide resolved

athei reviewed May 10, 2023

View reviewed changes

frame/contracts/src/storage.rs Outdated Show resolved Hide resolved

frame/contracts/src/exec.rs Outdated Show resolved Hide resolved

frame/contracts/src/exec.rs Outdated Show resolved Hide resolved

frame/contracts/src/storage/meter.rs Outdated Show resolved Hide resolved

pgherveou requested review from a team May 30, 2023 09:59

pgherveou changed the base branch from master to pg/frame-add-translate_next June 1, 2023 09:39

Base automatically changed from pg/frame-add-translate_next to master June 2, 2023 14:11

pgherveou mentioned this pull request Jul 4, 2023

contracts: Refactor instantiate with code #14503

Merged

pgherveou force-pushed the pg/delegate_deposit branch from c4c4e7b to 3cafdb6 Compare July 4, 2023 11:10

pgherveou changed the base branch from master to pg/simplify_instantiate_with_code July 4, 2023 11:11

pgherveou added 2 commits July 5, 2023 11:33

wip

304d84b

fixes

4e80ea6

fx lint

9627c4c

command-bot added 2 commits July 25, 2023 21:44

Merge branch 'master' of https://github.com/paritytech/substrate into…

ebb49fe

… HEAD

".git/.scripts/commands/bench/bench.sh" --subcommand=pallet --runtime…

e0fe397

…=dev --target_dir=substrate --pallet=pallet_contracts

pgherveou requested a review from agryaznov July 26, 2023 07:27

juangirini reviewed Jul 26, 2023

View reviewed changes

frame/contracts/src/lib.rs Outdated Show resolved Hide resolved

Update frame/contracts/src/lib.rs

9a888e5

Co-authored-by: Juan <juangirini@gmail.com>

juangirini reviewed Jul 26, 2023

View reviewed changes

frame/contracts/src/storage/meter.rs Show resolved Hide resolved

juangirini reviewed Jul 26, 2023

View reviewed changes

frame/contracts/src/tests.rs Show resolved Hide resolved

agryaznov reviewed Jul 26, 2023

View reviewed changes

agryaznov approved these changes Jul 26, 2023

View reviewed changes

juangirini approved these changes Jul 26, 2023

View reviewed changes

paritytech-processbot bot merged commit 9780579 into master Jul 26, 2023

paritytech-processbot bot deleted the pg/delegate_deposit branch July 26, 2023 12:09

pgherveou mentioned this pull request Sep 25, 2023

contracts: Fix incorrect storage alias in mirgration paritytech/polkadot-sdk#1687

Merged

crystalin mentioned this pull request Oct 20, 2023

Update substrate/polkadot/cumulus from v0.9.43 to v1.1.0 moonbeam-foundation/moonbeam#2535

Closed

CanonicalJP mentioned this pull request Oct 23, 2023

PR14079 Contracts Add deposit for dependencies paritytech/polkadot-sdk#1980

Open

JesseAbram mentioned this pull request Oct 26, 2023

Update substrate and subxt entropyxyz/entropy-core#435

Merged

Marcin-Radecki mentioned this pull request Feb 8, 2024

A0-4022: Enable pallet contract migrations v12 to v15 Cardinal-Cryptography/aleph-node#1610

Merged

ascjones mentioned this pull request Feb 9, 2024

delegate_dependency api calls use-ink/ink#2076

Merged

simonsso mentioned this pull request Feb 22, 2024

Upgrade polkadot-sdk NodleCode/chain#813

Merged

19 tasks

ashutoshvarma mentioned this pull request Feb 27, 2024

feat: update to polkadot v1.1.0 release AstarNetwork/Astar#1182

Merged

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Contracts Add deposit for dependencies #14079

Contracts Add deposit for dependencies #14079

pgherveou commented May 4, 2023 •

edited

Loading

pgherveou commented May 5, 2023

command-bot bot commented May 5, 2023 •

edited

Loading

command-bot bot commented May 6, 2023

pgherveou commented May 9, 2023

pgherveou commented May 9, 2023

athei left a comment

athei commented May 10, 2023

pgherveou commented Jul 3, 2023

pgherveou commented Jul 25, 2023

command-bot bot commented Jul 25, 2023

pgherveou commented Jul 25, 2023

command-bot bot commented Jul 25, 2023 •

edited

Loading

command-bot bot commented Jul 25, 2023

agryaznov Jul 26, 2023

pgherveou Jul 26, 2023

agryaznov Jul 26, 2023

pgherveou Jul 26, 2023

pgherveou commented Jul 26, 2023

paritytech-processbot bot commented Jul 26, 2023

pgherveou commented Jul 26, 2023

Contracts Add deposit for dependencies #14079

Contracts Add deposit for dependencies #14079

Conversation

pgherveou commented May 4, 2023 • edited Loading

pgherveou commented May 5, 2023

command-bot bot commented May 5, 2023 • edited Loading

command-bot bot commented May 6, 2023

pgherveou commented May 9, 2023

pgherveou commented May 9, 2023

athei left a comment

Choose a reason for hiding this comment

athei commented May 10, 2023

pgherveou commented Jul 3, 2023

pgherveou commented Jul 25, 2023

command-bot bot commented Jul 25, 2023

pgherveou commented Jul 25, 2023

command-bot bot commented Jul 25, 2023 • edited Loading

command-bot bot commented Jul 25, 2023

agryaznov Jul 26, 2023

Choose a reason for hiding this comment

pgherveou Jul 26, 2023

Choose a reason for hiding this comment

agryaznov Jul 26, 2023

Choose a reason for hiding this comment

pgherveou Jul 26, 2023

Choose a reason for hiding this comment

pgherveou commented Jul 26, 2023

paritytech-processbot bot commented Jul 26, 2023

pgherveou commented Jul 26, 2023

pgherveou commented May 4, 2023 •

edited

Loading

command-bot bot commented May 5, 2023 •

edited

Loading

command-bot bot commented Jul 25, 2023 •

edited

Loading