Skip to content

Commit 7840b62

Browse files
authored
Merge pull request #440 from tronprotocol/feature/adapt_to_solidity0.8.6
Feature/adapt to solidity0.8.6
2 parents 9f1cf86 + dcf17de commit 7840b62

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ dependencies {
8383
compile "org.apache.commons:commons-collections4:4.0"
8484
compile "org.apache.commons:commons-lang3:3.4"
8585
compile group: 'com.google.api.grpc', name: 'googleapis-common-protos', version: '0.0.3'
86-
compile 'com.alibaba:fastjson:1.2.47'
86+
compile 'com.alibaba:fastjson:1.2.76'
8787

8888
compile group: 'commons-io', name: 'commons-io', version: '2.6'
8989
compile group: 'org.projectlombok', name: 'lombok', version: '1.18.2'

src/main/java/org/tron/walletserver/WalletApi.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,8 +1697,10 @@ public static SmartContract.ABI.Entry.EntryType getEntryType(String type) {
16971697
return SmartContract.ABI.Entry.EntryType.Fallback;
16981698
case "receive":
16991699
return SmartContract.ABI.Entry.EntryType.Receive;
1700+
case "error":
1701+
return SmartContract.ABI.Entry.EntryType.Error;
17001702
default:
1701-
return SmartContract.ABI.Entry.EntryType.UNRECOGNIZED;
1703+
return SmartContract.ABI.Entry.EntryType.UnknownEntryType;
17021704
}
17031705
}
17041706

@@ -1714,7 +1716,7 @@ public static SmartContract.ABI.Entry.StateMutabilityType getStateMutability(
17141716
case "payable":
17151717
return SmartContract.ABI.Entry.StateMutabilityType.Payable;
17161718
default:
1717-
return SmartContract.ABI.Entry.StateMutabilityType.UNRECOGNIZED;
1719+
return SmartContract.ABI.Entry.StateMutabilityType.UnknownMutabilityType;
17181720
}
17191721
}
17201722

src/main/protos/core/contract/smart_contract.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ message SmartContract {
1818
Event = 3;
1919
Fallback = 4;
2020
Receive = 5;
21+
Error = 6;
2122
}
2223
message Param {
2324
bool indexed = 1;

0 commit comments

Comments
 (0)