DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Hush Hush Hush

Browse Source
This commit is contained in:
Duke Leto
2020-12-10 06:51:02 -05:00
parent 6ed55cc5a4
commit 2b9e993c31
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cc/payments.cpp
View File

@@ -406,7 +406,7 @@ bool PaymentsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &
else if ( funcid == 'S' || funcid == 'O' ) else if ( funcid == 'S' || funcid == 'O' )
{ {
// snapshot payment // snapshot payment
if ( KOMODO_SNAPSHOT_INTERVAL == 0 ) if ( HUSH_SNAPSHOT_INTERVAL == 0 )
return(eval->Invalid("snapshots not activated on this chain")); return(eval->Invalid("snapshots not activated on this chain"));
if ( vAddressSnapshot.size() == 0 ) if ( vAddressSnapshot.size() == 0 )
return(eval->Invalid("need first snapshot")); return(eval->Invalid("need first snapshot"));
@@ -1220,7 +1220,7 @@ UniValue PaymentsAirdrop(struct CCcontract_info *cp,char *jsonstr)
UniValue result(UniValue::VOBJ); UniValue result(UniValue::VOBJ);
uint256 hashBlock; CTransaction tx; CPubKey Paymentspk,mypk; char markeraddr[64]; std::string rawtx; uint256 hashBlock; CTransaction tx; CPubKey Paymentspk,mypk; char markeraddr[64]; std::string rawtx;
int32_t lockedblocks,minrelease,top,bottom,n,i,minimum=10000; std::vector<std::vector<uint8_t>> excludeScriptPubKeys; int8_t fixedAmount; int32_t lockedblocks,minrelease,top,bottom,n,i,minimum=10000; std::vector<std::vector<uint8_t>> excludeScriptPubKeys; int8_t fixedAmount;
if ( KOMODO_SNAPSHOT_INTERVAL == 0 ) if ( HUSH_SNAPSHOT_INTERVAL == 0 )
{ {
result.push_back(Pair("result","error")); result.push_back(Pair("result","error"));
result.push_back(Pair("error","cannot use airdrop wihtout -ac_snapshot set.")); result.push_back(Pair("error","cannot use airdrop wihtout -ac_snapshot set."));

2
src/hush_defs.h
View File

@@ -525,7 +525,7 @@ extern uint8_t ASSETCHAINS_PRIVATE;
extern int32_t USE_EXTERNAL_PUBKEY; extern int32_t USE_EXTERNAL_PUBKEY;
extern char NOTARYADDRS[64][64]; extern char NOTARYADDRS[64][64];
extern char NOTARY_ADDRESSES[NUM_HUSH_SEASONS][64][64]; extern char NOTARY_ADDRESSES[NUM_HUSH_SEASONS][64][64];
extern int32_t HUSH_TESTNODE, KOMODO_SNAPSHOT_INTERVAL; extern int32_t HUSH_TESTNODE, HUSH_SNAPSHOT_INTERVAL;
extern int32_t ASSETCHAINS_EARLYTXIDCONTRACT; extern int32_t ASSETCHAINS_EARLYTXIDCONTRACT;
extern int32_t ASSETCHAINS_STAKED_SPLIT_PERCENTAGE; extern int32_t ASSETCHAINS_STAKED_SPLIT_PERCENTAGE;
int tx_height( const uint256 &hash ); int tx_height( const uint256 &hash );