Browse Source

Test

etomic
jl777 7 years ago
parent
commit
dcf8c2c797
  1. 13
      iguana/exchanges/LP_instantdex.c
  2. 3
      iguana/exchanges/LP_nativeDEX.c
  3. 1
      iguana/exchanges/mm.c

13
iguana/exchanges/LP_instantdex.c

@ -178,8 +178,11 @@ char *LP_instantdex_deposit(struct iguana_info *coin,int32_t weeks,double amount
int64_t LP_claimtx(void *ctx,struct iguana_info *coin,bits256 *claimtxidp,bits256 utxotxid,int32_t utxovout,uint64_t satoshis,char *vinaddr,uint32_t claimtime,uint8_t *redeemscript,int32_t redeemlen) int64_t LP_claimtx(void *ctx,struct iguana_info *coin,bits256 *claimtxidp,bits256 utxotxid,int32_t utxovout,uint64_t satoshis,char *vinaddr,uint32_t claimtime,uint8_t *redeemscript,int32_t redeemlen)
{ {
uint8_t userdata[2]; char *signedtx; bits256 signedtxid,sendtxid; int32_t userdatalen; int64_t destamount,sum = 0; uint8_t userdata[2]; char *signedtx; bits256 signedtxid,sendtxid; int32_t isbots,userdatalen; int64_t destamount,sum = 0;
userdata[0] = 0x51; if ( strcmp(coin->smartaddr,BOTS_BONDADDRESS) == 0 )
isbots = 1;
else isbots = 0;
userdata[0] = (isbots == 0) ? 0x51 : 0;
userdatalen = 1; userdatalen = 1;
utxovout = 0; utxovout = 0;
memset(claimtxidp,0,sizeof(*claimtxidp)); memset(claimtxidp,0,sizeof(*claimtxidp));
@ -229,9 +232,10 @@ char *LP_instantdex_claim(struct iguana_info *coin)
} }
flagi = 0; flagi = 0;
utxovout = 0; utxovout = 0;
// make into function, and separate calling path by txid
if ( (txjson= LP_gettx(coin->symbol,utxotxid,1)) != 0 ) if ( (txjson= LP_gettx(coin->symbol,utxotxid,1)) != 0 )
{ {
if ( (vouts= jarray(&numvouts,txjson,"vout")) != 0 && numvouts == 3 ) if ( (vouts= jarray(&numvouts,txjson,"vout")) != 0 && numvouts >= 3 )
{ {
vout0 = jitem(vouts,0); vout0 = jitem(vouts,0);
LP_destaddr(vinaddr,vout0); LP_destaddr(vinaddr,vout0);
@ -410,6 +414,7 @@ int64_t LP_dynamictrust(bits256 pubkey,int64_t kmdvalue)
int64_t LP_instantdex_proofcheck(char *coinaddr,cJSON *proof,int32_t num) int64_t LP_instantdex_proofcheck(char *coinaddr,cJSON *proof,int32_t num)
{ {
uint8_t rmd160[20],addrtype; int32_t i; int64_t net = 0; char othersmartaddr[64]; struct iguana_info *coin; struct LP_address *ap = 0; uint8_t rmd160[20],addrtype; int32_t i; int64_t net = 0; char othersmartaddr[64]; struct iguana_info *coin; struct LP_address *ap = 0;
printf("proofcheck.(%s) %d %s\n",coinaddr,num,jprint(proof,0));
if ( (coin= LP_coinfind("KMD")) != 0 ) if ( (coin= LP_coinfind("KMD")) != 0 )
{ {
bitcoin_addr2rmd160(0,&addrtype,rmd160,coinaddr); bitcoin_addr2rmd160(0,&addrtype,rmd160,coinaddr);
@ -437,7 +442,7 @@ int64_t LP_myzcredits()
zcredits = LP_instantdex_proofcheck(coin->smartaddr,proof,cJSON_GetArraySize(proof)); zcredits = LP_instantdex_proofcheck(coin->smartaddr,proof,cJSON_GetArraySize(proof));
free_json(proof); free_json(proof);
return(zcredits); return(zcredits);
} } else printf("cant find my instantdex proof\n");
} }
return(0); return(0);
} }

3
iguana/exchanges/LP_nativeDEX.c

@ -17,7 +17,7 @@
// LP_nativeDEX.c // LP_nativeDEX.c
// marketmaker // marketmaker
// //
// verify claim works // delay swap credit back until notarization, else path
// big BTC swaps // big BTC swaps
// https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki for signing BCH/BTG // https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki for signing BCH/BTG
// //
@ -28,7 +28,6 @@
// USD paxprice based USDvalue in portfolio // USD paxprice based USDvalue in portfolio
// //
// improve critical section detection when parallel trades // improve critical section detection when parallel trades
// delay swap credit back until notarization
// dPoW security -> 4: KMD notarized, 5: BTC notarized, after next notary elections // dPoW security -> 4: KMD notarized, 5: BTC notarized, after next notary elections
// bigendian architectures need to use little endian for sighash calcs // bigendian architectures need to use little endian for sighash calcs
// //

1
iguana/exchanges/mm.c

@ -20,7 +20,6 @@
// //
void PNACL_message(char *arg,...) void PNACL_message(char *arg,...)
{ {

Loading…
Cancel
Save