Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
232 commits
Select commit Hold shift + click to select a range
98e6a83
init branch section_logs
317787106 Sep 24, 2021
ec79a44
add section bloom
317787106 Sep 26, 2021
5d77342
Merge branch 'release_v4.4.0' into feature/section_logs
Sep 26, 2021
4d54113
typo
Sep 26, 2021
afb8345
feat: add block filter process
Sep 27, 2021
6eafb86
feat: add logs filter process
Sep 27, 2021
c05da36
feat: update jsonrpc response code
Sep 28, 2021
a96b776
refactor: create BlockResult file
Sep 28, 2021
bf54254
typo
Sep 28, 2021
3e41892
support log filter in jsonrpc
317787106 Sep 28, 2021
996c829
merge code
317787106 Sep 28, 2021
fac09f9
typo
Sep 28, 2021
abc1053
typo
Sep 28, 2021
a740d80
merge code
317787106 Sep 28, 2021
8f9b2d3
Merge branch 'feature/section_logs' of github.com:tronprotocol/java-t…
317787106 Sep 28, 2021
ef38f9a
refactor
Sep 28, 2021
1c29328
typo
Sep 28, 2021
a25d2b5
typo
Sep 28, 2021
b275d44
typo
Sep 28, 2021
776f934
feat: add block hash to LogsFilterCapsule
Sep 28, 2021
e7e4cd6
parse block data for logfilter realtime
317787106 Sep 28, 2021
1413720
Merge branch 'feature/section_logs' of github.com:tronprotocol/java-t…
317787106 Sep 28, 2021
f7aa4d0
typo
Sep 28, 2021
e228fc3
Merge branch 'feature/section_logs' of github.com:tronprotocol/java-t…
317787106 Sep 30, 2021
80b095c
implements filter related json api
317787106 Sep 30, 2021
b3440b7
feat: add getCursor to Chainbase
Sep 30, 2021
0013e80
feat: diable some apis in PBFT
Sep 30, 2021
6f07e74
change some variable name
317787106 Sep 30, 2021
14199ac
Merge branch 'feature/section_logs' of github.com:tronprotocol/java-t…
317787106 Sep 30, 2021
4b1f78b
feat: post solidity block and logs filter
Sep 30, 2021
623945c
Merge branch 'feature/section_logs' of github.com:tronprotocol/java-t…
317787106 Sep 30, 2021
e33dd27
feat: disable buildTransaction in solidity and pbft
Sep 30, 2021
157a260
feat: check if latestSolidifiedBlockNum changed before post solidity …
Sep 30, 2021
9306ba3
support solidity and full log filter api in jsonrpc
317787106 Sep 30, 2021
7c2295c
Merge branch 'feature/section_logs' of github.com:tronprotocol/java-t…
317787106 Sep 30, 2021
9e0b0fd
typo
Sep 30, 2021
71ecea3
Merge branch 'feature/section_logs' of ssh://github.com/tronprotocol/…
Sep 30, 2021
3c1dd31
typo
Oct 8, 2021
5f8548e
typo
Oct 8, 2021
39f503b
typo
Oct 8, 2021
17d1b02
typo
Oct 8, 2021
abf7558
test: add testAddressCompatibleToByteArray
Oct 8, 2021
f68dc88
typo
Oct 8, 2021
ffe1e4b
add prefix 0x to blockFilter in TronJsonRpcImpl
317787106 Oct 8, 2021
c624ed5
typo
Oct 8, 2021
15e7b23
Merge branch 'feature/section_logs' of ssh://github.com/tronprotocol/…
Oct 8, 2021
339e25b
write data into section level db only if jsonrpc api is enabled
317787106 Oct 8, 2021
dfd252e
typo: update config comment, remove unused codes
Oct 8, 2021
2403f49
Merge branch 'release_v4.4.0' into feature/section_logs
Oct 8, 2021
8f87919
feat: update config
Oct 8, 2021
b3ec269
typo
Oct 8, 2021
0d9ccc9
reorganize some exception in jsonrpc api
317787106 Oct 8, 2021
48ceba0
typo
Oct 8, 2021
1dff3a9
fix bug of minBlock too large
317787106 Oct 9, 2021
752db74
typo
Oct 9, 2021
748517b
Merge branch 'feature/section_logs' of ssh://github.com/tronprotocol/…
Oct 9, 2021
d911f41
fix bug of matchesContractAddress
317787106 Oct 9, 2021
ae648a9
feat: move bloom, add bloom test
Oct 9, 2021
c026129
Merge branch 'feature/section_logs' of ssh://github.com/tronprotocol/…
Oct 9, 2021
5644985
typo: remove Bloom1
Oct 9, 2021
300a879
add JsonRpcTooManyResultException and can use empty query
317787106 Oct 9, 2021
08a02de
Merge branch 'feature/section_logs' of github.com:tronprotocol/java-t…
317787106 Oct 9, 2021
c10e847
typo
Oct 9, 2021
43b8229
use log.address to generate bloom; fix blockHash bug; use special err…
317787106 Oct 9, 2021
dbd57e1
Merge branch 'feature/section_logs' of github.com:tronprotocol/java-t…
317787106 Oct 9, 2021
f6b73d3
remove log
317787106 Oct 9, 2021
c1de8df
filter log with block num in LogFilterWrapper
317787106 Oct 9, 2021
ba9f2ad
test: add benchmarkCreateByTransaction
Oct 9, 2021
004531e
typo
Oct 11, 2021
a20a116
typo
Oct 11, 2021
823f501
fix bug of fromBlock is empty and toBlock is bigger then currentMaxNum
317787106 Oct 11, 2021
68ca7f9
support fromBlock/toBlock = earliest in jsonrpc log filter
317787106 Oct 11, 2021
0ef7545
test: update bloom test
Oct 11, 2021
f96a743
Merge branch 'feature/section_logs' of ssh://github.com/tronprotocol/…
Oct 11, 2021
9787827
feat: move handleBLockFilter and handleLogsFilter to TronJsonRpcImpl
Oct 12, 2021
c89806a
typo
Oct 12, 2021
320566e
modify error messgae; add read/write lock in read some filter concurrent
317787106 Oct 12, 2021
a044d29
Merge branch 'feature/section_logs' of github.com:tronprotocol/java-t…
317787106 Oct 12, 2021
86bbb92
fix bug of expire time
317787106 Oct 12, 2021
84d86d9
add some comment
317787106 Oct 12, 2021
5b2f7fd
test: add ConcurrentHashMapTest
Oct 12, 2021
3444632
Merge branch 'feature/section_logs' of ssh://github.com/tronprotocol/…
Oct 12, 2021
4f027d7
use LinkedBlockingQueue for multi thread
317787106 Oct 12, 2021
876c453
test: add testHandleBlockHash
Oct 12, 2021
689023c
fix bug in condition: fromBlock is empty and toBlock is latest
317787106 Oct 13, 2021
e899e5a
typo
Oct 13, 2021
a103919
Merge branch 'feature/section_logs' of ssh://github.com/tronprotocol/…
Oct 13, 2021
d49a11d
add many eth log filter test
317787106 Oct 14, 2021
de8c6cc
test
Oct 14, 2021
f8fd600
typo
Oct 14, 2021
5778a07
typo
Oct 14, 2021
d73f385
test: modify testAddressCompatibleToByteArray
Oct 14, 2021
57d4d0e
feat: add more restriction for addressCompatibleToByteArray
Oct 15, 2021
0c4b2c6
Fix daily build failed
wangzichichi Oct 15, 2021
6ad110a
Fix daily build failed
wangzichichi Oct 15, 2021
e05b891
Merge pull request #4120 from tronprotocol/master
forfreeday Oct 15, 2021
54d4c34
Merge pull request #4116 from tronprotocol/fix_dailybuild_failed
wangzichichi Oct 18, 2021
6a89d1f
merge release_v4.4.0 into feature/section_logs
317787106 Oct 18, 2021
b4e67d9
remove some setting
317787106 Oct 18, 2021
dcbdac9
typo
Oct 18, 2021
052353c
test: add BuildTransactionTest
Oct 18, 2021
084885d
feat: add WalletCursorTest
Oct 18, 2021
eca7f71
fix: miner address ignore 41
Oct 20, 2021
0a6bb72
broadcast tx support sigle node
xxo1shine Oct 20, 2021
6df56dd
Merge pull request #4130 from wubin01/sigle_node_broadcast
eodiandie Oct 20, 2021
1e287ab
add default config && threw get error for leveldb
halibobo1205 Oct 26, 2021
bbc30b2
modify testcase
Yuanshandai Nov 9, 2021
fe9be1e
modify testcase
Yuanshandai Nov 9, 2021
14e8ad5
modify testcase
Yuanshandai Nov 9, 2021
7bc99c6
Merge pull request #4140 from tronprotocol/addEstimateGasTestCase
wangzichichi Nov 10, 2021
b9f1f1f
add Operation and related energycosts, actions
Nov 11, 2021
cc1c42e
modify testcase
Yuanshandai Nov 12, 2021
b745082
Merge pull request #4142 from tronprotocol/addEstimateGasTestCase
wangzichichi Nov 12, 2021
2c69657
add other operations
Nov 12, 2021
bedf929
add op constant pool
Nov 12, 2021
705eed7
add op constant pool fields
Nov 12, 2021
dda66d4
add op constant pool fields comment
Nov 12, 2021
a1d4e9a
add condition
Nov 12, 2021
e2c4c54
fix actions
Nov 15, 2021
bce2137
add london proposal
Nov 15, 2021
2a93cd0
modify call series instructions
Nov 15, 2021
886c20f
remove unused import
Nov 15, 2021
3ae4a57
add adjustedCallEnergy field
Nov 15, 2021
c085043
get adjustedCallEnergy
Nov 16, 2021
435b110
add more detail config for db
halibobo1205 Nov 10, 2021
b8d026f
modify energy cost
Nov 16, 2021
c832e27
init validContractProtoThreadNum 1
Nov 16, 2021
136040b
modify proposal operations
Nov 17, 2021
8541d56
Add scan block tools
daxinzang1 Nov 17, 2021
ba18c02
feature(proposal,act,vm): add getImproveEvmCompatibility proposal
yanghang8612 Nov 17, 2021
2121cc7
modify operations cost
Nov 17, 2021
e1b59ed
Merge branch 'feature/optimize_TVM' of github.com:yanghang8612/java-t…
Nov 17, 2021
ea1140c
add testcase for trc1155
Yuanshandai Nov 19, 2021
db122a8
Merge branch 'addEstimateGasTestCase' of https://github.com/tronproto…
Yuanshandai Nov 19, 2021
5c3f5c7
add testcase for trc1155
Yuanshandai Nov 19, 2021
2c006a4
modify testcase
Yuanshandai Nov 19, 2021
0ccd7dc
modify
Yuanshandai Nov 19, 2021
bf9e515
modify
Yuanshandai Nov 19, 2021
20d7611
Merge pull request #4147 from tronprotocol/addEstimateGasTestCase
wangzichichi Nov 22, 2021
45aec12
Merge branch 'release_v4.4.2' into feature/section_logs
317787106 Nov 22, 2021
288071f
typo: fix typo in test
Nov 23, 2021
2e9d8f0
code review and add OperationsTest
Nov 23, 2021
23f2df8
remove energy_limit
Nov 23, 2021
e59419e
remove improveEvmCompatibility proposal
Nov 23, 2021
d0a2cb8
optimize expression
Nov 23, 2021
3944a66
Merge pull request #4153 from tronprotocol/feature/section_logs
317787106 Nov 23, 2021
f51f07f
add note and set default to 100,revert logback
halibobo1205 Nov 23, 2021
8daa8e2
test(vm): add stack under/overflow test
yanghang8612 Nov 23, 2021
0c1e3b4
modify OperationsTest
Nov 23, 2021
0939dc0
Merge branch 'feature/optimize_TVM' of github.com:yanghang8612/java-t…
Nov 23, 2021
5e9cad1
remove unused code
Nov 24, 2021
2c641ae
refactor: cost energy code
CodeNinjaEvan Nov 24, 2021
e0cc922
refactor: cost energy code
CodeNinjaEvan Nov 24, 2021
1bf33f8
code review
Nov 24, 2021
2eb45c9
add operation tests
Nov 25, 2021
f12733b
modify EnergyCost
Nov 25, 2021
0d7ceb7
Merge pull request #4154 from halibobo1205/feat/db_params
forfreeday Nov 25, 2021
403573f
modify op uint test and call opcode actions
Nov 25, 2021
1c34239
Merge pull request #4156 from tronprotocol/develop
forfreeday Nov 25, 2021
1a1075d
feat(vm): optimise address covert
yanghang8612 Nov 25, 2021
8b549ee
feat(vm): remove touch account and energy refund
yanghang8612 Nov 25, 2021
a889b73
fix(vm): compile error and some check styles
yanghang8612 Nov 25, 2021
dfa2a6f
modify op uint test
Nov 25, 2021
e9aa153
fix op uint test
Nov 26, 2021
912a535
fix op uint test
Nov 26, 2021
8a125e3
refactor(vm): program, invoke, vm and config
yanghang8612 Nov 26, 2021
c733518
Merge branch 'release_v4.4.2' into feature/optimize_vm_4.4.2
yanghang8612 Nov 26, 2021
d8a3a02
revert(conf): 4.4.1 config.conf changes
yanghang8612 Nov 26, 2021
47a089d
Add get witness size auto
daxinzang1 Nov 26, 2021
f89692e
revert(vm): program and some renames
yanghang8612 Nov 27, 2021
a2e687f
fix(vm): compile error
yanghang8612 Nov 27, 2021
68755ab
fix(vm): compile error
yanghang8612 Nov 27, 2021
cf8c5e5
review(vm): change some details
yanghang8612 Nov 27, 2021
2203859
Merge pull request #4157 from yanghang8612/feature/optimize_vm_4.4.2
Lredhdx Nov 29, 2021
d76ecea
feat: eth_call supports no from
Nov 29, 2021
2f32634
feat: eth_call supports value
Nov 29, 2021
75c1ca7
change exit method for db exception
halibobo1205 Nov 29, 2021
4419117
fix exit condition only invokes unpark
halibobo1205 Nov 30, 2021
c5345e2
Merge pull request #4162 from halibobo1205/feat/db_params
forfreeday Dec 1, 2021
1b15e7c
add
Yuanshandai Dec 1, 2021
0bae258
Merge pull request #4163 from tronprotocol/feat/db_params
forfreeday Dec 1, 2021
d05141d
fix(vm): check styles
yanghang8612 Dec 1, 2021
87a47d8
Merge pull request #4164 from yanghang8612/feature/fix_style
Lredhdx Dec 1, 2021
eb392c0
Merge pull request #4166 from tronprotocol/fix/jsonrpc_enhancement
waynercheung Dec 1, 2021
2eb8989
add
Yuanshandai Dec 2, 2021
d0234f4
add
Yuanshandai Dec 2, 2021
92dca58
add
Yuanshandai Dec 2, 2021
2295d45
add
Yuanshandai Dec 2, 2021
4a8208a
add case for opcode test
mumianhua Dec 2, 2021
203bc52
framework/src/test/java/stest/tron/wallet/common/client/utils/JsonRpc…
Yuanshandai Dec 3, 2021
1634619
fix case for opcode test in linux
mumianhua Dec 6, 2021
3800854
add
Yuanshandai Dec 6, 2021
a1958b0
Merge branch 'addFilterTestCase' of https://github.com/tronprotocol/j…
Yuanshandai Dec 6, 2021
92c35be
Merge pull request #4170 from tronprotocol/v4.4.1_temp
forfreeday Dec 6, 2021
8bb12a6
optimize storage key
Dec 6, 2021
6128e12
Merge branch 'feature/optimize_vm_4.4.2' of github.com:yanghang8612/j…
Dec 6, 2021
bb77466
Merge pull request #4172 from yanghang8612/feature/optimize_vm_4.4.2
yanghang8612 Dec 7, 2021
a650d5b
fix case for opcode test in linux
mumianhua Dec 8, 2021
93b75b8
Merge branch 'release_v4.4.2' into addFilterTestCase
mumianhua Dec 8, 2021
299052a
fix(vm): shorten storage db key
yanghang8612 Dec 9, 2021
ec1c80f
Merge pull request #4178 from yanghang8612/feature/optimize_vm_4.4.2
Lredhdx Dec 9, 2021
8be9581
Merge remote-tracking branch 'origin/release_v4.4.2' into addFilterTe…
mumianhua Dec 10, 2021
28bc3b8
add
Yuanshandai Dec 13, 2021
2ce1cea
Merge branch 'addFilterTestCase' of https://github.com/tronprotocol/j…
Yuanshandai Dec 13, 2021
52fbc4b
add
Yuanshandai Dec 13, 2021
925cc4f
add
Yuanshandai Dec 13, 2021
8cedc37
add
Yuanshandai Dec 13, 2021
946226b
add
Yuanshandai Dec 13, 2021
41d1fde
add
Yuanshandai Dec 13, 2021
8029efa
add
Yuanshandai Dec 13, 2021
6e807a1
fix
Yuanshandai Dec 14, 2021
24d606e
fix
Yuanshandai Dec 14, 2021
1a486e6
fix
Yuanshandai Dec 14, 2021
b0988ba
fix
Yuanshandai Dec 14, 2021
2dd95e8
fix
Yuanshandai Dec 14, 2021
c498c3b
add
Yuanshandai Dec 14, 2021
4af63b5
fix op after code review
Dec 14, 2021
84ba3b3
Turn solidity rpc case to false
daxinzang1 Dec 15, 2021
1b3e139
Merge pull request #4184 from yanghang8612/feature/optimize_vm_4.4.2
yanghang8612 Dec 15, 2021
f586685
Merge pull request #4183 from tronprotocol/addFilterTestCase
wangzichichi Dec 15, 2021
444334b
fix sonar check
Dec 15, 2021
a5cc716
remove unused function
Dec 15, 2021
e76a163
modify version to 4.4.2
forfreeday Dec 15, 2021
b6e343f
Merge pull request #4187 from yanghang8612/feature/optimize_vm_4.4.2
yanghang8612 Dec 15, 2021
b6e096a
Merge pull request #4188 from forfreeday/release_v4.4.2
forfreeday Dec 15, 2021
fd08113
fix sonar check
Dec 15, 2021
6b525c6
Merge pull request #4190 from yanghang8612/feature/optimize_vm_4.4.2
yanghang8612 Dec 15, 2021
cf77290
fix(vm): check style
yanghang8612 Dec 15, 2021
7cfd2c5
typo
Dec 15, 2021
779a377
fix sonar warning of TronJsonRpcImpl
317787106 Dec 15, 2021
3116f99
Merge pull request #4191 from yanghang8612/feature/optimize_vm_4.4.2
forfreeday Dec 15, 2021
f4277f6
Merge pull request #4192 from tronprotocol/fix/sonar_jsonrpc
forfreeday Dec 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ public boolean validate() throws ContractValidateException {
"Account type is Contract, but it is not exist in contract store.");
} else if (contractCapsule.getContractVersion() == 1) {
throw new ContractValidateException(
"Cannot transfer TRX to a smartContract which version is one. " +
"Instead please use TriggerSmartContract ");
"Cannot transfer TRX to a smartContract which version is one. "
+ "Instead please use TriggerSmartContract ");
}
}

Expand Down
136 changes: 64 additions & 72 deletions actuator/src/main/java/org/tron/core/actuator/VMActuator.java

Large diffs are not rendered by default.

Loading