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

Merged
merged 98 commits into from
Jan 23, 2025

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
mateuszjasiuk and others added 25 commits January 9, 2025 16:57
feat: increase masp txs gas limit + tx id hashes to lowercase
fix: duplicate votes for same voter
crawler: add latest processed block height
wrapper: add amount per gas unit
ci: improve client generation
@joel-u410
Copy link
Contributor Author

joel-u410 commented Jan 22, 2025

@Fraccaman -- I just updated this with the latest 1.0.0-maint and the latest main. There were a few more conflicts, most of which were straightforward to resolve, but there was one thing I wasn't sure about:

  • In 7e39bbb on the 1.0.0-maint side, you added pub last_processed_block_height: i32 to the API response for crawler_state.
  • In a8fde04 on the main side, you added pub last_processed_block: Option<i32> to the same API response.

I wasn't sure which one should "win" this conflict, so I combined them:

  • pub last_processed_block_height: Option<i32>

Also:

  • On the 1.0.0-maint side, the namada SDK was updated to the v1.0.0 release.
  • On the main side, the namada SDK was updated to the fraccaman/rpc-pgf-payments branch.

Since fraccaman/rpc-pgf-payments has been merged, but is not part of v1.0.0, I resolved it by updating namada to the main branch.

Can we merge this soon before these branches drift more & create more conflicts? 🙂

@Fraccaman Fraccaman added this pull request to the merge queue Jan 23, 2025
@Fraccaman
Copy link
Member

thanks a lot!

Merged via the queue into anoma:main with commit 3105e36 Jan 23, 2025
14 checks passed
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.

7 participants