Skip to content

update bandwidth consume #1405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 99 commits into from
Aug 29, 2018
Merged

update bandwidth consume #1405

merged 99 commits into from
Aug 29, 2018

Conversation

huzhenyuan
Copy link
Contributor

What does this PR do?
update bandwidth consume

Why are these changes required?

This PR has been tested by:

  • Unit Tests
  • Manual Testing

Follow up

Extra details

wangzihe and others added 30 commits August 27, 2018 16:42
Add support trx and sun test case
2134e56
@lvs007
fix sycn bug
eac9f30
@lvs007
add log
142be45
@wubin12
Merge pull request #1389 from tronprotocol/fix-sycn-l
0a17184 
fix sycn bug
@CodeNinjaEvan
change proto.
ef01d3a
@tjchern
add tolerance
225b0bb
@ithinker1991
fix bug
c056809
@ithinker1991
fix bug
7728009
@tjchern
add tolerance
d969a4c
@CodeNinjaEvan
set contract result.
80cba38
@huzhenyuan
Merge pull request #1391 from tronprotocol/fix/delete_account
3ddac7f 
fix bug
@CodeNinjaEvan
Merge branch 'set_out_of_time' of https://github.com/tronprotocol/jav…
4b8837f 
…a-tron into set_out_of_time

# Conflicts:
#	src/main/java/org/tron/common/runtime/Runtime.java
...
@lvs007
remove disconnect
b8c9959
@lvs007
remove else
4682e3d
@CodeNinjaEvan
Merge remote-tracking branch 'origin/develop' into set_out_of_time
2280753 
# Conflicts:
#	src/main/java/org/tron/core/db/Manager.java
@CodeNinjaEvan
merge develop to this.
b8cffdf
@wubin12
Merge pull request #1392 from tronprotocol/fix-sycn-l
7f1b5b4 
remove disconnect
@CodeNinjaEvan
rename exception.
0c6cffd
Add test for cycle energy cost test case
9bae495
@CodeNinjaEvan
rename exception.
fa5f8ee
@pangpangfeng
Merge pull request #1388 from tronprotocol/stest_VM_detail_fee
015aeff 
Add support trx and sun test case
@tjchern
add constant
e87257f
@CodeNinjaEvan
refactor check receipt.
21ccfca
@CodeNinjaEvan
rename exception.
46b96c6
@tjchern
check supporting constant
f96acf2
@tjchern
Merge branch 'set_out_of_time' of https://github.com/tronprotocol/jav…
00fff61 
…a-tron into set_out_of_time
@CodeNinjaEvan
remove .
178d4d2
@CodeNinjaEvan
rename exception.
72ff740
@Yrp
⬆️upgrade grpc version to 1.14.0
fa1309d
@CodeNinjaEvan
fix runtime constructor.
52b4ba9
nanfengpo and others added 16 commits August 29, 2018 16:22
@nanfengpo
mdf proposalcreate validateValue func
c67cf3a
@sean-liu55
Merge pull request #1406 from tronprotocol/feature/chainparameters_add
f4787f7 
Feature/chainparameters add
@taihaofu
timestamp in vm use second as unit
bcca508
@huzhenyuan
Update ProgramInvokeFactoryImpl.java
12483ad
@tjchern
use getMaxCpuTimeOfOneTX()
d17e648
@huzhenyuan
Merge pull request #1407 from tronprotocol/fix/storage_put
b1783db 
fix bug
@huzhenyuan
Merge pull request #1408 from tronprotocol/timestamp_use_seconde_in_vm
027ca7e 
timestamp in vm use second as unit
@huzhenyuan
Merge pull request #1409 from tronprotocol/add_getMaxCpuTimeOfOneTX
419dc6c 
use getMaxCpuTimeOfOneTX()
@ithinker1991
Polish exception
2cbc74d
Refresh committee with timeout setting function test case
c3d4cb1
@pangpangfeng
Merge pull request #1411 from tronprotocol/stest_VM_detail_fee
a7af7bf 
Refresh committee with timeout setting function test case
@CodeNinjaEvan
change longValue Exact.
cbf6ea4
@CodeNinjaEvan
change longValue Exact.
8de86f6
@CodeNinjaEvan
Merge branch 'develop' into longvalue_exact
5ce7d1b
@huzhenyuan
Merge pull request #1410 from tronprotocol/fix/constant_exception
f7d24a5 
Polish exception
@huzhenyuan
Merge branch 'develop' into longvalue_exact
b72a9c7
@huzhenyuan huzhenyuan closed this Aug 29, 2018
@huzhenyuan huzhenyuan reopened this Aug 29, 2018
@CodeNinjaEvan CodeNinjaEvan self-requested a review August 29, 2018 12:45
@huzhenyuan huzhenyuan merged commit a86d99f into master Aug 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
2 more reviewers

@taihaofu taihaofu taihaofu approved these changes

@CodeNinjaEvan CodeNinjaEvan CodeNinjaEvan approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.