release/0.2.2

Cargo.toml

@@ -13,7 +13,7 @@ exclude = ["pallets/proxy"]
 [workspace.package]
 authors = [ "Papers AG" ]
 repository = "https://github.com/Acurast/acurast-core"
-version = "0.2.1"
+version = "0.2.2"
 
 # TODO: Temporary workaround (https://substrate.stackexchange.com/questions/9870)
 [patch.crates-io]

pallets/acurast/Cargo.toml

@@ -31,6 +31,7 @@ pallet-balances = { git = "https://github.com/paritytech/substrate", default-fea
 pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.43" }
 pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.43" }
 parachains-common = { git = "https://github.com/paritytech/cumulus", default-features = false, optional = true, branch = "polkadot-v0.9.43" }
+log = "0.4.19"
 
 [dev-dependencies]
 base64 = { version = "0.13.0", default-features = false, features = ["alloc"] }

pallets/acurast/common/src/attestation.rs

@@ -80,16 +80,21 @@ pub fn extract_attestation<'a>(
             Ok(KeyDescription::V4(parsed))
         }
         100 => {
-            let parsed = asn1::parse_single::<KeyDescriptionV100V200>(extension.extn_value)
+            let parsed = asn1::parse_single::<KeyDescriptionKeyMint>(extension.extn_value)
                 .map_err(|_| ValidationError::ParseError)?;
             Ok(KeyDescription::V100(parsed))
         }
         200 => {
-            let parsed = asn1::parse_single::<KeyDescriptionV100V200>(extension.extn_value)
+            let parsed = asn1::parse_single::<KeyDescriptionKeyMint>(extension.extn_value)
                 .map_err(|_| ValidationError::ParseError)?;
             Ok(KeyDescription::V200(parsed))
         }
-        _ => Err(ValidationError::UnsupportedAttestationVersion),
+        300 => {
+            let parsed = asn1::parse_single::<KeyDescriptionKeyMint>(extension.extn_value)
+                .map_err(|_| ValidationError::ParseError)?;
+            Ok(KeyDescription::V300(parsed))
+        }
+        _ => Err(ValidationError::UnsupportedAttestationVersion(version)),
     }
 }
 
@@ -432,14 +437,25 @@ mod tests {
                 PIXEL_INTERMEDIATE_1_CERT,
                 PIXEL_KEY_CERT,
             ],
+            vec![
+                r"MIIFHDCCAwSgAwIBAgIJANUP8luj8tazMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAUTEGY5MjAwOWU4NTNiNmIwNDUwHhcNMTkxMTIyMjAzNzU4WhcNMzQxMTE4MjAzNzU4WjAbMRkwFwYDVQQFExBmOTIwMDllODUzYjZiMDQ1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAr7bHgiuxpwHsK7Qui8xUFmOr75gvMsd/dTEDDJdSSxtf6An7xyqpRR90PL2abxM1dEqlXnf2tqw1Ne4Xwl5jlRfdnJLmN0pTy/4lj4/7tv0Sk3iiKkypnEUtR6WfMgH0QZfKHM1+di+y9TFRtv6y//0rb+T+W8a9nsNL/ggjnar86461qO0rOs2cXjp3kOG1FEJ5MVmFmBGtnrKpa73XpXyTqRxB/M0n1n/W9nGqC4FSYa04T6N5RIZGBN2z2MT5IKGbFlbC8UrW0DxW7AYImQQcHtGl/m00QLVWutHQoVJYnFPlXTcHYvASLu+RhhsbDmxMgJJ0mcDpvsC4PjvB+TxywElgS70vE0XmLD+OJtvsBslHZvPBKCOdT0MS+tgSOIfga+z1Z1g7+DVagf7quvmag8jfPioyKvxnK/EgsTUVi2ghzq8wm27ud/mIM7AY2qEORR8Go3TVB4HzWQgpZrt3i5MIlCaY504LzSRiigHCzAPlHws+W0rB5N+er5/2pJKnfBSDiCiFAVtCLOZ7gLiMm0jhO2B6tUXHI/+MRPjy02i59lINMRRev56GKtcd9qO/0kUJWdZTdA2XoS82ixPvZtXQpUpuL12ab+9EaDK8Z4RHJYYfCT3Q5vNAXaiWQ+8PTWm2QgBR/bkwSWc+NpUFgNPN9PvQi8WEg5UmAGMCAwEAAaNjMGEwHQYDVR0OBBYEFDZh4QB8iAUJUYtEbEf/GkzJ6k8SMB8GA1UdIwQYMBaAFDZh4QB8iAUJUYtEbEf/GkzJ6k8SMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgIEMA0GCSqGSIb3DQEBCwUAA4ICAQBOMaBc8oumXb2voc7XCWnuXKhBBK3e2KMGz39t7lA3XXRe2ZLLAkLM5y3J7tURkf5a1SutfdOyXAmeE6SRo83Uh6WszodmMkxK5GM4JGrnt4pBisu5igXEydaW7qq2CdC6DOGjG+mEkN8/TA6p3cnoL/sPyz6evdjLlSeJ8rFBH6xWyIZCbrcpYEJzXaUOEaxxXxgYz5/cTiVKN2M1G2okQBUIYSY6bjEL4aUN5cfo7ogP3UvliEo3Eo0YgwuzR2v0KR6C1cZqZJSTnghIC/vAD32KdNQ+c3N+vl2OTsUVMC1GiWkngNx1OO1+kXW+YTnnTUOtOIswUP/Vqd5SYgAImMAfY8U9/iIgkQj6T2W6FsScy94IN9fFhE1UtzmLoBIuUFsVXJMTz+Jucth+IqoWFua9v1R93/k98p41pjtFX+H8DslVgfP097vju4KDlqN64xV1grw3ZLl4CiOe/A91oeLm2UHOq6wn3esB4r2EIQKb6jTVGu5sYCcdWpXr0AUVqcABPdgL+H7qJguBw09ojm6xNIrw2OocrDKsudk/okr/AwqEyPKw9WnMlQgLIKw1rODG2NvU9oR3GVGdMkUBZutL8VuFkERQGt6vQ2OCw0sV47VMkuYbacK/xyZFiRcrPJPb41zgbQj9XAEyLKCHex0SdDrx+tWUDqG8At2JHA==",
+                r"MIIDgDCCAWigAwIBAgIKA4gmZ2BliZaGDTANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQFExBmOTIwMDllODUzYjZiMDQ1MB4XDTIyMDEyNjIyNDc1MloXDTM3MDEyMjIyNDc1MlowKTETMBEGA1UEChMKR29vZ2xlIExMQzESMBAGA1UEAxMJRHJvaWQgQ0EyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEuppxbZvJgwNXXe6qQKidXqUt1ooT8M6Q+ysWIwpduM2EalST8v/Cy2JN10aqTfUSThJha/oCtG+F9TUUviOch6RahrpjVyBdhopM9MFDlCfkiCkPCPGu2ODMj7O/bKnko2YwZDAdBgNVHQ4EFgQUu/g2rYmubOLlnpTw1bLX0nrkfEEwHwYDVR0jBBgwFoAUNmHhAHyIBQlRi0RsR/8aTMnqTxIwEgYDVR0TAQH/BAgwBgEB/wIBAjAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIBAIFxUiFHYfObqrJM0eeXI+kZFT57wBplhq+TEjd+78nIWbKvKGUFlvt7IuXHzZ7YJdtSDs7lFtCsxXdrWEmLckxRDCRcth3Eb1leFespS35NAOd0Hekg8vy2G31OWAe567l6NdLjqytukcF4KAzHIRxoFivN+tlkEJmg7EQw9D2wPq4KpBtug4oJE53R9bLCT5wSVj63hlzEY3hC0NoSAtp0kdthow86UFVzLqxEjR2B1MPCMlyIfoGyBgkyAWhd2gWN6pVeQ8RZoO5gfPmQuCsn8m9kv/dclFMWLaOawgS4kyAn9iRi2yYjEAI0VVi7u3XDgBVnowtYAn4gma5q4BdXgbWbUTaMVVVZsepXKUpDpKzEfss6Iw0zx2Gql75zRDsgyuDyNUDzutvDMw8mgJmFkWjlkqkVM2diDZydzmgi8br2sJTLdG4lUwvedIaLgjnIDEG1J8/5xcPVQJFgRf3m5XEZB4hjG3We/49p+JRVQSpE1+QzG0raYpdNsxBUO+41diQo7qC7S8w2J+TMeGdpKGjCIzKjUDAy2+gOmZdZacanFN/03SydbKVHV0b/NYRWMa4VaZbomKON38IH2ep8pdj++nmSIXeWpQE8LnMEdnUFjvDzp0f0ELSXVW2+5xbl+fcqWgmOupmU4+bxNJLtknLo49Bg5w9jNn7T7rkF",
+                r"MIIB1jCCAVygAwIBAgITcM+MOFG89A40Y9HIF2M9NY+PTzAKBggqhkjOPQQDAzApMRMwEQYDVQQKEwpHb29nbGUgTExDMRIwEAYDVQQDEwlEcm9pZCBDQTIwHhcNMjMxMDE1MTkyNDUxWhcNMjMxMjA0MTkyNDUwWjApMRMwEQYDVQQKEwpHb29nbGUgTExDMRIwEAYDVQQDEwlEcm9pZCBDQTMwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARr95AOrHbuQ6kHxl+7t71D6qJmN8YreftJFZBhPA5Kw0RrM6KuYvYBF6gPqt8Sov+UWvWtDeL5sGGRybmN/gtWo2MwYTAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUSDkbhn725ZTB2PKmrq+6FSkfWmowHwYDVR0jBBgwFoAUu/g2rYmubOLlnpTw1bLX0nrkfEEwCgYIKoZIzj0EAwMDaAAwZQIxALFBTZe5vl4PBmAO8KHACvb4Qg6TLsnTrunrs9eja1oMmeYPO1dU0V8N0+nZRkP59gIwXDIumMPdaqz39DW6g38vizFhdvimGaEDQBZn7irtlbV5mao04wTZ3WRgp2L9fNHP",
+                r"MIIB3jCCAYSgAwIBAgIRAPb+T4MpCZjDmbqiVhfq+HIwCgYIKoZIzj0EAwIwKTETMBEGA1UEChMKR29vZ2xlIExMQzESMBAGA1UEAxMJRHJvaWQgQ0EzMB4XDTIzMTAxNDE1MzYxMFoXDTIzMTExODE1MzYxMFowPzESMBAGA1UEChMJU3Ryb25nQm94MSkwJwYDVQQDEyBmNmZlNGY4MzI5MDk5OGMzOTliYWEyNTYxN2VhZjg3MjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCUqltkFs/h7vHKQ2ZCcmw3vKi7AgFZZ24+lrL6jxXJ6l7HslskshJDa3QlYCAl6s/EBw94qilUvTI2h/V/h3W+jdzB1MB0GA1UdDgQWBBQIfrJVw4FkRZjl3aykqPe67idvPTAfBgNVHSMEGDAWgBRIORuGfvbllMHY8qaur7oVKR9aajAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwICBDASBgorBgEEAdZ5AgEeBAShARhAMAoGCCqGSM49BAMCA0gAMEUCIBmpMpCMKbBuvMK+0FHR5pnjJWfmpwOt9T8FgedpEzdWAiEA8gzScTX2ZUc5DMYm2Zrhx4SRMVP4XNHGTIhiSjWvM5w=",
+                r"MIICvTCCAmSgAwIBAgIBATAKBggqhkjOPQQDAjA/MRIwEAYDVQQKEwlTdHJvbmdCb3gxKTAnBgNVBAMTIGY2ZmU0ZjgzMjkwOTk4YzM5OWJhYTI1NjE3ZWFmODcyMB4XDTcwMDEwMTAwMDAwMFoXDTQ4MDEwMTAwMDAwMFowHzEdMBsGA1UEAxMUQW5kcm9pZCBLZXlzdG9yZSBLZXkwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATDGqojP3482hCBZkLBXCfKeaq43Xh+AeUOI9Ym9F0ch3gtfgfJmjU2Z3EXR7YYE+AKh91ysxVc0Xs7lpm2HOcGo4IBbzCCAWswDgYDVR0PAQH/BAQDAgMIMIIBVwYKKwYBBAHWeQIBEQSCAUcwggFDAgIBLAoBAgICASwKAQIEIFn60RrhIWvgMbYX5Yen3U+9/33bdmX070ih8hd+Z4I/BAAwZb+FPQgCBgGLOSJgrr+FRVUEUzBRMSswKQQkY29tLmFjdXJhc3QuYXR0ZXN0ZWQuZXhlY3V0b3IuY2FuYXJ5AgEPMSIEIOxwwqTgcqD1hlUqaDV7I2l8nUXx4SV6jE0polrEmCQzMIGnoQsxCQIBAgIBAwIBBqIDAgEDowQCAgEApQUxAwIBAKoDAgEBv4N3AgUAv4U+AwIBAL+FQEwwSgQgJqxMYL6x43g1fK0MMGE0evjfb7q7sNjOokRYVe4B42gBAf8KAQAEIHkY01pAyfdaFbiuYRh2UFMeF4ltt8FCbyvwoDT6CfTLv4VBBQIDAiLgv4VCBQIDAxZGv4VOBgIEATSzXb+FTwYCBAE0s10wCgYIKoZIzj0EAwIDRwAwRAIgP/JcTQhcHftUQRZSUdKedvMAUzj02tfvKP8t/7ruzgcCIHMS0aiL/dbzq+E1+bxtPL0pMZPjCxyGLdPcIySI8yk/",
+            ],
         ];
 
         for chain in chains {
             let decoded_chain = decode_certificate_chain(&chain);
             validate_certificate_chain_root(&decoded_chain).expect("validating root failed");
             let (_, cert, _) =
                 validate_certificate_chain(&decoded_chain).expect("validating chain failed");
-            let key_description = extract_attestation(cert.extensions)?;
+            let key_description = extract_attestation(cert.extensions).map_err(|err| {
+                dbg!(err.clone());
+
+                err
+            })?;
             match &key_description {
                 KeyDescription::V4(key_description) => {
                     assert_eq!(key_description.attestation_version, 4)
@@ -450,6 +466,9 @@ mod tests {
                 KeyDescription::V200(key_description) => {
                     assert_eq!(key_description.attestation_version, 200)
                 }
+                KeyDescription::V300(key_description) => {
+                    assert_eq!(key_description.attestation_version, 300)
+                }
                 _ => return Err(()),
             }
             let _: BoundedKeyDescription = key_description.try_into()?;

pallets/acurast/common/src/attestation/asn.rs

@@ -168,7 +168,7 @@ pub struct KeyDescriptionV4<'a> {
 }
 
 #[derive(Asn1Read, Asn1Write)]
-pub struct KeyDescriptionV100V200<'a> {
+pub struct KeyDescriptionKeyMint<'a> {
     /// The [version](https://developer.android.com/training/articles/security-key-attestation#certificate_schema) of the attestation.
     /// It's necessary to peak this field before parsing all fields, since fields differ in versions and ASN parsing fails with a single deviating field.
     pub attestation_version: i64,
@@ -177,17 +177,18 @@ pub struct KeyDescriptionV100V200<'a> {
     pub key_mint_security_level: SecurityLevel,
     pub attestation_challenge: &'a [u8],
     pub unique_id: &'a [u8],
-    pub software_enforced: AuthorizationListV100V200<'a>,
-    pub tee_enforced: AuthorizationListV100V200<'a>,
+    pub software_enforced: AuthorizationListKeyMint<'a>,
+    pub tee_enforced: AuthorizationListKeyMint<'a>,
 }
 
 pub enum KeyDescription<'a> {
     V1(KeyDescriptionV1<'a>),
     V2(KeyDescriptionV2<'a>),
     V3(KeyDescriptionV3<'a>),
     V4(KeyDescriptionV4<'a>),
-    V100(KeyDescriptionV100V200<'a>),
-    V200(KeyDescriptionV100V200<'a>),
+    V100(KeyDescriptionKeyMint<'a>),
+    V200(KeyDescriptionKeyMint<'a>),
+    V300(KeyDescriptionKeyMint<'a>),
 }
 
 /// One of
@@ -480,7 +481,7 @@ pub struct AuthorizationListV4<'a> {
 }
 
 #[derive(asn1::Asn1Read, asn1::Asn1Write)]
-pub struct AuthorizationListV100V200<'a> {
+pub struct AuthorizationListKeyMint<'a> {
     #[explicit(1)]
     pub purpose: Option<SetOf<'a, i64>>,
     #[explicit(2)]

pallets/acurast/common/src/attestation/error.rs

@@ -25,7 +25,7 @@ pub enum ValidationError {
     /// Error occured when parsing the extension field
     ParseExtension,
     /// Attestation version is not supported
-    UnsupportedAttestationVersion,
+    UnsupportedAttestationVersion(i64),
     /// Error occured while parsing the P256 public key
     ParseP256PublicKey,
     /// Error occured while parsing the P384 public key

pallets/acurast/common/src/types.rs

@@ -7,6 +7,7 @@ pub use bounded_attestation::*;
 use frame_support::{pallet_prelude::*, storage::bounded_vec::BoundedVec};
 use sp_std::prelude::*;
 
+use crate::ParameterBound;
 #[cfg(feature = "std")]
 use serde;
 #[cfg(feature = "std")]
@@ -37,9 +38,11 @@ pub type SerialNumber = BoundedVec<u8, ConstU32<SERIAL_NUMBER_MAX_LENGTH>>;
 pub enum MultiOrigin<AcurastAccountId> {
     Acurast(AcurastAccountId),
     Tezos(TezosAddressBytes),
+    Ethereum(EthereumAddressBytes),
 }
 
 pub type TezosAddressBytes = BoundedVec<u8, CU32<36>>;
+pub type EthereumAddressBytes = BoundedVec<u8, CU32<20>>;
 
 /// The type of a job identifier sequence.
 pub type JobIdSequence = u128;
@@ -93,6 +96,23 @@ pub struct JobRegistration<AccountId, MaxAllowedSources: Get<u32>, Extra> {
     pub extra: Extra,
 }
 
+pub const PUB_KEYS_MAX_LENGTH: u32 = 33;
+pub type PubKeyBytes = BoundedVec<u8, ConstU32<PUB_KEYS_MAX_LENGTH>>;
+
+/// Structure representing execution environment variables encrypted for a specific processor.
+#[derive(RuntimeDebug, Encode, Decode, MaxEncodedLen, TypeInfo, Clone, PartialEq)]
+pub struct Environment<
+    MaxEnvVars: ParameterBound,
+    KeyMaxSize: ParameterBound,
+    ValueMaxSize: ParameterBound,
+> {
+    /// Public key of key pair specifically created to encrypt environment secrets.
+    pub public_key: PubKeyBytes,
+    /// Environment variables with cleartext key, encrypted value.
+    pub variables:
+        BoundedVec<(BoundedVec<u8, KeyMaxSize>, BoundedVec<u8, ValueMaxSize>), MaxEnvVars>,
+}
+
 pub const MAX_JOB_MODULES: u32 = 1;
 
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]

pallets/acurast/common/src/types/bounded_attestation.rs

@@ -84,6 +84,7 @@ impl TryFrom<KeyDescription<'_>> for BoundedKeyDescription {
             KeyDescription::V4(kd) => kd.try_into(),
             KeyDescription::V100(kd) => kd.try_into(),
             KeyDescription::V200(kd) => kd.try_into(),
+            KeyDescription::V300(kd) => kd.try_into(),
         }
     }
 }
@@ -140,10 +141,10 @@ impl TryFrom<asn::KeyDescriptionV4<'_>> for BoundedKeyDescription {
     }
 }
 
-impl TryFrom<asn::KeyDescriptionV100V200<'_>> for BoundedKeyDescription {
+impl TryFrom<asn::KeyDescriptionKeyMint<'_>> for BoundedKeyDescription {
     type Error = ();
 
-    fn try_from(data: asn::KeyDescriptionV100V200) -> Result<Self, Self::Error> {
+    fn try_from(data: asn::KeyDescriptionKeyMint) -> Result<Self, Self::Error> {
         Ok(BoundedKeyDescription {
             attestation_security_level: data.attestation_security_level.into(),
             key_mint_security_level: data.key_mint_security_level.into(),
@@ -585,10 +586,10 @@ impl TryFrom<asn::AuthorizationListV4<'_>> for BoundedAuthorizationList {
     }
 }
 
-impl TryFrom<asn::AuthorizationListV100V200<'_>> for BoundedAuthorizationList {
+impl TryFrom<asn::AuthorizationListKeyMint<'_>> for BoundedAuthorizationList {
     type Error = ();
 
-    fn try_from(data: asn::AuthorizationListV100V200) -> Result<Self, Self::Error> {
+    fn try_from(data: asn::AuthorizationListKeyMint) -> Result<Self, Self::Error> {
         Ok(BoundedAuthorizationList {
             purpose: try_bound_set!(data.purpose, Purpose, u8)?,
             algorithm: try_bound!(data.algorithm, u8)?,

pallets/acurast/src/benchmarking.rs

@@ -173,5 +173,26 @@ benchmarks! {
         ).into());
     }
 
+    set_environment {
+        let x in 1 .. T::MaxEnvVars::get();
+        let (caller, job) = register_job::<T>(true, false);
+        let mut vars: Vec<(BoundedVec<u8, T::EnvKeyMaxSize>, BoundedVec<u8, T::EnvValueMaxSize>)> = vec![];
+        for i in 0..x {
+            (&mut vars).push((BoundedVec::truncate_from(vec![
+                105, 112, 102, 115, 58, 47, 47, 8]), BoundedVec::truncate_from(vec![
+                105, 112, 102, 115, 58, 47, 47, 8])))
+        }
+        let env: EnvironmentFor<T> = Environment{
+            public_key: BoundedVec::truncate_from(vec![105, 112, 102, 115, 58, 47, 47, 8]),
+            variables: BoundedVec::try_from(vars).unwrap(),
+        };
+        let local_job_id = 1;
+    }: _(RawOrigin::Signed(caller.clone()), local_job_id, account("processor", 0, SEED), env.clone())
+    verify {
+        assert_last_event::<T>(Event::ExecutionEnvironmentUpdated(
+            (MultiOrigin::Acurast(caller), 1), account("processor", 0, SEED)
+        ).into());
+    }
+
     impl_benchmark_test_suite!(Acurast, mock::ExtBuilder::default().build(), mock::Test);
 }