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.

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

fix latest NPM packages #8390

Merged
merged 10 commits into from
Nov 9, 2023
Merged

Conversation

mhofman
Copy link
Member

@mhofman mhofman commented Sep 26, 2023

Fixes #8380

Description

Follow up to #8360 and #8374. The new NPM packages were not sufficient to get our partner to test a dapp as expected. This PR cherry picks a few more existing and new fixes that were needed. It was not 100% sufficient to run without an agoric-sdk checkout because of their reliance of a cosmos based testnet (see #8033), and makefile targets in cosmic-swingset, however that's a separate issue.

This PR is constructed with the following git-rebase-todo

# Pull Request #8322
pick 97cb7158f fix(walletFactory): move upgrading check before baggage is populated (#8322)

# Pull Request #8351
pick 9f89f97d4 feat: puppetGovernor pass the Issuerkeywordrecord through (#8351)

# Partial Pull Request #7921
pick 1ab049437 build: export tools from swingset-liveslots

# Partial Pull Request #7922
pick 379277e77 fix: export of eslint-config.cjs

# Branch Agoric-mhofman-fix-solo-wallet-ui
label base-Agoric-mhofman-fix-solo-wallet-ui
pick c57885107 fix(solo): correct lookup of wallet-ui
pick 1ac063e79 fix(wallet): don't assume node_modules layout
label Agoric-mhofman-fix-solo-wallet-ui
reset base-Agoric-mhofman-fix-solo-wallet-ui
merge -C bf2e680e7 Agoric-mhofman-fix-solo-wallet-ui # Merge pull request #8392 from Agoric/mhofman/fix-solo-wallet-ui

# Branch Agoric-mhofman-workaround-babel-override-mistake
label base-Agoric-mhofman-workaround-babel-override-mistake
pick 584ec6248 fix(solo): use alternative endo init
pick 877c1a13d fix(internal): severe override taming for bundle-source
label Agoric-mhofman-workaround-babel-override-mistake
reset base-Agoric-mhofman-workaround-babel-override-mistake
merge -C 1831bf3fd Agoric-mhofman-workaround-babel-override-mistake # Merge pull request #8391 from Agoric/mhofman/workaround-babel-override-mistake

Security Considerations

This PR picks a change switching the override and error taming of the solo to a severe/unsafe mode respectively. This should be safe as only our trusted code should be impacted.

Scaling Considerations

None

Documentation Considerations

None

Testing Considerations

Verified these changes applied as patches are sufficient to get KREAd working with their testing flow.

Upgrade Considerations

Only a wallet factory change affects runtime code, however it's only to make it compatible with both a bootstrap and upgrade start, and safe to include even though not technically 100% matching of the code that was deployed in the core eval, but that's what the tag is for. No other contract code is affected.

dckc and others added 4 commits September 26, 2023 23:41
…8322)

* fix(walletFactory): move upgrading check before baggage is populated

The `baggage.has('walletsByAddress')` check has to come before the
`provideDurableMapStore(baggage, 'walletsByAddress')` call.

* test(smart-wallet): fake bridge manager detects handler not set

... and handler already set

* fixup! test(smart-wallet): fake bridge manager detects handler not set
@mhofman mhofman changed the title Mhofman/fix npm latest round 2 fix latest NPM packages Sep 27, 2023
@mhofman mhofman force-pushed the mhofman/fix-npm-latest-round-2 branch from db5e6cf to 777d079 Compare September 30, 2023 00:21
Work around babel dep override mistake
Work around babel dep override mistake
@mhofman mhofman force-pushed the mhofman/fix-npm-latest-round-2 branch from 777d079 to 9486c77 Compare November 7, 2023 21:34
@mhofman mhofman requested a review from warner November 7, 2023 21:40
@mhofman mhofman marked this pull request as ready for review November 7, 2023 21:41
…e-mistake

Workaround babel override mistake
@mhofman mhofman added the force:integration Force integration tests to run on PR label Nov 8, 2023
@mhofman mhofman requested a review from gibson042 November 9, 2023 16:08
Copy link
Member

@gibson042 gibson042 left a comment

Choose a reason for hiding this comment

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

The changes look reasonable, and I confirm that the claimed git-rebase-todo is able to produce the resulting commit history and file state.

# Pull Request #8322
pick 97cb7158f fix(walletFactory): move upgrading check before baggage is populated (#8322)

# Pull Request #8351
pick 9f89f97d4 feat: puppetGovernor pass the Issuerkeywordrecord through (#8351)

# Partial Pull Request #7921
pick 1ab049437 build: export tools from swingset-liveslots

# Partial Pull Request #7922
pick 379277e77 fix: export of eslint-config.cjs

# Branch Agoric-mhofman-fix-solo-wallet-ui
label base-Agoric-mhofman-fix-solo-wallet-ui
pick c57885107 fix(solo): correct lookup of wallet-ui
pick 1ac063e79 fix(wallet): don't assume node_modules layout
label Agoric-mhofman-fix-solo-wallet-ui
reset base-Agoric-mhofman-fix-solo-wallet-ui
merge -C bf2e680e7 Agoric-mhofman-fix-solo-wallet-ui # Merge pull request #8392 from Agoric/mhofman/fix-solo-wallet-ui

# Branch Agoric-mhofman-workaround-babel-override-mistake
label base-Agoric-mhofman-workaround-babel-override-mistake
pick 584ec6248 fix(solo): use alternative endo init
pick 877c1a13d fix(internal): severe override taming for bundle-source
label Agoric-mhofman-workaround-babel-override-mistake
reset base-Agoric-mhofman-workaround-babel-override-mistake
merge -C 1831bf3fd Agoric-mhofman-workaround-babel-override-mistake # Merge pull request #8391 from Agoric/mhofman/workaround-babel-override-mistake

Comment on lines +33 to +39
const env = /** @type {NodeJS.ProcessEnv} */ (
/** @type {unknown} */ ({
__proto__: process.env,
LOCKDOWN_OVERRIDE_TAMING: 'severe',
})
);
const { status } = spawnSync(prog, args, { stdio: 'inherit', env });
Copy link
Member

Choose a reason for hiding this comment

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

TIL that spawnSync etc. walk the prototype chain for env. A comment explaining the insertion of LOCKDOWN_OVERRIDE_TAMING: 'severe' would be nice, but I understand that this is cherry-picking.

@mhofman mhofman merged commit 867dea5 into release-mainnet1B Nov 9, 2023
65 of 67 checks passed
@mhofman mhofman deleted the mhofman/fix-npm-latest-round-2 branch November 9, 2023 19:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
force:integration Force integration tests to run on PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants