absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-08 04:09:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace bincode with borsh (#452)

Browse Source 
* Add SignalsConfig to chain_spec

* Correct multiexp feature flagging for rand_core std

* Remove bincode for borsh

Replaces a non-canonical encoding with a canonical encoding which additionally
should be faster.

Also fixes an issue where we used bincode in transcripts where it cannot be
trusted.

This ended up fixing a myriad of other bugs observed, unfortunately.
Accordingly, it either has to be merged or the bug fixes from it must be ported
to a new PR.

* Make serde optional, minimize usage

* Make borsh an optional dependency of substrate/ crates

* Remove unused dependencies

* Use [u8; 64] where possible in the processor messages

* Correct borsh feature flagging
This commit is contained in:
Luke Parker
2023-11-25 04:01:11 -05:00
committed by GitHub
parent 6b2876351e
commit b296be8515
52 changed files with 468 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/coordinator/Cargo.toml
View File

@@ -31,7 +31,7 @@ scale = { package = "parity-scale-codec", version = "3" }
serai-client = { path = "../../substrate/client", features = ["serai"] }
serai-message-queue = { path = "../../message-queue" }
serde_json = { version = "1", default-features = false }
borsh = { version = "1", features = ["de_strict_order"] }
tokio = { version = "1", features = ["time"] }

8
tests/coordinator/src/lib.rs
View File

@@ -268,7 +268,7 @@ impl Processor {
assert_eq!(msg.from, Service::Coordinator);
assert_eq!(msg.id, *next_recv_id);
let msg_msg = serde_json::from_slice(&msg.msg).unwrap();
let msg_msg = borsh::from_slice(&msg.msg).unwrap();
if !is_cosign_message(&msg_msg) {
continue;
}
@@ -309,7 +309,7 @@ impl Processor {
res
.send_message(messages::coordinator::ProcessorMessage::CosignPreprocess {
id: id.clone(),
preprocesses: vec![vec![raw_i; 64]],
preprocesses: vec![[raw_i; 64]],
})
.await;
}
@@ -387,7 +387,7 @@ impl Processor {
to: Service::Coordinator,
intent: msg.intent(),
},
serde_json::to_string(&msg).unwrap().into_bytes(),
borsh::to_vec(&msg).unwrap(),
)
.await;
*next_send_id += 1;
@@ -408,7 +408,7 @@ impl Processor {
assert_eq!(msg.id, *next_recv_id);
// If this is a cosign message, let the cosign task handle it
let msg_msg = serde_json::from_slice(&msg.msg).unwrap();
let msg_msg = borsh::from_slice(&msg.msg).unwrap();
if is_cosign_message(&msg_msg) {
continue;
}

8
tests/coordinator/src/tests/batch.rs
View File

@@ -63,7 +63,7 @@ pub async fn batch(
.send_message(messages::coordinator::ProcessorMessage::BatchPreprocess {
id: id.clone(),
block: batch.block,
preprocesses: vec![[processor_is[i]; 64].to_vec()],
preprocesses: vec![[processor_is[i]; 64]],
})
.await;
}
@@ -77,7 +77,7 @@ pub async fn batch(
.send_message(messages::coordinator::ProcessorMessage::BatchPreprocess {
id: id.clone(),
block: batch.block,
preprocesses: vec![[processor_is[excluded_signer]; 64].to_vec()],
preprocesses: vec![[processor_is[excluded_signer]; 64]],
})
.await;
@@ -98,7 +98,7 @@ pub async fn batch(
let mut participants = preprocesses.keys().cloned().collect::<HashSet<_>>();
for (p, preprocess) in preprocesses {
assert_eq!(preprocess, vec![u8::try_from(u16::from(p)).unwrap(); 64]);
assert_eq!(preprocess, [u8::try_from(u16::from(p)).unwrap(); 64]);
}
participants.insert(known_signer_i);
participants
@@ -116,7 +116,7 @@ pub async fn batch(
let mut preprocesses = participants
.clone()
.into_iter()
.map(|i| (i, [u8::try_from(u16::from(i)).unwrap(); 64].to_vec()))
.map(|i| (i, [u8::try_from(u16::from(i)).unwrap(); 64]))
.collect::<HashMap<_, _>>();
preprocesses.remove(&i);

4
tests/coordinator/src/tests/key_gen.rs
View File

@@ -16,7 +16,7 @@ use dkg::ThresholdParams;
use serai_client::{
primitives::NetworkId,
Public,
validator_sets::primitives::{Session, ValidatorSet},
validator_sets::primitives::{Session, ValidatorSet, KeyPair},
};
use messages::{key_gen::KeyGenId, CoordinatorMessage};
@@ -205,7 +205,7 @@ pub async fn key_gen<C: Ciphersuite>(
.await
.unwrap()
.unwrap(),
(Public(substrate_key), network_key.try_into().unwrap())
KeyPair(Public(substrate_key), network_key.try_into().unwrap())
);
for processor in processors.iter_mut() {

8
tests/coordinator/src/tests/sign.rs
View File

@@ -52,7 +52,7 @@ pub async fn sign<C: Ciphersuite>(
processor
.send_message(messages::sign::ProcessorMessage::Preprocess {
id: id.clone(),
preprocesses: vec![[processor_is[i]; 64].to_vec()],
preprocesses: vec![vec![processor_is[i]; 128]],
})
.await;
}
@@ -65,7 +65,7 @@ pub async fn sign<C: Ciphersuite>(
processors[excluded_signer]
.send_message(messages::sign::ProcessorMessage::Preprocess {
id: id.clone(),
preprocesses: vec![[processor_is[excluded_signer]; 64].to_vec()],
preprocesses: vec![vec![processor_is[excluded_signer]; 128]],
})
.await;
@@ -83,7 +83,7 @@ pub async fn sign<C: Ciphersuite>(
let mut participants = preprocesses.keys().cloned().collect::<HashSet<_>>();
for (p, preprocess) in preprocesses {
assert_eq!(preprocess, vec![u8::try_from(u16::from(p)).unwrap(); 64]);
assert_eq!(preprocess, vec![u8::try_from(u16::from(p)).unwrap(); 128]);
}
participants.insert(known_signer_i);
participants
@@ -101,7 +101,7 @@ pub async fn sign<C: Ciphersuite>(
let mut preprocesses = participants
.clone()
.into_iter()
.map(|i| (i, [u8::try_from(u16::from(i)).unwrap(); 64].to_vec()))
.map(|i| (i, vec![u8::try_from(u16::from(i)).unwrap(); 128]))
.collect::<HashMap<_, _>>();
preprocesses.remove(&i);

1
tests/processor/Cargo.toml
View File

@@ -32,6 +32,7 @@ scale = { package = "parity-scale-codec", version = "3" }
serai-client = { path = "../../substrate/client" }
serai-message-queue = { path = "../../message-queue" }
borsh = { version = "1", features = ["de_strict_order"] }
serde = { version = "1", default-features = false }
serde_json = { version = "1", default-features = false }

4
tests/processor/src/lib.rs
View File

@@ -224,7 +224,7 @@ impl Coordinator {
to: Service::Processor(self.network),
intent: msg.intent(),
},
serde_json::to_string(&msg).unwrap().into_bytes(),
borsh::to_vec(&msg).unwrap(),
)
.await;
self.next_send_id += 1;
@@ -242,7 +242,7 @@ impl Coordinator {
assert_eq!(msg.id, self.next_recv_id);
self.queue.ack(Service::Processor(self.network), msg.id).await;
self.next_recv_id += 1;
serde_json::from_slice(&msg.msg).unwrap()
borsh::from_slice(&msg.msg).unwrap()
}
pub async fn add_block(&self, ops: &DockerOperations) -> ([u8; 32], Vec<u8>) {

4
tests/processor/src/tests/batch.rs
View File

@@ -26,7 +26,7 @@ pub(crate) async fn recv_batch_preprocesses(
substrate_key: &[u8; 32],
batch: &Batch,
attempt: u32,
) -> (SubstrateSignId, HashMap<Participant, Vec<u8>>) {
) -> (SubstrateSignId, HashMap<Participant, [u8; 64]>) {
let id = SubstrateSignId {
key: *substrate_key,
id: SubstrateSignableId::Batch((batch.network, batch.id).encode().try_into().unwrap()),
@@ -87,7 +87,7 @@ pub(crate) async fn sign_batch(
coordinators: &mut [Coordinator],
key: [u8; 32],
id: SubstrateSignId,
preprocesses: HashMap<Participant, Vec<u8>>,
preprocesses: HashMap<Participant, [u8; 64]>,
) -> SignedBatch {
assert_eq!(preprocesses.len(), THRESHOLD);

8
tests/processor/src/tests/key_gen.rs
View File

@@ -4,7 +4,7 @@ use dkg::{Participant, ThresholdParams, tests::clone_without};
use serai_client::{
primitives::{NetworkId, BlockHash, PublicKey},
validator_sets::primitives::{Session, KeyPair, ValidatorSet},
validator_sets::primitives::{Session, ValidatorSet, KeyPair},
};
use messages::{SubstrateContext, key_gen::KeyGenId, CoordinatorMessage, ProcessorMessage};
@@ -122,8 +122,10 @@ pub(crate) async fn key_gen(coordinators: &mut [Coordinator], network: NetworkId
network_latest_finalized_block: BlockHash([0; 32]),
};
let key_pair =
(PublicKey::from_raw(substrate_key.unwrap()), network_key.clone().unwrap().try_into().unwrap());
let key_pair = KeyPair(
PublicKey::from_raw(substrate_key.unwrap()),
network_key.clone().unwrap().try_into().unwrap(),
);
for coordinator in coordinators {
coordinator