Skip to content

chore(rebase): align blink with galoy 0.1.114#33

Draft
dolcalmi wants to merge 67 commits intomainfrom
rebase/galoy-0.1.114
Draft

chore(rebase): align blink with galoy 0.1.114#33
dolcalmi wants to merge 67 commits intomainfrom
rebase/galoy-0.1.114

Conversation

@dolcalmi
Copy link

@dolcalmi dolcalmi commented Mar 11, 2026

Summary

  • Rebased Blink changes onto Galoy 0.1.114 baseline while preserving Blink-specific CI/repo ownership settings.
  • Synced latest main into this rebase branch and resolved conflicts in CI, SQLx metadata, and payout queue/job processing paths.
  • Regenerated SQLx metadata after migrations, aligned payout queue internals with Galoy behavior, and validated build with cargo check.

Notes

  • Cargo.toml keeps Blink versioning and restores es-entity dependency required by the merged code paths.
  • Branch is ready for PR review and merge workflow.

Lakshyyaa and others added 30 commits May 28, 2025 19:59
* refactor: refactor profile entity file to use es_entity

* fix: impl Debug on Profile for tracing

* fix: replaced find fns

* fix: use findby where needed

* fix: use dp op in place of tx

* fix: uses multiple dp ops

* fix: added es_entity errors

* chore: remove profile migration and fns

* fix: check-code warnings

* fix: persist=false for accountid in profile

* chore: run cargo sqlx

* chore: change argument order in findby fns

* chore: rename findby fns alphabetically
* fix: use entity_id macro from es_entity

* chore: use es_entity directly
* refactor: migrate wallet entity to es_entity

* fix: address Vaibhav Dixit's feedback for PR GaloyMoney#613

Remove create_in_tx/find_by_ids , use generated create in mod.rs

* fix: update repo.rs per feedback, await N+1 fix (GaloyMoney#613)

* fix: fixed N+1 with find_all

* fix: Optimize wallet fetching in process_payout_queue with find_all

* fix: update entity.rs per feedback, await app/mod.rs fix

* fix: update src/app/mod.rs per feedback

* style: handle clippy warnings

* refactor: return Vec from wallet_ids to simplify call site

* chore: format code to pass make check-code

* fix: removed .clone

* chore: add from_es_entity_error

---------

Co-authored-by: Vaibhav <thevaibhavdixit@gmail.com>
* chore: move e2e files to new bats directory

* chore: delete out.txt

* chore: rename commands for e2e test refactor
Co-authored-by: CI Bot <bot@galoy.io>
Co-authored-by: CI Bot <bot@galoy.io>
Co-authored-by: CI Bot <bot@galoy.io>
Co-authored-by: CI Bot <bot@galoy.io>
Co-authored-by: CI Bot <bot@galoy.io>
Co-authored-by: CI Bot <bot@galoy.io>
Co-authored-by: CI Bot <bot@galoy.io>
* refactor: update error files

* refactor: update repo definitions

* refactor: update repo fns from es_entity

* refactor: update repo fns and remove comments

* refactor: use XpubId for now

* fix: use clone and use builder for default value of config

* chore: remove comments and redundant code

* fix: rename db_id -> db_uuid

* fix: use accessor fn and replace persist_in_tx with create

* refactor: use create fn directly

* refactor: use create_in_op directly

* chore: remove unused import

* fix: use correct error variants

* fix: use correct error variant

* fix: use repo options for entity id

* chore: use es-entity on main

* chore: pin es-entity

* refactor: update entity names and use repo configs

* fix: use correct entity name

* chore: use es-entity main

* chore: pin es-entity

* refactor: correct format and remove diffs

* chore: undo comments for persist

* refactor: revert to key_name and use accessor fn

* chore: move persistence traits to repo

* chore: rename XPubId->XPubFingerprint and xpub_id->xpub_fingerprint

* chore: rename id->fingerprint and update error desc

* chore: use correct format

* refactor: explicitly specify event using es_entity attr

---------

Co-authored-by: Vaibhav <thevaibhavdixit@gmail.com>
Co-authored-by: bodymindarts <justin@galoy.io>
* refactor: update repo fns using es_entity

* chore: correct format

* fix: add created_at col to signing_sessions tbl

* fix: add await for async call

* chore: run sqlx prepare

* chore: clean up formatting in signing session

* chore: remove unnecessary check and comment

* chore: remove redundant check

* chore: remove redundant statements

---------

Co-authored-by: Vaibhav <thevaibhavdixit@gmail.com>
…ney#641)

* chore: delete empty file

* chore: remove unnecessary check and update repo

* chore: remove comment and rename persist_updated->update_signer_config
Co-authored-by: CI Bot <bot@galoy.io>
…ney#638)

* refactor: use es_query instead of post-query validation

* fix: use es_query for find_by fns which return a collection and undo find_by_id fns

* chore: remove unnecessary typecasting
* fix: use entity_id macro from es_entity

* fix: payout entity uses es_entity

* fix: replaced findby fns from repo

* fix: change error conversion

* refactor: use es_query macro for sqlx queries

* refactor: use es_query for findby fns

* refactor: use esquery for repo fns and loop for paginated responses

* fix: pass check-code

* chore: remove unused query

* refactor: use query_as macro to use update locks

* chore: remove unnecessary diffs

* fix: add missing collumns

* chore: add update option in repo

* fix: add missing column with accessor

* chore: use es_query over sqlx query_as

* chore(deps): pin es-entity to main

* chore: remove redundant macros

* refactor: update repo fns

* refactor: use correct format and update repo query

* chore: update es_entity version, remove unnecessary diffs

* refactor: restore es_entity version and update payout test

* chore: fix check-code warning

* refactor: remove comment, use typecast for list fn

* chore: remove default persist from repo

* chore: fix check-code warning

* chore: remove unnecessary code

* refactor: address pr review

* refactor: use fold and reduce lines of code

* chore: whitespace and local testing

* refactor: add migration script to add account_id in payout event, use direct findby fn

* chore: run sqlx prepare

* chore: remove list_for

* refactor: use was_not_found fn for error, update migration script

* chore: run sqlx prepare

---------

Co-authored-by: Vaibhav <thevaibhavdixit@gmail.com>
sutt0n and others added 28 commits September 18, 2025 20:25
…yMoney#654)

* fix(utxo): psql syntax used in querybuilder in reserve_utxos_in_batch for postgres 15.x

* chore: update postgres to 15.x

* fix: ensure uuid_nil() exists

* fix: various postgres 15.x syntax issues

* chore(deps): bump tracing-subscriber to pass cargo audit

* refactor: slim down changes per offline review of @bodymindarts

* test(e2e): get mempool image running for fees

* chore: don't set a strict timeout on mempool waiting for db

* chore: move retries to flaky test only
* refactor: update es_query, use impl in repo fn arguments

* chore: bump flake

* chore: update all repo fns use impl AtomicOperation

* chore: get jobs back in old state

* chore: remove entity module

* chore: migration to add context to events

* chore: fix typo

* Revert "chore: remove entity module"

This reverts commit 64f57ff.

* use existing entity module

* chore: update ledger tests

* chore: use pinned es-entity from github

* chore: run sqlx prepare

* chore: discard forked es-entity

* chore: use tx_mut for ledger operations

* chore: revert changes in ledger tests

* chore: use query_as macro as hack

* chore: remove lifetime

* chore: use explicit reborrow

* chore: run sqlx prepare

* chore: remove wrong file

---------

Co-authored-by: Vaibhav <thevaibhavdixit@gmail.com>
* feat: add batch drop

* feat: add cancel batch cmd

* fix: sqlx prepare

* test: update payout tests

* fix: add cancelled to batch response
* feat: add fee_rate field to estimate_payout_fee response

* test(e2e): evaluate fee_rate and estimate_fee into estimate-payout-fee

* fix: fmt error solved

* fix(e2e): estimate payout fee expected .satoshis

* feat: change fee_rate to float in EstimatePayoutFeeResponse

---------

Co-authored-by: Esaú Gómez <alfonsoesaugomez@gmail.com>
* chore: flake update

* fix: format issues
* chore: bump sqlx-ledger 0.11.10

* fix: lint issues

* fix: sqlx lint issues

* chore: bump sqlx-ledger to 0.11.11
* fix: nix config on darwin

* fix: suppress warning

* docs: better link

---------

Co-authored-by: k9ert <117085+k9ert@users.noreply.github.com>
…24)

* Revert "fix: update journal_events to handle stream close properly (#16)"

This reverts commit 073595c.

* fix: check-code issues
* chore: update bitcoind and lnd images

* fix(e2e): support LND v0.19+ taproot change addresses in lnd_sync tests
Rust 1.94 Clippy flags tonic::Status (176 bytes) as too large for
Result Err variants. This is a false positive for gRPC handlers where
tonic::Status is the idiomatic error type. Allow the lint at the module
level, consistent with the existing blocks_in_conditions allow.
* fix: isolate job channels with dedicated runners

Split job execution into account_main, critical, and maintenance runners with independent concurrency controls to prevent sync_wallet backlog from starving payout and broadcast flows. Keep process_all_payout_queues in maintenance as a scheduler/fan-out path while preserving critical bandwidth for signing and broadcasting.

* chore: align runner config defaults and validation logs

Deduplicate runner default helpers, align bria.yml example values with compiled defaults, and emit warnings when runner concurrency is normalized. Also clarify why JobRunners keeps handles alive for app lifetime.

* test(e2e): restore default job runner config

Remove e2e runner concurrency overrides so sync-related BATS scenarios run with the default daemon scheduling behavior. This avoids timing drift introduced by the lower test-only runner limits.

* perf: prioritize newer wallets in sync scheduling

Order wallet ids by created_at descending when scheduling sync_all_wallets so recently added wallets are synced first under backlog pressure. Refresh sqlx prepare metadata for the updated query.

* test: add normalize_concurrency unit tests
* perf: reduce bdk sync write churn and add indexes

* perf: lower bdk persistence batch size to 2000

* fix: lint issues

* chore: update index creation
@dolcalmi dolcalmi changed the title Rebase/galoy 0.1.114 chore(rebase): align blink with galoy 0.1.114 Mar 11, 2026
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.

10 participants