replace SELF out of circuit

Author: dgulotta

src/backends/plonky2/basetypes.rs

@@ -2,17 +2,16 @@
 //! is enabled.
 //! See src/middleware/basetypes.rs for more details.
 
+/// F is the native field we use everywhere.  Currently it's Goldilocks from plonky2
+pub use plonky2::field::goldilocks_field::GoldilocksField as F;
 use plonky2::{
-    field::{extension::quadratic::QuadraticExtension, goldilocks_field::GoldilocksField},
+    field::extension::quadratic::QuadraticExtension,
     hash::{hash_types, poseidon::PoseidonHash},
     plonk::{circuit_builder, circuit_data, config::GenericConfig, proof},
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Deserializer, Serialize};
 
-/// F is the native field we use everywhere.  Currently it's Goldilocks from plonky2
-pub type F = GoldilocksField;
-
 /// D defines the extension degree of the field used in the Plonky2 proofs (quadratic extension).
 pub const D: usize = 2;
 

src/middleware/basetypes.rs

@@ -33,10 +33,7 @@ use std::{
 
 use hex::{FromHex, FromHexError, ToHex};
 use plonky2::{
-    field::{
-        goldilocks_field::GoldilocksField,
-        types::{Field, PrimeField64},
-    },
+    field::types::{Field, PrimeField64},
     hash::poseidon::PoseidonHash,
     plonk::config::Hasher,
 };
@@ -58,12 +55,7 @@ pub const HASH_SIZE: usize = 4;
 pub const VALUE_SIZE: usize = 4;
 
 pub const EMPTY_VALUE: RawValue = RawValue([F::ZERO, F::ZERO, F::ZERO, F::ZERO]);
-pub const SELF_ID_HASH: Hash = Hash([
-    GoldilocksField(0x5),
-    GoldilocksField(0xe),
-    GoldilocksField(0x1),
-    GoldilocksField(0xf),
-]);
+pub const SELF_ID_HASH: Hash = Hash([F(0x5), F(0xe), F(0x1), F(0xf)]);
 pub const EMPTY_HASH: Hash = Hash([F::ZERO, F::ZERO, F::ZERO, F::ZERO]);
 
 #[derive(Clone, Copy, Debug, Default, Hash, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]

src/middleware/mod.rs

@@ -766,7 +766,7 @@ impl Params {
     }
 }
 
-/// Replace references to SELF by `self_id` in anchored keys of the statement.
+/// Replace references to SELF by `self_id`.
 pub fn normalize_statement(statement: &Statement, self_id: PodId) -> Statement {
     let predicate = statement.predicate();
     let args = statement
@@ -776,6 +776,9 @@ pub fn normalize_statement(statement: &Statement, self_id: PodId) -> Statement {
             StatementArg::Key(AnchoredKey { pod_id, key }) if *pod_id == SELF => {
                 StatementArg::Key(AnchoredKey::new(self_id, key.clone()))
             }
+            StatementArg::Literal(value) if value.raw.0 == SELF.0 .0 => {
+                StatementArg::Literal(self_id.into())
+            }
             _ => sa.clone(),
         })
         .collect();