prerelease fixes

Author: maht0rz

packages/cli/src/LocalhostAppChain.ts

@@ -27,6 +27,7 @@ import {
   StateServiceQueryModule,
   BlockStorageNetworkStateModule,
   AppChainModulesRecord,
+  InMemoryTransactionSender,
 } from "@proto-kit/sdk";
 
 export class LocalhostAppChain<
@@ -67,6 +68,9 @@ export class LocalhostAppChain<
         }),
       }),
       modules: {
+        // TODO: remove in favour of a real tx sender for the SettlementModule
+        // temporary dependency to make the SettlementModule work
+        TransactionSender: InMemoryTransactionSender,
         QueryTransportModule: StateServiceQueryModule,
         NetworkStateTransportModule: BlockStorageNetworkStateModule,
       },

packages/library/src/hooks/TransactionFeeHook.ts

@@ -11,7 +11,7 @@ import {
   BlockProverExecutionData,
   PublicKeyOption,
 } from "@proto-kit/protocol";
-import { Field, Provable, PublicKey, UInt64 as O1JSUInt64 } from "o1js";
+import { Field, Provable, PublicKey } from "o1js";
 
 import { UInt64 } from "../math/UInt64";
 
@@ -137,12 +137,12 @@ export class TransactionFeeHook extends ProvableTransactionHook<TransactionFeeHo
       errors.invalidFeeConfigMethodId()
     );
 
-    const fee = O1JSUInt64.from(feeConfig.baseFee.value).add(
-      O1JSUInt64.from(feeConfig.weight.value).mul(
-        O1JSUInt64.from(feeConfig.perWeightUnitFee.value)
+    const fee = UInt64.from(feeConfig.baseFee.value).add(
+      UInt64.from(feeConfig.weight.value).mul(
+        UInt64.from(feeConfig.perWeightUnitFee.value)
       )
     );
 
-    this.transferFee(executionData.transaction.sender, new UInt64(fee.value));
+    this.transferFee(executionData.transaction.sender, UInt64.from(fee.value));
   }
 }

packages/library/src/runtime/Balances.ts

@@ -13,7 +13,8 @@ import {
   runtimeModule,
 } from "@proto-kit/module";
 import { StateMap, assert } from "@proto-kit/protocol";
-import { Field, Provable, PublicKey, Struct, UInt64 } from "o1js";
+import { Field, PublicKey, Struct } from "o1js";
+import { UInt64 } from "../math/UInt64";
 
 export const errors = {
   senderNotFrom: () => "Sender does not match 'from'",
@@ -25,8 +26,9 @@ export class BalancesKey extends Struct({
   tokenId: TokenId,
   address: PublicKey,
 }) {
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  public test() {}
+  public static from(tokenId: TokenId, address: PublicKey) {
+    return new BalancesKey({ tokenId, address });
+  }
 }
 
 export class Balance extends UInt64 {}
@@ -58,13 +60,8 @@ export class Balances<Config = NoConfig>
   public getBalance(tokenId: TokenId, address: PublicKey): Balance {
     const key = new BalancesKey({ tokenId, address });
     const balanceOption = this.balances.get(key);
-
-    return Provable.if<Balance>(
-      balanceOption.isSome,
-      Balance,
-      balanceOption.value,
-      Balance.from(0)
-    );
+    const balance = Balance.from(balanceOption.value.value);
+    return balance;
   }
 
   public setBalance(tokenId: TokenId, address: PublicKey, amount: Balance) {
@@ -85,16 +82,7 @@ export class Balances<Config = NoConfig>
 
     assert(fromBalanceIsSufficient, errors.fromBalanceInsufficient());
 
-    // used to prevent field underflow during subtraction
-    const paddedFrombalance = fromBalance.add(amount);
-    const safeFromBalance = Provable.if<Balance>(
-      fromBalanceIsSufficient,
-      Balance,
-      fromBalance,
-      paddedFrombalance
-    );
-
-    const newFromBalance = safeFromBalance.sub(amount);
+    const newFromBalance = fromBalance.sub(amount);
     const newToBalance = toBalance.add(amount);
 
     this.setBalance(tokenId, from, newFromBalance);
@@ -109,14 +97,7 @@ export class Balances<Config = NoConfig>
 
   public burn(tokenId: TokenId, address: PublicKey, amount: Balance) {
     const balance = this.getBalance(tokenId, address);
-    // replace with library/uint64
-    const paddedBalance = Provable.if<Balance>(
-      balance.greaterThanOrEqual(amount),
-      Balance,
-      balance,
-      balance.add(amount)
-    );
-    const newBalance = paddedBalance.sub(amount);
+    const newBalance = balance.sub(amount);
     this.setBalance(tokenId, address, newBalance);
   }
 

packages/sdk/src/appChain/ClientAppChain.ts

@@ -60,6 +60,7 @@ export class ClientAppChain<
     });
 
     appChain.configurePartial({
+      Sequencer: {},
       Protocol: {
         BlockProver: {},
         StateTransitionProver: {},

packages/sdk/test/fees.test.ts

@@ -1,19 +1,12 @@
 import "reflect-metadata";
-import {
-  Balances,
-  BalancesKey,
-  TokenId,
-  VanillaProtocolModulesRecord,
-} from "@proto-kit/library";
+import { Balance, Balances, BalancesKey, TokenId } from "@proto-kit/library";
 import {
   runtimeMethod,
   runtimeModule,
   RuntimeModule,
   RuntimeModulesRecord,
-  state,
 } from "@proto-kit/module";
-import { SequencerModulesRecord } from "@proto-kit/sequencer";
-import { Field, PrivateKey, PublicKey, State, UInt64 } from "o1js";
+import { PrivateKey } from "o1js";
 import { inject } from "tsyringe";
 import { TestingAppChain } from "../src";
 
@@ -28,7 +21,7 @@ class Faucet extends RuntimeModule<unknown> {
     this.balances.mint(
       new TokenId(0),
       this.transaction.sender.value,
-      UInt64.from(1000)
+      Balance.from(1000)
     );
   }
 }
@@ -40,8 +33,8 @@ class Pit extends RuntimeModule<unknown> {
   }
 
   @runtimeMethod()
-  public burn(amount: UInt64) {
-    this.balances.burn(new TokenId(0), this.transaction.sender.value, amount);
+  public burn(amount: Balance) {
+    this.balances.burn(TokenId.from(0), this.transaction.sender.value, amount);
   }
 }
 
@@ -119,7 +112,7 @@ describe("fees", () => {
     const pit = appChain.runtime.resolve("Pit");
 
     const tx = await appChain.transaction(senderKey.toPublicKey(), () => {
-      pit.burn(UInt64.from(100));
+      pit.burn(Balance.from(100));
     });
 
     await tx.sign();

packages/sequencer/src/settlement/transactions/MinaTransactionSender.ts

@@ -3,10 +3,11 @@ import { inject, injectable } from "tsyringe";
 
 import type { MinaBaseLayer } from "../../protocol/baselayer/MinaBaseLayer";
 import { FlowCreator } from "../../worker/flow/Flow";
-import {
-  SettlementProvingTask,
-  TransactionTaskResult,
-} from "../tasks/SettlementProvingTask";
+// TODO: bring back once SettlementProvingTask doesnt rely on the Pickles import
+// import {
+//   SettlementProvingTask,
+//   TransactionTaskResult,
+// } from "../tasks/SettlementProvingTask";
 
 import { MinaTransactionSimulator } from "./MinaTransactionSimulator";
 
@@ -21,7 +22,9 @@ export class MinaTransactionSender {
 
   public constructor(
     private readonly creator: FlowCreator,
-    private readonly provingTask: SettlementProvingTask,
+    // TODO: bring back once SettlementProvingTask doesnt rely on the Pickles import
+
+    // private readonly provingTask: SettlementProvingTask,
     private readonly simulator: MinaTransactionSimulator,
     @inject("BaseLayer") private readonly baseLayer: MinaBaseLayer
   ) {}
@@ -82,25 +85,26 @@ export class MinaTransactionSender {
 
     await this.simulator.applyTransaction(transaction);
 
-    const resultPromise = flow.withFlow<TransactionTaskResult>(
-      async (resolve, reject) => {
-        await flow.pushTask(
-          this.provingTask,
-          {
-            transaction,
-            chainState: {
-              graphql: this.baseLayer.config.network.graphql,
-              accounts,
-            },
-          },
-          async (result) => {
-            resolve(result);
-          }
-        );
-      }
-    );
-
-    const result = await resultPromise;
-    await this.sendOrQueue(result.transaction);
+    // TODO: bring back once SettlementProvingTask doesnt rely on the Pickles import
+    // const resultPromise = flow.withFlow<TransactionTaskResult>(
+    //   async (resolve, reject) => {
+    //     await flow.pushTask(
+    //       this.provingTask,
+    //       {
+    //         transaction,
+    //         chainState: {
+    //           graphql: this.baseLayer.config.network.graphql,
+    //           accounts,
+    //         },
+    //       },
+    //       async (result) => {
+    //         resolve(result);
+    //       }
+    //     );
+    //   }
+    // );
+
+    // const result = await resultPromise;
+    // await this.sendOrQueue(result.transaction);
   }
 }

packages/sequencer/src/worker/worker/LocalTaskWorkerModule.ts

@@ -10,7 +10,6 @@ import {
   sequencerModule,
   SequencerModule,
 } from "../../sequencer/builder/SequencerModule";
-import { SettlementProvingTask } from "../../settlement/tasks/SettlementProvingTask";
 import { TaskQueue } from "../queue/TaskQueue";
 import {
   BlockProvingTask,