fix!: change monero consensus encoding an update for hardfork v15 #4492
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SWvheerden
force-pushed
the
sw_change_monero_con
branch
2 times, most recently
from
c1e5ecd to
f7115d1
Compare
SWvheerden
changed the title
SWvheerden
changed the title
sdbondi
reviewed
Aug 19, 2022
| let len = VarInt::consensus_decode(d)?.0 as usize; | ||
| impl ConsensusDecoding for FixedByteArray { | ||
| fn consensus_decode<R: Read>(reader: &mut R) -> Result<Self, io::Error> { | ||
| let mut buf = [0u8; 1]; |
There was a problem hiding this comment.
I think this can be simplified a bit (decodes from slice/vec encoding)
let len = u64::consensus_decode(reader)? as usize;
if len > MAX_ARR_SIZE {
return Err(io::Error::new(
io::ErrorKind::InvalidInput,
format!("length exceeded maximum of {}-bytes for FixedByteArray: {}", MAX_ARR_SIZE, len),
));
}
let mut buf = [0u8; MAX_ARR_SIZE];
reader.read_exact(&mut buf[..len])?;
Ok(FixedByteArray{
elems: buf,
len: len as u8,
})
stringhandler
previously approved these changes
Aug 19, 2022
base_layer/core/Cargo.toml
Outdated
| @@ -54,7 +54,7 @@ integer-encoding = "3.0.2" | |||
| lmdb-zero = "0.4.4" | |||
| log = "0.4" | |||
| log-mdc = "0.1.0" | |||
| monero = { version = "^0.13.0", features = ["serde_support"], optional = true } | |||
| monero = { git = "https://github.com/tari-project/monero-rs.git", features = ["serde"], optional = true } | |||
There was a problem hiding this comment.
This must have a tag or a commit specified
fmt Update base_layer/core/src/proof_of_work/monero_rx/fixed_array.rs Co-authored-by: Stan Bondi <sdbondi@users.noreply.github.com> fix clippy
SWvheerden
force-pushed
the
sw_change_monero_con
branch
from
6149a48 to
e59bc10
Compare
sdbondi
added a commit
to sdbondi/tari
that referenced
this pull request
Aug 22, 2022
* development: feat!: add hashing API use to base layer (see issue tari-project#4394) (tari-project#4447) feat(wallet): adds --stealth-one-sided flag to make-it-rain (tari-project#4508) fix!: change monero consensus encoding an update for hardfork v15 (tari-project#4492) fix(core/covenants)!: update covenants to support OutputType enum (tari-project#4472) feat(core)!: restrict output types to only those permitted by consensus (tari-project#4467)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Monero-rs has sealed their encoding in the newer version. This means we need to encode the struct using our own encoding trait and only using the encoding for the monero versions.
Upgrade to the newest monero v15 hardfork code.
Also point towards our own monero-rs fork so we can update code when we want to.