fix

contracts/Scarb.toml

@@ -18,4 +18,7 @@ openzeppelin_utils = { git = "https://github.com/OpenZeppelin/cairo-contracts.gi
 [[target.starknet-contract]]
 allowed-libfuncs-list.name = "experimental"
 
-[lib]
+[lib]
+
+[script]
+test = "snforge test"

contracts/src/tests.cairo

@@ -37,6 +37,7 @@ pub struct SetupResult {
 // pubkey.x =0x66da5d53168d591c55d4c05f3681663ac51bcdccd5ca09e366b71b0c40ccff4
 // pubkey.y =0x6d3eb29920bf55195e5ec76f69e247c0942c7ef85f6640896c058ec75ca2232
 
+// predict(7)
 // dec seed: 3032352359757432012563250899565907372094349154944589575541851581834778916567
 // hex seed: 6B440283D175E739D7576952E07F8E5F4DCB50CD3306980AB467701EBE036D7
 
@@ -53,6 +54,48 @@ pub struct SetupResult {
 //     }
 //   }
 
+fn proof_predict_7() -> Proof {
+    Proof {
+        gamma: Point {
+            x: 0x1d62b9f8ca67b4b0be877d129ddcdcfde0155a5770bd10531567a38bc59af7e,
+            y: 0x165932086b2c4f6d8aec5dd0e802739d3020a7b82c05f1022f8b62aef408931
+        },
+        c: 0x71026abfcecc06d527efeed5d13194588ec9824979356f6a1114af203816101,
+        s: 0x24f3bbd6c66491f75b86da2b84c930e888303c28ff598e925166115378fd5c4,
+        sqrt_ratio_hint: 0x66d6479b41f2f98f5a333faa24024ece7ccd461298de26d22a7626a1658793d,
+    }
+}
+
+// predict_xyz(7)
+// dec seed: 3296823651229936910592569470336223802394762194709333112375396103878069910189
+// hex seed: 749EFA1A613B8F5498F478B99BE33679FDACAB988418A5EB6994ECDF0FEFAAD
+
+// MUST give seed as hex string
+// curl -d '{"seed":["0x749EFA1A613B8F5498F478B99BE33679FDACAB988418A5EB6994ECDF0FEFAAD"]}' -H "Content-Type: application/json" http://localhost:3000/stark_vrf
+// {
+//     "result":{
+//        "gamma_x":"0x66416aa1032b6ce0d7821246d5665600801610f37582fd442d6df0fae0d2711",
+//        "gamma_y":"0x27b5c9576c1794394466006eb01140ca5165068dd97f7c40929d2a87c0c9461",
+//        "c":"0x148351524abedf607366c9af894985dbd2e811bfa7ae5cc8c0c936844bf4305",
+//        "s":"0x35ab74811a59894b492ab6c0fa176b90abca04b358a97080eab88691dc7ba99",
+//        "sqrt_ratio":"0x6b8ad3c093cdfb7fac6fb995c4db291f225cfce3da3b1612542f33757dbfb7b",
+//        "rnd":"0x15edf1f71b575e3042d869bb4829566e4d7103bdc0b6862d7a658c22eb55497"
+//     }
+//  }
+
+fn proof_predict_xyz_7() -> Proof {
+    Proof {
+        gamma: Point {
+            x: 0x66416aa1032b6ce0d7821246d5665600801610f37582fd442d6df0fae0d2711,
+            y: 0x27b5c9576c1794394466006eb01140ca5165068dd97f7c40929d2a87c0c9461
+        },
+        c: 0x148351524abedf607366c9af894985dbd2e811bfa7ae5cc8c0c936844bf4305,
+        s: 0x35ab74811a59894b492ab6c0fa176b90abca04b358a97080eab88691dc7ba99,
+        sqrt_ratio_hint: 0x6b8ad3c093cdfb7fac6fb995c4db291f225cfce3da3b1612542f33757dbfb7b,
+    }
+}
+
+
 pub fn setup() -> SetupResult {
     let mut provider_calldata = array![];
     provider_calldata.append_serde(OWNER());
@@ -78,17 +121,7 @@ pub fn setup() -> SetupResult {
     }
 }
 
-fn proof_predict_7() -> Proof {
-    Proof {
-        gamma: Point {
-            x: 0x1d62b9f8ca67b4b0be877d129ddcdcfde0155a5770bd10531567a38bc59af7e,
-            y: 0x165932086b2c4f6d8aec5dd0e802739d3020a7b82c05f1022f8b62aef408931
-        },
-        c: 0x71026abfcecc06d527efeed5d13194588ec9824979356f6a1114af203816101,
-        s: 0x24f3bbd6c66491f75b86da2b84c930e888303c28ff598e925166115378fd5c4,
-        sqrt_ratio_hint: 0x66d6479b41f2f98f5a333faa24024ece7ccd461298de26d22a7626a1658793d,
-    }
-}
+
 
 
 #[test]
@@ -140,7 +173,7 @@ fn test_setup() {
 
 #[test]
 #[should_panic(expected: 'VrfConsumer: commit mismatch')]
-fn test_changed_prediction() {
+fn test_changed_prediction_calldata() {
     let setup = setup();
 
     // user request_random for predict(params)
@@ -152,8 +185,8 @@ fn test_changed_prediction() {
     let nonce = setup.provider.get_nonce(setup.consumer.contract_address, CALLER());
 
     let seed = setup.provider.request_random(consumer, entrypoint, calldata, nonce);
-
     println!("seed: {}", seed);
+
     stop_cheat_caller_address(setup.provider.contract_address);
 
     // vrf-server provides proof for seed
@@ -177,3 +210,42 @@ fn test_changed_prediction() {
     // change guess from 7 -> 1
     setup.consumer.predict(PredictParams { value: 1 });
 }
+
+
+#[test]
+#[should_panic(expected: 'VrfConsumer: commit mismatch')]
+fn test_changed_prediction_entrypoint() {
+    let setup = setup();
+
+    // user request_random for predict(params)
+    start_cheat_caller_address(setup.provider.contract_address, CALLER());
+
+    let consumer = setup.consumer.contract_address;
+    let entrypoint = 'predict_xyz';
+    let calldata = array![7];
+    let nonce = setup.provider.get_nonce(setup.consumer.contract_address, CALLER());
+
+    let seed = setup.provider.request_random(consumer, entrypoint, calldata, nonce);
+    println!("seed: {}", seed);
+    stop_cheat_caller_address(setup.provider.contract_address);
+
+    // vrf-server provides proof for seed
+    start_cheat_caller_address(setup.provider.contract_address, AUTHORIZED());
+
+    let proof = proof_predict_xyz_7();
+    setup.provider.submit_random(seed, proof);
+
+    stop_cheat_caller_address(setup.provider.contract_address);
+
+    // user consumer randomness
+    start_cheat_caller_address(setup.consumer.contract_address, CALLER());
+
+    let random = setup.provider.get_random(seed);
+    println!("get_random: {}", random);
+    assert(
+        random == 0x15edf1f71b575e3042d869bb4829566e4d7103bdc0b6862d7a658c22eb55497,
+        'invalid random'
+    );
+
+    setup.consumer.predict(PredictParams { value: 7 });
+}

contracts/src/vrf_consumer/vrf_consumer_component.cairo

@@ -113,7 +113,7 @@ pub mod VrfConsumerComponent {
             calldata.serialize(ref serialized);
 
             // get seed for call
-            let seed = self.get_seed_for_call('predict', serialized);
+            let seed = self.get_seed_for_call(entrypoint, serialized);
 
             // get committed seed
             let committed = self.get_commit();