github/atomic-swap
1
1
Fork 0
mirror of https://github.com/AthanorLabs/atomic-swap.git synced 2026-01-09 14:18:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

integrated relayer into swapd (#342)

Browse Source
This commit is contained in:
Dmitry Holodov
2023-03-17 14:22:16 -05:00
committed by GitHub
parent baea93c839
commit 0e80eee4dc
69 changed files with 1496 additions and 1970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
monero/wallet_client.go
View File

@@ -308,7 +308,7 @@ func (c *walletClient) Transfer(
log.Infof("Transfer TXID=%s succeeded with %d confirmations and fee %s XMR",
transfer.TxID,
transfer.Confirmations,
coins.FmtPiconeroAmtAsXMR(transfer.Fee),
coins.FmtPiconeroAsXMR(transfer.Fee),
)
return transfer, nil
}
@@ -329,7 +329,7 @@ func (c *walletClient) SweepAll(
if err != nil {
return nil, fmt.Errorf("sweep operation failed to get balance: %w", err)
}
log.Infof("Starting sweep of %s XMR from %s to %s", coins.FmtPiconeroAmtAsXMR(balance.Balance), from, to)
log.Infof("Starting sweep of %s XMR from %s to %s", coins.FmtPiconeroAsXMR(balance.Balance), from, to)
if balance.Balance == 0 {
return nil, fmt.Errorf("sweep from %s failed, no balance to sweep", from)
}
@@ -362,8 +362,8 @@ func (c *walletClient) SweepAll(
}
log.Infof("Sweep transfer ID=%s of %s XMR (%s XMR fees) completed at height %d",
txID,
coins.FmtPiconeroAmtAsXMR(receipt.Amount),
coins.FmtPiconeroAmtAsXMR(receipt.Fee),
coins.FmtPiconeroAsXMR(receipt.Amount),
coins.FmtPiconeroAsXMR(receipt.Fee),
receipt.Height,
)
transfers = append(transfers, receipt)
@@ -458,7 +458,7 @@ func createWalletFromKeys(
log.Infof("Created wallet %s, balance is %s XMR (%d blocks to unlock), address is %s",
c.WalletName(),
coins.FmtPiconeroAmtAsXMR(bal.Balance),
coins.FmtPiconeroAsXMR(bal.Balance),
bal.BlocksToUnlock,
c.PrimaryAddress(),
)

18
monero/wallet_client_test.go
View File

@@ -33,8 +33,8 @@ func TestClient_Transfer(t *testing.T) {
balanceBob := GetBalance(t, cXMRMaker)
t.Logf("Bob's initial balance: bal=%s XMR, unlocked=%s XMR, blocks-to-unlock=%d",
coins.FmtPiconeroAmtAsXMR(balanceBob.Balance),
coins.FmtPiconeroAmtAsXMR(balanceBob.UnlockedBalance),
coins.FmtPiconeroAsXMR(balanceBob.Balance),
coins.FmtPiconeroAsXMR(balanceBob.UnlockedBalance),
balanceBob.BlocksToUnlock)
transferAmtU64, err := transferAmt.Uint64()
@@ -54,8 +54,8 @@ func TestClient_Transfer(t *testing.T) {
transfer, err := cXMRMaker.Transfer(ctx, abAddress, 0, transferAmt, MinSpendConfirmations)
require.NoError(t, err)
t.Logf("Bob sent %s (+fee %s) XMR to A+B address with TX ID %s",
coins.FmtPiconeroAmtAsXMR(transfer.Amount),
coins.FmtPiconeroAmtAsXMR(transfer.Fee),
coins.FmtPiconeroAsXMR(transfer.Amount),
coins.FmtPiconeroAsXMR(transfer.Fee),
transfer.TxID)
require.NoError(t, err)
require.GreaterOrEqual(t, transfer.Confirmations, uint64(MinSpendConfirmations))
@@ -83,8 +83,8 @@ func TestClient_Transfer(t *testing.T) {
height, err := abViewCli.GetHeight()
require.NoError(t, err)
t.Logf("A+B View-Only wallet balance: bal=%s unlocked=%s blocks-to-unlock=%d, cur-height=%d",
coins.FmtPiconeroAmtAsXMR(balanceABWal.Balance),
coins.FmtPiconeroAmtAsXMR(balanceABWal.UnlockedBalance),
coins.FmtPiconeroAsXMR(balanceABWal.Balance),
coins.FmtPiconeroAsXMR(balanceABWal.UnlockedBalance),
balanceABWal.BlocksToUnlock, height)
require.Zero(t, balanceABWal.BlocksToUnlock)
require.Equal(t, balanceABWal.Balance, balanceABWal.UnlockedBalance)
@@ -116,7 +116,7 @@ func TestClient_Transfer(t *testing.T) {
sweepFee := transfers[0].Fee
t.Logf("Sweep of A+B wallet sent %s XMR with fees %s XMR to Alice's primary wallet",
coins.FmtPiconeroAmtAsXMR(sweepAmount), coins.FmtPiconeroAmtAsXMR(sweepFee))
coins.FmtPiconeroAsXMR(sweepAmount), coins.FmtPiconeroAsXMR(sweepFee))
require.Equal(t, transferAmtU64, sweepAmount+sweepFee)
t.Logf("Alice's sweep transactions was mined at height %d with %d confirmations",
transfer.Height, transfer.Confirmations)
@@ -127,8 +127,8 @@ func TestClient_Transfer(t *testing.T) {
balanceAlice := GetBalance(t, cXMRTaker)
t.Logf("Alice's primary wallet after sweep: bal=%s XMR, unlocked=%s XMR, blocks-to-unlock=%d",
coins.FmtPiconeroAmtAsXMR(balanceAlice.Balance),
coins.FmtPiconeroAmtAsXMR(balanceAlice.UnlockedBalance),
coins.FmtPiconeroAsXMR(balanceAlice.Balance),
coins.FmtPiconeroAsXMR(balanceAlice.UnlockedBalance),
balanceAlice.BlocksToUnlock)
require.Equal(t, balanceAlice.Balance, sweepAmount)
}