mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
A first version of Natspec warning popup
- Runtime Contract code hash can now be retrieved from the Compiler - Using the hash the Natspec handler stores and later retrieves Natspec JSON for a given contract.
This commit is contained in:
parent
a253abf062
commit
12e000e0d3
@ -50,10 +50,9 @@ void Compiler::compileContract(ContractDefinition const& _contract, vector<Magic
|
|||||||
function->accept(*this);
|
function->accept(*this);
|
||||||
|
|
||||||
// Swap the runtime context with the creation-time context
|
// Swap the runtime context with the creation-time context
|
||||||
CompilerContext runtimeContext;
|
swap(m_context, m_runtimeContext);
|
||||||
swap(m_context, runtimeContext);
|
|
||||||
initializeContext(_contract, _magicGlobals, _contracts);
|
initializeContext(_contract, _magicGlobals, _contracts);
|
||||||
packIntoContractCreator(_contract, runtimeContext);
|
packIntoContractCreator(_contract, m_runtimeContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Compiler::initializeContext(ContractDefinition const& _contract, vector<MagicVariableDeclaration const*> const& _magicGlobals,
|
void Compiler::initializeContext(ContractDefinition const& _contract, vector<MagicVariableDeclaration const*> const& _magicGlobals,
|
||||||
|
@ -35,6 +35,7 @@ public:
|
|||||||
void compileContract(ContractDefinition const& _contract, std::vector<MagicVariableDeclaration const*> const& _magicGlobals,
|
void compileContract(ContractDefinition const& _contract, std::vector<MagicVariableDeclaration const*> const& _magicGlobals,
|
||||||
std::map<ContractDefinition const*, bytes const*> const& _contracts);
|
std::map<ContractDefinition const*, bytes const*> const& _contracts);
|
||||||
bytes getAssembledBytecode() { return m_context.getAssembledBytecode(m_optimize); }
|
bytes getAssembledBytecode() { return m_context.getAssembledBytecode(m_optimize); }
|
||||||
|
bytes getRuntimeBytecode() { return m_runtimeContext.getAssembledBytecode(m_optimize);}
|
||||||
void streamAssembly(std::ostream& _stream) const { m_context.streamAssembly(_stream); }
|
void streamAssembly(std::ostream& _stream) const { m_context.streamAssembly(_stream); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@ -70,6 +71,7 @@ private:
|
|||||||
|
|
||||||
bool const m_optimize;
|
bool const m_optimize;
|
||||||
CompilerContext m_context;
|
CompilerContext m_context;
|
||||||
|
CompilerContext m_runtimeContext;
|
||||||
std::vector<eth::AssemblyItem> m_breakTags; ///< tag to jump to for a "break" statement
|
std::vector<eth::AssemblyItem> m_breakTags; ///< tag to jump to for a "break" statement
|
||||||
std::vector<eth::AssemblyItem> m_continueTags; ///< tag to jump to for a "continue" statement
|
std::vector<eth::AssemblyItem> m_continueTags; ///< tag to jump to for a "continue" statement
|
||||||
eth::AssemblyItem m_returnTag; ///< tag to jump to for a "return" statement
|
eth::AssemblyItem m_returnTag; ///< tag to jump to for a "return" statement
|
||||||
|
@ -30,6 +30,8 @@
|
|||||||
#include <libsolidity/CompilerStack.h>
|
#include <libsolidity/CompilerStack.h>
|
||||||
#include <libsolidity/InterfaceHandler.h>
|
#include <libsolidity/InterfaceHandler.h>
|
||||||
|
|
||||||
|
#include <libdevcrypto/SHA3.h>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
namespace dev
|
namespace dev
|
||||||
@ -117,6 +119,7 @@ void CompilerStack::compile(bool _optimize)
|
|||||||
contractBytecode);
|
contractBytecode);
|
||||||
Contract& compiledContract = m_contracts[contract->getName()];
|
Contract& compiledContract = m_contracts[contract->getName()];
|
||||||
compiledContract.bytecode = compiler->getAssembledBytecode();
|
compiledContract.bytecode = compiler->getAssembledBytecode();
|
||||||
|
compiledContract.runtimeBytecode = compiler->getRuntimeBytecode();
|
||||||
compiledContract.compiler = move(compiler);
|
compiledContract.compiler = move(compiler);
|
||||||
contractBytecode[compiledContract.contract] = &compiledContract.bytecode;
|
contractBytecode[compiledContract.contract] = &compiledContract.bytecode;
|
||||||
}
|
}
|
||||||
@ -134,6 +137,16 @@ bytes const& CompilerStack::getBytecode(string const& _contractName) const
|
|||||||
return getContract(_contractName).bytecode;
|
return getContract(_contractName).bytecode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bytes const& CompilerStack::getRuntimeBytecode(std::string const& _contractName) const
|
||||||
|
{
|
||||||
|
return getContract(_contractName).runtimeBytecode;
|
||||||
|
}
|
||||||
|
|
||||||
|
dev::h256 CompilerStack::getContractCodeHash(std::string const& _contractName) const
|
||||||
|
{
|
||||||
|
return dev::sha3(getRuntimeBytecode(_contractName));
|
||||||
|
}
|
||||||
|
|
||||||
void CompilerStack::streamAssembly(ostream& _outStream, string const& _contractName) const
|
void CompilerStack::streamAssembly(ostream& _outStream, string const& _contractName) const
|
||||||
{
|
{
|
||||||
getContract(_contractName).compiler->streamAssembly(_outStream);
|
getContract(_contractName).compiler->streamAssembly(_outStream);
|
||||||
@ -218,13 +231,6 @@ bytes CompilerStack::staticCompile(std::string const& _sourceCode, bool _optimiz
|
|||||||
return stack.compile(_sourceCode, _optimize);
|
return stack.compile(_sourceCode, _optimize);
|
||||||
}
|
}
|
||||||
|
|
||||||
dev::h256 CompilerStack::getContractCodeHash(std::string const& _contractName)
|
|
||||||
{
|
|
||||||
//LTODO
|
|
||||||
(void) _contractName;
|
|
||||||
return dev::h256("");
|
|
||||||
}
|
|
||||||
|
|
||||||
void CompilerStack::reset(bool _keepSources)
|
void CompilerStack::reset(bool _keepSources)
|
||||||
{
|
{
|
||||||
m_parseSuccessful = false;
|
m_parseSuccessful = false;
|
||||||
|
@ -76,7 +76,13 @@ public:
|
|||||||
/// @returns the compiled bytecode
|
/// @returns the compiled bytecode
|
||||||
bytes const& compile(std::string const& _sourceCode, bool _optimize = false);
|
bytes const& compile(std::string const& _sourceCode, bool _optimize = false);
|
||||||
|
|
||||||
|
/// Gets the assembled bytecode for a contract
|
||||||
bytes const& getBytecode(std::string const& _contractName = "") const;
|
bytes const& getBytecode(std::string const& _contractName = "") const;
|
||||||
|
/// Get the runtime context's bytecode for a contract
|
||||||
|
bytes const& getRuntimeBytecode(std::string const& _contractName = "") const;
|
||||||
|
/// Get the runtime context's code hash for a contract
|
||||||
|
dev::h256 getContractCodeHash(std::string const& _contractName = "") const;
|
||||||
|
|
||||||
/// Streams a verbose version of the assembly to @a _outStream.
|
/// Streams a verbose version of the assembly to @a _outStream.
|
||||||
/// Prerequisite: Successful compilation.
|
/// Prerequisite: Successful compilation.
|
||||||
void streamAssembly(std::ostream& _outStream, std::string const& _contractName = "") const;
|
void streamAssembly(std::ostream& _outStream, std::string const& _contractName = "") const;
|
||||||
@ -108,9 +114,6 @@ public:
|
|||||||
/// scanning the source code - this is useful for printing exception information.
|
/// scanning the source code - this is useful for printing exception information.
|
||||||
static bytes staticCompile(std::string const& _sourceCode, bool _optimize = false);
|
static bytes staticCompile(std::string const& _sourceCode, bool _optimize = false);
|
||||||
|
|
||||||
/// Get the runtime context's code hash for a contract. LTODO
|
|
||||||
dev::h256 getContractCodeHash(std::string const& _contractName);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/**
|
/**
|
||||||
* Information pertaining to one source unit, filled gradually during parsing and compilation.
|
* Information pertaining to one source unit, filled gradually during parsing and compilation.
|
||||||
@ -128,6 +131,7 @@ private:
|
|||||||
ContractDefinition const* contract = nullptr;
|
ContractDefinition const* contract = nullptr;
|
||||||
std::shared_ptr<Compiler> compiler;
|
std::shared_ptr<Compiler> compiler;
|
||||||
bytes bytecode;
|
bytes bytecode;
|
||||||
|
bytes runtimeBytecode;
|
||||||
std::shared_ptr<InterfaceHandler> interfaceHandler;
|
std::shared_ptr<InterfaceHandler> interfaceHandler;
|
||||||
mutable std::unique_ptr<std::string const> interface;
|
mutable std::unique_ptr<std::string const> interface;
|
||||||
mutable std::unique_ptr<std::string const> solidityInterface;
|
mutable std::unique_ptr<std::string const> solidityInterface;
|
||||||
|
Loading…
Reference in New Issue
Block a user