Upgrade polkadot-sdk to stable2412
#1595
Open
+3,991
−2,014
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
nazar-pc
reviewed
Jan 18, 2025
|
Now, it's blocked as this rust-ethereum/evm#305 |
0xbillw
force-pushed
the
stable2412
branch
2 times, most recently
from
b9954f4 to
5ae383a
Compare
|
Please merge master and fix those tests. Thanks! |
|
I am struggling with integration testing and I estimate it will take me some time to complete the work. |
conr2d
reviewed
Jan 22, 2025
| @@ -147,7 +147,7 @@ where | |||
| graph | |||
| .validated_pool() | |||
| .ready() | |||
| .map(|in_pool_tx| in_pool_tx.data().clone()) | |||
| .map(|in_pool_tx| in_pool_tx.data().deref().clone()) | |||
There was a problem hiding this comment.
Suggested change
| .map(|in_pool_tx| in_pool_tx.data().deref().clone()) | |
| .map(|in_pool_tx| in_pool_tx.data().as_ref().clone()) |
| @@ -16,7 +16,7 @@ | |||
| // You should have received a copy of the GNU General Public License | |||
| // along with this program. If not, see <https://www.gnu.org/licenses/>. | |||
|
|
|||
| use std::sync::Arc; | |||
| use std::{ops::Deref, sync::Arc}; | |||
There was a problem hiding this comment.
Suggested change
| use std::{ops::Deref, sync::Arc}; | |
| use std::sync::Arc; |
| @@ -157,7 +157,7 @@ where | |||
| .validated_pool() | |||
| .futures() | |||
| .iter() | |||
| .map(|(_hash, extrinsic)| extrinsic.clone()) | |||
| .map(|(_hash, extrinsic)| extrinsic.deref().clone()) | |||
There was a problem hiding this comment.
Suggested change
| .map(|(_hash, extrinsic)| extrinsic.deref().clone()) | |
| .map(|(_hash, extrinsic)| extrinsic.as_ref().clone()) |
| @@ -19,6 +19,7 @@ | |||
| use std::{ | |||
| collections::{BTreeMap, HashSet}, | |||
| marker::PhantomData, | |||
| ops::Deref, | |||
There was a problem hiding this comment.
Suggested change
| ops::Deref, |
| @@ -111,7 +112,7 @@ where | |||
| .graph | |||
| .validated_pool() | |||
| .ready() | |||
| .map(|in_pool_tx| in_pool_tx.data().clone()) | |||
| .map(|in_pool_tx| in_pool_tx.data().deref().clone()) | |||
There was a problem hiding this comment.
Suggested change
| .map(|in_pool_tx| in_pool_tx.data().deref().clone()) | |
| .map(|in_pool_tx| in_pool_tx.data().as_ref().clone()) |
| @@ -16,7 +16,7 @@ | |||
| // You should have received a copy of the GNU General Public License | |||
| // along with this program. If not, see <https://www.gnu.org/licenses/>. | |||
|
|
|||
| use std::{marker::PhantomData, sync::Arc}; | |||
| use std::{marker::PhantomData, ops::Deref, sync::Arc}; | |||
There was a problem hiding this comment.
Suggested change
| use std::{marker::PhantomData, ops::Deref, sync::Arc}; | |
| use std::{marker::PhantomData, sync::Arc}; |
| @@ -109,7 +109,7 @@ where | |||
| .graph | |||
| .validated_pool() | |||
| .ready() | |||
| .map(|in_pool_tx| in_pool_tx.data().clone()) | |||
| .map(|in_pool_tx| in_pool_tx.data().deref().clone()) | |||
There was a problem hiding this comment.
Suggested change
| .map(|in_pool_tx| in_pool_tx.data().deref().clone()) | |
| .map(|in_pool_tx| in_pool_tx.data().as_ref().clone()) |
| @@ -118,7 +118,7 @@ where | |||
| .validated_pool() | |||
| .futures() | |||
| .iter() | |||
| .map(|(_, extrinsic)| extrinsic.clone()) | |||
| .map(|(_, extrinsic)| extrinsic.deref().clone()) | |||
There was a problem hiding this comment.
Suggested change
| .map(|(_, extrinsic)| extrinsic.deref().clone()) | |
| .map(|(_, extrinsic)| extrinsic.as_ref().clone()) |
Comment on lines
126
to
+127
| let tmp: &mut [u8; 32] = &mut [0; 32]; | ||
| index.to_big_endian(tmp); | ||
| index.write_as_big_endian(tmp); |
There was a problem hiding this comment.
Instead of doing this, you can remove all these and update LINE 131:
- key.extend(blake2_128_extend(tmp));
+ key.extend(blake2_128_extend(&index.to_big_endian()));| @@ -282,8 +282,7 @@ impl Precompile for Bn128Pairing { | |||
| } | |||
| }; | |||
|
|
|||
| let mut buf = [0u8; 32]; | |||
| ret_val.to_big_endian(&mut buf); | |||
| let buf = ret_val.to_big_endian(); | |||
There was a problem hiding this comment.
What about updating LINE 290 instead of assigning a new buf here?
Ok(PrecompileOutput {
exit_status: ExitSucceed::Returned,
- output: buf.to_vec(),
+ output: ret_val.to_big_endian().to_vec(),
})
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.
The main reason for the upgrade is to try to resolve the memory leak issue in
polkadot-sdkstable2409, but this PR has not been backported tostable2409.