Cherry-pick dependency and other changes to candidate-1.2 #1992

jcape · 2022-05-17T23:32:30Z

Update rust-toolchain to nightly-2022-04-29 (Update rust-toolchain to nightly-2022-04-29 #1888)
Write an integration test for mobilecoind-json (Write an integration test for mobilecoind-json #1885)
Bump libc from 0.2.124 to 0.2.125 (Bump libc from 0.2.124 to 0.2.125 #1887)
Bump syn from 1.0.91 to 1.0.92 (Bump syn from 1.0.91 to 1.0.92 #1886)
Bump serde from 1.0.136 to 1.0.137 in /fog/ledger/enclave/trusted (Bump serde from 1.0.136 to 1.0.137 in /fog/ledger/enclave/trusted #1894)
Bump serde from 1.0.136 to 1.0.137 in /fog/view/enclave/trusted (Bump serde from 1.0.136 to 1.0.137 in /fog/view/enclave/trusted #1895)
Bump serde from 1.0.136 to 1.0.137 in /consensus/enclave/trusted (Bump serde from 1.0.136 to 1.0.137 in /consensus/enclave/trusted #1897)
Bump serde from 1.0.136 to 1.0.137 in /fog/ingest/enclave/trusted (Bump serde from 1.0.136 to 1.0.137 in /fog/ingest/enclave/trusted #1901)
Bump serde from 1.0.136 to 1.0.137 (Bump serde from 1.0.136 to 1.0.137 #1903)
Bump semver from 1.0.7 to 1.0.9 (Bump semver from 1.0.7 to 1.0.9 #1900)
Bump zeroize from 1.5.4 to 1.5.5 in /fog/view/enclave/trusted (Bump zeroize from 1.5.4 to 1.5.5 in /fog/view/enclave/trusted #1896)
Bump zeroize from 1.5.4 to 1.5.5 in /consensus/enclave/trusted (Bump zeroize from 1.5.4 to 1.5.5 in /consensus/enclave/trusted #1898)
Bump zeroize from 1.5.4 to 1.5.5 in /fog/ingest/enclave/trusted (Bump zeroize from 1.5.4 to 1.5.5 in /fog/ingest/enclave/trusted #1899)
Dependency updates (Part 1) (Dependency updates (Part 1) #1908)
Switch to using our fork of opentelemetry. (Switch to using our fork of opentelemetry. #1918)
Upgrade to rocket 0.5.0-rc (Upgrade to rocket 0.5.0-rc #1913)
Bump clap from 3.1.12 to 3.1.15 (Bump clap from 3.1.12 to 3.1.15 #1904)
no need for 10 subaddresses, and this also makes the test compatible with the drain_accounts.py script (Small adjustment to mobilecoind-json test script that makes it compatible with other test scripts #1919)
Bump libz-sys from 1.1.5 to 1.1.6 (Bump libz-sys from 1.1.5 to 1.1.6 #1873)
added extra configuration consensus service serve side. (added extra configuration consensus service serve side. #1800)
Bump zeroize from 1.5.4 to 1.5.5 (Bump zeroize from 1.5.4 to 1.5.5 #1902)
Bump serde_json from 1.0.79 to 1.0.81 (Bump serde_json from 1.0.79 to 1.0.81 #1916)
Bump crc from 2.1.0 to 3.0.0 (Bump crc from 2.1.0 to 3.0.0 #1857)
Upgrade rusoto_s3 from 0.42 to 0.48. (Upgrade rusoto_s3 from 0.42 to 0.48. #1912)
Bump prost from 0.10.1 to 0.10.3 (Bump prost from 0.10.1 to 0.10.3 #1930)
allow providing minting trust root public key via a PEM file instead hex bytes (allow providing minting trust root public key via a PEM file instead hex bytes #1951)
make fog-resolver and ingest-report serializable (make fog-resolver and ingest-report serializable #1944)
Feature/attest verifier mc seed bugfix (Feature/attest verifier mc seed bugfix #1943)
Bump proc-macro2 from 1.0.37 to 1.0.38 (Bump proc-macro2 from 1.0.37 to 1.0.38 #1938)
reverting ledger-dist folder to work dir and work dir now in target dir (reverting ledger-dist folder to work dir and work dir now in target dir #1954)
Bump clap from 3.1.15 to 3.1.18 (Bump clap from 3.1.15 to 3.1.18 #1957)
Bump syn from 1.0.92 to 1.0.93 (Bump syn from 1.0.92 to 1.0.93 #1956)
Bump prost from 0.10.1 to 0.10.3 in /consensus/enclave/trusted (Bump prost from 0.10.1 to 0.10.3 in /consensus/enclave/trusted #1927)
Bump prost from 0.10.1 to 0.10.3 in /fog/view/enclave/trusted (Bump prost from 0.10.1 to 0.10.3 in /fog/view/enclave/trusted #1929)
Bump prost from 0.10.1 to 0.10.3 in /fog/ingest/enclave/trusted (Bump prost from 0.10.1 to 0.10.3 in /fog/ingest/enclave/trusted #1926)
MintTx/MintConfigTx tombstone validation bugfixes (MintTx/MintConfigTx tombstone validation bugfixes #1964)
mint-client: make the process exitcode reflect transaction status returned from consensus when a transaction is submitted (mint-client: make the process exitcode reflect transaction status returned from consensus when a transaction is submitted #1967)
Update builder_install image (Update builder_install image #1968)
Bump hashbrown from 0.11.2 to 0.12.1 (Bump hashbrown from 0.11.2 to 0.12.1 #1915)
Bump ed25519 from 1.4.1 to 1.5.0 (Bump ed25519 from 1.4.1 to 1.5.0 #1950)
Add a mint auditor integration test to be used in CD. (Add a mint auditor integration test to be used in CD. #1971)
Bump syn from 1.0.93 to 1.0.94 (Bump syn from 1.0.93 to 1.0.94 #1976)

Motivation

This ports a slew of changes from master to candidate-1.2, most notably an update to rust, some bugfixes, around minting, and dependencies.

Future Work

mbedtls update.
bigint update.

* Update rust-toolchain version * Fix clippy warnings

* Write an integration test for mobilecoind-json * sort * enable test * spaces * move wait_for_monitor_to_sync down * DRY * Update mobilecoind/strategies/test_client.py Co-authored-by: Remoun Metyas <remoun@mobilecoin.com> * Update mobilecoind/strategies/drain-accounts.py Co-authored-by: Remoun Metyas <remoun@mobilecoin.com> Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

Bumps [libc](https://github.com/rust-lang/libc) from 0.2.124 to 0.2.125. - [Release notes](https://github.com/rust-lang/libc/releases) - [Commits](rust-lang/libc@0.2.124...0.2.125) --- updated-dependencies: - dependency-name: libc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [syn](https://github.com/dtolnay/syn) from 1.0.91 to 1.0.92. - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](dtolnay/syn@1.0.91...1.0.92) --- updated-dependencies: - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

) Bumps [serde](https://github.com/serde-rs/serde) from 1.0.136 to 1.0.137. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](serde-rs/serde@v1.0.136...v1.0.137) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.136 to 1.0.137. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](serde-rs/serde@v1.0.136...v1.0.137) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

) Bumps [serde](https://github.com/serde-rs/serde) from 1.0.136 to 1.0.137. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](serde-rs/serde@v1.0.136...v1.0.137) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.136 to 1.0.137. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](serde-rs/serde@v1.0.136...v1.0.137) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [semver](https://github.com/dtolnay/semver) from 1.0.7 to 1.0.9. - [Release notes](https://github.com/dtolnay/semver/releases) - [Commits](dtolnay/semver@1.0.7...1.0.9) --- updated-dependencies: - dependency-name: semver dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [zeroize](https://github.com/RustCrypto/utils) from 1.5.4 to 1.5.5. - [Release notes](https://github.com/RustCrypto/utils/releases) - [Commits](RustCrypto/utils@zeroize-v1.5.4...zeroize-v1.5.5) --- updated-dependencies: - dependency-name: zeroize dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update regex in consensus enclave to 1.5.5 * Update crossbeam utils 0.8.5 to 0.8.8 * Update generic-array 0.12.3 to 0.12.4 * Update hyper from 0.12.35 to 0.12.36 * Update hyper 0.14.16 to 0.14.18 * Ran cargo update against protoc, somehow log is back to the right version. * Update log to 0.4.17. * Fix protoc again...

This was needed since we had to upgrade opentelemetry-jaeger's dependency on thrift, which in turn depended on a broken verison of ordered-float.

* mobilecoind-json uses new(er) rocket * admin gw uses newer rocket * fog-overseer-server uses newer rocket

Bumps [clap](https://github.com/clap-rs/clap) from 3.1.12 to 3.1.15. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](clap-rs/clap@v3.1.12...v3.1.15) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…with the drain_accounts.py script (#1919)

Bumps [libz-sys](https://github.com/rust-lang/libz-sys) from 1.1.5 to 1.1.6. - [Release notes](https://github.com/rust-lang/libz-sys/releases) - [Commits](rust-lang/libz-sys@1.1.5...1.1.6) --- updated-dependencies: - dependency-name: libz-sys dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* added extra configuration consensus service serve side. * fixed build errors * increased the allowed testime for testing * added one more method to set defaults * fixed compile error * linting issue * Update consensus/service/src/consensus_service.rs Co-authored-by: Remoun Metyas <remoun@mobilecoin.com> Co-authored-by: Eugene Rata <no-email@no-email.com> Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.79 to 1.0.81. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](serde-rs/json@v1.0.79...v1.0.81) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump crc from 2.1.0 to 3.0.0 Bumps [crc](https://github.com/mrhooray/crc-rs) from 2.1.0 to 3.0.0. - [Release notes](https://github.com/mrhooray/crc-rs/releases) - [Commits](mrhooray/crc-rs@2.1.0...3.0.0) --- updated-dependencies: - dependency-name: crc dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Update lock files Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nick Santana <nick@mobilecoin.com>

Simplify type of retry result

* Bump prost from 0.10.1 to 0.10.3 Bumps [prost](https://github.com/tokio-rs/prost) from 0.10.1 to 0.10.3. - [Release notes](https://github.com/tokio-rs/prost/releases) - [Commits](tokio-rs/prost@v0.10.1...v0.10.3) --- updated-dependencies: - dependency-name: prost dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update util/keyfile/Cargo.toml Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

…hex bytes (#1951) * allow providing minting trust root public key via a PEM file instead of hex bytes * update lock file

Bumps [proc-macro2](https://github.com/dtolnay/proc-macro2) from 1.0.37 to 1.0.38. - [Release notes](https://github.com/dtolnay/proc-macro2/releases) - [Commits](dtolnay/proc-macro2@1.0.37...1.0.38) --- updated-dependencies: - dependency-name: proc-macro2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ir (#1954)

Bumps [clap](https://github.com/clap-rs/clap) from 3.1.15 to 3.1.18. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](clap-rs/clap@v3.1.15...v3.1.18) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [syn](https://github.com/dtolnay/syn) from 1.0.92 to 1.0.93. - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](dtolnay/syn@1.0.92...1.0.93) --- updated-dependencies: - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [prost](https://github.com/tokio-rs/prost) from 0.10.1 to 0.10.3. - [Release notes](https://github.com/tokio-rs/prost/releases) - [Commits](tokio-rs/prost@v0.10.1...v0.10.3) --- updated-dependencies: - dependency-name: prost dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix a bug that would cause MintTxs that depend on old MintConfigTxs to fail validation * fix off by one error in mint tx/mint config tx tombstone validation. also add a test for duplicate nonce * lint, fix tests * test boundary condiotion and update comment * Update consensus/service/src/mint_tx_manager/mod.rs Co-authored-by: Nick Santana <nick@mobilecoin.com> * Update consensus/service/src/mint_tx_manager/mod.rs Co-authored-by: Nick Santana <nick@mobilecoin.com> * make tombstone block check optional by passing an Option for the current block index, as suggested in the PR review Co-authored-by: Nick Santana <nick@mobilecoin.com>

…urned from consensus when a transaction is submitted (#1967) * mint-client: make the process exitcode reflect transaction status returned from consensus when a transaction is submitted * add missing import

#1888 updated rust-toolchain without updating builder_install. * Remove bogus DATABASE_URL value * Add postgresql-client explicitly to init_debian.sh * Bump Dockerfile-version

* Bump hashbrown from 0.11.2 to 0.12.1 Bumps [hashbrown](https://github.com/rust-lang/hashbrown) from 0.11.2 to 0.12.1. - [Release notes](https://github.com/rust-lang/hashbrown/releases) - [Changelog](https://github.com/rust-lang/hashbrown/blob/master/CHANGELOG.md) - [Commits](rust-lang/hashbrown@v0.11.2...v0.12.1) --- updated-dependencies: - dependency-name: hashbrown dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Updating lock files for enclave crates Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nick Santana <nick@mobilecoin.com>

* Bump ed25519 from 1.4.1 to 1.5.0 Bumps [ed25519](https://github.com/RustCrypto/signatures) from 1.4.1 to 1.5.0. - [Release notes](https://github.com/RustCrypto/signatures/releases) - [Commits](RustCrypto/signatures@ed25519/v1.4.1...ed25519/v1.5.0) --- updated-dependencies: - dependency-name: ed25519 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update Cargo.lock for enclave crates Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrew Wygle <andrew@mobilecoin.com>

* Write a mint auditor integration test to be used in CD. accept command line args wip off by one debug * update comment * update fee amount * Update mint-auditor/tests/integration_test.py Co-authored-by: Remoun Metyas <remoun@mobilecoin.com> * Update mint-auditor/tests/integration_test.py Co-authored-by: Remoun Metyas <remoun@mobilecoin.com> Co-authored-by: Remoun Metyas <remoun@mobilecoin.com>

Bumps [syn](https://github.com/dtolnay/syn) from 1.0.93 to 1.0.94. - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](dtolnay/syn@1.0.93...1.0.94) --- updated-dependencies: - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

eranrund · 2022-05-17T23:41:18Z

admin-http-gateway/Cargo.toml

@@ -11,8 +11,7 @@ mc-util-uri = { path = "../util/uri" }

 clap = { version = "3.1", features = ["derive", "env"] }
 grpcio = "0.10.2"
-rocket = { version = "0.4.10", default-features = false }
-rocket_contrib = { version = "0.4.10", default-features = false, features = ["json"] }
+rocket = { version = "0.5.0-rc.1", features = ["json"] }


I thought we're moving to rc2?

We are, #1949 hasn't been merged yet.

Remoun Metyas and others added 30 commits May 17, 2022 16:19

Update rust-toolchain to nightly-2022-04-29 (#1888)

3c73f10

* Update rust-toolchain version * Fix clippy warnings

Switch to using our fork of opentelemetry. (#1918)

cc402ae

This was needed since we had to upgrade opentelemetry-jaeger's dependency on thrift, which in turn depended on a broken verison of ordered-float.

Upgrade to rocket 0.5.0-rc (#1913)

3442252

* mobilecoind-json uses new(er) rocket * admin gw uses newer rocket * fog-overseer-server uses newer rocket

no need for 10 subaddresses, and this also makes the test compatible …

2fbf16c

…with the drain_accounts.py script (#1919)

Bump zeroize from 1.5.4 to 1.5.5 (#1902)

54b087c

Upgrade rusoto_s3 from 0.42 to 0.48. (#1912)

58dd890

Simplify type of retry result

allow providing minting trust root public key via a PEM file instead …

c299296

…hex bytes (#1951) * allow providing minting trust root public key via a PEM file instead of hex bytes * update lock file

make fog-resolver and ingest-report serializable (#1944)

d1a577d

Feature/attest verifier mc seed bugfix (#1943)

362c021

reverting ledger-dist folder to work dir and work dir now in target d…

3a15130

…ir (#1954)

dependabot bot and others added 12 commits May 17, 2022 16:24

mint-client: make the process exitcode reflect transaction status ret…

b86cbc4

…urned from consensus when a transaction is submitted (#1967) * mint-client: make the process exitcode reflect transaction status returned from consensus when a transaction is submitted * add missing import

Update builder_install image (#1968)

a6bbcd5

#1888 updated rust-toolchain without updating builder_install. * Remove bogus DATABASE_URL value * Add postgresql-client explicitly to init_debian.sh * Bump Dockerfile-version

jcape added this to the 1.2.0 Release milestone May 17, 2022

jcape self-assigned this May 17, 2022

jcape requested review from eranrund, cbeck88, remoun and iamalwaysuncomfortable May 17, 2022 23:32

cbeck88 approved these changes May 17, 2022

View reviewed changes

eranrund approved these changes May 17, 2022

View reviewed changes

jcape marked this pull request as ready for review May 18, 2022 00:49

jcape merged commit 65c3076 into mobilecoinfoundation:candidate-1.2 May 18, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cherry-pick dependency and other changes to candidate-1.2 #1992

Cherry-pick dependency and other changes to candidate-1.2 #1992

jcape commented May 17, 2022

eranrund May 17, 2022

jcape May 18, 2022 •

edited

Loading

Cherry-pick dependency and other changes to candidate-1.2 #1992

Cherry-pick dependency and other changes to candidate-1.2 #1992

Conversation

jcape commented May 17, 2022

Motivation

Future Work

eranrund May 17, 2022

Choose a reason for hiding this comment

jcape May 18, 2022 • edited Loading

Choose a reason for hiding this comment

jcape May 18, 2022 •

edited

Loading