Merge pull request #16 from bobanetwork/input

use counter for rand input
bobanetwork · Jun 4, 2024 · d3a0085 · d3a0085
2 parents 7f5ded6 + 9902acb
commit d3a0085
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 76 deletions.
diff --git a/contracts/zkdvrf.sol b/contracts/zkdvrf.sol
@@ -37,6 +37,8 @@ contract zkdvrf is Ownable {
         Ready
     }
 
+    string public constant INPUT_PREFIX = "zkRand-v1-2024:";
+
     uint32 public memberCount;
     uint32 public threshold;
     uint32 public ppLength;
@@ -177,8 +179,7 @@ contract zkdvrf is Ownable {
         }
 
         currentRoundNum++;
-        uint256 currentTimestamp = block.timestamp;
-        roundInput[currentRoundNum] = currentTimestamp.toString();
+        roundInput[currentRoundNum] = string(abi.encodePacked(INPUT_PREFIX, currentRoundNum.toString()));
 
         emit RandomInitiated(currentRoundNum, roundInput[currentRoundNum]);
     }

diff --git a/scripts/admin.ts b/scripts/admin.ts
@@ -159,7 +159,7 @@ async function main() {
     async function listenRandThreshold() {
         const eventRandThreshold = `RandomThresholdReached`
         contract.on(eventRandThreshold, async (roundNum, input, event) => {
-            console.log("\nevent", eventRandThreshold, `round ${roundNum} input ${input}`)
+            console.log("\nevent", eventRandThreshold, `round ${roundNum} input "${input}"`)
 
             console.log("begin sleep...")
             await sleep(2000)
@@ -196,12 +196,12 @@ async function main() {
             await sleep(2000)
             console.log("end sleep")
 
-            const cmdCombine = `RUST_LOG=info ./target/release/client rand combine ${input}`
+            const cmdCombine = `RUST_LOG=info ./target/release/client rand combine "${input}"`
             console.log("running command <", cmdCombine, ">...")
             let result = await execPromise(cmdCombine)
             console.log(result[`stderr`])
 
-            const cmdVerify = `RUST_LOG=info ./target/release/client rand verify-final ${input}`
+            const cmdVerify = `RUST_LOG=info ./target/release/client rand verify-final "${input}"`
             console.log("running command <", cmdVerify, ">...")
             result = await execPromise(cmdVerify)
             console.log(result[`stderr`])

diff --git a/scripts/random.ts b/scripts/random.ts
@@ -27,8 +27,8 @@ async function main() {
         const memberContract = contract.connect(memberWallet)
 
         const index = await memberContract.getIndexPlus(memberAddress)
-        const cmdEval = `RUST_LOG=info ./target/release/client rand eval ${index} ${input}`
-        const cmdVerify = `RUST_LOG=info ./target/release/client rand verify ${index} ${input}`
+        const cmdEval = `RUST_LOG=info ./target/release/client rand eval ${index} "${input}"`
+        const cmdVerify = `RUST_LOG=info ./target/release/client rand verify ${index} "${input}"`
 
         console.log("running command <", cmdEval, ">...")
         let result = await execPromise(cmdEval)