cerc-io/solidity
10
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

Add errors to the ABI.

Browse Source
This commit is contained in:
chriseth 2021-02-02 12:34:58 +01:00
parent 3c69b7e552
commit 32974a5168
3 changed files with 109 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libsolidity/ast/AST.h
View File

@ -504,6 +504,7 @@ public:
std::vector<FunctionDefinition const*> definedFunctions() const { return filteredNodes<FunctionDefinition>(m_subNodes); }
std::vector<EventDefinition const*> events() const { return filteredNodes<EventDefinition>(m_subNodes); }
std::vector<EventDefinition const*> const& interfaceEvents() const;
std::vector<ErrorDefinition const*> errors() const { return filteredNodes<ErrorDefinition>(m_subNodes); }
bool isInterface() const { return m_contractKind == ContractKind::Interface; }
bool isLibrary() const { return m_contractKind == ContractKind::Library; }

20
libsolidity/interface/ABI.cpp
View File

@ -121,6 +121,26 @@ Json::Value ABI::generate(ContractDefinition const& _contractDef)
abi.emplace(std::move(event));
}
// TODO should use "used errors" once implemented,
// but should also include all errors defined in the contract.
for (ErrorDefinition const* error: _contractDef.errors())
{
Json::Value event;
event["type"] = "error";
event["name"] = error->name();
Json::Value params(Json::arrayValue);
for (auto const& p: error->parameters())
{
Type const* type = p->annotation().type->interfaceType(false);
solAssert(type, "");
Json::Value input;
auto param = formatType(p->name(), *type, *p->annotation().type, false);
params.append(std::move(param));
}
event["inputs"] = std::move(params);
abi.emplace(std::move(event));
}
Json::Value abiJson{Json::arrayValue};
for (auto& f: abi)
abiJson.append(std::move(f));

88
test/libsolidity/ABIJson/errors.sol Normal file
View File

@ -0,0 +1,88 @@
error FreeError();
contract X {
error E(uint);
error E2(uint a, uint b);
error E4(uint a, bytes[][] c);
struct S { uint x; }
error E5(S t);
function f() public pure {
revert(FreeError());
}
}
// ----
// :X
// [
// {
// "inputs":
// [
// {
// "internalType": "uint256",
// "name": "",
// "type": "uint256"
// }
// ],
// "name": "E",
// "type": "error"
// },
// {
// "inputs":
// [
// {
// "internalType": "uint256",
// "name": "a",
// "type": "uint256"
// },
// {
// "internalType": "uint256",
// "name": "b",
// "type": "uint256"
// }
// ],
// "name": "E2",
// "type": "error"
// },
// {
// "inputs":
// [
// {
// "internalType": "uint256",
// "name": "a",
// "type": "uint256"
// },
// {
// "internalType": "bytes[][]",
// "name": "c",
// "type": "bytes[][]"
// }
// ],
// "name": "E4",
// "type": "error"
// },
// {
// "inputs":
// [
// {
// "components":
// [
// {
// "internalType": "uint256",
// "name": "x",
// "type": "uint256"
// }
// ],
// "internalType": "struct X.S",
// "name": "t",
// "type": "tuple"
// }
// ],
// "name": "E5",
// "type": "error"
// },
// {
// "inputs": [],
// "name": "f",
// "outputs": [],
// "stateMutability": "pure",
// "type": "function"
// }
// ]