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: pick hotfixes from 1.8 branch #5645

Merged
merged 7 commits into from
Feb 20, 2025
Merged

Conversation

dandanlen
Copy link
Collaborator

@dandanlen dandanlen commented Feb 17, 2025

Cherry picks recent fixes from release/1.8

@dandanlen dandanlen requested a review from kylezs February 17, 2025 15:35
@dandanlen dandanlen changed the title fix: pull hotfixes from 1.8 branch fix: pick hotfixes from 1.8 branch Feb 17, 2025
@dandanlen
Copy link
Collaborator Author

Looks like it's waiting for 1.8.2 to be tagged before it can build...

@dandanlen dandanlen force-pushed the feat/cherry-picks-from-1.8 branch from e62b4ba to 312ab4b Compare February 19, 2025 10:27
@kylezs
Copy link
Contributor

kylezs commented Feb 19, 2025

The stuck fetches fix is already on main: #5632

@dandanlen
Copy link
Collaborator Author

The stuck fetches fix is already on main: #5632

True - looks like that commit only contains changelog updates and a version bump. I'll change the label.

@dandanlen dandanlen force-pushed the feat/cherry-picks-from-1.8 branch from 312ab4b to 4ca46b5 Compare February 19, 2025 10:37
@dandanlen dandanlen added this pull request to the merge queue Feb 20, 2025
github-merge-queue bot pushed a commit that referenced this pull request Feb 20, 2025
* fix: delete Solana channel state when closed

* chore: CHANGELOG and a version bump

* test: invalid fetches should not block valid fetches

* fix: only decrement counter if we can actually fetch

* feat: add account id / withdrawal address to affiliate events (#5634)

* feat: Added broker_id to WithdrawalRequest event

* chore: changed broker_id to account_id

I think this is a better name since it could be either a broker or an affiliate but in the end both is an account.

* feat: Added withdrawal address to AffiliateRegistration

* feat: returning detailed account information for affiliate in the cf_account_info rpc for brokers (#5641)

* feat: Added asset_balances to Unregistered Account variant

* chore: added deprecate note

* fix: simplify asset map conversion

* feat: add optional affiliate withdrawal address to broker account info

* fix: clippy and test

* fix: make BrokerInfo non-breaking

* fix: unused import

---------

Co-authored-by: Daniel <daniel@chainflip.io>

* fix: ensure correct affiliate account creation/removal

* fix: typo

* fix: missing version bumps

---------

Co-authored-by: kylezs <kyle@chainflip.io>
Co-authored-by: Janislav <jan@chainflip.io>
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Feb 20, 2025
dandanlen and others added 7 commits February 20, 2025 17:13
* test: invalid fetches should not block valid fetches

* fix: only decrement counter if we can actually fetch
* feat: Added broker_id to WithdrawalRequest event

* chore: changed broker_id to account_id

I think this is a better name since it could be either a broker or an affiliate but in the end both is an account.

* feat: Added withdrawal address to AffiliateRegistration
…account_info rpc for brokers (#5641)

* feat: Added asset_balances to Unregistered Account variant

* chore: added deprecate note

* fix: simplify asset map conversion

* feat: add optional affiliate withdrawal address to broker account info

* fix: clippy and test

* fix: make BrokerInfo non-breaking

* fix: unused import

---------

Co-authored-by: Daniel <daniel@chainflip.io>
@dandanlen dandanlen force-pushed the feat/cherry-picks-from-1.8 branch from ae04639 to 91e6382 Compare February 20, 2025 16:15
@dandanlen dandanlen enabled auto-merge February 20, 2025 16:15
@dandanlen dandanlen added this pull request to the merge queue Feb 20, 2025
Merged via the queue into main with commit 4cc134d Feb 20, 2025
48 checks passed
@dandanlen dandanlen deleted the feat/cherry-picks-from-1.8 branch February 20, 2025 20:19
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.

3 participants