Contracts: Remove ED from base deposit

[pgherveou]

• Update internal logic so that the storage_base_deposit does not include ED
• add v16 migration to update ContractInfo struct with this change

Before:

After:

[pgherveou]

@athei, I just reviewed this code, I wonder if we should use max here instead of adding ED
if not then the nit updates in this PR remove the unrelevant comments

polkadot-sdk/substrate/frame/contracts/src/storage.rs

Lines 222 to 225 in 6508866

	// Instantiate needs to transfer at least the minimum balance in order to pull the
	// contract's own account into existence, as the deposit itself does not contribute to the
	// `ed`.
	let deposit = info_deposit.saturating_add(upload_deposit).saturating_add(ed);

[athei]

I think this is a left over when we had a separate account for deposits. Then the deposit was free and could keep the deposit account alive. Hence we needed to make sure that it is high enough. Now we have the deposits on the main account which has always gets the ed on instantiate:

polkadot-sdk/substrate/frame/contracts/src/storage/meter.rs

Lines 453 to 454 in 6508866

	// We need to make sure that the contract's account exists.
	T::Currency::transfer(origin, contract, ed, Preservation::Preserve)?;

AFAIK we neither need max nor add here.

[pgherveou]

I think this is a left over when we had a separate account for deposits. Then the deposit was free and could keep the deposit account alive. Hence we needed to make sure that it is high enough. Now we have the deposits on the main account which has always gets the ed on instantiate:

polkadot-sdk/substrate/frame/contracts/src/storage/meter.rs

Lines 453 to 454 in 6508866

	// We need to make sure that the contract's account exists.
	T::Currency::transfer(origin, contract, ed, Preservation::Preserve)?;

AFAIK we neither need max nor add here.

Yep that make sense, will amend the PR

[pgherveou]

well actually, never mind this is correct, we just take into account the ED in the base and don't charge for it twice.

/~https://github.com/paritytech/polkadot-sdk/blob/6f81a4a09270a5930b8786e2dc765347078b4d4a/substrate/frame/contracts/src/storage/meter.rs?plain=1#L461j

[athei]

Yes it seems correct but it seems to be redundant to add it just to remove it again. The deposit also can be smaller than the ed with no problem. I think it is leftover code and we can just clean it up.

[pgherveou]

bot bench substrate-pallet --pallet=pallet_contracts

[athei]

Good catch. Yes the deposit has to add up to the reserved amount.

One note: Even with the migration the reserved amount might have a mismatch with the recorded deposit. Reason is that we probably refunded a tiny bit too much when refunding. Because we assumed that we had more deposit than we actually had. But I am not sure about that.

[pgherveou]

bot bench substrate-pallet --pallet=pallet_contracts

[command-bot]

@pgherveou https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/5869709 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/polkadot-sdk/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 6-be124f7e-37bd-48e1-89cb-362295c36ef6 to cancel this command or bot cancel to cancel all commands in this pull request.

[paritytech-cicd-pr]

The CI pipeline was cancelled due to failure one of the required jobs.
Job name: test-linux-stable 2/3
Logs: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/5869579

[pgherveou]

bot bench substrate-pallet --pallet=pallet_contracts

[command-bot]

@pgherveou https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/5872017 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/polkadot-sdk/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 7-e250f04b-0a70-48c7-9866-900d0be3affb to cancel this command or bot cancel to cancel all commands in this pull request.

[command-bot]

@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/polkadot-sdk/-/jobs/5869709 has finished. If any artifacts were generated, you can download them from https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/5869709/artifacts/download.

[command-bot]

@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/polkadot-sdk/-/jobs/5872017 has finished. If any artifacts were generated, you can download them from https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/5872017/artifacts/download.

[pgherveou]

bot help

[command-bot]

Here's a link to docs