Skip to content
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.

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

Add query pending interface #3656

Merged
merged 15 commits into from Feb 24, 2021
Merged

Conversation

Yrp
Copy link
Contributor

@Yrp Yrp commented Feb 24, 2021

What does this PR do?

Why are these changes required?

This PR has been tested by:

  • Unit Tests
  • Manual Testing

Follow up

Extra details

sean-liu55 and others added 15 commits November 24, 2020 11:43
…erTest_testProcessMessage

Fix unittest block msg handler test test process message
…n into feature/resolvecpu

� Conflicts:
�	actuator/src/main/java/org/tron/core/utils/ProposalUtil.java
�	common/src/main/java/org/tron/core/config/Parameter.java
�	framework/src/main/java/org/tron/core/db/Manager.java
�	framework/src/main/java/org/tron/core/services/WitnessProductBlockService.java
�	framework/src/main/java/org/tron/core/services/http/TriggerConstantContractServlet.java
�	framework/src/main/java/org/tron/core/services/http/TriggerSmartContractServlet.java
…o feature/resolvecpu

� Conflicts:
�	actuator/src/main/java/org/tron/core/utils/ProposalUtil.java
@Yrp Yrp merged commit 7ef5c2a into test_contract_timeout Feb 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants