feat(wallet): new command to publish a contract definition transaction #4133

mrnaveira · 2022-05-24T13:56:34Z

Description

Created a new transaction output features for the Contract Definition
- For simplicity, I decided to leave out fields that could be more coupled to the template format.
- The contract_id is calculated as a hash of the contents of the contract definition, in the line of what is described in the RFCs. I used ConsensusHashWriter to make it totally consistent.
- I created a new Output Features version to signal the consensus breaking changes.
- Had to update the genesis block struct to include the new features
- Had to update the gRPC types to include the new features
Created a new command in the tari console wallet (publish-contract-definition):
1. Reads the contract definition from a JSON file. I defined auxiliary structs (base_layer/wallet/src/assets/contract_definition.rs) to decouple the file format from the output features.
2. Created a new transaction with the CONTRACT_DEFNITION flag and the new Contract Definition output features.
3. Publishes the corresponding UTXO into the network.
Right now the base layer does not perform any check in the values in the contract definition. In the future we want to implement custom consensus rules for contract definition (like avoiding duplicates, spending requirements, etc.) but I purposely left that out of this PR for simplicity.

Motivation and Context

As a user, I want to be able to publish a new contract definition into the network through the console wallet.

How Has This Been Tested?

Created a new unit test for the consensus encoding of the new Contract Definition output features
Created a new integration test for the wallet CLI that reads the contract definition from a JSON file and successfully publishes the transaction

integration_tests/features/WalletCli.feature

sdbondi

Looks good - approved with few minor comments

base_layer/core/src/transactions/transaction_components/contract_definition_features.rs

SWvheerden

This looks good.
I just have an issue with the derive(Hash)
And a question about the one type

SWvheerden · 2022-05-25T06:28:57Z

base_layer/core/src/transactions/transaction_components/contract_definition_features.rs

+// Fixed lenght of all string fields in the contract definition
+const STR_LEN: usize = 32;
+
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, Hash)]


Suggested change

#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, Hash)]

#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq)]

This is not the same Hash trait we use, this is the rust one std::hash

I did it because output_features.rs (which is the "parent" struct) derives the standard that Hash trait, so it makes it required to do it here as well

mmm, wonder why it has it...
It looks like it could be removed, but I think that's for another PR

SWvheerden · 2022-05-25T06:29:46Z

base_layer/core/src/transactions/transaction_components/contract_definition_features.rs

+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, Hash)]


Suggested change

#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, Hash)]

#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq)]

SWvheerden · 2022-05-25T06:29:58Z

base_layer/core/src/transactions/transaction_components/contract_definition_features.rs

+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, Hash)]


Suggested change

#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, Hash)]

#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq)]

SWvheerden · 2022-05-25T06:30:12Z

base_layer/core/src/transactions/transaction_components/contract_definition_features.rs

+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, Hash)]


Suggested change

#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, Hash)]

#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq)]

base_layer/wallet/src/assets/contract_definition.rs

…ct_definition_features.rs Co-authored-by: Stan Bondi <[email protected]>

sdbondi

+1

stringhandler

Nice. I want to note that the public functions may not look like that in the final form, but this is fine for a start

mrnaveira added 22 commits May 11, 2022 11:06

create initial version of the command

563f47f

parse contract definition json file

63facab

complete contract definition structure

2791478

move contract features to base layer wallet

5c50f9d

boilerplate for contract definition transaction

f38c147

Merge branch 'development' of https://github.com/mrnaveira/tari into ud1

e2badc2

create integration test

387e613

test that block is mined

46ec143

flag a broken wallet-cli test

9421515

create simple feature for contract definition

43c047e

Merge branch 'development' of https://github.com/mrnaveira/tari into ud1

4c84fa2

use the new flag for contract definition

e856921

create nested contract specification

254bcf3

make contract_issuer field into a public key

f725362

make contract_id field as a hash

56b0327

add public function struct

b107fc8

add function ref type

489dcd0

assert transaction status in integration test

4d85a3a

show proper feedback in wallet cli

d2657cf

improve naming and comments in the new features

cfd7097

simplify contract definition features mapping

28168e4

remove old TODO comment

37e583e

brianp reviewed May 24, 2022

View reviewed changes

integration_tests/features/WalletCli.feature Outdated Show resolved Hide resolved

mrnaveira added 4 commits May 24, 2022 16:24

allow many lines in wallet handle request

7d7ce58

fix integration test lint warnings

1bbda7c

add cucumber flag for dan_layer tests

0170b4b

auto-calculate contract_id as a hash

8246eb2

sdbondi previously approved these changes May 25, 2022

View reviewed changes

base_layer/core/src/transactions/transaction_components/contract_definition_features.rs Outdated Show resolved Hide resolved

base_layer/core/src/transactions/transaction_components/contract_definition_features.rs Outdated Show resolved Hide resolved

SWvheerden reviewed May 25, 2022

View reviewed changes

mrnaveira dismissed sdbondi’s stale review via 9f05111 May 25, 2022 07:15

mrnaveira and others added 2 commits May 25, 2022 08:15

Update base_layer/core/src/transactions/transaction_components/contra…

9f05111

…ct_definition_features.rs Co-authored-by: Stan Bondi <[email protected]>

make contract_name an array

f37684d

sdbondi previously approved these changes May 25, 2022

View reviewed changes

sdbondi added the mq-approved label May 25, 2022

Merge branch 'development' into ud1

79ba18f

sdbondi removed the mq-approved label May 25, 2022

aviator-app bot added the mq-failed label May 25, 2022

mrnaveira marked this pull request as draft May 25, 2022 11:00

sdbondi removed the mq-failed label May 25, 2022

aviator-app bot added the mq-failed label May 25, 2022

mrnaveira added 2 commits May 25, 2022 12:22

make all string fields as fixed strings

57a9fe1

Merge branch 'ud1' of https://github.com/mrnaveira/tari into ud1

0be5c20

mrnaveira dismissed sdbondi’s stale review via 0be5c20 May 25, 2022 11:30

make contract_issuer a public key type

05e98c4

mrnaveira marked this pull request as ready for review May 25, 2022 11:59

mrnaveira added 3 commits May 25, 2022 13:06

Merge branch 'development' into ud1

02fc05d

solve conflicts with development branch

00ba098

Merge branch 'development' of https://github.com/mrnaveira/tari into ud1

2d747b6

stringhandler previously approved these changes May 26, 2022

View reviewed changes

stringhandler added the mq-approved label May 26, 2022

Merge branch 'development' of https://github.com/mrnaveira/tari into ud1

a04c499

mrnaveira dismissed stringhandler’s stale review via a04c499 May 26, 2022 14:05

remove unnecesary println

795653b

mrnaveira requested a review from stringhandler May 26, 2022 14:42

stringhandler approved these changes May 26, 2022

View reviewed changes

aviator-app bot removed the mq-failed label May 26, 2022

Merge branch 'development' into ud1

5157f02

aviator-app bot merged commit b4991a4 into tari-project:development May 26, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(wallet): new command to publish a contract definition transaction #4133

feat(wallet): new command to publish a contract definition transaction #4133

mrnaveira commented May 24, 2022 •

edited

Loading

sdbondi left a comment

SWvheerden left a comment

SWvheerden May 25, 2022

mrnaveira May 25, 2022

SWvheerden May 26, 2022

SWvheerden May 25, 2022

SWvheerden May 25, 2022

SWvheerden May 25, 2022

sdbondi left a comment

stringhandler left a comment

	#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, Hash)]
	#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq)]

feat(wallet): new command to publish a contract definition transaction #4133

feat(wallet): new command to publish a contract definition transaction #4133

Conversation

mrnaveira commented May 24, 2022 • edited Loading

Description

Motivation and Context

How Has This Been Tested?

sdbondi left a comment

Choose a reason for hiding this comment

SWvheerden left a comment

Choose a reason for hiding this comment

SWvheerden May 25, 2022

Choose a reason for hiding this comment

mrnaveira May 25, 2022

Choose a reason for hiding this comment

SWvheerden May 26, 2022

Choose a reason for hiding this comment

SWvheerden May 25, 2022

Choose a reason for hiding this comment

SWvheerden May 25, 2022

Choose a reason for hiding this comment

SWvheerden May 25, 2022

Choose a reason for hiding this comment

sdbondi left a comment

Choose a reason for hiding this comment

stringhandler left a comment

Choose a reason for hiding this comment

mrnaveira commented May 24, 2022 •

edited

Loading