Cherry-pick a3p and agd changes for upgrade-14 #8942

mhofman · 2024-02-18T01:33:47Z

Staged on top of #8869

Description

a3p-integration and other integration related tests sync from the master branch, including a core-eval test for the issue discovered during #8869

This also picks up changes to the bin/agd wrapper which had improvements to more reliably rebuild.

Constructed from the following rebase-todo:

# Branch Agoric-mfig-tweak-agd
label base-Agoric-mfig-tweak-agd
pick ce7d183cd fix(agd): make script more robust
label Agoric-mfig-tweak-agd
reset base-Agoric-mfig-tweak-agd
merge -C 2f87d77e4 Agoric-mfig-tweak-agd # Merge pull request #8256 from Agoric/mfig-tweak-agd

# From pull request #8001
pick e7ed7bf5a fix(bin-agd): recompile when C++ src changes

# Branch Agoric-mfig-integration-deps
label base-Agoric-mfig-integration-deps
pick e5a80fc8f ci(registry): `set-versions.sh` cwd is already at the target
pick 3bace780d ci(registry): use exact Endo version matches
# pick e0741e50e build(eslint-config): fix `peerDependencies.eslint-plugin-jsdoc`
label Agoric-mfig-integration-deps
reset base-Agoric-mfig-integration-deps
merge -C 01baa2896 Agoric-mfig-integration-deps # Merge pull request #8751 from Agoric/mfig-integration-deps

# Branch Agoric-mfig-build-uses-hashes
label base-Agoric-mfig-build-uses-hashes
pick 456f11c41 build(agd): rely on checksums, not timestamps
pick d712be231 fix(registry.sh): use `build:types` and `clean:types` if they exist
pick a1cfba894 build(golang): remove sources when building Docker image
pick e7fb9f5ab fix(deployment): remove dependency on `HELPER_BINARY`
label Agoric-mfig-build-uses-hashes
reset base-Agoric-mfig-build-uses-hashes
merge -C 386cc4922 Agoric-mfig-build-uses-hashes # Merge pull request #8715 from Agoric/mfig-build-uses-hashes

# From pull request #8866
pick d5484e3ff ci(integration): fix `agd` wrapper and `Dockerfile.sdk`

# Branch Agoric-ta-bump-a3p
label base-Agoric-ta-bump-a3p
pick 160fd0c2c chore(a3p): bump synthetic-chain to 0.0.5-2
pick 5b8663c98 chore(a3p): bump yarn to 4.1.0
pick 1a7d9b342 chore(a3p): bump synthetic-chain to 0.0.5-3
label Agoric-ta-bump-a3p
reset base-Agoric-ta-bump-a3p
merge -C 592f960d2 Agoric-ta-bump-a3p # Merge pull request #8873 from Agoric/ta/bump-a3p

# Pull Request #8892
pick 7e8835ec7 ci: merge integration branch before endo checkout (#8892)

# Branch Agoric-ta-integration-cleanup
label base-Agoric-ta-integration-cleanup
pick a5c64c69f chore: remove obsolete issue template
pick 73a52d415 ci: delete disabled dapp-fungible-faucet test
label Agoric-ta-integration-cleanup
reset base-Agoric-ta-integration-cleanup
merge -C 17e0efe7d Agoric-ta-integration-cleanup # Merge pull request #8899 from Agoric/ta/integration-cleanup

# From pull request #8902
pick 229b36ff1 chore(a3p): bump synthetic-chain to 0.0.6-4

# Branch Agoric-ta-a3p-coreeval
label base-Agoric-ta-a3p-coreeval
pick bab2f8295 docs(a3p): UPGRADE NEEDED case
pick 022abb15c chore(deps): simplify a3p-integration package
# pick f864dd35d test(a3p): restart-vats
label Agoric-ta-a3p-coreeval
reset base-Agoric-ta-a3p-coreeval
merge -C b4094ba2a Agoric-ta-a3p-coreeval # Merge pull request #8801 from Agoric/ta/a3p-coreeval

# Branch Agoric-mhofman-reland-8801
label base-Agoric-mhofman-reland-8801
pick 4ed3581e6 ci: build sdk in upgrade test for potential proposal uses
edit 2a7bcead2 test(a3p): restart vats # rm -rf a3p-integration/proposals/b:restart-vats
label Agoric-mhofman-reland-8801
reset base-Agoric-mhofman-reland-8801
merge -C c839fb4a0 Agoric-mhofman-reland-8801 # Merge pull request #8907 from Agoric/mhofman/reland-8801

# Pull Request #8944
edit 27079f984 refactor(a3p): reusable submission generation function (#8944) # remove buildSubmission restart-vats

# Branch Agoric-mhofman-clarify-a3p
label base-Agoric-mhofman-clarify-a3p
pick b89aa57ca fix(a3p-integration): rebuild SDK image automatically
pick 2798b83db fixup! fix(a3p-integration): rebuild SDK image automatically # Manually authored
pick 2eb9ff4c7 docs: detail structure of a3p-integration
# pick 66ab6c362 docs: add README.md to a3p upgrade proposal
label Agoric-mhofman-clarify-a3p
reset base-Agoric-mhofman-clarify-a3p
merge -C c7efebaff Agoric-mhofman-clarify-a3p # Merge pull request #8886 from Agoric/mhofman/clarify-a3p

# Pull Request #8929
pick bc337b531 feat(a3p-integration): add core eval in test (#8929)

# Pull Request #8940
pick 0c299962f fix(a3p): serial test execution (#8940)

# Branch Agoric-mfig-silence-vat-replay-console
label base-Agoric-mfig-silence-vat-replay-console
pick 5d00dc6dd fix(SwingSet): silence vat console output during replay
pick 3098a8e75 chore(cosmic-swingset): log swingset launched
label Agoric-mfig-silence-vat-replay-console
reset base-Agoric-mfig-silence-vat-replay-console
merge -C a239f8b79 Agoric-mfig-silence-vat-replay-console # Merge pull request #8943 from Agoric/mfig-silence-vat-replay-console

# Branch Agoric-mfig-silence-vat-replay-console
label base-Agoric-mfig-silence-vat-replay-console
pick 5d00dc6dd fix(SwingSet): silence vat console output during replay
pick 3098a8e75 chore(cosmic-swingset): log swingset launched
label Agoric-mfig-silence-vat-replay-console
reset base-Agoric-mfig-silence-vat-replay-console
merge -C a239f8b79 Agoric-mfig-silence-vat-replay-console # Merge pull request #8943 from Agoric/mfig-silence-vat-replay-console

Security Considerations

None

Scaling Considerations

None

Documentation Considerations

I don't think the agd change warrant documentation change, but could be mentioned in the release notes. The rest is internal

Testing Considerations

Improvements of the test integration test infra

Upgrade Considerations

Part of upgrade-14 supporting changes, but not in itself affecting the release.

mhofman · 2024-02-18T18:21:15Z

@ivanlei reports problems with a missing tsx in his environment. Likely a bug of @agoric/synthetic-chain. Should probably pick up a fix before merging

gibson042

Everything lines up except for scripts/generate-a3p-submission.sh (see specific comment below). I feel underqualified to evaluate many of the selections and the corresponding code changes, but they're already on master so a more mechanical review seems acceptable. LGTM modulo confirmation of the shell script.

gibson042 · 2024-02-19T19:37:30Z

scripts/generate-a3p-submission.sh

+buildSubmission() {
+  proposalName=$1
+  a3pProposal=$2
+
+  yarn agoric run packages/vats/scripts/$1.js
+
+  mkdir -p $sdkroot/a3p-integration/proposals/$2/submission
+  cp $(grep -oh '/.*b1-.*.json' $sdkroot/$1*) a3p-integration/proposals/$2/submission
+  mv $sdkroot/$1* a3p-integration/proposals/$2/submission
+}


This function appears to be a manual introduction of edit 2a7bcead2 test(a3p): restart vats # remove the restart vats part, and AFAICT is never called by anything. Did you intend to end the file with an invocation like buildSubmission "$@"?

Right it's actually a change I should land on master first. The restart-vats inclusion doesn't make sense in the release branch test

fix(agd): make script more robust

ci(registry): use Endo workspace packages

build(agd): rely on checksums, not timestamps

bump a3p

integration cleanup

add a CoreEval proposal to a3p-integration

Re-add a CoreEval proposal to a3p-integration

Clarify a3p-integration

* feat(a3p-integration): add core eval in test * fixup! feat(a3p-integration): add core eval in test * Nudge * test: reduce race sensitivity --------- Co-authored-by: Turadg Aleahmad <turadg@agoric.com>

fix(SwingSet): silence vat console output during replay

mhofman · 2024-02-19T22:40:07Z

@ivanlei reports problems with a missing tsx in his environment. Likely a bug of @agoric/synthetic-chain. Should probably pick up a fix before merging

To close the loop, the issue is documented as Agoric/agoric-3-proposals#110, but as a workaround, we'll rely on global installation for now.

mhofman added the force:integration Force integration tests to run on PR label Feb 18, 2024

mhofman requested a review from gibson042 February 18, 2024 01:35

mhofman force-pushed the mhofman/cherry-pick-a3p-changes branch from 76b4562 to 0b2a8a3 Compare February 18, 2024 03:08

This was referenced Feb 18, 2024

Cherry-pick upgrade-14 cosmos changes #8869

Merged

test: verify purse balances are updated after smartWallet upgrade #8787

Merged

mhofman force-pushed the mhofman/cherry-pick-a3p-changes branch from 0b2a8a3 to 86d3940 Compare February 18, 2024 16:12

gibson042 approved these changes Feb 19, 2024

View reviewed changes

Base automatically changed from mhofman/cherry-pick-ibc-updates to dev-upgrade-14 February 19, 2024 20:18

michaelfig and others added 21 commits February 19, 2024 21:14

build(agd): rely on checksums, not timestamps

ca48360

fix(agd): make script more robust

ccf9b15

fix(registry.sh): use build:types and clean:types if they exist

9b17c7e

ci(registry): set-versions.sh cwd is already at the target

35c3574

Merge pull request #8256 from Agoric/mfig-tweak-agd

e339ede

fix(agd): make script more robust

build(golang): remove sources when building Docker image

31a2ac9

ci(registry): use exact Endo version matches

d9c1190

fix(bin-agd): recompile when C++ src changes

4ae4bf7

chore(a3p): bump synthetic-chain to 0.0.5-2

49ead34

fix(deployment): remove dependency on HELPER_BINARY

8eeff73

Merge pull request #8751 from Agoric/mfig-integration-deps

76479e8

ci(registry): use Endo workspace packages

chore(a3p): bump yarn to 4.1.0

0cee3f2

Merge pull request #8715 from Agoric/mfig-build-uses-hashes

1d78006

build(agd): rely on checksums, not timestamps

chore(a3p): bump synthetic-chain to 0.0.5-3

68381f4

ci(integration): fix agd wrapper and Dockerfile.sdk

7373aee

chore: remove obsolete issue template

8d205c2

Merge pull request #8873 from Agoric/ta/bump-a3p

e65b0c7

bump a3p

ci: delete disabled dapp-fungible-faucet test

f54e142

ci: merge integration branch before endo checkout (#8892)

65a0841

docs(a3p): UPGRADE NEEDED case

e8d7505

Merge pull request #8899 from Agoric/ta/integration-cleanup

515407e

integration cleanup

mhofman and others added 15 commits February 19, 2024 21:14

ci: build sdk in upgrade test for potential proposal uses

8a5b2fd

chore(deps): simplify a3p-integration package

a24571d

chore(a3p): bump synthetic-chain to 0.0.6-4

a35a2dc

test(a3p): restart vats

b91a2bb

Merge pull request #8801 from Agoric/ta/a3p-coreeval

9b42e71

add a CoreEval proposal to a3p-integration

Merge pull request #8907 from Agoric/mhofman/reland-8801

fd798c3

Re-add a CoreEval proposal to a3p-integration

fix(a3p-integration): rebuild SDK image automatically

46909d7

fixup! fix(a3p-integration): rebuild SDK image automatically

71f6a1b

docs: detail structure of a3p-integration

96bc3a5

Merge pull request #8886 from Agoric/mhofman/clarify-a3p

568df70

Clarify a3p-integration

fix(SwingSet): silence vat console output during replay

6d51b08

feat(a3p-integration): add core eval in test (#8929)

2d66d55

* feat(a3p-integration): add core eval in test * fixup! feat(a3p-integration): add core eval in test * Nudge * test: reduce race sensitivity --------- Co-authored-by: Turadg Aleahmad <turadg@agoric.com>

chore(cosmic-swingset): log swingset launched

43ddaa5

fix(a3p): serial test execution (#8940)

169baec

Merge pull request #8943 from Agoric/mfig-silence-vat-replay-console

6d9459d

fix(SwingSet): silence vat console output during replay

mhofman force-pushed the mhofman/cherry-pick-a3p-changes branch from 44ae7cc to 6d9459d Compare February 19, 2024 21:17

mhofman merged commit bc066b1 into dev-upgrade-14 Feb 19, 2024
61 checks passed

mhofman deleted the mhofman/cherry-pick-a3p-changes branch February 19, 2024 22:40

This was referenced Feb 20, 2024

chore(release): publish upgrade-14 #8959

Closed

chore(release): publish upgrade-14 #9003

Merged

gibson042 mentioned this pull request Apr 23, 2024

docs(MAINTAINERS): Cover pre-release generation #9235

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cherry-pick a3p and agd changes for upgrade-14 #8942

Cherry-pick a3p and agd changes for upgrade-14 #8942

mhofman commented Feb 18, 2024 •

edited

Loading

mhofman commented Feb 18, 2024

gibson042 left a comment

gibson042 Feb 19, 2024

mhofman Feb 19, 2024

mhofman commented Feb 19, 2024

Cherry-pick a3p and agd changes for upgrade-14 #8942

Cherry-pick a3p and agd changes for upgrade-14 #8942

Conversation

mhofman commented Feb 18, 2024 • edited Loading

Description

Security Considerations

Scaling Considerations

Documentation Considerations

Testing Considerations

Upgrade Considerations

mhofman commented Feb 18, 2024

gibson042 left a comment

Choose a reason for hiding this comment

gibson042 Feb 19, 2024

Choose a reason for hiding this comment

mhofman Feb 19, 2024

Choose a reason for hiding this comment

mhofman commented Feb 19, 2024

mhofman commented Feb 18, 2024 •

edited

Loading