diff options
| author | chriseth <c@ethdev.com> | 2015-08-01 01:23:31 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2015-08-01 01:23:31 +0800 |
| commit | 598e66f395182e758a6e30516a9192f3a13a1362 (patch) | |
| tree | 38634f9c4e7b2670f1035c0e1a3c6b82a95a00a8 | |
| parent | c11d2a2c62a49140fd6dde49ee48ed157f7ca985 (diff) | |
| download | dexon-solidity-598e66f395182e758a6e30516a9192f3a13a1362.tar dexon-solidity-598e66f395182e758a6e30516a9192f3a13a1362.tar.gz dexon-solidity-598e66f395182e758a6e30516a9192f3a13a1362.tar.bz2 dexon-solidity-598e66f395182e758a6e30516a9192f3a13a1362.tar.lz dexon-solidity-598e66f395182e758a6e30516a9192f3a13a1362.tar.xz dexon-solidity-598e66f395182e758a6e30516a9192f3a13a1362.tar.zst dexon-solidity-598e66f395182e758a6e30516a9192f3a13a1362.zip | |
Create and output clone contracts.
| -rw-r--r-- | CommandLineInterface.cpp | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/CommandLineInterface.cpp b/CommandLineInterface.cpp index 1b1dbd3e..e579d883 100644 --- a/CommandLineInterface.cpp +++ b/CommandLineInterface.cpp @@ -63,6 +63,7 @@ static string const g_argAsmJsonStr = "asm-json"; static string const g_argAstStr = "ast"; static string const g_argAstJson = "ast-json"; static string const g_argBinaryStr = "binary"; +static string const g_argCloneBinaryStr = "clone-binary"; static string const g_argOpcodesStr = "opcodes"; static string const g_argNatspecDevStr = "natspec-dev"; static string const g_argNatspecUserStr = "natspec-user"; @@ -71,6 +72,7 @@ static string const g_argAddStandard = "add-std"; /// Possible arguments to for --combined-json static set<string> const g_combinedJsonArgs{ "binary", + "clone-binary", "opcodes", "json-abi", "sol-abi", @@ -110,7 +112,8 @@ static bool needsHumanTargetedStdout(po::variables_map const& _args) humanTargetedStdout(_args, g_argAsmStr) || humanTargetedStdout(_args, g_argAsmJsonStr) || humanTargetedStdout(_args, g_argOpcodesStr) || - humanTargetedStdout(_args, g_argBinaryStr); + humanTargetedStdout(_args, g_argBinaryStr) || + humanTargetedStdout(_args, g_argCloneBinaryStr); } static inline bool outputToFile(OutputType type) @@ -140,18 +143,33 @@ static std::istream& operator>>(std::istream& _in, OutputType& io_output) void CommandLineInterface::handleBinary(string const& _contract) { - auto choice = m_args[g_argBinaryStr].as<OutputType>(); - if (outputToStdout(choice)) + if (m_args.count(g_argBinaryStr)) { - cout << "Binary: " << endl; - cout << toHex(m_compiler->getBytecode(_contract)) << endl; + if (outputToStdout(m_args[g_argBinaryStr].as<OutputType>())) + { + cout << "Binary: " << endl; + cout << toHex(m_compiler->getBytecode(_contract)) << endl; + } + if (outputToFile(m_args[g_argBinaryStr].as<OutputType>())) + { + ofstream outFile(_contract + ".binary"); + outFile << toHex(m_compiler->getBytecode(_contract)); + outFile.close(); + } } - - if (outputToFile(choice)) + if (m_args.count(g_argCloneBinaryStr)) { - ofstream outFile(_contract + ".binary"); - outFile << toHex(m_compiler->getBytecode(_contract)); - outFile.close(); + if (outputToStdout(m_args[g_argCloneBinaryStr].as<OutputType>())) + { + cout << "Clone Binary: " << endl; + cout << toHex(m_compiler->getCloneBytecode(_contract)) << endl; + } + if (outputToFile(m_args[g_argCloneBinaryStr].as<OutputType>())) + { + ofstream outFile(_contract + ".clone_binary"); + outFile << toHex(m_compiler->getCloneBytecode(_contract)); + outFile.close(); + } } } @@ -177,7 +195,7 @@ void CommandLineInterface::handleBytecode(string const& _contract) { if (m_args.count(g_argOpcodesStr)) handleOpcode(_contract); - if (m_args.count(g_argBinaryStr)) + if (m_args.count(g_argBinaryStr) || m_args.count(g_argCloneBinaryStr)) handleBinary(_contract); } @@ -329,6 +347,8 @@ bool CommandLineInterface::parseArguments(int argc, char** argv) "Request to output the Opcodes of the contract.") (g_argBinaryStr.c_str(), po::value<OutputType>()->value_name("stdout|file|both"), "Request to output the contract in binary (hexadecimal).") + (g_argCloneBinaryStr.c_str(), po::value<OutputType>()->value_name("stdout|file|both"), + "Request to output the clone contract in binary (hexadecimal).") (g_argAbiStr.c_str(), po::value<OutputType>()->value_name("stdout|file|both"), "Request to output the contract's JSON ABI interface.") (g_argSolAbiStr.c_str(), po::value<OutputType>()->value_name("stdout|file|both"), @@ -490,6 +510,8 @@ void CommandLineInterface::handleCombinedJSON() contractData["json-abi"] = m_compiler->getInterface(contractName); if (requests.count("binary")) contractData["binary"] = toHex(m_compiler->getBytecode(contractName)); + if (requests.count("clone-binary")) + contractData["clone-binary"] = toHex(m_compiler->getCloneBytecode(contractName)); if (requests.count("opcodes")) contractData["opcodes"] = eth::disassemble(m_compiler->getBytecode(contractName)); if (requests.count("asm")) |