aljaz/ark
1
0
Fork 0
mirror of https://github.com/aljazceru/ark.git synced 2025-12-18 12:44:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (#121)

Browse Source 
* Cleanup common

* Cleanup client

* Cleanup server

* Renamings

* Tidy up proto

* Update ocean protos

* Fixes

* Fixes
This commit is contained in:
Pietralberto Mazza
2024-02-28 18:05:03 +01:00
committed by GitHub
parent 1650ea5935
commit 6d0d03e316
31 changed files with 2475 additions and 2217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/onboard.go
View File

@@ -40,17 +40,17 @@ func onboardAction(ctx *cli.Context) error {
_, net := getNetwork()
aspPubkey, err := getServiceProviderPublicKey()
aspPubkey, err := getAspPublicKey()
if err != nil {
return err
}
lifetime, err := getLifetime()
roundLifetime, err := getRoundLifetime()
if err != nil {
return err
}
exitDelay, err := getExitDelay()
unilateralExitDelay, err := getUnilateralExitDelay()
if err != nil {
return err
}
@@ -66,7 +66,8 @@ func onboardAction(ctx *cli.Context) error {
}
treeFactoryFn, sharedOutputScript, sharedOutputAmount, err := tree.CraftCongestionTree(
net.AssetID, aspPubkey, []tree.Receiver{congestionTreeLeaf}, minRelayFee, lifetime, exitDelay,
net.AssetID, aspPubkey, []tree.Receiver{congestionTreeLeaf},
minRelayFee, roundLifetime, unilateralExitDelay,
)
if err != nil {
return err
@@ -92,13 +93,14 @@ func onboardAction(ctx *cli.Context) error {
return err
}
txid, err := broadcastPset(pset)
explorer := NewExplorer()
txid, err := explorer.Broadcast(pset)
if err != nil {
return err
}
fmt.Println("onboard txid:", txid)
fmt.Println("waiting for confirmation... (this may take a while, do not cancel the process)")
fmt.Println("onboard_txid:", txid)
fmt.Println("waiting for confirmation... (this may take up to a minute, do not cancel the process)")
// wait for the transaction to be confirmed
if err := waitForTxConfirmation(ctx, txid); err != nil {
@@ -116,11 +118,11 @@ func onboardAction(ctx *cli.Context) error {
return err
}
client, close, err := getClientFromState(ctx)
client, cancel, err := getClientFromState()
if err != nil {
return err
}
defer close()
defer cancel()
_, err = client.Onboard(ctx.Context, &arkv1.OnboardRequest{
BoardingTx: pset,