Merge pull request #115 from o1-labs/feature/method-decorator-and-com…

…pile

Transaction Construction, Pt 1. `@method` and `compile()`

src/examples/ex00_preimage.ts

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

src/examples/simple_snapp.ts

@@ -20,8 +20,8 @@ class SimpleSnapp extends SmartContract {
     this.x.set(x);
   }
 
-  @method async update(y: Field) {
-    let x = await this.x.get();
+  @method update(y: Field) {
+    let x = this.x.get();
     this.x.set(x.add(y));
   }
 }
@@ -37,6 +37,12 @@ const account2 = Local.testAccounts[1].privateKey;
 const snappPrivKey = PrivateKey.random();
 const snappPubKey = snappPrivKey.toPublicKey();
 
+console.log('compile');
+let {
+  provers: [updateProver],
+} = SimpleSnapp.compile(snappPubKey);
+
+console.log('deploy');
 await Mina.transaction(account1, async () => {
   let snapp = new SimpleSnapp(snappPubKey);
 
@@ -49,6 +55,11 @@ await Mina.transaction(account1, async () => {
   .send()
   .wait();
 
+console.log('prove');
+let proof = updateProver(Field(1));
+console.log({ proof });
+
+console.log('update');
 let snappState = (await Mina.getAccount(snappPubKey)).snapp.appState[0];
 console.log('initial state: ' + snappState);
 

src/lib/circuit_value.ts

@@ -239,3 +239,26 @@ export function circuitMain(
     Array.from(publicIndexSet).map((i) => paramTypes[i])
   );
 }
+
+export function toFieldsMagic(thing: any): Field[] {
+  if (typeof thing == 'object') {
+    if (thing.toFields) {
+      // console.log('toFields');
+      return thing.toFields();
+    }
+
+    if (Array.isArray(thing)) {
+      // console.log('array', thing.length);
+      return thing.map((x) => toFieldsMagic(x)).flat();
+    }
+
+    let fields = [] as Field[];
+    let keys = Object.keys(thing).sort();
+    for (let key of keys) {
+      // console.log({ key });
+      fields.push(...toFieldsMagic(thing[key]));
+    }
+    return fields;
+  }
+  return [];
+}

src/lib/mina.ts

@@ -13,11 +13,7 @@ import {
 } from '../snarky';
 import { UInt32, UInt64 } from './int';
 import { PrivateKey, PublicKey } from './signature';
-import {
-  Body,
-  EpochDataPredicate,
-  ProtocolStatePredicate,
-} from './party';
+import { Body, EpochDataPredicate, ProtocolStatePredicate } from './party';
 
 interface TransactionId {
   wait(): Promise<void>;
@@ -41,19 +37,24 @@ export let nextTransactionId: { value: number } = { value: 0 };
 
 type PartyPredicate = UInt32 | FullAccountPredicate | undefined;
 
-export let currentTransaction:
+export type CurrentTransaction =
+  | undefined
   | {
       sender: PrivateKey;
       parties: Array<{ body: Body; predicate: PartyPredicate }>;
       nextPartyIndex: number;
       protocolState: ProtocolStatePredicate;
-    }
-  | undefined = undefined;
+    };
+
+export let currentTransaction: CurrentTransaction = undefined;
+export function setCurrentTransaction(transaction: CurrentTransaction) {
+  currentTransaction = transaction;
+}
 
 interface Mina {
   transaction(sender: PrivateKey, f: () => void | Promise<void>): Transaction;
   currentSlot(): UInt32;
-  getAccount(publicKey: PublicKey): Promise<Account>;
+  getAccount(publicKey: PublicKey): Account;
 }
 
 interface MockMina extends Mina {
@@ -92,7 +93,7 @@ export const LocalBlockchain: () => MockMina = () => {
     testAccounts.push({ privateKey: k, publicKey: pk });
   }
 
-  const getAccount = (pk: PublicKey): Promise<Account> => {
+  const getAccount = (pk: PublicKey) => {
     const r = ledger.getAccount(pk);
     if (r == null) {
       throw new Error(
@@ -104,7 +105,7 @@ export const LocalBlockchain: () => MockMina = () => {
         nonce: new UInt32(r.nonce.value),
         snapp: r.snapp,
       };
-      return new Promise((r) => r(a));
+      return a;
     }
   };
 
@@ -294,13 +295,13 @@ export function currentSlot(): UInt32 {
 /**
  * @return The account data associated to the given public key.
  */
-export function getAccount(pubkey: PublicKey): Promise<Account> {
+export function getAccount(pubkey: PublicKey) {
   return activeInstance.getAccount(pubkey);
 }
 
 /**
  * @return The balance associated to the given public key.
  */
-export function getBalance(pubkey: PublicKey): Promise<UInt64> {
-  return activeInstance.getAccount(pubkey).then((a) => a.balance);
+export function getBalance(pubkey: PublicKey) {
+  return activeInstance.getAccount(pubkey).balance;
 }

src/lib/party.ts

@@ -758,27 +758,27 @@ export class Party<P> {
     return party;
   }
 
-  static createSigned(signer: PrivateKey): Promise<Party<UInt32>> {
+  static createSigned(signer: PrivateKey) {
     // TODO: This should be a witness block that uses the setVariable
     // API to set the value of a variable after it's allocated
 
     const pk = signer.toPublicKey();
     const body: Body = Body.keepAll(pk);
-    return Mina.getAccount(pk).then((a) => {
-      if (Mina.currentTransaction === undefined) {
-        throw new Error(
-          'Party.createSigned: Cannot run outside of a transaction'
-        );
-      }
-
-      if (a == null) {
-        throw new Error('Party.createSigned: Account not found');
-      }
-
-      const party = new Party(body, a.nonce);
-      Mina.currentTransaction.nextPartyIndex++;
-      Mina.currentTransaction.parties.push(party);
-      return party;
-    });
+    let a = Mina.getAccount(pk);
+
+    if (Mina.currentTransaction === undefined) {
+      throw new Error(
+        'Party.createSigned: Cannot run outside of a transaction'
+      );
+    }
+
+    if (a == null) {
+      throw new Error('Party.createSigned: Account not found');
+    }
+
+    const party = new Party(body, a.nonce);
+    Mina.currentTransaction.nextPartyIndex++;
+    Mina.currentTransaction.parties.push(party);
+    return party;
   }
 }