Merge pull request #524 from o1-labs/field-static-remove

Removes static one/zero/-1 from Field

src/examples/api_exploration.ts

@@ -31,7 +31,7 @@ console.assert(x0.equals(x1).toBoolean());
 
 // When initializing with booleans, true corresponds to the field element 1, and false corresponds to 0
 const b = new Field(true);
-console.assert(b.equals(Field.one).toBoolean());
+console.assert(b.equals(Field(1)).toBoolean());
 
 /* You can perform arithmetic operations on field elements.
    The arithmetic methods can take any "fieldy" values as inputs: 

src/examples/constraint_system.ts

@@ -1,11 +1,11 @@
 import { Field, Circuit, Poseidon } from 'snarkyjs';
 
-let hash = Poseidon.hash([Field.one, Field.minusOne]);
+let hash = Poseidon.hash([Field(1), Field(-1)]);
 
 let { rows, digest } = Circuit.constraintSystem(() => {
-  let x = Circuit.witness(Field, () => Field.one);
-  let y = Circuit.witness(Field, () => Field.minusOne);
-  x.add(y).assertEquals(Field.zero);
+  let x = Circuit.witness(Field, () => Field(1));
+  let y = Circuit.witness(Field, () => Field(-1));
+  x.add(y).assertEquals(Field(0));
   let z = Poseidon.hash([x, y]);
   z.assertEquals(hash);
 });

src/examples/ex00_preimage.ts

@@ -26,7 +26,7 @@ await isReady;
 console.log('generating keypair...');
 const kp = Main.generateKeypair();
 
-const preimage = Field.one;
+const preimage = Field(1);
 const hash = Poseidon.hash([preimage]);
 
 console.log('prove...');

src/examples/matrix_mul.ts

@@ -27,7 +27,7 @@ function matrixMul(x: Field[][], y: Field[][]): Field[][] {
   for (let i = 0; i < n; i++) {
     result[i] = [];
     for (let j = 0; j < o; j++) {
-      result[i][j] = Field.zero;
+      result[i][j] = Field(0);
       for (let k = 0; k < m; k++) {
         result[i][j] = result[i][j].add(x[i][k].mul(y[k][j]));
       }

src/examples/program.ts

@@ -8,7 +8,7 @@ let MyProgram = Experimental.ZkProgram({
       privateInputs: [],
 
       method(publicInput: Field) {
-        publicInput.assertEquals(Field.zero);
+        publicInput.assertEquals(Field(0));
       },
     },
 
@@ -32,15 +32,15 @@ let { verificationKey } = await MyProgram.compile();
 console.log('verification key', verificationKey.slice(0, 10) + '..');
 
 console.log('proving base case...');
-let proof = await MyProgram.baseCase(Field.zero);
+let proof = await MyProgram.baseCase(Field(0));
 proof = testJsonRoundtrip(proof);
 
 console.log('verify...');
 let ok = await verify(proof.toJSON(), verificationKey);
 console.log('ok?', ok);
 
 console.log('proving step 1...');
-proof = await MyProgram.inductiveCase(Field.one, proof);
+proof = await MyProgram.inductiveCase(Field(1), proof);
 proof = testJsonRoundtrip(proof);
 
 console.log('verify alternative...');

src/examples/rollup/data_store.ts

@@ -64,7 +64,7 @@ export class Keyed {
       const n = eltTyp.sizeInFields();
       const xs = [];
       for (var i = 0; i < n; ++i) {
-        xs.push(Field.zero);
+        xs.push(Field(0));
       }
       return eltTyp.fromFields(xs);
     })();

src/examples/rollup/merkle_stack.ts

@@ -16,7 +16,7 @@ export class MerkleStack<A extends CircuitValue> {
     this.values = { computed: false, f };
     this.eltTyp = eltTyp;
     // TODO
-    this.commitment = Field.zero;
+    this.commitment = Field(0);
   }
 
   getValues(): Array<[A, Field]> {

src/examples/zkapps/dex/erc20.ts

@@ -99,7 +99,7 @@ class TrivialCoin extends SmartContract implements Erc20 {
     for (let i = 0; i < 8; i++) {
       let state = this.self.update.appState[i];
       state.isSome = Bool(true);
-      state.value = Field.zero;
+      state.value = Field(0);
     }
     // since this is the only method of this zkApp that resets the entire state, provedState: true implies
     // that this function was run. Since it can be run only once, this implies it was run exactly once

src/examples/zkapps/merkle_tree/merkle_zkapp.ts

@@ -58,7 +58,7 @@ class Account extends CircuitValue {
   }
 }
 // we need the initiate tree root in order to tell the contract about our off-chain storage
-let initialCommitment: Field = Field.zero;
+let initialCommitment: Field = Field(0);
 /*
   We want to write a smart contract that serves as a leaderboard,
   but only has the commitment of the off-chain storage stored in an on-chain variable.

src/examples/zkapps/reducer/reducer.ts

@@ -14,7 +14,7 @@ import {
 
 await isReady;
 
-const INCREMENT = Field.one;
+const INCREMENT = Field(1);
 
 class CounterZkapp extends SmartContract {
   // the "reducer" field describes a type of action that we can dispatch, and reduce later
@@ -61,7 +61,7 @@ class CounterZkapp extends SmartContract {
 }
 
 const doProofs = true;
-const initialCounter = Field.zero;
+const initialCounter = Field(0);
 
 let Local = Mina.LocalBlockchain();
 Mina.setActiveInstance(Local);

src/examples/zkapps/reducer/reducer_composite.ts

@@ -22,7 +22,7 @@ class MaybeIncrement extends Struct({
   isIncrement: Bool,
   otherData: Field,
 }) {}
-const INCREMENT = { isIncrement: Bool(true), otherData: Field.zero };
+const INCREMENT = { isIncrement: Bool(true), otherData: Field(0) };
 
 class CounterZkapp extends SmartContract {
   // the "reducer" field describes a type of action that we can dispatch, and reduce later
@@ -72,7 +72,7 @@ class CounterZkapp extends SmartContract {
 }
 
 const doProofs = true;
-const initialCounter = Field.zero;
+const initialCounter = Field(0);
 
 let Local = Mina.LocalBlockchain();
 Mina.setActiveInstance(Local);

src/examples/zkapps/simple_and_counter_zkapp.ts

@@ -29,7 +29,7 @@ const doProofs = true;
 
 await isReady;
 
-const INCREMENT = Field.one;
+const INCREMENT = Field(1);
 
 let offchainStorage = {
   pendingActions: [] as Field[][],

src/examples/zkapps/simple_zkapp_with_proof.ts

@@ -27,7 +27,7 @@ class NotSoSimpleZkapp extends SmartContract {
 
   @method init(proof: TrivialProof) {
     proof.verify();
-    this.x.set(Field.one);
+    this.x.set(Field(1));
   }
 
   @method update(

src/examples/zkapps/voting/demo.ts

@@ -103,7 +103,7 @@ try {
       0n,
       Member.from(
         PrivateKey.random().toPublicKey(),
-        Field.zero,
+        Field(0),
         UInt64.from(150)
       ),
       voterStore
@@ -127,7 +127,7 @@ try {
       1n,
       Member.from(
         PrivateKey.random().toPublicKey(),
-        Field.zero,
+        Field(0),
         UInt64.from(160)
       ),
       voterStore
@@ -152,7 +152,7 @@ try {
       2n,
       Member.from(
         PrivateKey.random().toPublicKey(),
-        Field.zero,
+        Field(0),
         UInt64.from(170)
       ),
       voterStore
@@ -191,7 +191,7 @@ try {
       0n,
       Member.from(
         PrivateKey.random().toPublicKey(),
-        Field.zero,
+        Field(0),
         UInt64.from(250)
       ),
       candidateStore
@@ -215,7 +215,7 @@ try {
       1n,
       Member.from(
         PrivateKey.random().toPublicKey(),
-        Field.zero,
+        Field(0),
         UInt64.from(400)
       ),
       candidateStore

src/examples/zkapps/voting/dummyContract.ts

@@ -21,7 +21,7 @@ export class DummyContract extends SmartContract {
       setVerificationKey: Permissions.proofOrSignature(),
       incrementNonce: Permissions.proofOrSignature(),
     });
-    this.sum.set(Field.zero);
+    this.sum.set(Field(0));
   }
 
   /**

src/examples/zkapps/voting/member.ts

@@ -13,7 +13,7 @@ import {
 export class MerkleWitness extends Experimental.MerkleWitness(8) {}
 let w = {
   isLeft: false,
-  sibling: Field.zero,
+  sibling: Field(0),
 };
 let dummyWitness = Array.from(Array(MerkleWitness.height - 1).keys()).map(
   () => w
@@ -50,7 +50,7 @@ export class Member extends CircuitValue {
     this.hashVoted = Bool(false);
     this.accountId = accountId;
     this.isCandidate = Bool(false);
-    this.votes = Field.zero;
+    this.votes = Field(0);
 
     this.witness = new MerkleWitness(dummyWitness);
     this.votesWitness = new MerkleWitness(dummyWitness);
@@ -75,7 +75,7 @@ export class Member extends CircuitValue {
   }
 
   static empty() {
-    return new Member(PublicKey.empty(), Field.zero, UInt64.zero, Field.zero);
+    return new Member(PublicKey.empty(), Field(0), UInt64.zero, Field(0));
   }
 
   static from(publicKey: PublicKey, tokenId: Field, balance: UInt64) {