Merge branch 'main' of github.com:ZkNoid/L1-lottery

ZkNoid · Oct 11, 2024 · 787ba61 · 787ba61
2 parents c2acf59 + 44fa950
commit 787ba61
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/random_request_cid b/random_request_cid
@@ -1 +1 @@
-bafkreih6hhv5m44xz6fhklhqhcpdgd3znrs6w5332trjxb3qz5ychjy4se
+bafkreih6hhv5m44xz6fhklhqhcpdgd3znrs6w5332trjxb3qz5ychjy4se
diff --git a/random_request_cid.js b/random_request_cid.js
@@ -0,0 +1 @@
+export const cidBuffer = 'bafkreicnannsz4gqqk3ccfwfd3z2hfzonr63z3hgsplefgrmz37psay23y';
diff --git a/scripts/utils.ts b/scripts/utils.ts
@@ -1,7 +1,6 @@
 import dotenv from 'dotenv';
 dotenv.config();
 import { Cache, Field, Mina, PrivateKey, PublicKey } from 'o1js';
-import * as fs from 'fs';
 import {
   LotteryAction,
   TicketReduceProgram,
@@ -16,6 +15,7 @@ import { ZkOnCoordinatorAddress } from '../src/constants.js';
 import { RandomManagerManager } from '../src/StateManager/RandomManagerManager.js';
 import { FactoryManager } from '../src/StateManager/FactoryStateManager.js';
 import { PlotteryFactory } from '../src/Factory.js';
+import { cidBuffer } from '../random_request_cid.js';
 
 export const configDefaultInstance = (): { transactionFee: number } => {
   const transactionFee = 100_000_000;
@@ -198,7 +198,5 @@ export const getIPFSCID = (): { hashPart1: Field; hashPart2: Field } => {
     return { hashPart1, hashPart2 };
   }
 
-  let cidBuffer = fs.readFileSync('./random_request_cid');
-
   return segmentHash(cidBuffer.toString());
 };
diff --git a/src/Factory.ts b/src/Factory.ts
@@ -16,7 +16,7 @@ import {
   Cache,
   UInt32,
 } from 'o1js';
-import fs from 'fs';
+import { vkJSON } from '../vk';
 import { BLOCK_PER_ROUND } from './constants.js';
 import { MerkleMap20 } from './Structs/CustomMerkleMap.js';
 import { RandomManager } from './Random/RandomManager.js';
@@ -36,9 +36,6 @@ const emptyMerkleMapRoot = new MerkleMap().getRoot();
 //   cache: Cache.FileSystem('cache'),
 // });
 
-let vkString = fs.readFileSync('./vk.json').toString();
-let vkJSON = JSON.parse(vkString);
-
 const randomManagerVK = {
   hash: Field(vkJSON.randomManagerVK.hash),
   data: vkJSON.randomManagerVK.data,

diff --git a/src/util.ts b/src/util.ts
@@ -1,4 +1,4 @@
-import * as fs from 'fs';
+// import * as fs from 'fs';
 
 import {
   Field,
@@ -15,6 +15,7 @@ import {
 import { MerkleMap20 } from './Structs/CustomMerkleMap.js';
 // import { PackedUInt32Factory } from 'o1js-pack';
 import { StringCircuitValue } from 'zkon-zkapp';
+import { cidBuffer } from '../random_request_cid.js';
 
 const MAX_BITS_PER_FIELD = 254n;
 const L = 7; // 7 32-bit uints fit in one Field
@@ -197,7 +198,5 @@ export const getIPFSCID = (): { hashPart1: Field; hashPart2: Field } => {
     return { hashPart1, hashPart2 };
   }
 
-  let cidBuffer = fs.readFileSync('./random_request_cid');
-
   return segmentHash(cidBuffer.toString());
 };
diff --git a/vk.json → vk.js b/vk.json → vk.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		bafkreih6hhv5m44xz6fhklhqhcpdgd3znrs6w5332trjxb3qz5ychjy4se
		bafkreih6hhv5m44xz6fhklhqhcpdgd3znrs6w5332trjxb3qz5ychjy4se
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const cidBuffer = 'bafkreicnannsz4gqqk3ccfwfd3z2hfzonr63z3hgsplefgrmz37psay23y';