Account deriver

CHANGELOG.md

@@ -26,6 +26,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - BREAKING CHANGE: Modify signature algorithm used by `Signature.{create,verify}` to be compatible with mina-signer https://github.com/o1-labs/snarkyjs/pull/710
   - Signatures created with mina-signer's `client.signFields()` can now be verified inside a SNARK!
   - Breaks existing deployed smart contracts which use `Signature.verify()`
+- BREAKING CHANGE: Change structure of `Account` type which is returned by `Mina.getAccount()` https://github.com/o1-labs/snarkyjs/pull/741
+  - for example, `account.appState` -> `account.zkapp.appState`
+  - full new type: https://github.com/o1-labs/snarkyjs/blob/0be70cb8ceb423976f348980e9d6238820758cc0/src/provable/gen/transaction.ts#L515
 
 ## [0.8.0](https://github.com/o1-labs/snarkyjs/compare/d880bd6e...c5a36207)
 

MINA_COMMIT

@@ -1,2 +1,2 @@
 The mina commit used to generate the backends for node and chrome is
-7414f2bf44e6c6a89cdded1a022bff01f82a55be
+57bfa85a626140ae86cdd27a14074f88e1ba1c60

src/build/jsLayoutToTypes.mjs

@@ -147,7 +147,7 @@ ${
   !isJson
     ? 'export { Json };\n' +
       `export * from '${leavesRelPath}';\n` +
-      'export { provableFromLayout, toJSONEssential, Layout, TypeMap };\n'
+      'export { provableFromLayout, toJSONEssential, emptyValue, Layout, TypeMap };\n'
     : `export * from '${leavesRelPath}';\n` + 'export { TypeMap };\n'
 }
 
@@ -175,7 +175,7 @@ type CustomTypes = { ${customTypes
     .map((c) => `${c.typeName}: ProvableExtended<${c.type}, ${c.jsonType}>;`)
     .join(' ')} }
 let customTypes: CustomTypes = { ${customTypeNames.join(', ')} };
-let { provableFromLayout, toJSONEssential } = ProvableFromLayout<
+let { provableFromLayout, toJSONEssential, emptyValue } = ProvableFromLayout<
   TypeMap,
   Json.TypeMap
 >(TypeMap, customTypes);

src/examples/simple_zkapp.ts

@@ -29,6 +29,7 @@ class SimpleZkapp extends SmartContract {
   }
 
   @method update(y: Field): Field {
+    this.account.provedState.assertEquals(Bool(true));
     this.emitEvent('update', y);
     let x = this.x.get();
     this.x.assertEquals(x);
@@ -42,6 +43,8 @@ class SimpleZkapp extends SmartContract {
    * @param caller the privileged account
    */
   @method payout(caller: PrivateKey) {
+    this.account.provedState.assertEquals(Bool(true));
+
     // check that caller is the privileged account
     let callerAddress = caller.toPublicKey();
     callerAddress.assertEquals(privilegedAddress);
@@ -99,7 +102,7 @@ console.log('initial state: ' + zkapp.x.get());
 console.log(`initial balance: ${zkapp.account.balance.get().div(1e9)} MINA`);
 
 let account = Mina.getAccount(zkappAddress);
-console.log('account is proved:', account.provedState.toBoolean());
+console.log('account state is proved:', account.zkapp?.provedState.toBoolean());
 
 console.log('update');
 tx = await Mina.transaction(sender, () => {

src/examples/zkapps/dex/upgradability.ts

@@ -360,11 +360,11 @@ async function upgradeabilityTests({ withVesting }: { withVesting: boolean }) {
 
   // Making sure that both token holder accounts have been updated with the new modified verification key
   expect(
-    Mina.getAccount(addresses.dex, tokenX.token.id).verificationKey
+    Mina.getAccount(addresses.dex, tokenX.token.id).zkapp?.verificationKey?.data
   ).toEqual(ModifiedDexTokenHolder._verificationKey?.data);
 
   expect(
-    Mina.getAccount(addresses.dex, tokenY.token.id).verificationKey
+    Mina.getAccount(addresses.dex, tokenY.token.id).zkapp?.verificationKey?.data
   ).toEqual(ModifiedDexTokenHolder._verificationKey?.data);
 
   // this is important; we have to re-enable proof production (and verification) to make sure the proofs are valid against the newly deployed VK

src/examples/zkapps/escrow/escrow.ts

@@ -1,13 +1,8 @@
 import {
   SmartContract,
-  state,
-  State,
   method,
-  DeployArgs,
-  Permissions,
   UInt64,
   AccountUpdate,
-  PrivateKey,
   PublicKey,
 } from 'snarkyjs';
 

src/examples/zkapps/hello_world/run.ts

@@ -29,7 +29,8 @@ txn = await Mina.transaction(feePayer1.publicKey, () => {
 });
 await txn.sign([feePayer1.privateKey, zkAppPrivateKey]).send();
 
-const initialState = Mina.getAccount(zkAppAddress).appState?.[0].toString();
+const initialState =
+  Mina.getAccount(zkAppAddress).zkapp?.appState?.[0].toString();
 
 let currentState;
 
@@ -46,7 +47,7 @@ txn = await Mina.transaction(feePayer1.publicKey, () => {
 await txn.prove();
 await txn.sign([feePayer1.privateKey]).send();
 
-currentState = Mina.getAccount(zkAppAddress).appState?.[0].toString();
+currentState = Mina.getAccount(zkAppAddress).zkapp?.appState?.[0].toString();
 
 if (currentState !== '4') {
   throw Error(
@@ -135,7 +136,7 @@ txn2 = await Mina.transaction({ sender: feePayer2.publicKey, fee: '2' }, () => {
 await txn2.prove();
 await txn2.sign([feePayer2.privateKey]).send();
 
-currentState = Mina.getAccount(zkAppAddress).appState?.[0].toString();
+currentState = Mina.getAccount(zkAppAddress).zkapp?.appState?.[0].toString();
 
 if (currentState !== '16') {
   throw Error(
@@ -152,7 +153,7 @@ txn3 = await Mina.transaction({ sender: feePayer3.publicKey, fee: '1' }, () => {
 await txn3.prove();
 await txn3.sign([feePayer3.privateKey]).send();
 
-currentState = Mina.getAccount(zkAppAddress).appState?.[0].toString();
+currentState = Mina.getAccount(zkAppAddress).zkapp?.appState?.[0].toString();
 
 if (currentState !== '256') {
   throw Error(
@@ -191,7 +192,7 @@ if (!correctlyFails) {
  */
 
 function handleError(error: any, errorMessage: string) {
-  currentState = Mina.getAccount(zkAppAddress).appState?.[0].toString();
+  currentState = Mina.getAccount(zkAppAddress).zkapp?.appState?.[0].toString();
 
   if (error.message.includes(errorMessage)) {
     correctlyFails = true;