Skip to content

Commit b1cc886

Browse files
rodiazetrodiazet
committed
eof: Implement and use ext*call 
1 parent 2b3c2b0 commit b1cc886

File tree

11 files changed

+334
-18
lines changed

11 files changed

+334
-18
lines changed

‎libevmasm/Instruction.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,9 @@ std::map<std::string, Instruction> const solidity::evmasm::c_instructions =
182182
{ "STATICCALL", Instruction::STATICCALL },
183183
{ "RETURN", Instruction::RETURN },
184184
{ "DELEGATECALL", Instruction::DELEGATECALL },
185+
{ "EXTCALL", Instruction::EXTCALL },
186+
{ "EXTSTATICCALL", Instruction::EXTSTATICCALL },
187+
{ "EXTDELEGATECALL", Instruction::EXTDELEGATECALL },
185188
{ "CREATE2", Instruction::CREATE2 },
186189
{ "REVERT", Instruction::REVERT },
187190
{ "INVALID", Instruction::INVALID },
@@ -344,6 +347,9 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
344347
{Instruction::RETURN, {"RETURN", 0, 2, 0, true, Tier::Zero}},
345348
{Instruction::DELEGATECALL, {"DELEGATECALL", 0, 6, 1, true, Tier::Special}},
346349
{Instruction::STATICCALL, {"STATICCALL", 0, 6, 1, true, Tier::Special}},
350+
{Instruction::EXTCALL, {"EXTCALL", 0, 4, 1, true, Tier::Special}},
351+
{Instruction::EXTDELEGATECALL,{"EXTDELEGATECALL", 0, 3, 1, true, Tier::Special}},
352+
{Instruction::EXTSTATICCALL, {"EXTSTATICCALL", 0, 3, 1, true, Tier::Special}},
347353
{Instruction::CREATE2, {"CREATE2", 0, 4, 1, true, Tier::Special}},
348354
{Instruction::REVERT, {"REVERT", 0, 2, 0, true, Tier::Zero}},
349355
{Instruction::INVALID, {"INVALID", 0, 0, 0, true, Tier::Zero}},

‎libevmasm/Instruction.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,10 @@ enum class Instruction: uint8_t
198198
RETURN, ///< halt execution returning output data
199199
DELEGATECALL, ///< like CALLCODE but keeps caller's value and sender
200200
CREATE2 = 0xf5, ///< create new account with associated code at address `sha3(0xff + sender + salt + init code) % 2**160`
201+
EXTCALL = 0xf8, ///< EOF message-call into an account
202+
EXTDELEGATECALL = 0xf9, ///< EOF delegate call
201203
STATICCALL = 0xfa, ///< like CALL but disallow state modifications
204+
EXTSTATICCALL = 0xfb, ///< like EXTCALL but disallow state modifications
202205

203206
REVERT = 0xfd, ///< halt execution, revert state and return output data
204207
INVALID = 0xfe, ///< invalid instruction for expressing runtime errors (e.g., division-by-zero)
@@ -214,6 +217,9 @@ constexpr bool isCallInstruction(Instruction _inst) noexcept
214217
case Instruction::CALLCODE:
215218
case Instruction::DELEGATECALL:
216219
case Instruction::STATICCALL:
220+
case Instruction::EXTCALL:
221+
case Instruction::EXTSTATICCALL:
222+
case Instruction::EXTDELEGATECALL:
217223
return true;
218224
default:
219225
return false;

‎libevmasm/SemanticInformation.cpp‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,37 @@ std::vector<SemanticInformation::Operation> SemanticInformation::readWriteOperat
169169
});
170170
return operations;
171171
}
172+
case Instruction::EXTSTATICCALL:
173+
case Instruction::EXTDELEGATECALL:
174+
{
175+
size_t paramCount = static_cast<size_t>(instructionInfo(_instruction, langutil::EVMVersion()).args);
176+
std::vector<Operation> operations{
177+
Operation{Location::Memory, Effect::Read, paramCount - 2, paramCount - 1, {}},
178+
Operation{Location::Storage, Effect::Read, {}, {}, {}},
179+
Operation{Location::TransientStorage, Effect::Read, {}, {}, {}}
180+
};
181+
if (_instruction == Instruction::EXTDELEGATECALL)
182+
{
183+
operations.emplace_back(Operation{Location::Storage, Effect::Write, {}, {}, {}});
184+
operations.emplace_back(Operation{Location::TransientStorage, Effect::Write, {}, {}, {}});
185+
}
186+
187+
return operations;
188+
}
189+
case Instruction::EXTCALL:
190+
{
191+
size_t paramCount = static_cast<size_t>(instructionInfo(_instruction, langutil::EVMVersion()).args);
192+
std::vector<Operation> operations{
193+
Operation{Location::Memory, Effect::Read, paramCount - 3, paramCount - 2, {}},
194+
Operation{Location::Storage, Effect::Read, {}, {}, {}},
195+
Operation{Location::TransientStorage, Effect::Read, {}, {}, {}}
196+
};
197+
198+
operations.emplace_back(Operation{Location::Storage, Effect::Write, {}, {}, {}});
199+
operations.emplace_back(Operation{Location::TransientStorage, Effect::Write, {}, {}, {}});
200+
201+
return operations;
202+
}
172203
case Instruction::CREATE:
173204
case Instruction::CREATE2:
174205
return std::vector<Operation>{
@@ -380,6 +411,9 @@ bool SemanticInformation::isDeterministic(AssemblyItem const& _item)
380411
case Instruction::CALLCODE:
381412
case Instruction::DELEGATECALL:
382413
case Instruction::STATICCALL:
414+
case Instruction::EXTCALL:
415+
case Instruction::EXTDELEGATECALL:
416+
case Instruction::EXTSTATICCALL:
383417
case Instruction::CREATE:
384418
case Instruction::CREATE2:
385419
case Instruction::GAS:
@@ -459,6 +493,9 @@ SemanticInformation::Effect SemanticInformation::memory(Instruction _instruction
459493
case Instruction::CALLCODE:
460494
case Instruction::DELEGATECALL:
461495
case Instruction::STATICCALL:
496+
case Instruction::EXTCALL:
497+
case Instruction::EXTDELEGATECALL:
498+
case Instruction::EXTSTATICCALL:
462499
return SemanticInformation::Write;
463500

464501
case Instruction::CREATE:
@@ -514,10 +551,13 @@ SemanticInformation::Effect SemanticInformation::storage(Instruction _instructio
514551
case Instruction::SSTORE:
515552
case Instruction::EOFCREATE:
516553
case Instruction::RETURNCONTRACT:
554+
case Instruction::EXTCALL:
555+
case Instruction::EXTDELEGATECALL:
517556
return SemanticInformation::Write;
518557

519558
case Instruction::SLOAD:
520559
case Instruction::STATICCALL:
560+
case Instruction::EXTSTATICCALL:
521561
return SemanticInformation::Read;
522562

523563
default:
@@ -537,10 +577,13 @@ SemanticInformation::Effect SemanticInformation::transientStorage(Instruction _i
537577
case Instruction::TSTORE:
538578
case Instruction::EOFCREATE:
539579
case Instruction::RETURNCONTRACT:
580+
case Instruction::EXTCALL:
581+
case Instruction::EXTDELEGATECALL:
540582
return SemanticInformation::Write;
541583

542584
case Instruction::TLOAD:
543585
case Instruction::STATICCALL:
586+
case Instruction::EXTSTATICCALL:
544587
return SemanticInformation::Read;
545588

546589
default:
@@ -559,7 +602,10 @@ SemanticInformation::Effect SemanticInformation::otherState(Instruction _instruc
559602
case Instruction::CREATE2:
560603
case Instruction::EOFCREATE:
561604
case Instruction::RETURNCONTRACT:
605+
case Instruction::EXTCALL:
606+
case Instruction::EXTDELEGATECALL:
562607
case Instruction::SELFDESTRUCT:
608+
case Instruction::EXTSTATICCALL:
563609
case Instruction::STATICCALL: // because it can affect returndatasize
564610
// Strictly speaking, log0, .., log4 writes to the state, but the EVM cannot read it, so they
565611
// are just marked as having 'other side effects.'
@@ -606,6 +652,7 @@ bool SemanticInformation::invalidInPureFunctions(Instruction _instruction)
606652
case Instruction::NUMBER:
607653
case Instruction::PREVRANDAO:
608654
case Instruction::GASLIMIT:
655+
case Instruction::EXTSTATICCALL:
609656
case Instruction::STATICCALL:
610657
case Instruction::SLOAD:
611658
case Instruction::TLOAD:
@@ -635,6 +682,8 @@ bool SemanticInformation::invalidInViewFunctions(Instruction _instruction)
635682
case Instruction::CALL:
636683
case Instruction::CALLCODE:
637684
case Instruction::DELEGATECALL:
685+
case Instruction::EXTCALL:
686+
case Instruction::EXTDELEGATECALL:
638687
// According to EOF spec https://eips.ethereum.org/EIPS/eip-7620#eofcreate
639688
case Instruction::EOFCREATE:
640689
// According to EOF spec https://eips.ethereum.org/EIPS/eip-7620#returncontract

‎liblangutil/EVMVersion.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ bool EVMVersion::hasOpcode(Instruction _opcode, std::optional<uint8_t> _eofVersi
8585
case Instruction::CALLF:
8686
case Instruction::JUMPF:
8787
case Instruction::RETF:
88+
case Instruction::EXTCALL:
89+
case Instruction::EXTSTATICCALL:
90+
case Instruction::EXTDELEGATECALL:
8891
return _eofVersion.has_value();
8992
default:
9093
return true;

‎libsolidity/codegen/ir/IRGeneratorForStatements.cpp‎

Lines changed: 81 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1622,11 +1622,16 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
16221622
Whiskers templ(R"(
16231623
let <gas> := 0
16241624
if iszero(<value>) { <gas> := <callStipend> }
1625-
let <success> := call(<gas>, <address>, <value>, 0, 0, 0, 0)
1625+
<?eof>
1626+
let <success> := iszero(extcall(<address>, 0, 0, <value>))
1627+
<!eof>
1628+
let <success> := call(<gas>, <address>, <value>, 0, 0, 0, 0)
1629+
</eof>
16261630
<?isTransfer>
16271631
if iszero(<success>) { <forwardingRevert>() }
16281632
</isTransfer>
16291633
)");
1634+
templ("eof", m_context.eofVersion().has_value());
16301635
templ("gas", m_context.newYulVariable());
16311636
templ("callStipend", toString(evmasm::GasCosts::callStipend));
16321637
templ("address", address);
@@ -1669,17 +1674,29 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
16691674
<?isECRecover>
16701675
mstore(0, 0)
16711676
</isECRecover>
1672-
let <success> := <call>(<gas>, <address> <?isCall>, 0</isCall>, <pos>, sub(<end>, <pos>), 0, 32)
1677+
<?eof>
1678+
let <success> := iszero(<call>(<address>, <pos>, sub(<end>, <pos>) <?isCall>, 0</isCall>))
1679+
<!eof>
1680+
let <success> := <call>(<gas>, <address> <?isCall>, 0</isCall>, <pos>, sub(<end>, <pos>), 0, 32)
1681+
</eof>
16731682
if iszero(<success>) { <forwardingRevert>() }
1683+
<?eof>
1684+
if eq(returndatasize(), 32) { returndatacopy(0, 0, 32) }
1685+
</eof>
16741686
let <retVars> := <shl>(mload(0))
16751687
)");
1676-
templ("call", m_context.evmVersion().hasStaticCall() ? "staticcall" : "call");
1688+
auto const eof = m_context.eofVersion().has_value();
1689+
if (!eof)
1690+
templ("call", m_context.evmVersion().hasStaticCall() ? "staticcall" : "call");
1691+
else
1692+
templ("call", "extstaticcall"); // EOF always has static call
16771693
templ("isCall", !m_context.evmVersion().hasStaticCall());
16781694
templ("shl", m_utils.shiftLeftFunction(offset * 8));
16791695
templ("allocateUnbounded", m_utils.allocateUnboundedFunction());
16801696
templ("pos", m_context.newYulVariable());
16811697
templ("end", m_context.newYulVariable());
16821698
templ("isECRecover", FunctionType::Kind::ECRecover == functionType->kind());
1699+
templ("eof", eof);
16831700
if (FunctionType::Kind::ECRecover == functionType->kind())
16841701
templ("encodeArgs", m_context.abiFunctions().tupleEncoder(argumentTypes, parameterTypes));
16851702
else
@@ -1844,7 +1861,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
18441861
solAssert(dynamic_cast<AddressType const&>(*_memberAccess.expression().annotation().type).stateMutability() == StateMutability::Payable);
18451862
define(IRVariable{_memberAccess}.part("address"), _memberAccess.expression());
18461863
}
1847-
else if (std::set<std::string>{"call", "callcode", "delegatecall", "staticcall"}.count(member))
1864+
else if (std::set<std::string>{"call", "extcall", "callcode", "delegatecall" , "extdelegatecall", "staticcall", "extstaticcall"}.count(member))
18481865
define(IRVariable{_memberAccess}.part("address"), _memberAccess.expression());
18491866
else
18501867
solAssert(false, "Invalid member access to address");
@@ -2642,7 +2659,7 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
26422659
}
26432660

26442661
// NOTE: When the expected size of returndata is static, we pass that in to the call opcode and it gets copied automatically.
2645-
// When it's dynamic, we get zero from estimatedReturnSize() instead and then we need an explicit returndatacopy().
2662+
// When it's dynamic, we get zero from estimatedReturnSize() instead and then we need an explicit returndatacopy().
26462663
Whiskers templ(R"(
26472664
<?checkExtcodesize>
26482665
if iszero(extcodesize(<address>)) { <revertNoCode>() }
@@ -2652,7 +2669,11 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
26522669
mstore(<pos>, <shl28>(<funSel>))
26532670
let <end> := <encodeArgs>(add(<pos>, 4) <argumentString>)
26542671
2655-
let <success> := <call>(<gas>, <address>, <?hasValue> <value>, </hasValue> <pos>, sub(<end>, <pos>), <pos>, <staticReturndataSize>)
2672+
<?eof>
2673+
let <success> := iszero(<call>(<address>, <pos>, sub(<end>, <pos>) <?hasValue>, <value></hasValue>))
2674+
<!eof>
2675+
let <success> := <call>(<gas>, <address>, <?hasValue> <value>, </hasValue> <pos>, sub(<end>, <pos>), <pos>, <staticReturndataSize>)
2676+
</eof>
26562677
<?noTryCall>
26572678
if iszero(<success>) { <forwardingRevert>() }
26582679
</noTryCall>
@@ -2667,6 +2688,9 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
26672688
if gt(<returnDataSizeVar>, returndatasize()) {
26682689
<returnDataSizeVar> := returndatasize()
26692690
}
2691+
<?eof>
2692+
returndatacopy(<pos>, 0, <returnDataSizeVar>)
2693+
</eof>
26702694
</supportsReturnData>
26712695
</isReturndataSizeDynamic>
26722696
@@ -2678,16 +2702,21 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
26782702
}
26792703
)");
26802704
templ("revertNoCode", m_utils.revertReasonIfDebugFunction("Target contract does not contain code"));
2705+
auto const eof = m_context.eofVersion().has_value();
2706+
templ("eof", eof);
26812707

26822708
// We do not need to check extcodesize if we expect return data: If there is no
26832709
// code, the call will return empty data and the ABI decoder will revert.
26842710
size_t encodedHeadSize = 0;
26852711
for (auto const& t: returnInfo.returnTypes)
26862712
encodedHeadSize += t->decodingType()->calldataHeadSize();
26872713
bool const checkExtcodesize =
2688-
encodedHeadSize == 0 ||
2689-
!m_context.evmVersion().supportsReturndata() ||
2690-
m_context.revertStrings() >= RevertStrings::Debug;
2714+
!m_context.eofVersion().has_value() &&
2715+
(
2716+
encodedHeadSize == 0 ||
2717+
!m_context.evmVersion().supportsReturndata() ||
2718+
m_context.revertStrings() >= RevertStrings::Debug
2719+
);
26912720
templ("checkExtcodesize", checkExtcodesize);
26922721

26932722
templ("pos", m_context.newYulVariable());
@@ -2747,12 +2776,25 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
27472776
templ("gas", "sub(gas(), " + formatNumber(gasNeededByCaller) + ")");
27482777
}
27492778
// Order is important here, STATICCALL might overlap with DELEGATECALL.
2750-
if (isDelegateCall)
2751-
templ("call", "delegatecall");
2752-
else if (useStaticCall)
2753-
templ("call", "staticcall");
2779+
if (!eof)
2780+
{
2781+
if (isDelegateCall)
2782+
templ("call", "delegatecall");
2783+
else if (useStaticCall)
2784+
templ("call", "staticcall");
2785+
else
2786+
templ("call", "call");
2787+
}
27542788
else
2755-
templ("call", "call");
2789+
{
2790+
if (isDelegateCall)
2791+
templ("call", "extdelegatecall");
2792+
else if (useStaticCall)
2793+
templ("call", "extstaticcall");
2794+
else
2795+
templ("call", "extcall");
2796+
}
2797+
27562798

27572799
templ("forwardingRevert", m_utils.forwardingRevertFunction());
27582800

@@ -2791,13 +2833,21 @@ void IRGeneratorForStatements::appendBareCall(
27912833
let <length> := mload(<arg>)
27922834
</needsEncoding>
27932835
2794-
let <success> := <call>(<gas>, <address>, <?+value> <value>, </+value> <pos>, <length>, 0, 0)
2836+
<?eof>
2837+
let <success> := <call>(<address>, <pos>, <length> <?+value>, <value></+value>)
2838+
<success> := iszero(<success>)
2839+
<!eof>
2840+
let <success> := <call>(<gas>, <address>, <?+value> <value>, </+value> <pos>, <length>, 0, 0)
2841+
</eof>
2842+
27952843
let <returndataVar> := <extractReturndataFunction>()
27962844
)");
27972845

27982846
templ("allocateUnbounded", m_utils.allocateUnboundedFunction());
27992847
templ("pos", m_context.newYulVariable());
28002848
templ("length", m_context.newYulVariable());
2849+
auto const eof = m_context.eofVersion().has_value();
2850+
templ("eof", eof);
28012851

28022852
templ("arg", IRVariable(*_arguments.front()).commaSeparatedList());
28032853
Type const& argType = type(*_arguments.front());
@@ -2819,16 +2869,29 @@ void IRGeneratorForStatements::appendBareCall(
28192869
if (funKind == FunctionType::Kind::BareCall)
28202870
{
28212871
templ("value", funType.valueSet() ? IRVariable(_functionCall.expression()).part("value").name() : "0");
2822-
templ("call", "call");
2872+
if (eof)
2873+
templ("call", "extcall");
2874+
else
2875+
templ("call", "call");
28232876
}
28242877
else
28252878
{
28262879
solAssert(!funType.valueSet(), "Value set for delegatecall or staticcall.");
28272880
templ("value", "");
28282881
if (funKind == FunctionType::Kind::BareStaticCall)
2829-
templ("call", "staticcall");
2882+
{
2883+
if (eof)
2884+
templ("call", "extstaticcall");
2885+
else
2886+
templ("call", "staticcall");
2887+
}
28302888
else
2831-
templ("call", "delegatecall");
2889+
{
2890+
if (eof)
2891+
templ("call", "extdelegatecall");
2892+
else
2893+
templ("call", "delegatecall");
2894+
}
28322895
}
28332896

28342897
if (funType.gasSet())

‎libyul/AsmAnalysis.cpp‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,10 +771,27 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
771771
"PC instruction is a low-level EVM feature. "
772772
"Because of that PC is disallowed in strict assembly."
773773
);
774+
else if (!m_eofVersion.has_value() && (
775+
_instr == evmasm::Instruction::EXTCALL ||
776+
_instr == evmasm::Instruction::EXTDELEGATECALL ||
777+
_instr == evmasm::Instruction::EXTSTATICCALL
778+
))
779+
{
780+
m_errorReporter.typeError(
781+
4328_error,
782+
_location,
783+
fmt::format(
784+
"The \"{instruction}\" instruction is {kind} VMs.",
785+
fmt::arg("instruction", boost::to_lower_copy(instructionInfo(_instr, m_evmVersion).name)),
786+
fmt::arg("kind", "not available in legacy bytecode")
787+
)
788+
);
789+
}
774790
else if (m_eofVersion.has_value() && (
775791
_instr == evmasm::Instruction::CALL ||
776792
_instr == evmasm::Instruction::CALLCODE ||
777793
_instr == evmasm::Instruction::DELEGATECALL ||
794+
_instr == evmasm::Instruction::STATICCALL ||
778795
_instr == evmasm::Instruction::SELFDESTRUCT ||
779796
_instr == evmasm::Instruction::JUMP ||
780797
_instr == evmasm::Instruction::JUMPI ||

0 commit comments

Comments
 (0)