lukechilds
/
SuperNET
mirror of https://github.com/lukechilds/SuperNET.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

#104 Expose ETH/ERC20 spending txs data on WS endpoint and trade status.

pass-iguana-arg
Artem Pikulin 7 years ago
parent
38bf61e56c
commit
a7e4f5810b
2 changed files with 35 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      iguana/exchanges/LP_include.h
  2. 35
      iguana/exchanges/LP_remember.c

3
iguana/exchanges/LP_include.h
View File

@ -278,7 +278,8 @@ struct LP_swap_remember
uint32_t finishtime,tradeid,requestid,quoteid,plocktime,dlocktime,expiration,state,otherstate; uint32_t finishtime,tradeid,requestid,quoteid,plocktime,dlocktime,expiration,state,otherstate;
int32_t iambob,finishedflag,origfinishedflag,Predeemlen,Dredeemlen,sentflags[sizeof(txnames)/sizeof(*txnames)]; int32_t iambob,finishedflag,origfinishedflag,Predeemlen,Dredeemlen,sentflags[sizeof(txnames)/sizeof(*txnames)];
uint8_t secretAm[20],secretAm256[32],secretBn[20],secretBn256[32],Predeemscript[1024],Dredeemscript[1024],pubkey33[33],other33[33]; uint8_t secretAm[20],secretAm256[32],secretBn[20],secretBn256[32],Predeemscript[1024],Dredeemscript[1024],pubkey33[33],other33[33];
char uuidstr[65],Agui[65],Bgui[65],gui[65],src[65],dest[65],bobtomic[128],alicetomic[128],etomicsrc[65],etomicdest[65],destaddr[64],Adestaddr[64],Sdestaddr[64],alicepaymentaddr[64],bobpaymentaddr[64],bobdepositaddr[64],alicecoin[65],bobcoin[65],*txbytes[sizeof(txnames)/sizeof(*txnames)],bobDepositEthTx[75],bobPaymentEthTx[75],aliceFeeEthTx[75],alicePaymentEthTx[75]; char uuidstr[65],Agui[65],Bgui[65],gui[65],src[65],dest[65],bobtomic[128],alicetomic[128],etomicsrc[65],etomicdest[65],destaddr[64],Adestaddr[64],Sdestaddr[64],alicepaymentaddr[64],bobpaymentaddr[64],bobdepositaddr[64],alicecoin[65],bobcoin[65],*txbytes[sizeof(txnames)/sizeof(*txnames)];
char bobDepositEthTx[75],bobPaymentEthTx[75],aliceFeeEthTx[75],alicePaymentEthTx[75],bobPaymentSpentEth[75],alicePaymentSpentEth[75],bobDepositSpentEth[75];
}; };
struct LP_outpoint struct LP_outpoint

35
iguana/exchanges/LP_remember.c
View File

@ -707,6 +707,7 @@ cJSON *LP_swap_json(struct LP_swap_remember *rswap)
jaddbits256(item,"Apaymentspent",rswap->Apaymentspent); jaddbits256(item,"Apaymentspent",rswap->Apaymentspent);
jaddbits256(item,"depositspent",rswap->depositspent); jaddbits256(item,"depositspent",rswap->depositspent);
jaddbits256(item,"alicedexfee",rswap->iambob == 0 ? rswap->txids[BASILISK_MYFEE] : rswap->txids[BASILISK_OTHERFEE]); jaddbits256(item,"alicedexfee",rswap->iambob == 0 ? rswap->txids[BASILISK_MYFEE] : rswap->txids[BASILISK_OTHERFEE]);
#ifndef NOTETOMIC
if ( rswap->bobtomic[0] != 0 || rswap->alicetomic[0] != 0) { if ( rswap->bobtomic[0] != 0 || rswap->alicetomic[0] != 0) {
cJSON *eth_info = cJSON_CreateObject(); cJSON *eth_info = cJSON_CreateObject();
if (rswap->alicetomic[0] != 0) { if (rswap->alicetomic[0] != 0) {
@ -719,6 +720,13 @@ cJSON *LP_swap_json(struct LP_swap_remember *rswap)
jaddstr(a_payment, "txid", rswap->alicePaymentEthTx); jaddstr(a_payment, "txid", rswap->alicePaymentEthTx);
jaddnum(a_payment, "amount", dstr(rswap->alicerealsat)); jaddnum(a_payment, "amount", dstr(rswap->alicerealsat));
cJSON_AddItemToObject(eth_info, "alicepayment", a_payment); cJSON_AddItemToObject(eth_info, "alicepayment", a_payment);
if (rswap->alicePaymentSpentEth[0] != 0) {
cJSON *a_payment_spent = cJSON_CreateObject();
jaddstr(a_payment_spent, "txid", rswap->alicePaymentSpentEth);
jaddnum(a_payment_spent, "amount", dstr(rswap->alicerealsat));
cJSON_AddItemToObject(eth_info, "alicepaymentspent", a_payment_spent);
}
} }
if (rswap->bobtomic[0] != 0) { if (rswap->bobtomic[0] != 0) {
@ -731,11 +739,24 @@ cJSON *LP_swap_json(struct LP_swap_remember *rswap)
jaddstr(b_payment, "txid", rswap->bobPaymentEthTx); jaddstr(b_payment, "txid", rswap->bobPaymentEthTx);
jaddnum(b_payment, "amount", dstr(rswap->bobrealsat)); jaddnum(b_payment, "amount", dstr(rswap->bobrealsat));
cJSON_AddItemToObject(eth_info, "bobpayment", b_payment); cJSON_AddItemToObject(eth_info, "bobpayment", b_payment);
if (rswap->bobDepositSpentEth[0] != 0) {
cJSON *b_deposit_spent = cJSON_CreateObject();
jaddstr(b_deposit_spent, "txid", rswap->bobDepositSpentEth);
jaddnum(b_deposit_spent, "amount", dstr(LP_DEPOSITSATOSHIS(rswap->bobrealsat)));
cJSON_AddItemToObject(eth_info, "bobdepositspent", b_deposit_spent);
}
if (rswap->bobPaymentSpentEth[0] != 0) {
cJSON *b_payment_spent = cJSON_CreateObject();
jaddstr(b_payment_spent, "txid", rswap->bobPaymentSpentEth);
jaddnum(b_payment_spent, "amount", dstr(rswap->bobrealsat));
cJSON_AddItemToObject(eth_info, "bobpaymentspent", b_payment_spent);
}
} }
cJSON_AddItemToObject(item, "eth_info", eth_info); cJSON_AddItemToObject(item, "eth_info", eth_info);
} }
#endif
return(item); return(item);
} }
@ -1337,6 +1358,7 @@ cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,
{ {
char *aliceSpendEthTxId = LP_etomicalice_spends_bob_payment(&rswap); char *aliceSpendEthTxId = LP_etomicalice_spends_bob_payment(&rswap);
if (aliceSpendEthTxId != NULL) { if (aliceSpendEthTxId != NULL) {
strcpy(rswap.bobPaymentSpentEth, aliceSpendEthTxId);
free(aliceSpendEthTxId); free(aliceSpendEthTxId);
} else { } else {
printf("Alice spend ETH tx send failed!\n"); printf("Alice spend ETH tx send failed!\n");
@ -1386,6 +1408,7 @@ cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,
{ {
char *aliceClaimsEthTxId = LP_etomicalice_claims_bob_deposit(&rswap); char *aliceClaimsEthTxId = LP_etomicalice_claims_bob_deposit(&rswap);
if (aliceClaimsEthTxId != NULL) { if (aliceClaimsEthTxId != NULL) {
strcpy(rswap.bobDepositSpentEth, aliceClaimsEthTxId);
free(aliceClaimsEthTxId); free(aliceClaimsEthTxId);
} else { } else {
printf("Alice Bob deposit claim ETH tx failed!\n"); printf("Alice Bob deposit claim ETH tx failed!\n");
@ -1418,7 +1441,12 @@ cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,
if ( rswap.alicetomic[0] != 0 ) if ( rswap.alicetomic[0] != 0 )
{ {
char *aliceReclaimEthTx = LP_etomicalice_reclaims_payment(&rswap); char *aliceReclaimEthTx = LP_etomicalice_reclaims_payment(&rswap);
free(aliceReclaimEthTx); if (aliceReclaimEthTx != NULL) {
strcpy(rswap.alicePaymentSpentEth, aliceReclaimEthTx);
free(aliceReclaimEthTx);
} else {
printf("Alice could not reclaim ETH/ERC20 payment!\n");
}
} }
#endif #endif
} }
@ -1462,6 +1490,7 @@ cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,
{ {
char *bobSpendEthTx = LP_etomicbob_spends_alice_payment(&rswap); char *bobSpendEthTx = LP_etomicbob_spends_alice_payment(&rswap);
if (bobSpendEthTx != NULL) { if (bobSpendEthTx != NULL) {
strcpy(rswap.alicePaymentSpentEth, bobSpendEthTx);
free(bobSpendEthTx); free(bobSpendEthTx);
} else { } else {
printf("Bob spends Alice payment ETH tx send failed!\n"); printf("Bob spends Alice payment ETH tx send failed!\n");
@ -1499,6 +1528,7 @@ cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,
{ {
char *bobReclaimEthTx = LP_etomicbob_reclaims_payment(&rswap); char *bobReclaimEthTx = LP_etomicbob_reclaims_payment(&rswap);
if (bobReclaimEthTx != NULL) { if (bobReclaimEthTx != NULL) {
strcpy(rswap.bobPaymentSpentEth, bobReclaimEthTx);
free(bobReclaimEthTx); free(bobReclaimEthTx);
} else { } else {
printf("Bob reclaims payment ETH tx send failed!\n"); printf("Bob reclaims payment ETH tx send failed!\n");
@ -1552,6 +1582,7 @@ cJSON *basilisk_remember(int32_t fastflag,int64_t *KMDtotals,int64_t *BTCtotals,
{ {
char *bobRefundsEthTx = LP_etomicbob_refunds_deposit(&rswap); char *bobRefundsEthTx = LP_etomicbob_refunds_deposit(&rswap);
if (bobRefundsEthTx != NULL) { if (bobRefundsEthTx != NULL) {
strcpy(rswap.bobDepositSpentEth, bobRefundsEthTx);
free(bobRefundsEthTx); free(bobRefundsEthTx);
} else { } else {
printf("Bob refunds deposit ETH tx send failed!\n"); printf("Bob refunds deposit ETH tx send failed!\n");

Write Preview
Loading…
Cancel
Save