Merge pull request #519 from o1-labs/static-cleanup

CHANGELOG.md

@@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - BREAKING CHANGE: `tx.send()` is now asynchronous: old: `send(): TransactionId` new: `send(): Promise<TransactionId>` and `tx.send()` now directly waits for the network response, as opposed to `tx.send().wait()`
 - `Circuit.witness` can now be called outside circuits, where it will just directly return the callback result
+- BREAKING CHANGE: Static methods of type `.fromString()`, `.fromNumber()` and `.fromBigInt()` on `Field`, `UInt64`, `UInt32` and `Int64` are not longer supported.
 
 ### Deprecated
 

src/examples/rollup/wip.ts

@@ -398,7 +398,7 @@ function main() {
     })
     .then(() =>
       Mina.transaction(minaSender, () => {
-        const amount = UInt64.fromNumber(1000000000);
+        const amount = UInt64.from(1000000000);
 
         return AccountUpdate.createSigned(depositorPrivkey).then((p) => {
           p.body.delta = Int64.fromUnsigned(amount).neg();
@@ -408,7 +408,7 @@ function main() {
             operatorsDb,
             accountDb,
             pendingDeposits,
-            UInt32.fromNumber(0)
+            UInt32.from(0)
           );
         });
       }).send()
@@ -466,8 +466,8 @@ function main() {
         })
         .then(() => {
           console.log('main', 7);
-          let rollupAmount = UInt64.fromNumber(10);
-          let rollupNonce = UInt32.fromNumber(0);
+          let rollupAmount = UInt64.from(10);
+          let rollupNonce = UInt32.from(0);
           let rollupSender = depositorPubkey;
           let rollupReceiver = depositorPubkey;
           let rollupTransaction = new RollupTransaction(

src/examples/simple_zkapp.ts

@@ -36,7 +36,7 @@ class SimpleZkapp extends SmartContract {
       editState: Permissions.proofOrSignature(),
       send: Permissions.proofOrSignature(),
     });
-    this.balance.addInPlace(UInt64.fromNumber(initialBalance));
+    this.balance.addInPlace(UInt64.from(initialBalance));
     this.x.set(initialState);
   }
 

src/examples/zkapps/local_events_zkapp.ts

@@ -48,7 +48,7 @@ class SimpleZkapp extends SmartContract {
       editState: Permissions.proofOrSignature(),
       send: Permissions.proofOrSignature(),
     });
-    this.balance.addInPlace(UInt64.fromNumber(initialBalance));
+    this.balance.addInPlace(UInt64.from(initialBalance));
     this.x.set(initialState);
   }
 

src/examples/zkapps/merkle_tree/merkle_zkapp.ts

@@ -76,7 +76,7 @@ class Leaderboard extends SmartContract {
       ...Permissions.default(),
       editState: Permissions.proofOrSignature(),
     });
-    this.balance.addInPlace(UInt64.fromNumber(initialBalance));
+    this.balance.addInPlace(UInt64.from(initialBalance));
     this.commitment.set(initialCommitment);
   }
 

src/examples/zkapps/set_local_preconditions_zkapp.ts

@@ -31,7 +31,7 @@ class SimpleZkapp extends SmartContract {
       editState: Permissions.proofOrSignature(),
       send: Permissions.proofOrSignature(),
     });
-    this.balance.addInPlace(UInt64.fromNumber(initialBalance));
+    this.balance.addInPlace(UInt64.from(initialBalance));
   }
 
   @method blockheightEquals(y: UInt32) {

src/examples/zkapps/simple_and_counter_zkapp.ts

@@ -102,7 +102,7 @@ class SimpleZkapp extends SmartContract {
       editState: Permissions.proofOrSignature(),
       send: Permissions.proofOrSignature(),
     });
-    this.balance.addInPlace(UInt64.fromNumber(initialBalance));
+    this.balance.addInPlace(UInt64.from(initialBalance));
     this.x.set(initialState);
   }
 

src/examples/zkapps/simple_zkapp_payment.ts

@@ -22,7 +22,7 @@ class SendMINAExample extends SmartContract {
       editState: Permissions.proofOrSignature(),
       editSequenceState: Permissions.proofOrSignature(),
     });
-    this.balance.addInPlace(UInt64.fromNumber(initialBalance));
+    this.balance.addInPlace(UInt64.from(initialBalance));
   }
 
   @method sendMINA(receiverAddress: PublicKey, amount: UInt64) {

src/examples/zkapps/token_with_proofs.ts

@@ -25,7 +25,7 @@ class TokenContract extends SmartContract {
       ...Permissions.default(),
       send: Permissions.proof(),
     });
-    this.balance.addInPlace(UInt64.fromNumber(initialBalance));
+    this.balance.addInPlace(UInt64.from(initialBalance));
   }
 
   @method tokenDeploy(deployer: PrivateKey, verificationKey: VerificationKey) {

src/examples/zkapps/voting/member.ts

@@ -80,11 +80,6 @@ export class Member extends CircuitValue {
 
   static from(publicKey: PublicKey, tokenId: Field, balance: UInt64) {
     this.count++;
-    return new Member(
-      publicKey,
-      tokenId,
-      balance,
-      Field.fromNumber(this.count)
-    );
+    return new Member(publicKey, tokenId, balance, Field(this.count));
   }
 }

src/examples/zkapps/voting/test.ts

@@ -104,7 +104,7 @@ export async function testSet(
 
       AccountUpdate.setValue(vkUpdate.update.verificationKey, {
         ...verificationKey,
-        hash: Field.fromString(verificationKey.hash),
+        hash: Field(verificationKey.hash),
       });
     },
     verificationKeySet.feePayer

src/lib/account_update.ts

@@ -532,12 +532,12 @@ function ignore<T>(dummy: T): OrIgnore<T> {
 /**
  * Ranges between all uint32 values
  */
-const uint32 = () => ({ lower: UInt32.fromNumber(0), upper: UInt32.MAXINT() });
+const uint32 = () => ({ lower: UInt32.from(0), upper: UInt32.MAXINT() });
 
 /**
  * Ranges between all uint64 values
  */
-const uint64 = () => ({ lower: UInt64.fromNumber(0), upper: UInt64.MAXINT() });
+const uint64 = () => ({ lower: UInt64.from(0), upper: UInt64.MAXINT() });
 
 type AccountPrecondition = Preconditions['account'];
 const AccountPrecondition = {
@@ -862,7 +862,7 @@ class AccountUpdate implements Types.AccountUpdate {
    * ```ts
    * \@method onlyRunsWhenBalanceIsLow() {
    *   let lower = UInt64.zero;
-   *   let upper = UInt64.fromNumber(20e9);
+   *   let upper = UInt64.from(20e9);
    *   AccountUpdate.assertBetween(this.self.body.preconditions.account.balance, lower, upper);
    *   // ...
    * }
@@ -1078,7 +1078,7 @@ class AccountUpdate implements Types.AccountUpdate {
     let amount =
       initialBalance instanceof UInt64
         ? initialBalance
-        : UInt64.fromString(`${initialBalance}`);
+        : UInt64.from(`${initialBalance}`);
     accountUpdate.balance.subInPlace(amount.add(Mina.accountCreationFee()));
   }
 

src/lib/fetch.ts

@@ -229,8 +229,8 @@ function parseFetchedAccount({
   return {
     publicKey:
       publicKey !== undefined ? PublicKey.fromBase58(publicKey) : undefined,
-    nonce: nonce !== undefined ? UInt32.fromString(nonce) : undefined,
-    balance: balance && UInt64.fromString(balance.total),
+    nonce: nonce !== undefined ? UInt32.from(nonce) : undefined,
+    balance: balance && UInt64.from(balance.total),
     appState: (zkappState && zkappState.map(Field)) ?? undefined,
     permissions:
       permissions &&
@@ -497,13 +497,13 @@ function parseFetchedBlock({
   return {
     snarkedLedgerHash: Encoding.LedgerHash.fromBase58(snarkedLedgerHash),
     // TODO: use date or utcDate?
-    timestamp: UInt64.fromString(utcDate),
-    blockchainLength: UInt32.fromString(blockHeight),
-    minWindowDensity: UInt32.fromString(minWindowDensity),
-    totalCurrency: UInt64.fromString(totalCurrency),
+    timestamp: UInt64.from(utcDate),
+    blockchainLength: UInt32.from(blockHeight),
+    minWindowDensity: UInt32.from(minWindowDensity),
+    totalCurrency: UInt64.from(totalCurrency),
     // is this really `slot`?
-    globalSlotSinceHardFork: UInt32.fromString(slot),
-    globalSlotSinceGenesis: UInt32.fromString(slotSinceGenesis),
+    globalSlotSinceHardFork: UInt32.from(slot),
+    globalSlotSinceGenesis: UInt32.from(slotSinceGenesis),
     nextEpochData: parseEpochData(nextEpochData),
     stakingEpochData: parseEpochData(stakingEpochData),
   };
@@ -519,12 +519,12 @@ function parseEpochData({
   return {
     ledger: {
       hash: Encoding.LedgerHash.fromBase58(hash),
-      totalCurrency: UInt64.fromString(totalCurrency),
+      totalCurrency: UInt64.from(totalCurrency),
     },
     seed: Encoding.EpochSeed.fromBase58(seed),
     startCheckpoint: Encoding.StateHash.fromBase58(startCheckpoint),
     lockCheckpoint: Encoding.StateHash.fromBase58(lockCheckpoint),
-    epochLength: UInt32.fromString(epochLength),
+    epochLength: UInt32.from(epochLength),
   };
 }
 

src/lib/field.test.ts

@@ -9,37 +9,37 @@ describe('Field constructor', () => {
   it('handles small numbers', () => {
     expect(Field(5).toString()).toEqual('5');
     expect(Field(1313).toString()).toEqual('1313');
-    expect(Field.fromNumber(5).toString()).toEqual('5');
+    expect(Field(5).toString()).toEqual('5');
   });
 
   it('handles large numbers 2^31 <= x < 2^53', () => {
     expect(Field(2 ** 31).toString()).toEqual('2147483648');
     expect(Field(Number.MAX_SAFE_INTEGER).toString()).toEqual(
       String(Number.MAX_SAFE_INTEGER)
     );
-    expect(Field.fromNumber(2 ** 31).toString()).toEqual('2147483648');
+    expect(Field(2 ** 31).toString()).toEqual('2147483648');
   });
 
   it('handles negative numbers', () => {
     expect(Field(-1)).toEqual(Field(1).neg());
     expect(Field(-(2 ** 31))).toEqual(Field(2 ** 31).neg());
-    expect(Field.fromNumber(-1)).toEqual(Field(1).neg());
+    expect(Field(-1)).toEqual(Field(1).neg());
   });
 
   it('throws on fractional numbers', () => {
     expect(() => Field(0.5)).toThrow();
     expect(() => Field(-1.1)).toThrow();
-    expect(() => Field.fromNumber(0.5)).toThrow();
+    expect(() => Field(0.5)).toThrow();
   });
 
   // Field(bigint), Field.fromBigInt, toBigInt
 
   it('handles bigints', () => {
     expect(Field(-1n)).toEqual(Field(1).neg());
-    expect(Field.fromBigInt(-1n)).toEqual(Field.fromNumber(-1));
+    expect(Field(-1n)).toEqual(Field(-1));
     expect(Field(Field.ORDER - 1n)).toEqual(Field(1).neg());
     expect(Field(1n << 64n).toString()).toEqual('18446744073709551616');
-    expect(Field.fromBigInt(1n << 64n)).toEqual(Field('18446744073709551616'));
+    expect(Field(1n << 64n)).toEqual(Field('18446744073709551616'));
   });
 
   // TODO Field(string), Field(boolean), Field(otherField)