[CLI] Bump CLI version to 2.0.0 #8416

alnoki · 2023-05-29T18:53:01Z

In #8346 I bumped the changelog per the request of @banool and accordingly bumped the CLI Cargo.toml to v1.0.14.

It looks like #8398 duplicated some of this activity in a manner that did not introduce merge conflicts, but nevertheless instigated duplicate changelog headings, and led to the content from #8346 being excluded from the v1.0.14 release.

Hence this PR deduplicates the changelog headings, by bumping the CLI version to incorporate content from #8346 that was not included in the v1.0.14 release.

banool · 2023-05-30T06:54:47Z

Thanks for this, we'll coordinate a release soon.

0xmigo

Ok I see. Looks like my PR from last week got committed right before #8346

I can coordinate another patch release today.

0xmigo · 2023-05-30T16:21:05Z

crates/aptos/CHANGELOG.md


+## [1.0.15] - 2023/05/29


Suggested change

## [1.0.15] - 2023/05/29

## [1.0.15] - 2023/05/30

I can patch another release today. Can we upate this to 5/30? Thanks!

@alnoki or feel free to update the date to the "current" date. I will path a release when this PR is merged.

We just spoke offline. We should bump the major version due to the breaking change with arg parsing for executing move functions.

alnoki · 2023-05-30T19:44:20Z

@alnoki or feel free to update the date to the "current" date. I will path a release when this PR is merged.

@0xjinn 778728c updates the date to current per your request

We should bump the major version due to the breaking change with arg parsing for executing move functions.

@banool breaking arg parsing changes were already incorporated in the v1.0.14 release. E.g. after brew installing aptos I can run the following breaking JSON syntax on the CLI:

aptos move run \
    --function-id $ace_addr::cli_args::set_vals \
    --type-args \
        0x1::account::Account \
        0x1::chain_id::ChainId \
    --args \
        u8:123 \
        "bool:[false, true, false, false]" \
        'address:[["0xace", "0xbee"], ["0xcad"], []]' \
    --private-key-file ace.key \
    --assume-yes

But I can not run the following JSON input file alternative, support for which was added in #8346:

aptos move run \
    --json-file entry_function_arguments.json \
    --private-key-file ace.key \
    --assume-yes

Hence if you want to bump the version major then I think v1.0.14 would have to be retroactively re-released as v2.0.0 with the content from #8346 included: this would entail merging the headings currently labeled v1.0.14 and v1.0.15 on the changelog into a single v2.0.0.

I think a retroactive re-release would be confusing, though, and I would prefer to just bump per how this PR currently stands, but can of course accommodate a re-release if that's what it takes to land the multisig tooling in a way that can be brew installed.

Please advise

0xmigo · 2023-05-30T20:50:52Z

Hi @alnoki. I discussed with @banool offline. I think we still want to bump up the major version, lets do it v2.0.0. The v1.0.14 have 0 installs based on the metrc from brew, so I think we should be good.

0xmigo

Feel free to just land this. I can update the version on my end - since I have a PR that I want to commit before next release

alnoki · 2023-05-31T03:50:35Z

Hi @alnoki. I discussed with @banool offline. I think we still want to bump up the major version, lets do it v2.0.0. The v1.0.14 have 0 installs based on the metrc from brew, so I think we should be good.

@0xjinn @banool 56ab890 bumps version and refactors changelog for a v2.0.0 release

banool · 2023-05-31T11:19:15Z

Yeah late is better than never, we should've gone to 2.0.0 to begin with but now is okay still. I agree we should still have a section in the changelog for 1.0.14 though since we did indeed make that release. Not a big deal though.

aptos-labs#8416 (comment)

alnoki · 2023-05-31T13:23:10Z

Yeah late is better than never, we should've gone to 2.0.0 to begin with but now is okay still. I agree we should still have a section in the changelog for 1.0.14 though since we did indeed make that release. Not a big deal though.

@banool 9088594 re-inserts v1.0.14 section in changelog, maintaining Cargo.toml at v2.0.0 for a new release.

Is this ready to land?

aptos-labs#8416 (comment)

0xmigo · 2023-05-31T17:10:39Z

@alnoki Yep go for it. Thank you for working on this and catching the conflict from 1.0.14!

alnoki · 2023-05-31T19:45:39Z

@alnoki Yep go for it. Thank you for working on this and catching the conflict from 1.0.14!

@0xjinn you're welcome!

I'm a community contributor and hence I can't merge, though

So it looks like we are waiting on @banool to land this?

banool · 2023-05-31T20:33:46Z

I just hit auto merge, it should land once all the land-blocking tests pass!

alnoki · 2023-06-01T10:15:51Z

I just hit auto merge, it should land once all the land-blocking tests pass!

@banool it looks like the CI is getting caught up here. Is there anything else I can do to move things along?

banool · 2023-06-01T11:07:31Z

Yeah we've had a couple of CI issues lately. The one that is blocking land right now is resolved, could you rebase?

@banool

aptos-labs#8416 (comment) Squashed commit 1: Bump CLI version to 1.0.15 Squashed commit 2: Update current release date, Cargo.lock Squashed commit 3: Modify for v2.0.0 release Squashed commit 4: Re-insert v1.0.14 changelog section per @banool aptos-labs#8416 (comment)

alnoki · 2023-06-01T11:21:59Z

Yeah we've had a couple of CI issues lately. The one that is blocking land right now is resolved, could you rebase?

@banool 0013bcf rebases per your request. Will you please re-attempt auto-merge?

github-actions · 2023-06-01T12:30:22Z

✅ Forge suite `land_blocking` success on `5bd1b9a0cc58f397b326f932ac7df44720e23b62`

performance benchmark : 5708 TPS, 6920 ms latency, 23500 ms p99 latency,(!) expired 316 out of 2437800 txns
Test Ok

Grafana dashboard
Humio Logs
Test runner output
Test run is land-blocking

banool · 2023-06-01T12:35:22Z

These failing tests are non-blocking and known to be having issues, don't worry about those. Once these other ones finish it should merge and we can make a release!

github-actions · 2023-06-01T12:35:27Z

✅ Forge suite `compat` success on `testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b` ==> `5bd1b9a0cc58f397b326f932ac7df44720e23b62`

Compatibility test results for testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b ==> 5bd1b9a0cc58f397b326f932ac7df44720e23b62 (PR)
1. Check liveness of validators at old version: testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b
compatibility::simple-validator-upgrade::liveness-check : 9920 TPS, 3805 ms latency, 6600 ms p99 latency,no expired txns
2. Upgrading first Validator to new version: 5bd1b9a0cc58f397b326f932ac7df44720e23b62
compatibility::simple-validator-upgrade::single-validator-upgrade : 6088 TPS, 6384 ms latency, 9600 ms p99 latency,no expired txns
3. Upgrading rest of first batch to new version: 5bd1b9a0cc58f397b326f932ac7df44720e23b62
compatibility::simple-validator-upgrade::half-validator-upgrade : 5518 TPS, 7172 ms latency, 9300 ms p99 latency,no expired txns
4. upgrading second batch to new version: 5bd1b9a0cc58f397b326f932ac7df44720e23b62
compatibility::simple-validator-upgrade::rest-validator-upgrade : 8097 TPS, 4631 ms latency, 7600 ms p99 latency,no expired txns
5. check swarm health
Compatibility test for testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b ==> 5bd1b9a0cc58f397b326f932ac7df44720e23b62 passed
Test Ok

Grafana dashboard
Humio Logs
Test runner output
Test run is land-blocking

github-actions · 2023-06-01T12:40:54Z

✅ Forge suite `framework_upgrade` success on `aptos-node-v1.3.0_3fc3d42b6cfe27460004f9a0326451bcda840a60` ==> `5bd1b9a0cc58f397b326f932ac7df44720e23b62`

Compatibility test results for aptos-node-v1.3.0_3fc3d42b6cfe27460004f9a0326451bcda840a60 ==> 5bd1b9a0cc58f397b326f932ac7df44720e23b62 (PR)
Upgrade the nodes to version: 5bd1b9a0cc58f397b326f932ac7df44720e23b62
framework_upgrade::framework-upgrade::full-framework-upgrade : 6651 TPS, 6051 ms latency, 16300 ms p99 latency,no expired txns
5. check swarm health
Compatibility test for aptos-node-v1.3.0_3fc3d42b6cfe27460004f9a0326451bcda840a60 ==> 5bd1b9a0cc58f397b326f932ac7df44720e23b62 passed
Test Ok

Grafana dashboard
Humio Logs
Test runner output
Test run is land-blocking

alnoki · 2023-06-01T12:59:52Z

@0xjinn now that the changelog and manifest version have been updated, are you able to coordinate a release tag so that v2.0.0 can be installed via brew?

alnoki · 2023-06-01T13:01:18Z

These failing tests are non-blocking and known to be having issues, don't worry about those. Once these other ones finish it should merge and we can make a release!

@banool sounds like a plan. I missed this comment in the above forge logs, but I'm ready for a release when you are!

Standing by to brew install v2.0.0

@banool

* Rebase per @banool #8416 (comment) Squashed commit 1: Bump CLI version to 1.0.15 Squashed commit 2: Update current release date, Cargo.lock Squashed commit 3: Modify for v2.0.0 release Squashed commit 4: Re-insert v1.0.14 changelog section per @banool #8416 (comment) * Remove erroneous double cash sign

@banool

* Rebase per @banool #8416 (comment) Squashed commit 1: Bump CLI version to 1.0.15 Squashed commit 2: Update current release date, Cargo.lock Squashed commit 3: Modify for v2.0.0 release Squashed commit 4: Re-insert v1.0.14 changelog section per @banool #8416 (comment) * Remove erroneous double cash sign

alnoki requested review from saharct, gregnazario, 0xmigo and banool as code owners May 29, 2023 18:53

alnoki mentioned this pull request May 29, 2023

Deduplicate changelog headings #8406

Closed

davidiw approved these changes May 30, 2023

View reviewed changes

banool approved these changes May 30, 2023

View reviewed changes

0xmigo approved these changes May 30, 2023

View reviewed changes

0xmigo suggested changes May 30, 2023

View reviewed changes

0xmigo approved these changes May 30, 2023

View reviewed changes

alnoki changed the title ~~[CLI] Bump CLI version to 1.0.15~~ [CLI] Bump CLI version to 2.0.0 May 31, 2023

alnoki added a commit to alnoki/aptos-core that referenced this pull request May 31, 2023

Re-insert v1.0.14 changelog section per @banool

211b47d

aptos-labs#8416 (comment)

alnoki added a commit to alnoki/aptos-core that referenced this pull request May 31, 2023

Re-insert v1.0.14 changelog section per @banool

9088594

aptos-labs#8416 (comment)

alnoki force-pushed the cli-1.0.15 branch from 211b47d to 9088594 Compare May 31, 2023 13:24

banool enabled auto-merge (squash) May 31, 2023 20:33

auto-merge was automatically disabled June 1, 2023 11:20
Head branch was pushed to by a user without write access

alnoki force-pushed the cli-1.0.15 branch from 9088594 to 0013bcf Compare June 1, 2023 11:20

Remove erroneous double cash sign

5bd1b9a

alnoki force-pushed the cli-1.0.15 branch from f2056e4 to 5bd1b9a Compare June 1, 2023 11:24

banool enabled auto-merge (squash) June 1, 2023 12:01

This comment has been minimized.

Sign in to view

banool merged commit b2d3839 into aptos-labs:main Jun 1, 2023
55 of 58 checks passed

qdrs mentioned this pull request Jun 20, 2023

dearb patching otter-sec/aptos-core#1

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CLI] Bump CLI version to 2.0.0 #8416

[CLI] Bump CLI version to 2.0.0 #8416

alnoki commented May 29, 2023 •

edited

banool commented May 30, 2023

0xmigo left a comment

0xmigo May 30, 2023

0xmigo May 30, 2023

banool May 30, 2023

alnoki commented May 30, 2023

0xmigo commented May 30, 2023

0xmigo left a comment

alnoki commented May 31, 2023

banool commented May 31, 2023 •

edited

alnoki commented May 31, 2023 •

edited

0xmigo commented May 31, 2023

alnoki commented May 31, 2023

banool commented May 31, 2023 •

edited

alnoki commented Jun 1, 2023

banool commented Jun 1, 2023

alnoki commented Jun 1, 2023

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

github-actions bot commented Jun 1, 2023

banool commented Jun 1, 2023

github-actions bot commented Jun 1, 2023

github-actions bot commented Jun 1, 2023

alnoki commented Jun 1, 2023

alnoki commented Jun 1, 2023

[CLI] Bump CLI version to 2.0.0 #8416

[CLI] Bump CLI version to 2.0.0 #8416

Conversation

alnoki commented May 29, 2023 • edited

banool commented May 30, 2023

0xmigo left a comment

Choose a reason for hiding this comment

0xmigo May 30, 2023

Choose a reason for hiding this comment

0xmigo May 30, 2023

Choose a reason for hiding this comment

banool May 30, 2023

Choose a reason for hiding this comment

alnoki commented May 30, 2023

0xmigo commented May 30, 2023

0xmigo left a comment

Choose a reason for hiding this comment

alnoki commented May 31, 2023

banool commented May 31, 2023 • edited

alnoki commented May 31, 2023 • edited

0xmigo commented May 31, 2023

alnoki commented May 31, 2023

banool commented May 31, 2023 • edited

alnoki commented Jun 1, 2023

banool commented Jun 1, 2023

alnoki commented Jun 1, 2023

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

github-actions bot commented Jun 1, 2023

✅ Forge suite land_blocking success on 5bd1b9a0cc58f397b326f932ac7df44720e23b62

banool commented Jun 1, 2023

github-actions bot commented Jun 1, 2023

✅ Forge suite compat success on testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b ==> 5bd1b9a0cc58f397b326f932ac7df44720e23b62

github-actions bot commented Jun 1, 2023

✅ Forge suite framework_upgrade success on aptos-node-v1.3.0_3fc3d42b6cfe27460004f9a0326451bcda840a60 ==> 5bd1b9a0cc58f397b326f932ac7df44720e23b62

alnoki commented Jun 1, 2023

alnoki commented Jun 1, 2023

alnoki commented May 29, 2023 •

edited

banool commented May 31, 2023 •

edited

alnoki commented May 31, 2023 •

edited

banool commented May 31, 2023 •

edited

✅ Forge suite `land_blocking` success on `5bd1b9a0cc58f397b326f932ac7df44720e23b62`

✅ Forge suite `compat` success on `testnet_2d8b1b57553d869190f61df1aaf7f31a8fc19a7b` ==> `5bd1b9a0cc58f397b326f932ac7df44720e23b62`

✅ Forge suite `framework_upgrade` success on `aptos-node-v1.3.0_3fc3d42b6cfe27460004f9a0326451bcda840a60` ==> `5bd1b9a0cc58f397b326f932ac7df44720e23b62`