cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11785 from ethereum/someMoreBaseFees

Browse Source 
Some more base fees.
This commit is contained in:
chriseth
2021-08-12 19:48:10 +02:00
committed by GitHub
parent b0164bd2a4 c87c0f02bd
commit fe0d027d45
37 changed files with 1141 additions and 1128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/formal/Predicate.cpp
+1
View File
@@ -518,6 +518,7 @@ bool Predicate::fillArray(smtutil::Expression const& _expr, vector<string>& _arr
map<string, optional<string>> Predicate::readTxVars(smtutil::Expression const& _tx) const
{
map<string, Type const*> const txVars{
{"block.basefee", TypeProvider::uint256()},
{"block.chainid", TypeProvider::uint256()},
{"block.coinbase", TypeProvider::address()},
{"block.difficulty", TypeProvider::uint256()},
libsolidity/formal/SymbolicState.cpp
+3 -1
View File
@@ -128,7 +128,9 @@ smtutil::Expression SymbolicState::txMember(string const& _member) const
smtutil::Expression SymbolicState::txTypeConstraints() const
{
return smt::symbolicUnknownConstraints(m_tx.member("block.chainid"), TypeProvider::uint256()) &&
return
smt::symbolicUnknownConstraints(m_tx.member("block.basefee"), TypeProvider::uint256()) &&
smt::symbolicUnknownConstraints(m_tx.member("block.chainid"), TypeProvider::uint256()) &&
smt::symbolicUnknownConstraints(m_tx.member("block.coinbase"), TypeProvider::address()) &&
smt::symbolicUnknownConstraints(m_tx.member("block.difficulty"), TypeProvider::uint256()) &&
smt::symbolicUnknownConstraints(m_tx.member("block.gaslimit"), TypeProvider::uint256()) &&
libsolidity/formal/SymbolicState.h
+2
View File
@@ -65,6 +65,7 @@ private:
* - TODO: potentially storage of contracts
* - block and transaction properties, represented as a tuple of:
* - blockhash
* - block basefee
* - block chainid
* - block coinbase
* - block difficulty
@@ -191,6 +192,7 @@ private:
BlockchainVariable m_tx{
"tx",
{
{"block.basefee", smtutil::SortProvider::uintSort},
{"block.chainid", smtutil::SortProvider::uintSort},
{"block.coinbase", smt::smtSort(*TypeProvider::address())},
{"block.difficulty", smtutil::SortProvider::uintSort},