Merge pull request #894 from o1-labs/feature/remove-depricated-apis

Remove deprecated APIs from all code, tutorials, and code snippets

examples/zkapps/06-offchain-storage/experimental-zkapp-offchain-storage/src/examples/OffChainStorageTestContract.ts

@@ -52,13 +52,13 @@ export class OffChainStorageTestContract extends SmartContract {
     storedNewRootSignature: Signature
   ) {
     let root = this.root.get();
-    this.root.assertEquals(root);
+    this.root.requireEquals(root);
 
     let rootNumber = this.rootNumber.get();
-    this.rootNumber.assertEquals(rootNumber);
+    this.rootNumber.requireEquals(rootNumber);
 
     let serverPublicKey = this.serverPublicKey.get();
-    this.serverPublicKey.assertEquals(serverPublicKey);
+    this.serverPublicKey.requireEquals(serverPublicKey);
 
     let leaf = [oldNum];
     let newLeaf = [num];

examples/zkapps/06-offchain-storage/experimental-zkapp-offchain-storage/src/examples/main.ts

@@ -70,7 +70,7 @@ const SERVER_ADDRESS = 'http://localhost:3001';
       { sender: deployerAccount.publicKey, fee: TRANSACTION_FEE },
       async () => {
         AccountUpdate.fundNewAccount(deployerAccount.publicKey);
-        await zkAppInstance.deploy({ zkappKey: zkAppAccount.privateKey });
+        await zkAppInstance.deploy();
       }
     );
     deploy_txn.sign([deployerAccount.privateKey, zkAppAccount.privateKey]);

examples/zkapps/06-offchain-storage/offchain-storage-zkapp/contracts/src/NumberTreeContract.ts

@@ -22,14 +22,6 @@ export class NumberTreeContract extends SmartContract {
   @state(Field) storageNumber = State<Field>();
   @state(Field) storageTreeRoot = State<Field>();
 
-  deploy(args: DeployArgs) {
-    super.deploy(args);
-    this.account.permissions.set({
-      ...Permissions.default(),
-      editState: Permissions.proofOrSignature(),
-    });
-  }
-
   @method async initState(storageServerPublicKey: PublicKey) {
     this.storageServerPublicKey.set(storageServerPublicKey);
     this.storageNumber.set(Field(0));
@@ -46,14 +38,10 @@ export class NumberTreeContract extends SmartContract {
     storedNewRootNumber: Field,
     storedNewRootSignature: Signature
   ) {
-    const storedRoot = this.storageTreeRoot.get();
-    this.storageTreeRoot.assertEquals(storedRoot);
-
-    let storedNumber = this.storageNumber.get();
-    this.storageNumber.assertEquals(storedNumber);
-
-    let storageServerPublicKey = this.storageServerPublicKey.get();
-    this.storageServerPublicKey.assertEquals(storageServerPublicKey);
+    const storedRoot = this.storageTreeRoot.getAndRequireEquals();
+    let storedNumber = this.storageNumber.getAndRequireEquals();
+    let storageServerPublicKey =
+      this.storageServerPublicKey.getAndRequireEquals();
 
     let leaf = [oldNum];
     let newLeaf = [num];

examples/zkapps/06-offchain-storage/offchain-storage-zkapp/contracts/src/SignedMessageBoard.ts

@@ -24,14 +24,6 @@ export class SignedMessageBoard extends SmartContract {
   @state(Field) storageNumber = State<Field>();
   @state(Field) storageTreeRoot = State<Field>();
 
-  deploy(args: DeployArgs) {
-    super.deploy(args);
-    this.account.permissions.set({
-      ...Permissions.default(),
-      editState: Permissions.proofOrSignature(),
-    });
-  }
-
   @method async initState(storageServerPublicKey: PublicKey) {
     this.storageServerPublicKey.set(storageServerPublicKey);
     this.storageNumber.set(Field(0));
@@ -51,14 +43,12 @@ export class SignedMessageBoard extends SmartContract {
     storedNewStorageNumber: Field,
     storedNewStorageSignature: Signature
   ) {
-    const storedRoot = this.storageTreeRoot.get();
-    this.storageTreeRoot.assertEquals(storedRoot);
+    const storedRoot = this.storageTreeRoot.getAndRequireEquals();
 
-    let storedNumber = this.storageNumber.get();
-    this.storageNumber.assertEquals(storedNumber);
+    let storedNumber = this.storageNumber.getAndRequireEquals();
 
-    let storageServerPublicKey = this.storageServerPublicKey.get();
-    this.storageServerPublicKey.assertEquals(storageServerPublicKey);
+    let storageServerPublicKey =
+      this.storageServerPublicKey.getAndRequireEquals();
 
     const leaf = priorLeafSigner
       .toGroup()

examples/zkapps/06-offchain-storage/offchain-storage-zkapp/contracts/src/main.ts

@@ -72,7 +72,7 @@ if (useLocal) {
     feePayerKey.toPublicKey(),
     async () => {
       AccountUpdate.fundNewAccount(feePayerKey.toPublicKey());
-      await zkapp.deploy({ zkappKey: zkappPrivateKey });
+      await zkapp.deploy();
       await zkapp.initState(serverPublicKey);
     }
   );

examples/zkapps/06-offchain-storage/offchain-storage-zkapp/contracts/src/messageBoardMain.ts

@@ -48,7 +48,7 @@ async function main() {
 
   const transaction = await Mina.transaction(feePayerPublicKey, async () => {
     AccountUpdate.fundNewAccount(feePayerPublicKey);
-    await zkapp.deploy({ zkappKey: zkappPrivateKey });
+    await zkapp.deploy();
     await zkapp.initState(serverPublicKey);
   });
   transaction.sign([feePayerKey, zkappPrivateKey]);

examples/zkapps/06-offchain-storage/offchain-storage-zkapp/contracts/src/utils.ts

@@ -58,7 +58,7 @@ export const makeAndSendTransaction = async <State extends ToString>({
   await fetchAccount({ publicKey: feePayerPrivateKey.toPublicKey() });
 
   let transaction = await Mina.transaction(
-    { feePayerKey: feePayerPrivateKey, fee: transactionFee },
+    { sender: feePayerPrivateKey.toPublicKey(), fee: transactionFee },
     async () => {
       await mutateZkApp();
     }

examples/zkapps/07-oracles/contracts/package.json

@@ -36,7 +36,6 @@
     "@typescript-eslint/parser": "^5.5.0",
     "eslint": "^8.7.0",
     "eslint-plugin-o1js": "^0.4.0",
-    "husky": "^7.0.1",
     "jest": "^27.3.1",
     "lint-staged": "^11.0.1",
     "prettier": "^2.3.2",