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

Merge 1.0.0-maint into main #226

Open
wants to merge 40 commits into
base: main
Choose a base branch
from

Conversation

joel-u410
Copy link
Contributor

This branch merges and resolves conflicts for 1.0.0-maint into main.

@Fraccaman @mateuszjasiuk -- I went ahead and opened this because I am running my fork based on main but wanted my recent 1.0.0-maint PRs incorporated too 🙂

Merge remote-tracking branch 'upstream/1.0.0-maint' into joel/1.0.0-maint-merge-main

# Conflicts:
#	chain/src/main.rs
#	orm/src/schema.rs
#	orm/src/transactions.rs
#	shared/src/transaction.rs
#	webserver/src/app.rs
#	webserver/src/error/api.rs
#	webserver/src/error/mod.rs
#	webserver/src/handler/mod.rs
#	webserver/src/repository/mod.rs
#	webserver/src/response/mod.rs
#	webserver/src/service/mod.rs
#	webserver/src/state/common.rs

mateuszjasiuk and others added 30 commits December 5, 2024 10:03
backport: fetch validators out of consensus set
feat: add block proposer to addresses_with_balance_change
enhancement: store blocks while crawling transactions and chain
@joel-u410 joel-u410 changed the title Merge 1.0.0-main into main Merge 1.0.0-maint into main Dec 17, 2024
@joel-u410 joel-u410 changed the title Merge 1.0.0-maint into main Merge 1.0.0-maint into main Dec 17, 2024
Comment on lines +244 to +247
let all_balance_changed_addresses = addresses
.iter()
.chain(block_proposer_address.iter())
.chain(pgf_receipient_addresses.iter())
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was probably the trickiest part of the merge -- given the changes on both sides to this, I had to make sure pgf_recipient_addresses was still accounted for (which it is, as you can see).

@ValidityOps-CLU
Copy link

@joel-u410 will this one make it into this 1.0.0 release?

Copy link
Collaborator

@mateuszjasiuk mateuszjasiuk left a comment

Choose a reason for hiding this comment

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

Hello! I think this is fine. Let's wait for Gian to take a look though just in case! :)

@mateuszjasiuk
Copy link
Collaborator

@ValidityOps-CLU The PR that you are pointing to can be merged to main when finished. For now we only tag new versions based on 1.0.0-maint branch. The reason is that we need to support web client(namadillo) in non breaking way. All of the extra features that namadillo does not need at the moment will end up in main and will be a part of version 2.0.0 of indexer sometime in the future :)

@neocybereth
Copy link

Awesome thank you @mateuszjasiuk

@Fraccaman
Copy link
Member

Fraccaman commented Dec 30, 2024

@joel-u410 thanks for the PR! can you take all the latest changes too ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants