remaining updates

Author: bleepbloopsify

src/lib/mina/v1/local-blockchain.ts

@@ -261,7 +261,6 @@ async function LocalBlockchain({ proofsEnabled = true, enforceTransactionLimits
           errors,
           transaction: txn.transaction,
           setFee: txn.setFee,
-          setFeePerSnarkCost: txn.setFeePerSnarkCost,
           hash,
           toJSON: txn.toJSON,
           toPretty: txn.toPretty,

src/lib/mina/v1/mina.ts

@@ -254,7 +254,6 @@ function Network(
           errors: updatedErrors,
           transaction: txn.transaction,
           setFee: txn.setFee,
-          setFeePerSnarkCost: txn.setFeePerSnarkCost,
           hash,
           toJSON: txn.toJSON,
           toPretty: txn.toPretty,

src/lib/mina/v1/transaction.test.ts

@@ -49,7 +49,7 @@ describe('transactions', () => {
     });
     let nonce = tx.transaction.feePayer.body.nonce;
     let promise = tx.sign([feePayer.key, contractAccount.key]);
-    let new_fee = promise.setFeePerSnarkCost(42.7);
+    let new_fee = promise.setFee(new UInt64(42));
     await new_fee.sign([feePayer.key, contractAccount.key]);
     await new_fee.send();
     // check that tx was applied, by checking nonce was incremented

src/lib/mina/v1/transaction.ts

@@ -1,47 +1,46 @@
+import { Types } from '../../../bindings/mina-transaction/v1/types.js';
+import { Proof } from '../../proof-system/proof.js';
+import { Empty } from '../../proof-system/zkprogram.js';
+import { PrivateKey, PublicKey } from '../../provable/crypto/signature.js';
+import { UInt32, UInt64 } from '../../provable/int.js';
+import { Provable } from '../../provable/provable.js';
+import { Field } from '../../provable/wrapped.js';
+import { assertPromise } from '../../util/assert.js';
 import {
-  ZkappCommand,
   AccountUpdate,
-  ZkappPublicInput,
   AccountUpdateLayout,
   FeePayerUnsigned,
-  addMissingSignatures,
   TokenId,
+  ZkappCommand,
+  ZkappPublicInput,
   addMissingProofs,
+  addMissingSignatures,
 } from './account-update.js';
-import { Field } from '../../provable/wrapped.js';
-import { PrivateKey, PublicKey } from '../../provable/crypto/signature.js';
-import { UInt32, UInt64 } from '../../provable/int.js';
-import { Empty } from '../../proof-system/zkprogram.js';
-import { Proof } from '../../proof-system/proof.js';
-import { currentTransaction } from './transaction-context.js';
-import { Provable } from '../../provable/provable.js';
-import { assertPreconditionInvariants } from './precondition.js';
 import { Account } from './account.js';
-import { type FeePayerSpec, activeInstance } from './mina-instance.js';
 import * as Fetch from './fetch.js';
-import { type SendZkAppResponse, sendZkappQuery } from './graphql.js';
-import { type FetchMode } from './transaction-context.js';
-import { assertPromise } from '../../util/assert.js';
-import { Types } from '../../../bindings/mina-transaction/v1/types.js';
+import { sendZkappQuery, type SendZkAppResponse } from './graphql.js';
+import { activeInstance, type FeePayerSpec } from './mina-instance.js';
+import { assertPreconditionInvariants } from './precondition.js';
+import { currentTransaction, type FetchMode } from './transaction-context.js';
 import { getTotalTimeRequired } from './transaction-validation.js';
 
 export {
   Transaction,
-  type TransactionPromise,
-  type PendingTransaction,
-  type IncludedTransaction,
-  type RejectedTransaction,
-  type PendingTransactionPromise,
-  type PendingTransactionStatus,
+  createIncludedTransaction,
+  createRejectedTransaction,
   createTransaction,
-  toTransactionPromise,
-  toPendingTransactionPromise,
-  sendTransaction,
-  newTransaction,
   getAccount,
+  newTransaction,
+  sendTransaction,
+  toPendingTransactionPromise,
+  toTransactionPromise,
   transaction,
-  createRejectedTransaction,
-  createIncludedTransaction,
+  type IncludedTransaction,
+  type PendingTransaction,
+  type PendingTransactionPromise,
+  type PendingTransactionStatus,
+  type RejectedTransaction,
+  type TransactionPromise
 };
 
 type TransactionCommon = {
@@ -141,10 +140,6 @@ type Transaction<Proven extends boolean, Signed extends boolean> = TransactionCo
    * ```
    */
   setFee(newFee: UInt64): TransactionPromise<Proven, false>;
-  /**
-   * setFeePerSnarkCost behaves identically to {@link Transaction.setFee} but the fee is given per estimated cost of snarking the transition as given by {@link getTotalTimeRequired}. This is useful because it should reflect what snark workers would charge in times of network contention.
-   */
-  setFeePerSnarkCost(newFeePerSnarkCost: number): TransactionPromise<Proven, false>;
 } & (Proven extends false
     ? {
         /**
@@ -280,10 +275,6 @@ type PendingTransaction = Pick<TransactionCommon, 'transaction' | 'toJSON' | 'to
    * setFee is the same as {@link Transaction.setFee(newFee)} but for a {@link PendingTransaction}.
    */
   setFee(newFee: UInt64): TransactionPromise<boolean, false>;
-  /**
-   * setFeePerSnarkCost is the same as {@link Transaction.setFeePerSnarkCost(newFeePerSnarkCost)} but for a {@link PendingTransaction}.
-   */
-  setFeePerSnarkCost(newFeePerSnarkCost: number): TransactionPromise<boolean, false>;
 };
 
 /**
@@ -560,10 +551,6 @@ function newTransaction(transaction: ZkappCommand, proofsEnabled?: boolean) {
       }
       return pendingTransaction;
     },
-    setFeePerSnarkCost(newFeePerSnarkCost: number) {
-      let { totalTimeRequired } = getTotalTimeRequired(transaction.accountUpdates);
-      return this.setFee(new UInt64(Math.round(totalTimeRequired * newFeePerSnarkCost)));
-    },
     setFee(newFee: UInt64) {
       return toTransactionPromise(async () => {
         self = self as Transaction<false, false>;