Call a contract #165

ascjones · 2020-09-16T12:45:48Z

Make the contract call extrinsic work, and update the contracts tests so they can run in parallel and all succeed.

Note: the contracts tests require a node-template based runtime with contracts enabled running.

# Conflicts: # src/frame/contracts.rs

…chain purge

dvdplm · 2020-09-18T13:14:39Z

This looks interesting. I get Metadata(ModuleNotFound("Contracts")) when I try to run these tests, likely because of how I run the node (client/run.sh).

ascjones · 2020-09-21T08:18:44Z

Yeah the contracts module is not included in the test runtime at the moment. We could consider adding it, at the cost of increasing complexity of the test node.

But it does beg the question as to whether we should add all modules to that, in which case it would just become node-runtime. I don't know the answer to that but we need to figure it out

dvdplm · 2020-09-21T08:27:49Z

But it does beg the question as to whether we should add all modules to that, in which case it would just become node-runtime. I don't know the answer to that but we need to figure it out

Agreed. I'm fine with a heavy-handed interim solution. Can you spell out the pros/cons to using the whole node-runtime?

ascjones · 2020-09-21T08:59:59Z

Well now that there exists tagged releases of substrate on docker: https://hub.docker.com/r/parity/substrate/tags we could use one of those on CI.

So pros: don't need a dependency, or to compile the maintain the whole node runtime. Cons: some CI setup.

I think it could work: #169.

dvdplm

Good stuff. I think the account generation and nonce handling stuff is useful enough to warrant making it available to other code as well; can be done in a diff PR though.

dvdplm · 2020-09-22T18:48:36Z

src/frame/contracts.rs

@@ -115,44 +116,164 @@ pub struct InstantiatedEvent<T: Contracts> {
    pub contract: <T as System>::AccountId,
 }

+/// Contract execution event.
+///
+/// Raised upon successful executionFailing  of a contract call


Suggested change

/// Raised upon successful executionFailing of a contract call

/// Emitted upon successful execution/failure of a contract call

dvdplm · 2020-09-22T18:50:10Z

src/frame/contracts.rs

+pub struct ContractExecutionEvent<T: Contracts> {
+    /// Caller of the contract.
+    pub caller: <T as System>::AccountId,
+    /// Raw contract event data


Is this SCALE encoded data that is runtime dependent or can we say anything at all about the content?

The data is the encoded contract event, I will update the comment

dvdplm · 2020-09-22T18:53:51Z

src/frame/contracts.rs

+                .unwrap()
+                .nonce;
+            let local_nonce = STASH_NONCE
+                .fetch_update(Ordering::SeqCst, Ordering::SeqCst, |x| Some(x + 1))


Why not fetch_add()?

dvdplm · 2020-09-22T18:57:41Z

src/frame/contracts.rs

+    }
+
+    impl TestContext {
+        async fn init() -> Self {


I think this is useful enough that it might be worth making it generic over the runtime and put it in a test-utils.rs for use in other places.

dvdplm · 2020-09-22T18:58:16Z

src/frame/contracts.rs

+        }
+
+        /// generate a new keypair for an account, and fund it so it can perform smart contract operations
+        async fn generate_account(


Same as above: consider making this available to other code.

src/frame/contracts.rs

ascjones · 2020-09-24T15:45:22Z

the account generation and nonce handling stuff is useful enough to warrant making it available to other code as well; can be done in a diff PR though.

#176

* master: Call a contract (#165)

@ascjones

* Upgrade to substrate 2.0.0 * WIP implement Subcommand manually (see paritytech/substrate#6894 (comment)) * Add pallet-staking/std to the std feature * Sort out the subcommand impl * Sort out the module index (ty @ascjones) Sort out the RefCount type (ty @dvc94ch) Random tweaks to make test-node more similar to the vanilla node-template * obey the fmt * Add changelog and bump versions * Merge #165 and update CHANGELOG * Update test-node/runtime/src/lib.rs Co-authored-by: Demi Marie Obenour <demiobenour@gmail.com> * Update CHANGELOG.md Co-authored-by: Demi Marie Obenour <demiobenour@gmail.com> Co-authored-by: Demi Marie Obenour <demiobenour@gmail.com>

ascjones added 11 commits September 14, 2020 13:44

Revert contracts put_code test to pure code (not using the macro)

9a86802

Test contract instantiate

0e7bc2d

Fmt

92bcd26

Extract put_code and new_client functions

e5800f4

Merge branch 'master' into aj-contract-call

a958819

# Conflicts: # src/frame/contracts.rs

Generate fresh accounts for contract tests to allow reruns without a …

c6906c0

…chain purge

Fetch and increment nonce to allow concurrent test runs

477cac9

fmt

f12013e

Failing contract call test

e7c9eb2

Fmt and fix compilation

4b5ef63

Fix error message for contract call

f6f9c61

Fix call test

635f958

ascjones marked this pull request as ready for review September 22, 2020 15:32

ascjones requested a review from dvdplm September 22, 2020 15:33

dvdplm approved these changes Sep 22, 2020

View reviewed changes

Update contract execution event comment

ae82617

ascjones mentioned this pull request Sep 24, 2020

Upgrade to substrate 2.0.0 #173

Merged

ascjones added 5 commits September 24, 2020 16:29

Merge branch 'master' into aj-contract-call

2c85d21

Remove redundant feature flags, now on module

3f4ae68

Update event data comment

779cb18

Use fetch_add

6684552

Fmt

93b4e61

ascjones mentioned this pull request Sep 24, 2020

Extract integration test helpers from contracts tests #176

Closed

dvdplm approved these changes Sep 24, 2020

View reviewed changes

dvdplm merged commit 385d214 into master Sep 24, 2020

dvdplm added a commit that referenced this pull request Sep 24, 2020

Merge branch 'master' into dp-prep-release-v0.13

cc93b69

* master: Call a contract (#165)

dvdplm added a commit that referenced this pull request Sep 24, 2020

Merge #165 and update CHANGELOG

374cbe8

ascjones deleted the aj-contract-call branch September 25, 2020 07:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Call a contract #165

Call a contract #165

ascjones commented Sep 16, 2020 •

edited

Loading

dvdplm commented Sep 18, 2020

ascjones commented Sep 21, 2020

dvdplm commented Sep 21, 2020

ascjones commented Sep 21, 2020

dvdplm left a comment

dvdplm Sep 22, 2020

dvdplm Sep 22, 2020

ascjones Sep 24, 2020

dvdplm Sep 22, 2020

dvdplm Sep 22, 2020

dvdplm Sep 22, 2020

ascjones commented Sep 24, 2020

	/// Raised upon successful executionFailing of a contract call
	/// Emitted upon successful execution/failure of a contract call

Call a contract #165

Call a contract #165

Conversation

ascjones commented Sep 16, 2020 • edited Loading

dvdplm commented Sep 18, 2020

ascjones commented Sep 21, 2020

dvdplm commented Sep 21, 2020

ascjones commented Sep 21, 2020

dvdplm left a comment

Choose a reason for hiding this comment

dvdplm Sep 22, 2020

Choose a reason for hiding this comment

dvdplm Sep 22, 2020

Choose a reason for hiding this comment

ascjones Sep 24, 2020

Choose a reason for hiding this comment

dvdplm Sep 22, 2020

Choose a reason for hiding this comment

dvdplm Sep 22, 2020

Choose a reason for hiding this comment

dvdplm Sep 22, 2020

Choose a reason for hiding this comment

ascjones commented Sep 24, 2020

ascjones commented Sep 16, 2020 •

edited

Loading