Merge 1.0.0 rc4.1 (#130)

* Bump doughnut-rs to fix doughnut extrinsic decoding

Author: jordy25519

Cargo.lock

@@ -17,7 +17,7 @@
 //!
 #![cfg(test)]
 use pallet_balances::Call as BalancesCall;
-use codec::{Encode};
+use codec::{Decode, Encode};
 use prml_doughnut::{DoughnutRuntime, PlugDoughnut, error_code};
 use sp_core::{crypto::UncheckedFrom, H256};
 use sp_keyring::AccountKeyring;
@@ -544,3 +544,35 @@ fn delegated_dispatch_fails_with_bad_argument() {
 		assert_eq!(r, Ok(Err(DispatchError::Other("dispatch unverified"))));
 	});
 }
+
+#[test]
+fn plug_extrinsic_decodes_with_doughnut() {
+	// Integrationt test for doughnut + extrinsic codec, not Executive specific
+	let issuer_alice: AccountId = AccountKeyring::Alice.into();
+	let holder_bob: AccountId = AccountKeyring::Bob.into();
+
+	// The doughnut proof is wrapped for embeddeding in extrinsic
+	let doughnut = PlugDoughnut::<Runtime>::new(
+		make_doughnut(
+			issuer_alice.clone(),
+			holder_bob.clone(),
+			None,
+			None,
+			true,
+		)
+	);
+
+	// Setup extrinsic
+	let xt = CheckedExtrinsic {
+		signed: Some((
+			holder_bob.clone(),
+			signed_extra(0, 0, Some(doughnut)),
+		)),
+		function: Call::Balances(BalancesCall::transfer(holder_bob.clone().into(), 69)),
+	};
+	let uxt = sign_extrinsic(xt);
+	let encoded_extrinsic = uxt.encode();
+	let decoded: UncheckedExtrinsic = Decode::decode(&mut &encoded_extrinsic[..]).expect("plug extrinsic with doughnut decodes ok");
+
+	assert_eq!(decoded, uxt);
+}

frame/executive/tests/doughnut_integration.rs

@@ -22,7 +22,7 @@ log = { version = "0.4.8", optional = true }
 paste = "0.1.6"
 rand = { version = "0.7.2", optional = true }
 impl-trait-for-tuples = "0.1.3"
-doughnut = { package = "doughnut_rs", git = "https://github.com/cennznet/doughnut-rs", branch = "0.5.0", features = ["crypto"], default-features = false }
+doughnut = { package = "doughnut_rs", git = "https://github.com/cennznet/doughnut-rs", branch = "0.5.1", features = ["crypto"], default-features = false }
 sp-inherents = { version = "2.0.0-alpha.5", default-features = false, path = "../inherents" }
 parity-util-mem = { version = "0.6.0", default-features = false, features = ["primitive-types"] }
 hash256-std-hasher = { version = "0.15.2", default-features = false }