@proto-kit/protocol 0.1.1-develop.456 → 0.1.1-develop.600

package/dist/blockmodules/AccountStateModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AccountStateModule.d.ts","sourceRoot":"","sources":["../../src/blockmodules/AccountStateModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,EAAE,MAAM,MAAM,CAAC;AAEjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG9E,qBAAa,YAAa,SAAQ,iBAEhC;CAAG;AAEL,qBAAa,kBAAmB,SAAQ,uBAAuB;IACrC,YAAY,oCAGlC;IAEK,aAAa,CAAC,EAAE,WAAW,EAAE,EAAE,wBAAwB,GAAG,IAAI;CActE"}
+{"version":3,"file":"AccountStateModule.d.ts","sourceRoot":"","sources":["../../src/blockmodules/AccountStateModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,SAAS,EAAU,MAAM,EAAE,MAAM,MAAM,CAAC;AAE3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG9E,qBAAa,YAAa,SAAQ,iBAEhC;CAAG;AAEL,qBAAa,kBAAmB,SAAQ,uBAAuB;IACrC,YAAY,oCAGlC;IAEK,aAAa,CAAC,EAAE,WAAW,EAAE,EAAE,wBAAwB,GAAG,IAAI;CAyBtE"}

package/dist/blockmodules/AccountStateModule.js

@@ -22,12 +22,19 @@ export class AccountStateModule extends ProvableTransactionHook {
         this.accountState = StateMap.from(PublicKey, AccountState);
     }
     onTransaction({ transaction }) {
+        const sender = transaction.sender.value;
         const accountState = this.accountState
-            .get(transaction.sender)
+            .get(sender)
             .orElse(new AccountState({ nonce: UInt64.zero }));
         const currentNonce = accountState.nonce;
-        assert(currentNonce.equals(transaction.nonce), "Nonce not matching");
-        this.accountState.set(transaction.sender, new AccountState({ nonce: currentNonce.add(1) }));
+        // Either the nonce matches or the tx is a message, in which case we don't care
+        assert(currentNonce
+            .equals(transaction.nonce.value)
+            .or(transaction.sender.isSome.not()), "Nonce not matching");
+        // Optimized version of transaction.sender.isSome ? currentNonce.add(1) : Field(0)
+        // Bcs Bool(true).toField() == 1
+        const newNonce = UInt64.from(currentNonce.value.add(1).mul(transaction.sender.isSome.toField()));
+        this.accountState.set(sender, new AccountState({ nonce: newNonce }));
     }
 }
 __decorate([

package/dist/blockmodules/BlockHeightHook.d.ts

@@ -1,7 +1,7 @@
 import { NetworkState } from "../model/network/NetworkState";
-import { AfterBlockParameters, BeforeBlockParameters, ProvableBlockHook } from "../protocol/ProvableBlockHook";
+import { ProvableBlockHook } from "../protocol/ProvableBlockHook";
 export declare class BlockHeightHook extends ProvableBlockHook<Record<string, never>> {
-    afterBlock({ networkState }: AfterBlockParameters): NetworkState;
-    beforeBlock(blockData: BeforeBlockParameters): NetworkState;
+    afterBlock(networkState: NetworkState): NetworkState;
+    beforeBlock(networkState: NetworkState): NetworkState;
 }
 //# sourceMappingURL=BlockHeightHook.d.ts.map

package/dist/blockmodules/BlockHeightHook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BlockHeightHook.d.ts","sourceRoot":"","sources":["../../src/blockmodules/BlockHeightHook.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AAEvC,qBAAa,eAAgB,SAAQ,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACpE,UAAU,CAAC,EAAE,YAAY,EAAE,EAAE,oBAAoB,GAAG,YAAY;IAShE,WAAW,CAAC,SAAS,EAAE,qBAAqB,GAAG,YAAY;CAGnE"}
+{"version":3,"file":"BlockHeightHook.d.ts","sourceRoot":"","sources":["../../src/blockmodules/BlockHeightHook.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,qBAAa,eAAgB,SAAQ,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACpE,UAAU,CAAC,YAAY,EAAE,YAAY,GAAG,YAAY;IASpD,WAAW,CAAC,YAAY,EAAE,YAAY,GAAG,YAAY;CAG7D"}

package/dist/blockmodules/BlockHeightHook.js

@@ -1,16 +1,15 @@
-import { Provable } from "o1js";
 import { NetworkState } from "../model/network/NetworkState";
-import { ProvableBlockHook, } from "../protocol/ProvableBlockHook";
+import { ProvableBlockHook } from "../protocol/ProvableBlockHook";
 export class BlockHeightHook extends ProvableBlockHook {
-    afterBlock({ networkState }) {
-        Provable.log("afterBlock", networkState);
+    afterBlock(networkState) {
         return new NetworkState({
             block: {
                 height: networkState.block.height.add(1),
             },
+            previous: networkState.previous
         });
     }
-    beforeBlock(blockData) {
-        return blockData.networkState;
+    beforeBlock(networkState) {
+        return networkState;
     }
 }

package/dist/blockmodules/LastStateRootBlockHook.d.ts

@@ -0,0 +1,8 @@
+import { ProvableBlockHook } from "../protocol/ProvableBlockHook";
+import { NetworkState } from "../model/network/NetworkState";
+import { BlockProverState } from "../prover/block/BlockProver";
+export declare class LastStateRootBlockHook extends ProvableBlockHook<Record<string, never>> {
+    afterBlock(networkState: NetworkState, state: BlockProverState): NetworkState;
+    beforeBlock(networkState: NetworkState, state: BlockProverState): NetworkState;
+}
+//# sourceMappingURL=LastStateRootBlockHook.d.ts.map

package/dist/blockmodules/LastStateRootBlockHook.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"LastStateRootBlockHook.d.ts","sourceRoot":"","sources":["../../src/blockmodules/LastStateRootBlockHook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,qBAAa,sBAAuB,SAAQ,iBAAiB,CAC3D,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CACtB;IACQ,UAAU,CACf,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,gBAAgB,GACtB,YAAY;IASR,WAAW,CAChB,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,gBAAgB,GACtB,YAAY;CAGhB"}

package/dist/blockmodules/LastStateRootBlockHook.js

@@ -0,0 +1,15 @@
+import { ProvableBlockHook } from "../protocol/ProvableBlockHook";
+import { NetworkState } from "../model/network/NetworkState";
+export class LastStateRootBlockHook extends ProvableBlockHook {
+    afterBlock(networkState, state) {
+        return new NetworkState({
+            block: networkState.block,
+            previous: {
+                rootHash: state.stateRoot,
+            },
+        });
+    }
+    beforeBlock(networkState, state) {
+        return networkState;
+    }
+}

package/dist/blockmodules/NoopBlockHook.d.ts

@@ -1,7 +1,9 @@
-import { AfterBlockParameters, BeforeBlockParameters, ProvableBlockHook } from "../protocol/ProvableBlockHook";
+import { ProvableBlockHook } from "../protocol/ProvableBlockHook";
 import { NetworkState } from "../model/network/NetworkState";
-export declare class NoopBlockHook extends ProvableBlockHook<Record<string, never>> {
-    afterBlock(blockData: AfterBlockParameters): NetworkState;
-    beforeBlock(blockData: BeforeBlockParameters): NetworkState;
+import { BlockProverState } from "../prover/block/BlockProver";
+import { NoConfig } from "@proto-kit/common";
+export declare class NoopBlockHook extends ProvableBlockHook<NoConfig> {
+    afterBlock(networkState: NetworkState, state: BlockProverState): NetworkState;
+    beforeBlock(networkState: NetworkState, state: BlockProverState): NetworkState;
 }
 //# sourceMappingURL=NoopBlockHook.d.ts.map

package/dist/blockmodules/NoopBlockHook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NoopBlockHook.d.ts","sourceRoot":"","sources":["../../src/blockmodules/NoopBlockHook.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,qBAAa,aAAc,SAAQ,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClE,UAAU,CAAC,SAAS,EAAE,oBAAoB,GAAG,YAAY;IAIzD,WAAW,CAAC,SAAS,EAAE,qBAAqB,GAAG,YAAY;CAGnE"}
+{"version":3,"file":"NoopBlockHook.d.ts","sourceRoot":"","sources":["../../src/blockmodules/NoopBlockHook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,qBAAa,aAAc,SAAQ,iBAAiB,CAAC,QAAQ,CAAC;IACrD,UAAU,CACf,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,gBAAgB,GACtB,YAAY;IAIR,WAAW,CAChB,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,gBAAgB,GACtB,YAAY;CAGhB"}

package/dist/blockmodules/NoopBlockHook.js

@@ -1,9 +1,9 @@
 import { ProvableBlockHook } from "../protocol/ProvableBlockHook";
 export class NoopBlockHook extends ProvableBlockHook {
-    afterBlock(blockData) {
-        return blockData.networkState;
+    afterBlock(networkState, state) {
+        return networkState;
     }
-    beforeBlock(blockData) {
-        return blockData.networkState;
+    beforeBlock(networkState, state) {
+        return networkState;
     }
 }

package/dist/blockmodules/NoopSettlementHook.d.ts

@@ -0,0 +1,6 @@
+import { SmartContract } from "o1js";
+import { ProvableSettlementHook, SettlementHookInputs } from "../settlement/ProvableSettlementHook";
+export declare class NoopSettlementHook extends ProvableSettlementHook<Record<string, never>> {
+    beforeSettlement(contract: SmartContract, state: SettlementHookInputs): void;
+}
+//# sourceMappingURL=NoopSettlementHook.d.ts.map

package/dist/blockmodules/NoopSettlementHook.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NoopSettlementHook.d.ts","sourceRoot":"","sources":["../../src/blockmodules/NoopSettlementHook.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAGrC,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAE9C,qBACa,kBAAmB,SAAQ,sBAAsB,CAC5D,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CACtB;IACQ,gBAAgB,CACrB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,oBAAoB,GAC1B,IAAI;CAGR"}

package/dist/blockmodules/NoopSettlementHook.js

@@ -0,0 +1,18 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { injectable } from "tsyringe";
+import { noop } from "@proto-kit/common";
+import { ProvableSettlementHook, } from "../settlement/ProvableSettlementHook";
+let NoopSettlementHook = class NoopSettlementHook extends ProvableSettlementHook {
+    beforeSettlement(contract, state) {
+        noop();
+    }
+};
+NoopSettlementHook = __decorate([
+    injectable()
+], NoopSettlementHook);
+export { NoopSettlementHook };

package/dist/hooks/AccountStateHook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AccountStateHook.d.ts","sourceRoot":"","sources":["../../src/hooks/AccountStateHook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,EAAE,MAAM,MAAM,CAAC;AAEjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG9E,qBAAa,YAAa,SAAQ,iBAEhC;CAAG;AAEL,qBAAa,gBAAiB,SAAQ,uBAAuB;IACnC,YAAY,oCAGlC;IAEK,aAAa,CAAC,EAAE,WAAW,EAAE,EAAE,wBAAwB,GAAG,IAAI;CActE"}
+{"version":3,"file":"AccountStateHook.d.ts","sourceRoot":"","sources":["../../src/hooks/AccountStateHook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,EAAE,MAAM,MAAM,CAAC;AAEjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;AAI9E,qBAAa,YAAa,SAAQ,iBAEhC;CAAG;AAEL,qBACa,gBAAiB,SAAQ,uBAAuB;IACnC,YAAY,oCAGlC;IAEK,aAAa,CAAC,EAAE,WAAW,EAAE,EAAE,wBAAwB,GAAG,IAAI;CActE"}

package/dist/hooks/AccountStateHook.js

@@ -12,11 +12,12 @@ import { StateMap } from "../state/StateMap";
 import { protocolState } from "../state/protocol/ProtocolState";
 import { ProvableTransactionHook } from "../protocol/ProvableTransactionHook";
 import { assert } from "../state/assert/assert";
+import { injectable } from "tsyringe";
 export class AccountState extends Struct({
     nonce: UInt64,
 }) {
 }
-export class AccountStateHook extends ProvableTransactionHook {
+let AccountStateHook = class AccountStateHook extends ProvableTransactionHook {
     constructor() {
         super(...arguments);
         this.accountState = StateMap.from(PublicKey, AccountState);
@@ -29,8 +30,12 @@ export class AccountStateHook extends ProvableTransactionHook {
         assert(currentNonce.equals(transaction.nonce), "Nonce not matching");
         this.accountState.set(transaction.sender, new AccountState({ nonce: currentNonce.add(1) }));
     }
-}
+};
 __decorate([
     protocolState(),
     __metadata("design:type", Object)
 ], AccountStateHook.prototype, "accountState", void 0);
+AccountStateHook = __decorate([
+    injectable()
+], AccountStateHook);
+export { AccountStateHook };

package/dist/hooks/BlockHeightHook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BlockHeightHook.d.ts","sourceRoot":"","sources":["../../src/hooks/BlockHeightHook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AAEvC,qBAAa,eAAgB,SAAQ,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACpE,UAAU,CAAC,EAAE,YAAY,EAAE,EAAE,oBAAoB,GAAG,YAAY;IAQhE,WAAW,CAAC,SAAS,EAAE,qBAAqB,GAAG,YAAY;CAGnE"}
+{"version":3,"file":"BlockHeightHook.d.ts","sourceRoot":"","sources":["../../src/hooks/BlockHeightHook.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AAEvC,qBAAa,eAAgB,SAAQ,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACpE,UAAU,CAAC,EAAE,YAAY,EAAE,EAAE,oBAAoB,GAAG,YAAY;IAQhE,WAAW,CAAC,SAAS,EAAE,qBAAqB,GAAG,YAAY;CAGnE"}

package/dist/index.d.ts

@@ -1,18 +1,21 @@
 export * from "./blockmodules/AccountStateModule";
 export * from "./blockmodules/BlockHeightHook";
+export * from "./blockmodules/LastStateRootBlockHook";
 export * from "./utils/ProvableHashList";
 export * from "./model/StateTransition";
 export * from "./model/StateTransitionProvableBatch";
 export * from "./model/Option";
 export * from "./model/Path";
 export * from "./model/network/NetworkState";
-export * from "./model/transaction/ProtocolTransaction";
+export * from "./model/transaction/SignedTransaction";
 export * from "./model/transaction/RuntimeTransaction";
-export * from "./utils/PrefixedProvableHashList.js";
+export * from "./model/transaction/ValueOption";
+export * from "./utils/PrefixedProvableHashList";
+export * from "./utils/MinaPrefixedProvableHashList";
 export * from "./utils/utils";
 export * from "./prover/block/BlockProver";
 export * from "./prover/block/BlockProvable";
-export * from "./prover/block/BlockTransactionPosition";
+export * from "./prover/block/accummulators/BlockHashMerkleTree";
 export * from "./prover/statetransition/StateTransitionProver";
 export * from "./prover/statetransition/StateTransitionProvable";
 export * from "./prover/statetransition/StateTransitionWitnessProvider";
@@ -32,5 +35,8 @@ export * from "./state/StateMap";
 export * from "./state/StateService";
 export * from "./state/StateServiceProvider";
 export * from "./state/assert/assert";
+export * from "./settlement/SettlementContract";
+export * from "./settlement/ProvableSettlementHook";
+export * from "./settlement/modules/NetworkStateSettlementModule";
 export { constants as ProtocolConstants } from "./Constants";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mCAAmC,CAAC;AAClD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sCAAsC,CAAC;AACrD,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yCAAyC,CAAC;AACxD,cAAc,wCAAwC,CAAC;AACvD,cAAc,qCAAqC,CAAC;AACpD,cAAc,eAAe,CAAC;AAC9B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yCAAyC,CAAC;AACxD,cAAc,gDAAgD,CAAC;AAC/D,cAAc,kDAAkD,CAAC;AACjE,cAAc,yDAAyD,CAAC;AACxE,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kEAAkE,CAAC;AACjF,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gDAAgD,CAAC;AAC/D,cAAc,kDAAkD,CAAC;AACjE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,gCAAgC,CAAC;AAC/C,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,OAAO,EAAE,SAAS,IAAI,iBAAiB,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mCAAmC,CAAC;AAClD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,uCAAuC,CAAC;AACtD,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sCAAsC,CAAC;AACrD,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uCAAuC,CAAC;AACtD,cAAc,wCAAwC,CAAC;AACvD,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,sCAAsC,CAAC;AACrD,cAAc,eAAe,CAAC;AAC9B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kDAAkD,CAAC;AACjE,cAAc,gDAAgD,CAAC;AAC/D,cAAc,kDAAkD,CAAC;AACjE,cAAc,yDAAyD,CAAC;AACxE,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kEAAkE,CAAC;AACjF,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gDAAgD,CAAC;AAC/D,cAAc,kDAAkD,CAAC;AACjE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,gCAAgC,CAAC;AAC/C,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,qCAAqC,CAAC;AACpD,cAAc,mDAAmD,CAAC;AAClE,OAAO,EAAE,SAAS,IAAI,iBAAiB,EAAE,MAAM,aAAa,CAAC"}

package/dist/index.js

@@ -1,18 +1,21 @@
 export * from "./blockmodules/AccountStateModule";
 export * from "./blockmodules/BlockHeightHook";
+export * from "./blockmodules/LastStateRootBlockHook";
 export * from "./utils/ProvableHashList";
 export * from "./model/StateTransition";
 export * from "./model/StateTransitionProvableBatch";
 export * from "./model/Option";
 export * from "./model/Path";
 export * from "./model/network/NetworkState";
-export * from "./model/transaction/ProtocolTransaction";
+export * from "./model/transaction/SignedTransaction";
 export * from "./model/transaction/RuntimeTransaction";
-export * from "./utils/PrefixedProvableHashList.js";
+export * from "./model/transaction/ValueOption";
+export * from "./utils/PrefixedProvableHashList";
+export * from "./utils/MinaPrefixedProvableHashList";
 export * from "./utils/utils";
 export * from "./prover/block/BlockProver";
 export * from "./prover/block/BlockProvable";
-export * from "./prover/block/BlockTransactionPosition";
+export * from "./prover/block/accummulators/BlockHashMerkleTree";
 export * from "./prover/statetransition/StateTransitionProver";
 export * from "./prover/statetransition/StateTransitionProvable";
 export * from "./prover/statetransition/StateTransitionWitnessProvider";
@@ -32,4 +35,7 @@ export * from "./state/StateMap";
 export * from "./state/StateService";
 export * from "./state/StateServiceProvider";
 export * from "./state/assert/assert";
+export * from "./settlement/SettlementContract";
+export * from "./settlement/ProvableSettlementHook";
+export * from "./settlement/modules/NetworkStateSettlementModule";
 export { constants as ProtocolConstants } from "./Constants";

package/dist/model/MethodPublicOutput.d.ts

@@ -3,11 +3,13 @@ declare const MethodPublicOutput_base: (new (value: {
     status: import("o1js/dist/node/lib/bool").Bool;
     transactionHash: import("o1js/dist/node/lib/field").Field;
     networkStateHash: import("o1js/dist/node/lib/field").Field;
+    isMessage: import("o1js/dist/node/lib/bool").Bool;
 }) => {
     stateTransitionsHash: import("o1js/dist/node/lib/field").Field;
     status: import("o1js/dist/node/lib/bool").Bool;
     transactionHash: import("o1js/dist/node/lib/field").Field;
     networkStateHash: import("o1js/dist/node/lib/field").Field;
+    isMessage: import("o1js/dist/node/lib/bool").Bool;
 }) & {
     _isStruct: true;
 } & import("o1js/dist/node/snarky").ProvablePure<{
@@ -15,12 +17,14 @@ declare const MethodPublicOutput_base: (new (value: {
     status: import("o1js/dist/node/lib/bool").Bool;
     transactionHash: import("o1js/dist/node/lib/field").Field;
     networkStateHash: import("o1js/dist/node/lib/field").Field;
+    isMessage: import("o1js/dist/node/lib/bool").Bool;
 }> & {
     toInput: (x: {
         stateTransitionsHash: import("o1js/dist/node/lib/field").Field;
         status: import("o1js/dist/node/lib/bool").Bool;
         transactionHash: import("o1js/dist/node/lib/field").Field;
         networkStateHash: import("o1js/dist/node/lib/field").Field;
+        isMessage: import("o1js/dist/node/lib/bool").Bool;
     }) => {
         fields?: import("o1js/dist/node/lib/field").Field[] | undefined;
         packed?: [import("o1js/dist/node/lib/field").Field, number][] | undefined;
@@ -30,22 +34,26 @@ declare const MethodPublicOutput_base: (new (value: {
         status: import("o1js/dist/node/lib/bool").Bool;
         transactionHash: import("o1js/dist/node/lib/field").Field;
         networkStateHash: import("o1js/dist/node/lib/field").Field;
+        isMessage: import("o1js/dist/node/lib/bool").Bool;
     }) => {
         stateTransitionsHash: string;
         status: boolean;
         transactionHash: string;
         networkStateHash: string;
+        isMessage: boolean;
     };
     fromJSON: (x: {
         stateTransitionsHash: string;
         status: boolean;
         transactionHash: string;
         networkStateHash: string;
+        isMessage: boolean;
     }) => {
         stateTransitionsHash: import("o1js/dist/node/lib/field").Field;
         status: import("o1js/dist/node/lib/bool").Bool;
         transactionHash: import("o1js/dist/node/lib/field").Field;
         networkStateHash: import("o1js/dist/node/lib/field").Field;
+        isMessage: import("o1js/dist/node/lib/bool").Bool;
     };
 };
 /**

package/dist/model/MethodPublicOutput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MethodPublicOutput.d.ts","sourceRoot":"","sources":["../../src/model/MethodPublicOutput.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,uBAKtC;CAAG"}
+{"version":3,"file":"MethodPublicOutput.d.ts","sourceRoot":"","sources":["../../src/model/MethodPublicOutput.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,uBAMtC;CAAG"}

package/dist/model/MethodPublicOutput.js

@@ -8,5 +8,6 @@ export class MethodPublicOutput extends Struct({
     status: Bool,
     transactionHash: Field,
     networkStateHash: Field,
+    isMessage: Bool,
 }) {
 }

package/dist/model/network/NetworkState.d.ts

@@ -27,34 +27,74 @@ declare const CurrentBlock_base: (new (value: {
 };
 export declare class CurrentBlock extends CurrentBlock_base {
 }
+declare const PreviousBlock_base: (new (value: {
+    rootHash: import("o1js/dist/node/lib/field").Field;
+}) => {
+    rootHash: import("o1js/dist/node/lib/field").Field;
+}) & {
+    _isStruct: true;
+} & import("o1js/dist/node/snarky").ProvablePure<{
+    rootHash: import("o1js/dist/node/lib/field").Field;
+}> & {
+    toInput: (x: {
+        rootHash: import("o1js/dist/node/lib/field").Field;
+    }) => {
+        fields?: import("o1js/dist/node/lib/field").Field[] | undefined;
+        packed?: [import("o1js/dist/node/lib/field").Field, number][] | undefined;
+    };
+    toJSON: (x: {
+        rootHash: import("o1js/dist/node/lib/field").Field;
+    }) => {
+        rootHash: string;
+    };
+    fromJSON: (x: {
+        rootHash: string;
+    }) => {
+        rootHash: import("o1js/dist/node/lib/field").Field;
+    };
+};
+export declare class PreviousBlock extends PreviousBlock_base {
+}
 declare const NetworkState_base: (new (value: {
     block: CurrentBlock;
+    previous: PreviousBlock;
 }) => {
     block: CurrentBlock;
+    previous: PreviousBlock;
 }) & {
     _isStruct: true;
 } & import("o1js/dist/node/snarky").ProvablePure<{
     block: CurrentBlock;
+    previous: PreviousBlock;
 }> & {
     toInput: (x: {
         block: CurrentBlock;
+        previous: PreviousBlock;
     }) => {
         fields?: import("o1js/dist/node/lib/field").Field[] | undefined;
         packed?: [import("o1js/dist/node/lib/field").Field, number][] | undefined;
     };
     toJSON: (x: {
         block: CurrentBlock;
+        previous: PreviousBlock;
     }) => {
         block: {
             height: string;
         };
+        previous: {
+            rootHash: string;
+        };
     };
     fromJSON: (x: {
         block: {
             height: string;
         };
+        previous: {
+            rootHash: string;
+        };
     }) => {
         block: CurrentBlock;
+        previous: PreviousBlock;
     };
 };
 export declare class NetworkState extends NetworkState_base {

package/dist/model/network/NetworkState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkState.d.ts","sourceRoot":"","sources":["../../../src/model/network/NetworkState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAoB,MAAM,EAAE,MAAM,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEvD,qBAAa,YAAa,SAAQ,iBAEhC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL,qBAAa,YAAa,SAAQ,iBAEhC;IACO,IAAI,IAAI,KAAK;WAIN,KAAK;CAOpB"}
+{"version":3,"file":"NetworkState.d.ts","sourceRoot":"","sources":["../../../src/model/network/NetworkState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAoB,MAAM,EAAE,MAAM,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGvD,qBAAa,YAAa,SAAQ,iBAEhC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL,qBAAa,aAAc,SAAQ,kBAEjC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL,qBAAa,YAAa,SAAQ,iBAGhC;IACO,IAAI,IAAI,KAAK;WAON,KAAK;CAUpB"}

package/dist/model/network/NetworkState.js

@@ -1,19 +1,31 @@
-import { Poseidon, Struct, UInt64 } from "o1js";
+import { Field, Poseidon, Struct, UInt64 } from "o1js";
+import { RollupMerkleTree } from "@proto-kit/common";
 export class CurrentBlock extends Struct({
     height: UInt64,
 }) {
 }
+export class PreviousBlock extends Struct({
+    rootHash: Field,
+}) {
+}
 export class NetworkState extends Struct({
     block: CurrentBlock,
+    previous: PreviousBlock,
 }) {
     hash() {
-        return Poseidon.hash(CurrentBlock.toFields(this.block));
+        return Poseidon.hash([
+            ...CurrentBlock.toFields(this.block),
+            ...PreviousBlock.toFields(this.previous),
+        ]);
     }
     static empty() {
         return new NetworkState({
             block: {
                 height: UInt64.zero,
             },
+            previous: {
+                rootHash: Field(RollupMerkleTree.EMPTY_ROOT)
+            }
         });
     }
 }

package/dist/model/transaction/RuntimeTransaction.d.ts

@@ -1,53 +1,65 @@
-import { Field, PublicKey, UInt64 } from "o1js";
-import { ProtocolTransaction } from "./ProtocolTransaction";
+import { Bool, Field, Provable, PublicKey, UInt64 } from "o1js";
+import { PublicKeyOption, UInt64Option } from "./ValueOption";
 declare const RuntimeTransaction_base: (new (value: {
     methodId: import("o1js/dist/node/lib/field").Field;
-    nonce: UInt64;
-    sender: PublicKey;
     argsHash: import("o1js/dist/node/lib/field").Field;
+    nonce: UInt64Option;
+    sender: PublicKeyOption;
 }) => {
     methodId: import("o1js/dist/node/lib/field").Field;
-    nonce: UInt64;
-    sender: PublicKey;
     argsHash: import("o1js/dist/node/lib/field").Field;
+    nonce: UInt64Option;
+    sender: PublicKeyOption;
 }) & {
     _isStruct: true;
-} & import("o1js/dist/node/snarky").ProvablePure<{
+} & Provable<{
     methodId: import("o1js/dist/node/lib/field").Field;
-    nonce: UInt64;
-    sender: PublicKey;
     argsHash: import("o1js/dist/node/lib/field").Field;
+    nonce: UInt64Option;
+    sender: PublicKeyOption;
 }> & {
     toInput: (x: {
         methodId: import("o1js/dist/node/lib/field").Field;
-        nonce: UInt64;
-        sender: PublicKey;
         argsHash: import("o1js/dist/node/lib/field").Field;
+        nonce: UInt64Option;
+        sender: PublicKeyOption;
     }) => {
         fields?: import("o1js/dist/node/lib/field").Field[] | undefined;
         packed?: [import("o1js/dist/node/lib/field").Field, number][] | undefined;
     };
     toJSON: (x: {
         methodId: import("o1js/dist/node/lib/field").Field;
-        nonce: UInt64;
-        sender: PublicKey;
         argsHash: import("o1js/dist/node/lib/field").Field;
+        nonce: UInt64Option;
+        sender: PublicKeyOption;
     }) => {
         methodId: string;
-        nonce: string;
-        sender: string;
         argsHash: string;
+        nonce: {
+            isSome: boolean;
+            value: any;
+        };
+        sender: {
+            isSome: boolean;
+            value: any;
+        };
     };
     fromJSON: (x: {
         methodId: string;
-        nonce: string;
-        sender: string;
         argsHash: string;
+        nonce: {
+            isSome: boolean;
+            value: any;
+        };
+        sender: {
+            isSome: boolean;
+            value: any;
+        };
     }) => {
         methodId: import("o1js/dist/node/lib/field").Field;
-        nonce: UInt64;
-        sender: PublicKey;
         argsHash: import("o1js/dist/node/lib/field").Field;
+        nonce: UInt64Option;
+        sender: PublicKeyOption;
     };
 };
 /**
@@ -56,7 +68,20 @@ declare const RuntimeTransaction_base: (new (value: {
  * For example, we don't want to expose the signature or args as fields.
  */
 export declare class RuntimeTransaction extends RuntimeTransaction_base {
-    static fromProtocolTransaction({ methodId, nonce, sender, argsHash, }: ProtocolTransaction): RuntimeTransaction;
+    static fromTransaction(input: {
+        methodId: Field;
+        argsHash: Field;
+        nonce: UInt64;
+        sender: PublicKey;
+    }): RuntimeTransaction;
+    static fromMessage({ methodId, argsHash, }: {
+        methodId: Field;
+        argsHash: Field;
+    }): RuntimeTransaction;
+    static dummyTransaction(): RuntimeTransaction;
+    assertTransactionType(isMessage: Bool): void;
+    hashData(): Field[];
+    static fromHashData(fields: Field[]): RuntimeTransaction;
     hash(): Field;
 }
 export {};

package/dist/model/transaction/RuntimeTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RuntimeTransaction.d.ts","sourceRoot":"","sources":["../../../src/model/transaction/RuntimeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAY,SAAS,EAAU,MAAM,EAAE,MAAM,MAAM,CAAC;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE5D;;;;GAIG;AACH,qBAAa,kBAAmB,SAAQ,uBAKtC;WACc,uBAAuB,CAAC,EACpC,QAAQ,EACR,KAAK,EACL,MAAM,EACN,QAAQ,GACT,EAAE,mBAAmB,GAAG,kBAAkB;IASpC,IAAI,IAAI,KAAK;CAQrB"}
+{"version":3,"file":"RuntimeTransaction.d.ts","sourceRoot":"","sources":["../../../src/model/transaction/RuntimeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,KAAK,EAEL,QAAQ,EACR,SAAS,EAET,MAAM,EACP,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG9D;;;;GAIG;AACH,qBAAa,kBAAmB,SAAQ,uBAKtC;WACc,eAAe,CAAC,KAAK,EAAE;QACnC,QAAQ,EAAE,KAAK,CAAC;QAChB,QAAQ,EAAE,KAAK,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,SAAS,CAAC;KACnB;WASa,WAAW,CAAC,EACxB,QAAQ,EACR,QAAQ,GACT,EAAE;QACD,QAAQ,EAAE,KAAK,CAAC;QAChB,QAAQ,EAAE,KAAK,CAAC;KACjB;WASa,gBAAgB,IAAI,kBAAkB;IAe7C,qBAAqB,CAAC,SAAS,EAAE,IAAI;IAerC,QAAQ,IAAI,KAAK,EAAE;WASZ,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE;IAiBnC,IAAI,IAAI,KAAK;CAGrB"}