Merge pull request #1598 from o1-labs/feature/remove-account

Remove Account constructor

Author: mitschabaude

CHANGELOG.md

@@ -38,6 +38,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Improved functionality of `MerkleList` and `MerkleListIterator` for easier traversal of `MerkleList`s. https://github.com/o1-labs/o1js/pull/1562
 - Simplified internal logic of reducer. https://github.com/o1-labs/o1js/pull/1577
   - `contract.getActions()` now returns a `MerkleList`
+- Add `toValue()` and `fromValue()` interface to `Provable<T>` to encode how provable types map to plain JS values https://github.com/o1-labs/o1js/pull/1271
+  - You can now return the plain value from a `Provable.witness()` callback, and it will be transformed into the provable type
+- Remove `Account()` constructor which was no different from `AccountUpdate.create().account`, and export `Account` type instead. https://github.com/o1-labs/o1js/pull/1598
 
 ### Added
 

src/examples/zkapps/dex/dex-with-actions.ts

@@ -146,8 +146,8 @@ class Dex extends TokenContract {
    */
   async supplyLiquidity(dx: UInt64) {
     // calculate dy outside circuit
-    let x = Account(this.address, TokenId.derive(this.tokenX)).balance.get();
-    let y = Account(this.address, TokenId.derive(this.tokenY)).balance.get();
+    let x = Mina.getAccount(this.address, TokenId.derive(this.tokenX)).balance;
+    let y = Mina.getAccount(this.address, TokenId.derive(this.tokenY)).balance;
     if (x.value.isConstant() && x.value.equals(0).toBoolean()) {
       throw Error(
         'Cannot call `supplyLiquidity` when reserves are zero. Use `supplyLiquidityBase`.'

src/examples/zkapps/dex/dex.ts

@@ -126,8 +126,14 @@ function createDex({
      */
     async supplyLiquidity(dx: UInt64) {
       // calculate dy outside circuit
-      let x = Account(this.address, TokenId.derive(this.tokenX)).balance.get();
-      let y = Account(this.address, TokenId.derive(this.tokenY)).balance.get();
+      let x = Mina.getAccount(
+        this.address,
+        TokenId.derive(this.tokenX)
+      ).balance;
+      let y = Mina.getAccount(
+        this.address,
+        TokenId.derive(this.tokenY)
+      ).balance;
       if (x.value.isConstant() && x.value.equals(0).toBoolean()) {
         throw Error(
           'Cannot call `supplyLiquidity` when reserves are zero. Use `supplyLiquidityBase`.'

src/index.ts

@@ -63,7 +63,6 @@ export {
   SmartContract,
   method,
   declareMethods,
-  Account,
   Reducer,
 } from './lib/mina/zkapp.js';
 export { state, State, declareState } from './lib/mina/state.js';
@@ -80,6 +79,7 @@ export {
 } from './lib/proof-system/zkprogram.js';
 export { Cache, CacheHeader } from './lib/proof-system/cache.js';
 
+export { Account } from './lib/mina/account.js';
 export {
   TokenId,
   AccountUpdate,

src/lib/mina/zkapp.ts

@@ -77,7 +77,7 @@ import { ProvablePure } from '../provable/types/provable-intf.js';
 import { MerkleList } from '../provable/merkle-list.js';
 
 // external API
-export { SmartContract, method, DeployArgs, declareMethods, Account, Reducer };
+export { SmartContract, method, DeployArgs, declareMethods, Reducer };
 
 const reservedPropNames = new Set(['_methods', '_']);
 type AsyncFunction = (...args: any) => Promise<any>;
@@ -1478,14 +1478,6 @@ type DeployArgs =
   | { verificationKey?: { data: string; hash: string | Field } }
   | undefined;
 
-function Account(address: PublicKey, tokenId?: Field) {
-  if (smartContractContext.get()) {
-    return AccountUpdate.create(address, tokenId).account;
-  } else {
-    return AccountUpdate.defaultAccountUpdate(address, tokenId).account;
-  }
-}
-
 // alternative API which can replace decorators, works in pure JS
 
 /**