Skip to content

merge develop to master - #8

Merged
tronfoundation merged 44 commits into
masterfrom
develop
Dec 28, 2017
Merged

tronfoundation merged 44 commits into
masterfrom
develop

Conversation

@tronfoundation

Copy link
Copy Markdown
Contributor

fix

@tronfoundation
tronfoundation merged commit 1a16294 into master Dec 28, 2017
tronfoundation added a commit that referenced this pull request Dec 28, 2017
Merge pull request #8 from tronprotocol/develop
zhaohong pushed a commit that referenced this pull request Feb 5, 2018
 XpP48QHnoDPrUwFCjwisbvX0cpRLbqblP8lQmt06UCE7umBEU1drNLJMobaTh44v
 qpDgXkbGH7EP18a4LxDQFWc/xNDxld3cyryAhc2v1ITIe7CILbDVy39RXfTd1GIe
 vknNNGaIJXkYTX/eajOcDDAiWOdNwqb06KZiFMhtSCLGX/28sTKvc8oP31EbpNFg
 E2zo3p4h+cd0s3ri8wI++baO2IuoUCwQSSJYEduFLCgk+Ql95RDbLHGnK07yvPDC
 8oYaIW6lEFyQHhlKQFVYnUsWzhVXQod1O8z7buvNO0Te48PTuuGlUeIGrn4FEt8=
 =FSyK
 -----END PGP SIGNATURE-----
 

Merge pull request #8 from tronprotocol/develop

merge develop to master
zhaohong pushed a commit that referenced this pull request Feb 5, 2018
 u7gadu9AcwZgiDq+U+jfsIrWlKqMcE7h6ze1Fen+6LAnvj4cHwoZ44CxXRRWUEdU
 0K05ySqYwdP/YV++KjTIc7lNBwpTaTezhF9OXeYpfZ2EOnkKftaB51P0REIwvqz8
 NE/2y5SV8lg4CHqO2KZKvqbrAaVAx3s4SXevCAEgY3v5DVu62MzhIMRGZWp/KgSG
 xn8z2YDEc913Rdde+OPyNEoHW86jaPYeRB0mSL3VBbE5yILsKzhnxrT2iGa17s5s
 h5OHcE28WKL/rOF8mtcI9ZZG9V9EqYZ5hT+P5aXdYEUtkqzDrAFrbE2EmffcTUc=
 =MwaS
 -----END PGP SIGNATURE-----
 

Merge pull request #9 from tronprotocol/master

Merge pull request #8 from tronprotocol/develop
CodeNinjaEvan pushed a commit that referenced this pull request Mar 20, 2018
shydesky pushed a commit that referenced this pull request Dec 7, 2019
jiangyy0824 pushed a commit that referenced this pull request Dec 23, 2019
halibobo1205 added a commit that referenced this pull request Feb 27, 2023
yanghang8612 pushed a commit to yanghang8612/java-tron that referenced this pull request Jan 4, 2026
…pool_close_opt

fix(backup): make SR node with backup exit normally by kill -15
317787106 referenced this pull request in 0xbigapple/java-tron Mar 9, 2026
Little-Peony added a commit to Little-Peony/java-tron that referenced this pull request Jun 24, 2026
# This is the 1st commit message:

feat(proposal): add VERSION_4_8_2_PQ1 and gate PQC proposals on it

# This is the commit message #2:

fix test checkstyle

# This is the commit message tronprotocol#3:

reverse changes

# This is the commit message tronprotocol#4:

reverse

# This is the commit message tronprotocol#5:

reverse

# This is the commit message tronprotocol#6:

delete comments, remove unused code

# This is the commit message tronprotocol#7:

fix(vm): relocate pqc precompiles to 0x02000016-0x0200001a to avoid address conflicts

# This is the commit message tronprotocol#8:

fix(chainbase): render pq_auth_sig safely in TransactionCapsule.toString

getBase64FromByteString parses bytes as an ECDSA r/s/v signature, so calling it
on a pq_auth_sig threw and crashed toString() for any PQ-signed transaction. The
i.get() gating also dropped the PQ output when an ECDSA signature was present and
only ever printed the first entry.

Print every pq_auth_sig at the transaction level and hex-encode the raw bytes.
Add toString format regression tests (PQ-only and hybrid ECDSA+PQ).

# This is the commit message tronprotocol#9:

revers feberico change

# This is the commit message tronprotocol#10:

add more test

# This is the commit message tronprotocol#11:

fix format

# This is the commit message tronprotocol#12:

refactor

# This is the commit message tronprotocol#13:

fix(net): bound inbound HelloMessage size and pq_auth_sig fields

valid() capped legacy fields at 200B but left pq_auth_sig unbounded, so
an inbound hello was limited only by the 5MB frame. Per-field bounds are
not enough: raw bytes can still bloat via repeated pq_auth_sig (parser
merges), top-level unknown fields, or unbounded `from` sub-fields.

- Add MAX_HELLO_MESSAGE_SIZE (16KB); reject oversized hellos in
  TronMessageFactory before the body copy, and defensively in the
  HelloMessage constructors and valid() (-> BAD_MESSAGE/BAD_PROTOCOL).
- valid(): reject nested unknown fields in pq_auth_sig; bound
  public_key/signature to the scheme's max (global max for unknown).
- Add PQSchemeRegistry.getMaxPublicKeyLength()/getMaxSignatureLength().
- Tests for nested unknown field and the three raw-size bypasses.
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.

5 participants