Skip to content

main to 2.0 merge of #1383, #1316, #1330 #1391

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
spoonincode merged 54 commits into from
Apr 16, 2025
Merged

main to 2.0 merge of #1383, #1316, #1330 #1391

spoonincode merged 54 commits into from
Apr 16, 2025

Conversation

@spoonincode
Copy link
Contributor

@spoonincode spoonincode commented Apr 16, 2025

2.0 branch is busted since it is referring to contracts main which requires recent changes on spring's main

Brings over #1383 (from #1369), #1316, #1330. This was a fast forward

greg7mdp and others added 30 commits March 28, 2025 12:25
@greg7mdp
Update peer_keys_db to use the ro transaction result.
bc78038
@greg7mdp
Implement get_top_producer_keys and factorize dup. code.
696f02b
@greg7mdp
Add code to test the ro action getpeerkeys
dba098c
@greg7mdp
Make the getpeerkeys return type nicer.
63731f2
@greg7mdp
Checkin state before trying to avoid table changes in `~system_contra…
b1e64cc 
…ct()`
@greg7mdp
To avoid the non-readonly destructor, implement getpeerkeys in sepa…
00b9582 
…rate class
@greg7mdp
Update getpeerkeys result type to match system contracts.
ac600cf
@greg7mdp
Update peer keys on accepted_block.
4b9364a
@greg7mdp
Undo whitespace change
328d2fe
@greg7mdp
implement get_peer_info
1bd34ed
@greg7mdp
Need to find the right location in the code to call update_peer_keys
70edeab
@greg7mdp
Merge branch 'main' of github.com:AntelopeIO/spring into gh_1183_3
b07e4d5
@greg7mdp
Update contracts and tests to match eos-system-contracts
27075d6
@greg7mdp
Remove outdated comment.
b58e9c1
@greg7mdp
Merge branch 'main' of github.com:AntelopeIO/spring into gh_1183_3
bce86eb
@heifner
GH-1170 Also interrupt speculative trxs
383be15
@heifner
GH-1170 Rename interrupt_apply_block_transaction() to interrupt_trans…
8fc5690 
…action()
@greg7mdp
Push wasm file compiled with cdt @ commit #b949569188f9d8bfaec8d40fa0…
77c2123 
…16939c13307b74
@heifner
GH-1170 Use debug log since this now happens rather often
486a383
@heifner
GH-1170 Call interrupt when receiving a new head block
e52a9b5
@heifner
GH-1170 Call receive_block before process_block as receive_block can …
e77158a 
…interrupt the process_block
@greg7mdp
Move update_peer_keys when we have a `building_block.
7e70919
@greg7mdp
Merge branch 'main' of github.com:AntelopeIO/spring into gh_1183_3
8f36e60
@greg7mdp
Call ro action from producer_plugin.
bdbe42f
@greg7mdp
test
d440317
@greg7mdp
Be tolerant of the getpeerkeys action not being available in some i…
b3f3693 
…ntegration tests.

In that case the return value is an empty vector.
@greg7mdp
Update push_transaction params, ignore exceptions.
9c783fd
@heifner
Merge branch 'GH-1323-interrupt-read-only-trx' into GH-1170-interrupt…
2052737 
…-spec-trx
@heifner
GH-1170 Only interrupt after savanna active as interrupt during trans…
17aa0db 
…ition can cause issues
@heifner
GH-1170 Improve log message
ba2c739
heifner and others added 24 commits April 10, 2025 07:25
@heifner
Merge branch 'GH-1323-interrupt-read-only-trx' into GH-1170-interrupt…
f1faaf8 
…-spec-trx
@heifner
Merge branch 'GH-1323-interrupt-read-only-trx' into GH-1170-interrupt…
611e264 
…-spec-trx
@greg7mdp
Update a couple comments.
f694d61
@greg7mdp
Merge branch 'main' into gh_1183_3
68bc98b
@heifner
Merge branch 'GH-1323-interrupt-read-only-trx' into GH-1170-interrupt…
b18a03d 
…-spec-trx
@greg7mdp
Update comments referring to top-50 producers.
6342b5d
@greg7mdp
Add comment in peer_keys test contract.
406d928
@greg7mdp
Remove outdated comment.
e80a6e5
@heifner
Merge branch 'main' into GH-1170-interrupt-spec-trx
fab51ad
@greg7mdp
Allow a max of 20ms for getpeerkeys
ca9c2f1
@greg7mdp
Merge branch 'main' of github.com:AntelopeIO/spring into gh_1183_3
53770de
@greg7mdp
Merge branch 'gh_1183_3' of github.com:AntelopeIO/spring into gh_1183_3
a42f0b8
@greg7mdp
Give run_readonly_transactions a more descriptive name.
9ca911a
@heifner
GH-1344 Disable pause production since test needs to rely on producti…
a2cc5aa 
…on continuing after a restart
@greg7mdp
rename function to update_peer_keys.
59e9336
@greg7mdp
Remove producers not in top-50 anymore from _peer_info_map.
de28545
@heifner
Merge pull request #1369 from AntelopeIO/GH-1344-test-fix-1.1
48f5064 
[1.1.4] Test: Disable pause production in test
@heifner
Merge remote-tracking branch 'spring/release/1.1' into GH-1344-test-f…
93c0f9c 
…ix-main
@heifner
GH-1170 remove duplicate code
b5949aa
@heifner
Merge pull request #1383 from AntelopeIO/GH-1344-test-fix-main
c1ac619 
[1.1.4 -> main] Test: Disable pause production in test
@greg7mdp
Address PR comments.
f2e0543
@greg7mdp
Merge branch 'main' of github.com:AntelopeIO/spring into gh_1183_3
88a9855
@greg7mdp
Merge pull request #1316 from AntelopeIO/gh_1183_3
99febb5 
Update to peer_keys_db_t to match changes in eos-system-contracts pr 185
@heifner
Merge pull request #1330 from AntelopeIO/GH-1170-interrupt-spec-trx
2f236ca 
Interrupt speculative transaction when block received
@spoonincode spoonincode merged commit b0d05db into release/2.0 Apr 16, 2025
73 checks passed
@spoonincode spoonincode deleted the 20mainmerge-Apr16 branch April 16, 2025 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@greg7mdp greg7mdp greg7mdp approved these changes

@heifner heifner heifner 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.

4 participants

@spoonincode @greg7mdp @heifner