`seal_reentrant_count` returns contract reentrant count #11539

yarikbratashchuk · 2022-05-29T11:52:54Z

This PR addresses #11082.

agryaznov

Thank you for the PR! Here is the first review round. Also please try to make the CI green.

frame/contracts/fixtures/reentrant_count_call.wat

frame/contracts/src/wasm/runtime.rs

frame/contracts/src/wasm/mod.rs

frame/contracts/src/tests.rs

frame/contracts/fixtures/reentrant_count_call.wat

frame/contracts/src/exec.rs

frame/contracts/src/wasm/runtime.rs

frame/contracts/src/exec.rs

frame/contracts/fixtures/reentrant_count_call.wat

frame/contracts/src/wasm/mod.rs

frame/contracts/fixtures/reentrant_count_call.wat

athei

Please consider using some tooling to format your wat files if you can't do it by hand. This is also way too light on tests. It just tests the bare minimum happy case. The interaction with delegate calls needs to be tested.

frame/contracts/src/wasm/runtime.rs

frame/contracts/src/exec.rs

frame/contracts/src/wasm/runtime.rs

frame/contracts/fixtures/reentrant_count_call.wat

frame/contracts/fixtures/account_entrance_count_call.wat

frame/contracts/src/benchmarking/mod.rs

frame/contracts/src/wasm/runtime.rs

frame/contracts/fixtures/account_entrance_count_call.wat

frame/contracts/src/tests.rs

frame/contracts/fixtures/account_entrance_count_call.wat

frame/contracts/fixtures/reentrant_count_delegated_call.wat

agryaznov · 2022-10-30T13:22:01Z

frame/contracts/fixtures/account_entrance_count_call.wat

+	(func (export "call")
+		(local $account_entrance_count i32)
+
+		;; Reading "callee" contract address (which is the address of the caller)


I meant here that the way the contract fixture is being called, and hence the expected state of the call stack - this all should be set in the outer unit test, and no assumption on this regard should be hard-coded into the fixture. Just return the account_entrance_count with $seal_return and check it outside the contract.

agryaznov

Please merge master and address the highlighted issues (just a few left).

Artemka374 · 2022-11-07T13:20:54Z

Could you review again please? I updated everything, should be ok

frame/contracts/fixtures/reentrant_count_delegated_call.wat

frame/contracts/src/benchmarking/mod.rs

frame/contracts/fixtures/reentrant_count_delegated_call.wat

frame/contracts/fixtures/reentrant_count_call.wat

frame/contracts/fixtures/account_entrance_count_call.wat

Artemka374 · 2022-11-10T13:01:24Z

fixed

agryaznov

could you please satisfy the CI?

agryaznov · 2022-11-10T14:19:35Z

/benchmark runtime pallet pallet_contracts

athei · 2022-11-10T20:01:56Z

/cmd queue -c bench-bot $ pallet dev pallet_contracts

command-bot · 2022-11-10T20:02:00Z

@athei https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2033704 was started for your command "$PIPELINE_SCRIPTS_DIR/bench-bot.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 /cmd cancel 34-7f834d54-341a-42a3-b7bf-50b7d69d8e36 to cancel this command or /cmd cancel to cancel all commands in this pull request.

athei · 2022-11-10T20:04:43Z

@cr4pt0 Can you please sign the CLA or we can't merge? Or anyone rewrite the branch to remove the commit in question.

command-bot · 2022-11-10T21:34:02Z

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

Artemka374 · 2022-11-11T14:39:17Z

we can't get the signature right now, because this person is not working with us now, so I opened another pull request with all these changes.

Artemka374 · 2022-11-11T16:13:30Z

CI is satisfied there, just need some approvals again

athei · 2022-11-11T16:15:30Z

Replaced by #12695

yarikbratashchuk added 5 commits May 20, 2022 12:15

Add logic, test, broken benchmark

a8214fd

Merge branch 'master' into seal_reentrant_count

143c158

Merge branch 'master' into seal_reentrant_count

219eb84

account_entrance_count

fccd751

Addressing comments

0a70239

yarikbratashchuk requested a review from athei as a code owner May 29, 2022 11:52

agryaznov suggested changes Jun 1, 2022

View reviewed changes

Address @agryaznov's comments

6f3655a

yarikbratashchuk force-pushed the master branch from 523a683 to 6f3655a Compare June 1, 2022 16:29

yarikbratashchuk requested a review from agryaznov June 1, 2022 16:30

agryaznov suggested changes Jun 1, 2022

View reviewed changes

frame/contracts/src/wasm/runtime.rs Outdated Show resolved Hide resolved

yarikbratashchuk added 2 commits June 2, 2022 13:56

Add test for account_entrance_count, fix ci

f29884b

Cargo fmt

72c8f83

yarikbratashchuk force-pushed the master branch from 6cf2fd9 to 72c8f83 Compare June 2, 2022 12:22

Fix tests

0f6f894

yarikbratashchuk force-pushed the master branch from 5be2650 to 0f6f894 Compare June 2, 2022 17:41

Fix tests

949c438

yarikbratashchuk requested a review from agryaznov June 5, 2022 18:23

xgreenx mentioned this pull request Jun 10, 2022

allow_reentrancy modifier for messages use-ink/ink#1285

Open

agryaznov suggested changes Jun 12, 2022

View reviewed changes

Remove delegated call from test, address comments

f34b6da

athei reviewed Jun 17, 2022

View reviewed changes

yarikbratashchuk added 4 commits June 21, 2022 18:14

Minor fixes and indentation in wat files

a036585

Update test for account_entrance_count

3be772e

Update reentrant_count_call test

5fdc100

Delegate call test

b656c88

yarikbratashchuk force-pushed the master branch from dd2fa63 to b656c88 Compare June 24, 2022 12:29

yarikbratashchuk requested a review from athei June 24, 2022 13:01

athei added A0-please_review Pull request needs code review. labels Jun 24, 2022

stale bot added the A5-stale Pull request did not receive any updates in a long time. No review needed at this stage. Close it. label Oct 11, 2022

stale bot closed this Oct 26, 2022

agryaznov reopened this Oct 30, 2022

agryaznov reviewed Oct 30, 2022

View reviewed changes

agryaznov suggested changes Oct 30, 2022

View reviewed changes

stale bot removed A5-stale Pull request did not receive any updates in a long time. No review needed at this stage. Close it. labels Oct 30, 2022

Artemka374 added 3 commits November 2, 2022 14:28

Merge remote-tracking branch 'paritytech/master'

ee63f37

fix compilation errors and apply some suggestions

3463795

apply suggestions

1649d37

cargo fmt

8d94425

agryaznov reviewed Nov 9, 2022

View reviewed changes

apply suggestions

0e48a2d

agryaznov approved these changes Nov 10, 2022

View reviewed changes

Merge remote-tracking branch 'paritytech/master'

7db2660

athei closed this Nov 11, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`seal_reentrant_count` returns contract reentrant count #11539

`seal_reentrant_count` returns contract reentrant count #11539

yarikbratashchuk commented May 29, 2022

agryaznov left a comment

athei left a comment •

edited

Loading

agryaznov Oct 30, 2022

agryaznov left a comment

Artemka374 commented Nov 7, 2022 •

edited

Loading

Artemka374 commented Nov 10, 2022

agryaznov left a comment

agryaznov commented Nov 10, 2022

athei commented Nov 10, 2022

command-bot bot commented Nov 10, 2022 •

edited

Loading

athei commented Nov 10, 2022

command-bot bot commented Nov 10, 2022

Artemka374 commented Nov 11, 2022

Artemka374 commented Nov 11, 2022

athei commented Nov 11, 2022

seal_reentrant_count returns contract reentrant count #11539

seal_reentrant_count returns contract reentrant count #11539

Conversation

yarikbratashchuk commented May 29, 2022

agryaznov left a comment

Choose a reason for hiding this comment

athei left a comment • edited Loading

Choose a reason for hiding this comment

agryaznov Oct 30, 2022

Choose a reason for hiding this comment

agryaznov left a comment

Choose a reason for hiding this comment

Artemka374 commented Nov 7, 2022 • edited Loading

Artemka374 commented Nov 10, 2022

agryaznov left a comment

Choose a reason for hiding this comment

agryaznov commented Nov 10, 2022

athei commented Nov 10, 2022

command-bot bot commented Nov 10, 2022 • edited Loading

athei commented Nov 10, 2022

command-bot bot commented Nov 10, 2022

Artemka374 commented Nov 11, 2022

Artemka374 commented Nov 11, 2022

athei commented Nov 11, 2022

`seal_reentrant_count` returns contract reentrant count #11539

`seal_reentrant_count` returns contract reentrant count #11539

athei left a comment •

edited

Loading

Artemka374 commented Nov 7, 2022 •

edited

Loading

command-bot bot commented Nov 10, 2022 •

edited

Loading