tornado-packages/ethers.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed mutabilityState calculation for function fragments (#762).

Browse Source
This commit is contained in:
Richard Moore 2020-04-03 21:28:53 -04:00
parent da412f6607
commit 6526de016f
No known key found for this signature in database
GPG Key ID: 665176BE8E9DC651
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/abi/src.ts/fragments.ts
View File

@ -607,6 +607,7 @@ function verifyState(value: any): { constant: boolean, payable: boolean, stateMu
if (value.stateMutability != null) { if (value.stateMutability != null) {
result.stateMutability = value.stateMutability; result.stateMutability = value.stateMutability;
// Set (and check things are consistent) the constant property
result.constant = (result.stateMutability === "view" || result.stateMutability === "pure"); result.constant = (result.stateMutability === "view" || result.stateMutability === "pure");
if (value.constant != null) { if (value.constant != null) {
if ((!!value.constant) !== result.constant) { if ((!!value.constant) !== result.constant) {
@ -614,6 +615,7 @@ function verifyState(value: any): { constant: boolean, payable: boolean, stateMu
} }
} }
// Set (and check things are consistent) the payable property
result.payable = (result.stateMutability === "payable"); result.payable = (result.stateMutability === "payable");
if (value.payable != null) { if (value.payable != null) {
if ((!!value.payable) !== result.payable) { if ((!!value.payable) !== result.payable) {
@ -623,9 +625,21 @@ function verifyState(value: any): { constant: boolean, payable: boolean, stateMu
} else if (value.payable != null) { } else if (value.payable != null) {
result.payable = !!value.payable; result.payable = !!value.payable;
result.stateMutability = (result.payable ? "payable": "nonpayable");
result.constant = !result.payable; // If payable we can assume non-constant; otherwise we can't assume
if (value.constant != null && (value.constant !== result.constant)) { if (value.constant == null && !result.payable) {
throw new Error("unable to determine stateMutability");
}
result.constant = !!value.constant;
if (result.constant) {
result.stateMutability = "view";
} else {
result.stateMutability = (result.payable ? "payable": "nonpayable");
}
if (result.payable && result.constant) {
throw new Error("cannot have constant payable function"); throw new Error("cannot have constant payable function");
} }
@ -633,6 +647,9 @@ function verifyState(value: any): { constant: boolean, payable: boolean, stateMu
result.constant = !!value.constant; result.constant = !!value.constant;
result.payable = !result.constant; result.payable = !result.constant;
result.stateMutability = (result.constant ? "view": "payable"); result.stateMutability = (result.constant ? "view": "payable");
} else {
throw new Error("unable to determine stateMutability");
} }
return result; return result;