Skip to content

Split client-lib and client-wallet #1078

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.

Sign up for GitHub

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

Open
altafan wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Split client-lib and client-wallet #1078

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f3b03ac
Refactor: Move signer session from identity to ark-lib, extract clien…
altafan May 21, 2026
e928358
Update tests
altafan May 21, 2026
29b8a5a
Update ark cli
altafan May 21, 2026
32c1977
Go mod tidy
altafan May 21, 2026
ac9f8c1
Polish
altafan May 21, 2026
631314b
Fix
altafan May 21, 2026
01d6c5a
Fixes
altafan May 21, 2026
a80645e
Finxes after review
altafan May 21, 2026
11a702f
Fixes
altafan May 21, 2026
72b7b74
Merge branch 'master' into refactor-client-lib
altafan May 21, 2026
108c721
Merge branch 'master' into refactor-client-lib
altafan May 22, 2026
da5e75d
Merge branch 'master' into refactor-client-lib
altafan May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@ replace github.com/arkade-os/arkd/pkg/errors => ./pkg/errors

replace github.com/arkade-os/arkd/pkg/client-lib => ./pkg/client-lib

replace github.com/arkade-os/arkd/pkg/client-wallet => ./pkg/client-wallet

require (
github.com/ThreeDotsLabs/watermill-sql/v3 v3.1.0
github.com/arkade-os/arkd/api-spec v0.0.0-00010101000000-000000000000
github.com/arkade-os/arkd/pkg/ark-lib v0.8.1-0.20260210151408-67ee91bbd639
github.com/arkade-os/arkd/pkg/arkd-wallet v0.0.0-00010101000000-000000000000
github.com/arkade-os/arkd/pkg/client-lib v0.0.0-00010101000000-000000000000
github.com/arkade-os/arkd/pkg/client-wallet v0.0.0-00010101000000-000000000000
github.com/arkade-os/arkd/pkg/errors v0.0.0-00010101000000-000000000000
github.com/arkade-os/arkd/pkg/kvdb v0.0.0-20250606113434-241d3e1ec7cb
github.com/arkade-os/arkd/pkg/macaroons v0.0.0-00010101000000-000000000000
Expand Down Expand Up @@ -138,6 +141,7 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/miekg/dns v1.1.61 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/sys/user v0.4.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
Expand Down
86 changes: 33 additions & 53 deletions internal/test/e2e/delegate_utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import (
arklib "github.com/arkade-os/arkd/pkg/ark-lib"
"github.com/arkade-os/arkd/pkg/ark-lib/script"
"github.com/arkade-os/arkd/pkg/ark-lib/tree"
"github.com/arkade-os/arkd/pkg/client-lib/client"
"github.com/arkade-os/arkd/pkg/client-lib/identity"
clientlib "github.com/arkade-os/arkd/pkg/client-lib"
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcutil/psbt"
"github.com/btcsuite/btcd/txscript"
Expand All @@ -25,22 +24,22 @@ type delegateBatchEventsHandler struct {
intentId string
signerSession tree.SignerSession
partialForfeitTx string
delegatorIdentity identity.Identity
client client.Client
delegatorIdentity clientlib.Identity
client clientlib.Client
forfeitPubKey *btcec.PublicKey
batchExpiry arklib.RelativeLocktime

cacheBatchId string
}

func (h *delegateBatchEventsHandler) OnStreamStarted(
ctx context.Context, event client.StreamStartedEvent,
ctx context.Context, event clientlib.StreamStartedEvent,
) error {
return nil
}

func (h *delegateBatchEventsHandler) OnBatchStarted(
ctx context.Context, event client.BatchStartedEvent,
ctx context.Context, event clientlib.BatchStartedEvent,
) (bool, time.Duration, error) {
buf := sha256.Sum256([]byte(h.intentId))
hashedIntentId := hex.EncodeToString(buf[:])
Expand All @@ -60,13 +59,13 @@ func (h *delegateBatchEventsHandler) OnBatchStarted(
}

func (h *delegateBatchEventsHandler) OnBatchFinalized(
ctx context.Context, event client.BatchFinalizedEvent,
ctx context.Context, event clientlib.BatchFinalizedEvent,
) error {
return nil
}

func (h *delegateBatchEventsHandler) OnBatchFailed(
ctx context.Context, event client.BatchFailedEvent,
ctx context.Context, event clientlib.BatchFailedEvent,
) error {
if event.Id == h.cacheBatchId {
return fmt.Errorf("batch failed: %s", event.Reason)
Expand All @@ -75,19 +74,19 @@ func (h *delegateBatchEventsHandler) OnBatchFailed(
}

func (h *delegateBatchEventsHandler) OnTreeTxEvent(
ctx context.Context, event client.TreeTxEvent,
ctx context.Context, event clientlib.TreeTxEvent,
) error {
return nil
}

func (h *delegateBatchEventsHandler) OnTreeSignatureEvent(
ctx context.Context, event client.TreeSignatureEvent,
ctx context.Context, event clientlib.TreeSignatureEvent,
) error {
return nil
}

func (h *delegateBatchEventsHandler) OnTreeSigningStarted(
ctx context.Context, event client.TreeSigningStartedEvent, vtxoTree *tree.TxTree,
ctx context.Context, event clientlib.TreeSigningStartedEvent, vtxoTree *tree.TxTree,
) (bool, error) {
myPubkey := h.signerSession.GetPublicKey()
if !slices.Contains(event.CosignersPubkeys, myPubkey) {
Expand Down Expand Up @@ -137,15 +136,13 @@ func (h *delegateBatchEventsHandler) OnTreeSigningStarted(
}

func (h *delegateBatchEventsHandler) OnTreeNonces(
ctx context.Context,
event client.TreeNoncesEvent,
ctx context.Context, event clientlib.TreeNoncesEvent,
) (bool, error) {
return false, nil
}

func (h *delegateBatchEventsHandler) OnTreeNoncesAggregated(
ctx context.Context,
event client.TreeNoncesAggregatedEvent,
ctx context.Context, event clientlib.TreeNoncesAggregatedEvent,
) (bool, error) {
h.signerSession.SetAggregatedNonces(event.Nonces)

Expand All @@ -155,19 +152,14 @@ func (h *delegateBatchEventsHandler) OnTreeNoncesAggregated(
}

err = h.client.SubmitTreeSignatures(
ctx,
event.Id,
h.signerSession.GetPublicKey(),
sigs,
ctx, event.Id, h.signerSession.GetPublicKey(), sigs,
)
return err == nil, err
}

func (h *delegateBatchEventsHandler) OnBatchFinalization(
ctx context.Context,
event client.BatchFinalizationEvent,
vtxoTree *tree.TxTree,
connectorTree *tree.TxTree,
event clientlib.BatchFinalizationEvent, vtxoTree *tree.TxTree, connectorTree *tree.TxTree,
) ([]string, error) {
forfeitPtx, err := psbt.NewFromRawBytes(strings.NewReader(h.partialForfeitTx), true)
if err != nil {
Expand Down Expand Up @@ -220,20 +212,19 @@ func (h *delegateBatchEventsHandler) OnBatchFinalization(
}

type customBatchEventsHandler struct {
onStreamStarted func(ctx context.Context, event client.StreamStartedEvent) error
onBatchStarted func(ctx context.Context, event client.BatchStartedEvent) (bool, time.Duration, error)
onBatchFinalization func(ctx context.Context, event client.BatchFinalizationEvent, vtxoTree *tree.TxTree, connectorTree *tree.TxTree) ([]string, error)
onBatchFinalized func(ctx context.Context, event client.BatchFinalizedEvent) error
onBatchFailed func(ctx context.Context, event client.BatchFailedEvent) error
onTreeTxEvent func(ctx context.Context, event client.TreeTxEvent) error
onTreeSignatureEvent func(ctx context.Context, event client.TreeSignatureEvent) error
onTreeSigningStarted func(ctx context.Context, event client.TreeSigningStartedEvent, vtxoTree *tree.TxTree) (bool, error)
onTreeNoncesAggregated func(ctx context.Context, event client.TreeNoncesAggregatedEvent) (bool, error)
onStreamStarted func(ctx context.Context, event clientlib.StreamStartedEvent) error
onBatchStarted func(ctx context.Context, event clientlib.BatchStartedEvent) (bool, time.Duration, error)
onBatchFinalization func(ctx context.Context, event clientlib.BatchFinalizationEvent, vtxoTree *tree.TxTree, connectorTree *tree.TxTree) ([]string, error)
onBatchFinalized func(ctx context.Context, event clientlib.BatchFinalizedEvent) error
onBatchFailed func(ctx context.Context, event clientlib.BatchFailedEvent) error
onTreeTxEvent func(ctx context.Context, event clientlib.TreeTxEvent) error
onTreeSignatureEvent func(ctx context.Context, event clientlib.TreeSignatureEvent) error
onTreeSigningStarted func(ctx context.Context, event clientlib.TreeSigningStartedEvent, vtxoTree *tree.TxTree) (bool, error)
onTreeNoncesAggregated func(ctx context.Context, event clientlib.TreeNoncesAggregatedEvent) (bool, error)
}

func (h *customBatchEventsHandler) OnStreamStarted(
ctx context.Context,
event client.StreamStartedEvent,
ctx context.Context, event clientlib.StreamStartedEvent,
) error {
if h.onStreamStarted != nil {
return h.onStreamStarted(ctx, event)
Expand All @@ -242,8 +233,7 @@ func (h *customBatchEventsHandler) OnStreamStarted(
}

func (h *customBatchEventsHandler) OnBatchStarted(
ctx context.Context,
event client.BatchStartedEvent,
ctx context.Context, event clientlib.BatchStartedEvent,
) (bool, time.Duration, error) {
if h.onBatchStarted != nil {
return h.onBatchStarted(ctx, event)
Expand All @@ -253,9 +243,7 @@ func (h *customBatchEventsHandler) OnBatchStarted(

func (h *customBatchEventsHandler) OnBatchFinalization(
ctx context.Context,
event client.BatchFinalizationEvent,
vtxoTree *tree.TxTree,
connectorTree *tree.TxTree,
event clientlib.BatchFinalizationEvent, vtxoTree *tree.TxTree, connectorTree *tree.TxTree,
) ([]string, error) {
if h.onBatchFinalization != nil {
return h.onBatchFinalization(ctx, event, vtxoTree, connectorTree)
Expand All @@ -264,8 +252,7 @@ func (h *customBatchEventsHandler) OnBatchFinalization(
}

func (h *customBatchEventsHandler) OnBatchFinalized(
ctx context.Context,
event client.BatchFinalizedEvent,
ctx context.Context, event clientlib.BatchFinalizedEvent,
) error {
if h.onBatchFinalized != nil {
return h.onBatchFinalized(ctx, event)
Expand All @@ -274,8 +261,7 @@ func (h *customBatchEventsHandler) OnBatchFinalized(
}

func (h *customBatchEventsHandler) OnBatchFailed(
ctx context.Context,
event client.BatchFailedEvent,
ctx context.Context, event clientlib.BatchFailedEvent,
) error {
if h.onBatchFailed != nil {
return h.onBatchFailed(ctx, event)
Expand All @@ -284,8 +270,7 @@ func (h *customBatchEventsHandler) OnBatchFailed(
}

func (h *customBatchEventsHandler) OnTreeTxEvent(
ctx context.Context,
event client.TreeTxEvent,
ctx context.Context, event clientlib.TreeTxEvent,
) error {
if h.onTreeTxEvent != nil {
return h.onTreeTxEvent(ctx, event)
Expand All @@ -294,8 +279,7 @@ func (h *customBatchEventsHandler) OnTreeTxEvent(
}

func (h *customBatchEventsHandler) OnTreeSignatureEvent(
ctx context.Context,
event client.TreeSignatureEvent,
ctx context.Context, event clientlib.TreeSignatureEvent,
) error {
if h.onTreeSignatureEvent != nil {
return h.onTreeSignatureEvent(ctx, event)
Expand All @@ -304,9 +288,7 @@ func (h *customBatchEventsHandler) OnTreeSignatureEvent(
}

func (h *customBatchEventsHandler) OnTreeSigningStarted(
ctx context.Context,
event client.TreeSigningStartedEvent,
vtxoTree *tree.TxTree,
ctx context.Context, event clientlib.TreeSigningStartedEvent, vtxoTree *tree.TxTree,
) (bool, error) {
if h.onTreeSigningStarted != nil {
return h.onTreeSigningStarted(ctx, event, vtxoTree)
Expand All @@ -315,8 +297,7 @@ func (h *customBatchEventsHandler) OnTreeSigningStarted(
}

func (h *customBatchEventsHandler) OnTreeNoncesAggregated(
ctx context.Context,
event client.TreeNoncesAggregatedEvent,
ctx context.Context, event clientlib.TreeNoncesAggregatedEvent,
) (bool, error) {
if h.onTreeNoncesAggregated != nil {
return h.onTreeNoncesAggregated(ctx, event)
Expand All @@ -325,8 +306,7 @@ func (h *customBatchEventsHandler) OnTreeNoncesAggregated(
}

func (h *customBatchEventsHandler) OnTreeNonces(
ctx context.Context,
event client.TreeNoncesEvent,
ctx context.Context, event clientlib.TreeNoncesEvent,
) (bool, error) {
return false, nil
}
Loading
Loading