Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

introduce FormBlockInputs and break out some code from form_block into its own method #1625

Merged
merged 3 commits into from
Mar 14, 2022
Merged

introduce FormBlockInputs and break out some code from form_block into its own method #1625

merged 3 commits into from
Mar 14, 2022
+208 −149

Conversation

eranrund
Copy link
Contributor

Motivation

The consensus enclave's form_block method currently receives the list of encrypted transactions paired with membership proofs in one of its arguments, and uses that to form a new block. As we add more transaction types, the list of arguments will start to grow and require a tedious change across the various enclave crates. I am encountering this in the minting branch, and figured this is a small enough change to bring in immediately which will help keep minting-related PRs shorter.

In this PR

  • Add a new FormBlockInputs struct that can easily be extended to add more transaction types that will be fed into the enclave
  • Break out a bunch of transaction validation code form_block was doing into its own method, so that form_block can be easier to read and maintain.

eranrund
eranrund commented Mar 14, 2022
View reviewed changes
consensus/enclave/impl/src/lib.rs
/// Given a list of well formed encrypted txs + proofs and a root membership
/// element, decrypt and validate "original" Tx transactions, and if
/// successful return the list of transactions.
fn get_txs_from_inputs(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All this stuff was moved from form_block.

eranrund
eranrund commented Mar 14, 2022
View reviewed changes
consensus/enclave/api/src/lib.rs
@@ -318,7 +326,7 @@ pub trait ConsensusEnclave: ReportableEnclave {
fn form_block(
&self,
parent_block: &Block,
encrypted_txs_with_proofs: &[(WellFormedEncryptedTx, Vec<TxOutMembershipProof>)],
inputs: FormBlockInputs,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switching to this struct means that adding new transaction types doesn't involve changing a bunch of traits, messages, mocks, etc. Just the callers to form_block and the actual implementation.

@eranrund eranrund self-assigned this Mar 14, 2022
@eranrund eranrund merged commit 25b433e into master Mar 14, 2022
@eranrund eranrund deleted the eran/form-block-inputs-and-misc-cleanup branch March 14, 2022 22:42
eranrund added a commit that referenced this pull request Mar 15, 2022
@eranrund @dependabot @cbeck88
Eran/merge master 2022 03 14 (#1629)
4198b9a 
* Update grpcio to 0.10 (#1592)

* Bump pretty_assertions from 1.1.0 to 1.2.0 (#1610)

Bumps [pretty_assertions](https://github.com/colin-kiegel/rust-pretty-assertions) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/colin-kiegel/rust-pretty-assertions/releases)
- [Changelog](https://github.com/colin-kiegel/rust-pretty-assertions/blob/main/CHANGELOG.md)
- [Commits](https://github.com/colin-kiegel/rust-pretty-assertions/commits)

---
updated-dependencies:
- dependency-name: pretty_assertions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* delete slam, fixes #1574 (#1611)

slam is no longer needed because fog-distro, which began life
as a fork of it, has superceded it and slam is no longer used in
CD

* introduce FormBlockInputs and break out some code from form_block into its own method (#1625)

* introduce FormBlockInputs and break out some code from form_block into its own method

* add some missing code

* add missing import

* remove the Copy trait from ConsensusValue  (#1628)

* remove the Copy and Display traits from ConsensusValue since they make it hard to add transaction types that cant implement them

* add back display

* fmt

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Chris Beck <beck.ct@gmail.com>
eranrund added a commit that referenced this pull request Mar 22, 2022
@eranrund @sugargoat
@dependabot @cbeck88
MintTx and MintConfigTx transactions (#1651)
cacb574 
* Add master minters configuration to TokensConfig (#1504)

* minting configuration wip

* fmt

* fix indent

* fix test

* add test, be more aggressive about validation

* use serde(with=...)

* one line

* Minting data types and initial LedgerDb support (#1537)

* initial mint data structures

* basic mint config in ledger

* basic get/set test

* another test

* update total minted api+tests

* add migration code

* enforce limit

* lock and lint

* fmt

* update comment and remove pub

* update lock files

* misc pr review fixes

* add a test for setting an active configuration with no configs

* small fixes

* use PEM encoding for signers

* fix tag

* ensure total minted amount cannot decrease

* use inconsistent_digit_grouping to make version numbers more readable

* fmt

* MintTx/Config protobuf conversions (#1558)

* add external.proto minting messages and api conversion traits

* tests

* mint tx conversions

* lint

* fix module name

* Store mint-related transations in LedgerDb (#1587)

* wip

* remove BlockContents::new to make adding new fields less tedious

* fix typos/lints

* add todo

* fix typos

* more defaults

* tests

* iterate

* more tests

* remove unneeded public api

* more tests

* more tests

* stricter validation

* reorganize code

* lint

* add mint migration code

* mint_tx_store test no. 1

* dont allow overwriting existing blocks, iterate on test

* pr fixes

* lint

* more tests

* add test

* remove unneeded type declaration

* Update ledger/db/src/mint_config_store.rs

Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* rename test to better explain what its testing

* be more strict about having outputs when MintTxs are present

Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* Expose LedgerDb API for looking up txs by nonce (#1602)

* wip

* remove BlockContents::new to make adding new fields less tedious

* fix typos/lints

* add todo

* fix typos

* more defaults

* tests

* iterate

* more tests

* remove unneeded public api

* more tests

* more tests

* stricter validation

* reorganize code

* lint

* add mint migration code

* mint_tx_store test no. 1

* dont allow overwriting existing blocks, iterate on test

* pr fixes

* lint

* more tests

* add test

* remove unneeded type declaration

* add public ledger api for looking up mint txs by nonce, change to return block index since that is more useful

* missing mock changes

* fix fmt

* Update ledger/db/src/mint_config_store.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* fix typo

* Update ledger/db/src/mint_config_store.rs

Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* rename test to better explain what its testing

* be more strict about having outputs when MintTxs are present

* add public ledger api for looking up mint txs by nonce, change to return block index since that is more useful

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>
Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* Minting transaction validation (#1593)

* wip

* remove BlockContents::new to make adding new fields less tedious

* fix typos/lints

* add todo

* fix typos

* more defaults

* tests

* iterate

* more tests

* remove unneeded public api

* more tests

* more tests

* stricter validation

* reorganize code

* lint

* add mint migration code

* mint_tx_store test no. 1

* dont allow overwriting existing blocks, iterate on test

* pr fixes

* lint

* more tests

* add test

* remove unneeded type declaration

* add public ledger api for looking up mint txs by nonce, change to return block index since that is more useful

* missing mock changes

* fix fmt

* Update ledger/db/src/mint_config_store.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* fix typo

* Update ledger/db/src/mint_config_store.rs

Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* rename test to better explain what its testing

* be more strict about having outputs when MintTxs are present

* add public ledger api for looking up mint txs by nonce, change to return block index since that is more useful

* initial work on validation

* SetMintConfigTx validation + tests

* reorganize

* MintTx validation and tests

* lint

* add comments

* update comments

* Update transaction/core/src/mint/validation/common.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* Update transaction/core/src/mint/validation/config.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* address pr review comment

* make nonce constant length

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>
Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* SetMintConfigTx -> MintConfigTx (#1607)

* SetMintConfigTx -> MintConfigTx

* more renames

* Small fixes following the confidential-token-id merging (#1609)

* post rebase fixes

* fix tests

* Eran/merge master 2022 03 14 (#1629)

* Update grpcio to 0.10 (#1592)

* Bump pretty_assertions from 1.1.0 to 1.2.0 (#1610)

Bumps [pretty_assertions](https://github.com/colin-kiegel/rust-pretty-assertions) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/colin-kiegel/rust-pretty-assertions/releases)
- [Changelog](https://github.com/colin-kiegel/rust-pretty-assertions/blob/main/CHANGELOG.md)
- [Commits](https://github.com/colin-kiegel/rust-pretty-assertions/commits)

---
updated-dependencies:
- dependency-name: pretty_assertions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* delete slam, fixes #1574 (#1611)

slam is no longer needed because fog-distro, which began life
as a fork of it, has superceded it and slam is no longer used in
CD

* introduce FormBlockInputs and break out some code from form_block into its own method (#1625)

* introduce FormBlockInputs and break out some code from form_block into its own method

* add some missing code

* add missing import

* remove the Copy trait from ConsensusValue  (#1628)

* remove the Copy and Display traits from ConsensusValue since they make it hard to add transaction types that cant implement them

* add back display

* fmt

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Chris Beck <beck.ct@gmail.com>

* Support reaching consensus on MintConfigTxs (#1630)

* initial work on stubbing out SetMintConfigTx

* MintTxManager replaces stubs

* grpc api

* fmt

* mint client and misc improvements

* interate towards tx working

* actual validation taking place

* iterate

* append block from client works

* wip

* rename and lint

* fix nonce length

* comine, cleanups, validate that nonce is not already in ledger

* cleanups

* lint

* make test code reusable

* add tests

* structopt -> clap

* rebase fixes

* fix test

* Update consensus/mint-client/src/config.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* address review comments

* Update transaction/core/test-utils/src/mint.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* use dedup_by+truncate

* renames

* undo incorrect change

* typo

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* Support for reaching consensus on MintTx, mint client improvements (#1641)

* stub out ProposeMintTx

* expose get_active_mint_config_for_mint_tx, more plumbing

* undo wrong change

* MintTxManager impls for MintTx

* mint client support subcommands

* basic MintTx flow works, getting NoOutputs

* mobilecoind api filtering for token_id

* minting is working :)

* client improvements, local network script defaults to having two mintable tokens

* tests

* more tests yay

* testsssssssss

* test fixes and linting

* try without block version

* back to block v3

* Update consensus/service/src/api/client_api_service.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* new line

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* Update ledger/db/src/mint_tx_store.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* pr comments

* improve comment

* use const

* Update ledger/db/src/mint_tx_store.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* lint

Co-authored-by: sugargoat <sugargoat@mobilecoin.com>
Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Chris Beck <beck.ct@gmail.com>
eranrund added a commit that referenced this pull request Mar 22, 2022
@eranrund @sugargoat
@dependabot @cbeck88
Make the consensus enclave aware of the master minters (#1684)
acbf108 
* Add master minters configuration to TokensConfig (#1504)

* minting configuration wip

* fmt

* fix indent

* fix test

* add test, be more aggressive about validation

* use serde(with=...)

* one line

* Minting data types and initial LedgerDb support (#1537)

* initial mint data structures

* basic mint config in ledger

* basic get/set test

* another test

* update total minted api+tests

* add migration code

* enforce limit

* lock and lint

* fmt

* update comment and remove pub

* update lock files

* misc pr review fixes

* add a test for setting an active configuration with no configs

* small fixes

* use PEM encoding for signers

* fix tag

* ensure total minted amount cannot decrease

* use inconsistent_digit_grouping to make version numbers more readable

* fmt

* MintTx/Config protobuf conversions (#1558)

* add external.proto minting messages and api conversion traits

* tests

* mint tx conversions

* lint

* fix module name

* Store mint-related transations in LedgerDb (#1587)

* wip

* remove BlockContents::new to make adding new fields less tedious

* fix typos/lints

* add todo

* fix typos

* more defaults

* tests

* iterate

* more tests

* remove unneeded public api

* more tests

* more tests

* stricter validation

* reorganize code

* lint

* add mint migration code

* mint_tx_store test no. 1

* dont allow overwriting existing blocks, iterate on test

* pr fixes

* lint

* more tests

* add test

* remove unneeded type declaration

* Update ledger/db/src/mint_config_store.rs

Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* rename test to better explain what its testing

* be more strict about having outputs when MintTxs are present

Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* Expose LedgerDb API for looking up txs by nonce (#1602)

* wip

* remove BlockContents::new to make adding new fields less tedious

* fix typos/lints

* add todo

* fix typos

* more defaults

* tests

* iterate

* more tests

* remove unneeded public api

* more tests

* more tests

* stricter validation

* reorganize code

* lint

* add mint migration code

* mint_tx_store test no. 1

* dont allow overwriting existing blocks, iterate on test

* pr fixes

* lint

* more tests

* add test

* remove unneeded type declaration

* add public ledger api for looking up mint txs by nonce, change to return block index since that is more useful

* missing mock changes

* fix fmt

* Update ledger/db/src/mint_config_store.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* fix typo

* Update ledger/db/src/mint_config_store.rs

Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* rename test to better explain what its testing

* be more strict about having outputs when MintTxs are present

* add public ledger api for looking up mint txs by nonce, change to return block index since that is more useful

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>
Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* Minting transaction validation (#1593)

* wip

* remove BlockContents::new to make adding new fields less tedious

* fix typos/lints

* add todo

* fix typos

* more defaults

* tests

* iterate

* more tests

* remove unneeded public api

* more tests

* more tests

* stricter validation

* reorganize code

* lint

* add mint migration code

* mint_tx_store test no. 1

* dont allow overwriting existing blocks, iterate on test

* pr fixes

* lint

* more tests

* add test

* remove unneeded type declaration

* add public ledger api for looking up mint txs by nonce, change to return block index since that is more useful

* missing mock changes

* fix fmt

* Update ledger/db/src/mint_config_store.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* fix typo

* Update ledger/db/src/mint_config_store.rs

Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* rename test to better explain what its testing

* be more strict about having outputs when MintTxs are present

* add public ledger api for looking up mint txs by nonce, change to return block index since that is more useful

* initial work on validation

* SetMintConfigTx validation + tests

* reorganize

* MintTx validation and tests

* lint

* add comments

* update comments

* Update transaction/core/src/mint/validation/common.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* Update transaction/core/src/mint/validation/config.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* address pr review comment

* make nonce constant length

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>
Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* SetMintConfigTx -> MintConfigTx (#1607)

* SetMintConfigTx -> MintConfigTx

* more renames

* Small fixes following the confidential-token-id merging (#1609)

* post rebase fixes

* fix tests

* Eran/merge master 2022 03 14 (#1629)

* Update grpcio to 0.10 (#1592)

* Bump pretty_assertions from 1.1.0 to 1.2.0 (#1610)

Bumps [pretty_assertions](https://github.com/colin-kiegel/rust-pretty-assertions) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/colin-kiegel/rust-pretty-assertions/releases)
- [Changelog](https://github.com/colin-kiegel/rust-pretty-assertions/blob/main/CHANGELOG.md)
- [Commits](https://github.com/colin-kiegel/rust-pretty-assertions/commits)

---
updated-dependencies:
- dependency-name: pretty_assertions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* delete slam, fixes #1574 (#1611)

slam is no longer needed because fog-distro, which began life
as a fork of it, has superceded it and slam is no longer used in
CD

* introduce FormBlockInputs and break out some code from form_block into its own method (#1625)

* introduce FormBlockInputs and break out some code from form_block into its own method

* add some missing code

* add missing import

* remove the Copy trait from ConsensusValue  (#1628)

* remove the Copy and Display traits from ConsensusValue since they make it hard to add transaction types that cant implement them

* add back display

* fmt

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Chris Beck <beck.ct@gmail.com>

* Support reaching consensus on MintConfigTxs (#1630)

* initial work on stubbing out SetMintConfigTx

* MintTxManager replaces stubs

* grpc api

* fmt

* mint client and misc improvements

* interate towards tx working

* actual validation taking place

* iterate

* append block from client works

* wip

* rename and lint

* fix nonce length

* comine, cleanups, validate that nonce is not already in ledger

* cleanups

* lint

* make test code reusable

* add tests

* structopt -> clap

* rebase fixes

* fix test

* Update consensus/mint-client/src/config.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* address review comments

* Update transaction/core/test-utils/src/mint.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* use dedup_by+truncate

* renames

* undo incorrect change

* typo

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* Support for reaching consensus on MintTx, mint client improvements (#1641)

* stub out ProposeMintTx

* expose get_active_mint_config_for_mint_tx, more plumbing

* undo wrong change

* MintTxManager impls for MintTx

* mint client support subcommands

* basic MintTx flow works, getting NoOutputs

* mobilecoind api filtering for token_id

* minting is working :)

* client improvements, local network script defaults to having two mintable tokens

* tests

* more tests yay

* testsssssssss

* test fixes and linting

* try without block version

* back to block v3

* Update consensus/service/src/api/client_api_service.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* new line

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* Update ledger/db/src/mint_tx_store.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* pr comments

* improve comment

* use const

* Update ledger/db/src/mint_tx_store.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* lint

* add MasterMintersMap

* pass MasterMintersMap around

* enclave validates MintConfigTxs

* fix typo

* lint

* more lint

* fix block index

* try less concurrency

* Revert "try less concurrency"

This reverts commit 0e4209f.

Co-authored-by: sugargoat <sugargoat@mobilecoin.com>
Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Chris Beck <beck.ct@gmail.com>
eranrund added a commit that referenced this pull request Mar 25, 2022
@eranrund @sugargoat
@dependabot @cbeck88
Mint client improvements (#1666)
e9bea39 
* Add master minters configuration to TokensConfig (#1504)

* minting configuration wip

* fmt

* fix indent

* fix test

* add test, be more aggressive about validation

* use serde(with=...)

* one line

* Minting data types and initial LedgerDb support (#1537)

* initial mint data structures

* basic mint config in ledger

* basic get/set test

* another test

* update total minted api+tests

* add migration code

* enforce limit

* lock and lint

* fmt

* update comment and remove pub

* update lock files

* misc pr review fixes

* add a test for setting an active configuration with no configs

* small fixes

* use PEM encoding for signers

* fix tag

* ensure total minted amount cannot decrease

* use inconsistent_digit_grouping to make version numbers more readable

* fmt

* MintTx/Config protobuf conversions (#1558)

* add external.proto minting messages and api conversion traits

* tests

* mint tx conversions

* lint

* fix module name

* Store mint-related transations in LedgerDb (#1587)

* wip

* remove BlockContents::new to make adding new fields less tedious

* fix typos/lints

* add todo

* fix typos

* more defaults

* tests

* iterate

* more tests

* remove unneeded public api

* more tests

* more tests

* stricter validation

* reorganize code

* lint

* add mint migration code

* mint_tx_store test no. 1

* dont allow overwriting existing blocks, iterate on test

* pr fixes

* lint

* more tests

* add test

* remove unneeded type declaration

* Update ledger/db/src/mint_config_store.rs

Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* rename test to better explain what its testing

* be more strict about having outputs when MintTxs are present

Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* Expose LedgerDb API for looking up txs by nonce (#1602)

* wip

* remove BlockContents::new to make adding new fields less tedious

* fix typos/lints

* add todo

* fix typos

* more defaults

* tests

* iterate

* more tests

* remove unneeded public api

* more tests

* more tests

* stricter validation

* reorganize code

* lint

* add mint migration code

* mint_tx_store test no. 1

* dont allow overwriting existing blocks, iterate on test

* pr fixes

* lint

* more tests

* add test

* remove unneeded type declaration

* add public ledger api for looking up mint txs by nonce, change to return block index since that is more useful

* missing mock changes

* fix fmt

* Update ledger/db/src/mint_config_store.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* fix typo

* Update ledger/db/src/mint_config_store.rs

Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* rename test to better explain what its testing

* be more strict about having outputs when MintTxs are present

* add public ledger api for looking up mint txs by nonce, change to return block index since that is more useful

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>
Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* Minting transaction validation (#1593)

* wip

* remove BlockContents::new to make adding new fields less tedious

* fix typos/lints

* add todo

* fix typos

* more defaults

* tests

* iterate

* more tests

* remove unneeded public api

* more tests

* more tests

* stricter validation

* reorganize code

* lint

* add mint migration code

* mint_tx_store test no. 1

* dont allow overwriting existing blocks, iterate on test

* pr fixes

* lint

* more tests

* add test

* remove unneeded type declaration

* add public ledger api for looking up mint txs by nonce, change to return block index since that is more useful

* missing mock changes

* fix fmt

* Update ledger/db/src/mint_config_store.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* fix typo

* Update ledger/db/src/mint_config_store.rs

Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* rename test to better explain what its testing

* be more strict about having outputs when MintTxs are present

* add public ledger api for looking up mint txs by nonce, change to return block index since that is more useful

* initial work on validation

* SetMintConfigTx validation + tests

* reorganize

* MintTx validation and tests

* lint

* add comments

* update comments

* Update transaction/core/src/mint/validation/common.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* Update transaction/core/src/mint/validation/config.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* address pr review comment

* make nonce constant length

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>
Co-authored-by: sugargoat <sugargoat@mobilecoin.com>

* SetMintConfigTx -> MintConfigTx (#1607)

* SetMintConfigTx -> MintConfigTx

* more renames

* Small fixes following the confidential-token-id merging (#1609)

* post rebase fixes

* fix tests

* Eran/merge master 2022 03 14 (#1629)

* Update grpcio to 0.10 (#1592)

* Bump pretty_assertions from 1.1.0 to 1.2.0 (#1610)

Bumps [pretty_assertions](https://github.com/colin-kiegel/rust-pretty-assertions) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/colin-kiegel/rust-pretty-assertions/releases)
- [Changelog](https://github.com/colin-kiegel/rust-pretty-assertions/blob/main/CHANGELOG.md)
- [Commits](https://github.com/colin-kiegel/rust-pretty-assertions/commits)

---
updated-dependencies:
- dependency-name: pretty_assertions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* delete slam, fixes #1574 (#1611)

slam is no longer needed because fog-distro, which began life
as a fork of it, has superceded it and slam is no longer used in
CD

* introduce FormBlockInputs and break out some code from form_block into its own method (#1625)

* introduce FormBlockInputs and break out some code from form_block into its own method

* add some missing code

* add missing import

* remove the Copy trait from ConsensusValue  (#1628)

* remove the Copy and Display traits from ConsensusValue since they make it hard to add transaction types that cant implement them

* add back display

* fmt

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Chris Beck <beck.ct@gmail.com>

* Support reaching consensus on MintConfigTxs (#1630)

* initial work on stubbing out SetMintConfigTx

* MintTxManager replaces stubs

* grpc api

* fmt

* mint client and misc improvements

* interate towards tx working

* actual validation taking place

* iterate

* append block from client works

* wip

* rename and lint

* fix nonce length

* comine, cleanups, validate that nonce is not already in ledger

* cleanups

* lint

* make test code reusable

* add tests

* structopt -> clap

* rebase fixes

* fix test

* Update consensus/mint-client/src/config.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* address review comments

* Update transaction/core/test-utils/src/mint.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* use dedup_by+truncate

* renames

* undo incorrect change

* typo

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* Support for reaching consensus on MintTx, mint client improvements (#1641)

* stub out ProposeMintTx

* expose get_active_mint_config_for_mint_tx, more plumbing

* undo wrong change

* MintTxManager impls for MintTx

* mint client support subcommands

* basic MintTx flow works, getting NoOutputs

* mobilecoind api filtering for token_id

* minting is working :)

* client improvements, local network script defaults to having two mintable tokens

* tests

* more tests yay

* testsssssssss

* test fixes and linting

* try without block version

* back to block v3

* Update consensus/service/src/api/client_api_service.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* new line

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* Update ledger/db/src/mint_tx_store.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* pr comments

* improve comment

* use const

* support multiple configs and multiple signers

* reusable config objects

* support multiple signers

* offline flow pt 1

* offline flow pt 2

* remove unneeded dep

* Update consensus/mint-client/src/bin/main.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* Update consensus/mint-client/src/config.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* Update consensus/mint-client/src/config.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* Update consensus/mint-client/src/config.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* Update consensus/mint-client/src/config.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* Update consensus/mint-client/src/config.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* fix incorrect suggestion, DRY nonce generation

* improve usage doc

* DRY file loading

* Trigger CI

* Update consensus/mint-client/src/bin/main.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* Update consensus/mint-client/src/config.rs

Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

* pr fixes

Co-authored-by: sugargoat <sugargoat@mobilecoin.com>
Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Chris Beck <beck.ct@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sugargoat sugargoat sugargoat approved these changes

@jcape jcape jcape approved these changes

Assignees

@eranrund eranrund

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@eranrund @jcape @sugargoat