mirror of https://github.com/bitcoin/bitcoin
tools: Use ECC_Context helper in bitcoin-tx and bitcoin-wallet tools
This commit is contained in:
parent
28905c1a64
commit
a08d2b3cb9
|
@ -692,21 +692,10 @@ static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)
|
|||
tx = mergedTx;
|
||||
}
|
||||
|
||||
class Secp256k1Init
|
||||
{
|
||||
public:
|
||||
Secp256k1Init() {
|
||||
ECC_Start();
|
||||
}
|
||||
~Secp256k1Init() {
|
||||
ECC_Stop();
|
||||
}
|
||||
};
|
||||
|
||||
static void MutateTx(CMutableTransaction& tx, const std::string& command,
|
||||
const std::string& commandVal)
|
||||
{
|
||||
std::unique_ptr<Secp256k1Init> ecc;
|
||||
std::unique_ptr<ECC_Context> ecc;
|
||||
|
||||
if (command == "nversion")
|
||||
MutateTxVersion(tx, commandVal);
|
||||
|
@ -726,10 +715,10 @@ static void MutateTx(CMutableTransaction& tx, const std::string& command,
|
|||
else if (command == "outaddr")
|
||||
MutateTxAddOutAddr(tx, commandVal);
|
||||
else if (command == "outpubkey") {
|
||||
ecc.reset(new Secp256k1Init());
|
||||
ecc.reset(new ECC_Context());
|
||||
MutateTxAddOutPubKey(tx, commandVal);
|
||||
} else if (command == "outmultisig") {
|
||||
ecc.reset(new Secp256k1Init());
|
||||
ecc.reset(new ECC_Context());
|
||||
MutateTxAddOutMultiSig(tx, commandVal);
|
||||
} else if (command == "outscript")
|
||||
MutateTxAddOutScript(tx, commandVal);
|
||||
|
@ -737,7 +726,7 @@ static void MutateTx(CMutableTransaction& tx, const std::string& command,
|
|||
MutateTxAddOutData(tx, commandVal);
|
||||
|
||||
else if (command == "sign") {
|
||||
ecc.reset(new Secp256k1Init());
|
||||
ecc.reset(new ECC_Context());
|
||||
MutateTxSign(tx, commandVal);
|
||||
}
|
||||
|
||||
|
|
|
@ -128,10 +128,9 @@ MAIN_FUNCTION
|
|||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
ECC_Start();
|
||||
ECC_Context ecc_context{};
|
||||
if (!wallet::WalletTool::ExecuteWalletToolFunc(args, command->command)) {
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
ECC_Stop();
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue