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: merge v0.46.16-alpha.agoric.2.4 #421

Merged
merged 21 commits into from
Aug 4, 2024

Conversation

michaelfig
Copy link
Collaborator

Updates the Agoric default branch.

JimLarson and others added 16 commits March 8, 2024 12:34
* feat: configurable fee collector for DeductFeeDecorator

* docs: update changelog with PR number

* test: ensure increment of alt account, comments
Also add tests and documentation.
* feat: abci client type now an explicit config setting

Setting the flag still works and takes precedence.

* docs: changelog entry

* refactor: common location for valid abci client types and default

* refactor: actually use the defined default value
chore: cherry-pick and update docs for v0.46.16-alpha.agoric.2.3
Also more documentation for TOML template.

(cherry picked from commit 820bc69)
…rry-picks

build: cherry-pick commits for v0.46.16-alpha.agoric.2.4
@michaelfig michaelfig self-assigned this Jul 5, 2024
Copy link

@mhofman mhofman left a comment

Choose a reason for hiding this comment

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

I have verified that the only substantive change between v0.46.16-alpha.agoric.2.4 and the Agoric branch is the removal of the lien module (#385).

As a matter of process I would have preferred for this PR to be a merge of that tag into Agoric, and for #338 to land on top targeting the Agoric branch.

@michaelfig
Copy link
Collaborator Author

As a matter of process I would have preferred for this PR to be a merge of that tag into Agoric, and for #338 to land on top targeting the Agoric branch.

Ack. I think that was my original plan, but I merged in order of approvals instead. I'll remember for next time.

@michaelfig michaelfig merged commit 3cc2d36 into Agoric Aug 4, 2024
28 of 29 checks passed
@michaelfig michaelfig deleted the mfig-v0.46.16-alpha.agoric.2.4 branch August 4, 2024 06:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants