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

chore: u18 cherrypicks round 6 #10711

Merged
merged 6 commits into from
Dec 17, 2024
Merged

Conversation

mujahidkay
Copy link
Member

Description

Cherry-picks the following commits from master:

No new upgrade name has been added.

Using following rebase todo:

# PR #10704 Branch build-deps-use-backport-of-cosmos-sdk-v0-46-15-10704-
label onto
pick 140c1be67 Save the contractKit for the auctioneer before overwriting it (#10694)
pick 3e27c74e5 test: add proposal w/300 E(chainTimerService).getTimerBrand() calls (#10696)
label base-build-deps-use-backport-of-cosmos-sdk-v0-46-15-10704-
pick ab3fcb564 build(deps): use backport of cosmos-sdk v0.46.15
pick c025cb7fa fix(cosmic-swingset): expect chain --halt-height exit status > 1
label pr-10704--build-deps-use-backport-of-cosmos-sdk-v0-46-15-10704-
reset base-build-deps-use-backport-of-cosmos-sdk-v0-46-15-10704- # test: add proposal w/300 E(chainTimerService).getTimerBrand() calls (#10696)
merge -C 5939b2a0f pr-10704--build-deps-use-backport-of-cosmos-sdk-v0-46-15-10704- # build(deps): use backport of cosmos-sdk v0.46.15 (#10704)

michaelfig and others added 5 commits December 17, 2024 15:29
refs: #10680

## Description

We misplaced the adminFacets that would allow us to manage Auctions after they've been replaced and were about to do it again. The auctions were [last upgraded](https://github.com/Agoric/agoric-sdk/blob/43345a561fbdf7621c369abb15e6839f7c696565/packages/inter-protocol/src/proposals/add-auction.js#L157) in `agoric-upgrade-16av`. That code fails to save the instance's adminFacet, and only stores the contractKit in bootstrap promise space under the name `auctioneerKit`, where it will be overwritten on upgrade. Our other contracts now save a copy of the `contractKit` in either `contractKits` or `governedContractKits`, indexed by the instance, so the facets will hang around. This saves the old auctioneer during upgrade so we can manage it later (upgrade, terminate, change parameters).

### Security Considerations

Losing our last handle for vats is a problem.

### Scaling Considerations

We're upgrading vats to deal with scaling.

### Documentation Considerations

None.

### Testing Considerations

there was a test in #10680 which looked for this kit in `governedContractKits`, but I commented it out when it didn't succeed. It succeeds now.

### Upgrade Considerations

Yes.
…10696)

## Description

@warner asked for a proposal that would ensure there were several more (300 was settled on) arbitrary calls in order to provoke bring-out-your-dead.

### Security Considerations

test environments only: aimed at mainFork.

### Scaling Considerations

No implications

### Documentation Considerations

Unnecessary

### Testing Considerations

For test environments.

### Upgrade Considerations

None.
## Description

Update `cosmos-sdk` dependency to newly tagged Agoric version, `v0.46.16-alpha.agoric.2.5`

### Security Considerations

Improves decoding of deeply nested transaction data.

### Scaling Considerations

n/a

### Documentation Considerations

n/a

### Testing Considerations

Should be drop-in replacement for current dependencies.

### Upgrade Considerations

n/a
@mujahidkay mujahidkay requested a review from a team as a code owner December 17, 2024 11:00
@mujahidkay mujahidkay added the force:integration Force integration tests to run on PR label Dec 17, 2024
@mujahidkay mujahidkay self-assigned this Dec 17, 2024
Copy link
Contributor

@Muneeb147 Muneeb147 left a comment

Choose a reason for hiding this comment

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

@mujahidkay Changes look good and I don't see anything missing or misaligned in cherry-picks from the original master commits. Let's see what CI tells us now

@mujahidkay
Copy link
Member Author

mujahidkay commented Dec 17, 2024

@mujahidkay Changes look good and I don't see anything missing or misaligned in cherry-picks from the original master commits. Let's see what CI tells us now

CI failed again. Investigating.
Edit: seems like a known flake (albeit a different error, but same test) #10565 test has been skipped in master but that change isn't in dev-upgrade-18 branch yet. Re-running till it passes.

Copy link

cloudflare-workers-and-pages bot commented Dec 17, 2024

Deploying agoric-sdk with  Cloudflare Pages  Cloudflare Pages

Latest commit: 540d4b1
Status: ✅  Deploy successful!
Preview URL: https://78b3c91b.agoric-sdk.pages.dev
Branch Preview URL: https://mk-u18-rc5-cherrypicks.agoric-sdk.pages.dev

View logs

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.

LGTM

@mujahidkay mujahidkay merged commit 0218510 into dev-upgrade-18 Dec 17, 2024
78 checks passed
@mujahidkay mujahidkay deleted the mk/u18-rc5-cherrypicks branch December 17, 2024 14:18
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