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

corr cp param to ...addr1of2set

Browse Source
This commit is contained in:
dimxy
2019-01-15 14:09:50 +05:00
parent 46406f3c25
commit 395fac4173
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cc/heir.cpp
View File

@@ -909,7 +909,7 @@ template <typename Helper>UniValue HeirClaim(uint256 fundingtxid, uint64_t txfee
Myprivkey(myprivkey); Myprivkey(myprivkey);
// set pubkeys for finding 1of2 cc in FinalizeCCtx to sign it: // set pubkeys for finding 1of2 cc in FinalizeCCtx to sign it:
Helper::CCaddrCoinsOrTokens1of2set(ownerPubkey, heirPubkey, coinaddr); Helper::CCaddrCoinsOrTokens1of2set(cp, ownerPubkey, heirPubkey, coinaddr);
// add 1of2 vout validation pubkeys (this is for tokens): // add 1of2 vout validation pubkeys (this is for tokens):
std::vector<CPubKey> voutTokenPubkeys; std::vector<CPubKey> voutTokenPubkeys;

13
src/cc/heir_validate.h
View File

@@ -51,10 +51,8 @@ public:
cpHeir = CCinit(&heirC, EVAL_HEIR); cpHeir = CCinit(&heirC, EVAL_HEIR);
return GetCCaddress1of2(cpHeir, coinaddr, ownerPubkey, heirPubkey); return GetCCaddress1of2(cpHeir, coinaddr, ownerPubkey, heirPubkey);
} }
static void CCaddrCoinsOrTokens1of2set(CPubKey ownerPubkey, CPubKey heirPubkey, char *coinaddr) { static void CCaddrCoinsOrTokens1of2set(struct CCcontract_info *cp, CPubKey ownerPubkey, CPubKey heirPubkey, char *coinaddr) {
struct CCcontract_info *cpHeir, heirC; CCaddr1of2set(cp, ownerPubkey, heirPubkey, coinaddr);
cpHeir = CCinit(&heirC, EVAL_HEIR);
CCaddr1of2set(cpHeir, ownerPubkey, heirPubkey, coinaddr);
} }
}; };
@@ -96,10 +94,9 @@ public:
return GetTokensCCaddress1of2(cpHeir, coinaddr, ownerPubkey, heirPubkey); return GetTokensCCaddress1of2(cpHeir, coinaddr, ownerPubkey, heirPubkey);
} }
static void CCaddrCoinsOrTokens1of2set(CPubKey ownerPubkey, CPubKey heirPubkey, char *coinaddr) { static void CCaddrCoinsOrTokens1of2set(struct CCcontract_info *cp, CPubKey ownerPubkey, CPubKey heirPubkey, char *coinaddr) {
struct CCcontract_info *cpHeir, heirC;
cpHeir = CCinit(&heirC, EVAL_HEIR); CCaddrTokens1of2set(cp, ownerPubkey, heirPubkey, coinaddr);
CCaddrTokens1of2set(cpHeir, ownerPubkey, heirPubkey, coinaddr);
} }
}; };