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

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

@@ -1 +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"}
+{"version":3,"file":"NoopSettlementHook.d.ts","sourceRoot":"","sources":["../../src/blockmodules/NoopSettlementHook.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAGrC,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAEpG,qBACa,kBAAmB,SAAQ,sBAAsB,CAC5D,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CACtB;IACQ,gBAAgB,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,oBAAoB,GAAG,IAAI;CAGpF"}

package/dist/blockmodules/NoopSettlementHook.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { injectable } from "tsyringe";
 import { noop } from "@proto-kit/common";
-import { ProvableSettlementHook, } from "../settlement/ProvableSettlementHook";
+import { ProvableSettlementHook } from "../settlement/ProvableSettlementHook";
 let NoopSettlementHook = class NoopSettlementHook extends ProvableSettlementHook {
     beforeSettlement(contract, state) {
         noop();

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;;;;;;;;;;;;;;;;;;;;;;;;;;;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"}
+{"version":3,"file":"AccountStateHook.d.ts","sourceRoot":"","sources":["../../src/hooks/AccountStateHook.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;;;;;;;;;;;;;;;;;;;;;;;;;;;AAI9E,qBAAa,YAAa,SAAQ,iBAEhC;CAAG;AAEL,qBACa,gBAAiB,SAAQ,uBAAuB;IACnC,YAAY,oCAGlC;IAEK,aAAa,CAAC,EAAE,WAAW,EAAE,EAAE,wBAAwB,GAAG,IAAI;CAyBtE"}

package/dist/hooks/AccountStateHook.js

@@ -23,12 +23,19 @@ let AccountStateHook = class AccountStateHook 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/hooks/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/hooks/BlockHeightHook.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"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,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/hooks/BlockHeightHook.js

@@ -1,14 +1,15 @@
 import { NetworkState } from "../model/network/NetworkState";
-import { ProvableBlockHook, } from "../protocol/ProvableBlockHook";
+import { ProvableBlockHook } from "../protocol/ProvableBlockHook";
 export class BlockHeightHook extends ProvableBlockHook {
-    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/hooks/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/hooks/LastStateRootBlockHook.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"LastStateRootBlockHook.d.ts","sourceRoot":"","sources":["../../src/hooks/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/hooks/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/hooks/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/hooks/NoopBlockHook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NoopBlockHook.d.ts","sourceRoot":"","sources":["../../src/hooks/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/hooks/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/hooks/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/hooks/NoopSettlementHook.d.ts

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"NoopSettlementHook.d.ts","sourceRoot":"","sources":["../../src/hooks/NoopSettlementHook.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAErC,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,iDAAiD,CAAC;AAEzD,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/hooks/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/modularity/ProvableSettlementHook";
+let NoopSettlementHook = class NoopSettlementHook extends ProvableSettlementHook {
+    beforeSettlement(contract, state) {
+        noop();
+    }
+};
+NoopSettlementHook = __decorate([
+    injectable()
+], NoopSettlementHook);
+export { NoopSettlementHook };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-export * from "./blockmodules/AccountStateModule";
-export * from "./blockmodules/BlockHeightHook";
-export * from "./blockmodules/LastStateRootBlockHook";
+export * from "./hooks/AccountStateHook";
+export * from "./hooks/BlockHeightHook";
 export * from "./utils/ProvableHashList";
+export * from "./hooks/LastStateRootBlockHook";
 export * from "./model/StateTransition";
 export * from "./model/StateTransitionProvableBatch";
 export * from "./model/Option";
@@ -10,8 +10,13 @@ export * from "./model/network/NetworkState";
 export * from "./model/transaction/SignedTransaction";
 export * from "./model/transaction/RuntimeTransaction";
 export * from "./model/transaction/ValueOption";
+export * from "./model/MethodPublicOutput";
+export * from "./model/RuntimeLike";
+export * from "./utils/ProvableHashList";
 export * from "./utils/PrefixedProvableHashList";
 export * from "./utils/MinaPrefixedProvableHashList";
+export * from "./utils/ProvableReductionHashList";
+export * from "./utils/StateTransitionReductionList";
 export * from "./utils/utils";
 export * from "./prover/block/BlockProver";
 export * from "./prover/block/BlockProvable";
@@ -19,7 +24,6 @@ export * from "./prover/block/accummulators/BlockHashMerkleTree";
 export * from "./prover/statetransition/StateTransitionProver";
 export * from "./prover/statetransition/StateTransitionProvable";
 export * from "./prover/statetransition/StateTransitionWitnessProvider";
-export * from "./model/MethodPublicOutput";
 export * from "./prover/statetransition/StateTransitionWitnessProviderReference";
 export * from "./protocol/Protocol";
 export * from "./protocol/ProtocolModule";
@@ -35,8 +39,16 @@ 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/contracts/SettlementSmartContract";
+export * from "./settlement/contracts/SettlementContractProtocolModule";
+export * from "./settlement/contracts/DispatchSmartContract";
+export * from "./settlement/contracts/DispatchContractProtocolModule";
+export * from "./settlement/SettlementContractModule";
+export * from "./settlement/ContractModule";
+export * from "./settlement/modularity/ProvableSettlementHook";
+export * from "./settlement/messages/OutgoingMessageArgument";
 export * from "./settlement/modules/NetworkStateSettlementModule";
+export * from "./settlement/messages/Deposit";
+export * from "./settlement/messages/Withdrawal";
 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,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,gCAAgC,CAAC;AAC/C,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,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,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,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,gDAAgD,CAAC;AAC/D,cAAc,yDAAyD,CAAC;AACxE,cAAc,8CAA8C,CAAC;AAC7D,cAAc,uDAAuD,CAAC;AACtE,cAAc,uCAAuC,CAAC;AACtD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gDAAgD,CAAC;AAC/D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,mDAAmD,CAAC;AAClE,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC;AACjD,OAAO,EAAE,SAAS,IAAI,iBAAiB,EAAE,MAAM,aAAa,CAAC"}

package/dist/index.js

@@ -1,7 +1,7 @@
-export * from "./blockmodules/AccountStateModule";
-export * from "./blockmodules/BlockHeightHook";
-export * from "./blockmodules/LastStateRootBlockHook";
+export * from "./hooks/AccountStateHook";
+export * from "./hooks/BlockHeightHook";
 export * from "./utils/ProvableHashList";
+export * from "./hooks/LastStateRootBlockHook";
 export * from "./model/StateTransition";
 export * from "./model/StateTransitionProvableBatch";
 export * from "./model/Option";
@@ -10,8 +10,13 @@ export * from "./model/network/NetworkState";
 export * from "./model/transaction/SignedTransaction";
 export * from "./model/transaction/RuntimeTransaction";
 export * from "./model/transaction/ValueOption";
+export * from "./model/MethodPublicOutput";
+export * from "./model/RuntimeLike";
+export * from "./utils/ProvableHashList";
 export * from "./utils/PrefixedProvableHashList";
 export * from "./utils/MinaPrefixedProvableHashList";
+export * from "./utils/ProvableReductionHashList";
+export * from "./utils/StateTransitionReductionList";
 export * from "./utils/utils";
 export * from "./prover/block/BlockProver";
 export * from "./prover/block/BlockProvable";
@@ -19,7 +24,6 @@ export * from "./prover/block/accummulators/BlockHashMerkleTree";
 export * from "./prover/statetransition/StateTransitionProver";
 export * from "./prover/statetransition/StateTransitionProvable";
 export * from "./prover/statetransition/StateTransitionWitnessProvider";
-export * from "./model/MethodPublicOutput";
 export * from "./prover/statetransition/StateTransitionWitnessProviderReference";
 export * from "./protocol/Protocol";
 export * from "./protocol/ProtocolModule";
@@ -35,7 +39,15 @@ 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/contracts/SettlementSmartContract";
+export * from "./settlement/contracts/SettlementContractProtocolModule";
+export * from "./settlement/contracts/DispatchSmartContract";
+export * from "./settlement/contracts/DispatchContractProtocolModule";
+export * from "./settlement/SettlementContractModule";
+export * from "./settlement/ContractModule";
+export * from "./settlement/modularity/ProvableSettlementHook";
+export * from "./settlement/messages/OutgoingMessageArgument";
 export * from "./settlement/modules/NetworkStateSettlementModule";
+export * from "./settlement/messages/Deposit";
+export * from "./settlement/messages/Withdrawal";
 export { constants as ProtocolConstants } from "./Constants";

package/dist/model/Option.d.ts

@@ -1,4 +1,4 @@
-import { Bool, Field, type FlexibleProvablePure } from "o1js";
+import { Bool, Field, type FlexibleProvablePure, ProvablePure } from "o1js";
 declare const ProvableOption_base: (new (value: {
     isSome: import("o1js/dist/node/lib/bool").Bool;
     value: import("o1js/dist/node/lib/field").Field;
@@ -7,7 +7,7 @@ declare const ProvableOption_base: (new (value: {
     value: import("o1js/dist/node/lib/field").Field;
 }) & {
     _isStruct: true;
-} & import("o1js/dist/node/snarky").ProvablePure<{
+} & ProvablePure<{
     isSome: import("o1js/dist/node/lib/bool").Bool;
     value: import("o1js/dist/node/lib/field").Field;
 }> & {
@@ -97,6 +97,7 @@ export declare class Option<Value> extends OptionBase {
      * otherwise returns the given defaultValue
      */
     orElse(defaultValue: Value): Value;
+    toConstant(): Option<Value>;
 }
 export {};
 //# sourceMappingURL=Option.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Option.d.ts","sourceRoot":"","sources":["../../src/model/Option.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,KAAK,EACL,KAAK,oBAAoB,EAI1B,MAAM,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,qBAAa,cAAe,SAAQ,mBAGlC;IACO,MAAM;CAId;AAED,8BAAsB,UAAU;IACD,MAAM,EAAE,IAAI;IAAS,YAAY,EAAE,IAAI;IAApE,SAAS,aAAoB,MAAM,EAAE,IAAI,EAAS,YAAY,EAAE,IAAI;IAEpE,SAAS,CAAC,QAAQ,CAAC,mBAAmB,IAAI,KAAK,EAAE;IAEjD,SAAS,CAAC,QAAQ,CAAC,KAAK,IAAI,UAAU;IAEtC;;OAEG;IACH,IAAW,SAAS,6CAQnB;IAEM,SAAS;IAKhB;;;OAGG;IACI,QAAQ,IAAI,KAAK,EAAE;IAO1B;;OAEG;IACI,UAAU;IAOV,MAAM;;;;;CASd;AAED;;GAEG;AACH,qBAAa,MAAM,CAAC,KAAK,CAAE,SAAQ,UAAU;IAwClC,KAAK,EAAE,KAAK;IACZ,SAAS,EAAE,oBAAoB,CAAC,KAAK,CAAC;IAxC/C;;;;;;;OAOG;WACW,IAAI,CAAC,KAAK,EACtB,MAAM,EAAE,IAAI,EACZ,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,oBAAoB,CAAC,KAAK,CAAC;IAKxC;;;;;;OAMG;WACW,SAAS,CAAC,KAAK,EAC3B,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,oBAAoB,CAAC,KAAK,CAAC;IAKxC;;OAEG;WACW,IAAI;gBAKhB,MAAM,EAAE,IAAI,EACL,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,oBAAoB,CAAC,KAAK,CAAC,EAC7C,YAAY,yCAAc;IAKrB,mBAAmB,IAAI,KAAK,EAAE;IAI9B,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;IAS7B;;;OAGG;IACI,MAAM,CAAC,YAAY,EAAE,KAAK,GAAG,KAAK;CAQ1C"}
+{"version":3,"file":"Option.d.ts","sourceRoot":"","sources":["../../src/model/Option.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,KAAK,EACL,KAAK,oBAAoB,EAGzB,YAAY,EAEb,MAAM,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,qBAAa,cAAe,SAAQ,mBAGlC;IACO,MAAM;CAId;AAED,8BAAsB,UAAU;IACD,MAAM,EAAE,IAAI;IAAS,YAAY,EAAE,IAAI;IAApE,SAAS,aAAoB,MAAM,EAAE,IAAI,EAAS,YAAY,EAAE,IAAI;IAEpE,SAAS,CAAC,QAAQ,CAAC,mBAAmB,IAAI,KAAK,EAAE;IAEjD,SAAS,CAAC,QAAQ,CAAC,KAAK,IAAI,UAAU;IAEtC;;OAEG;IACH,IAAW,SAAS,6CAQnB;IAEM,SAAS;IAKhB;;;OAGG;IACI,QAAQ,IAAI,KAAK,EAAE;IAO1B;;OAEG;IACI,UAAU;IAOV,MAAM;;;;;CASd;AAED;;GAEG;AACH,qBAAa,MAAM,CAAC,KAAK,CAAE,SAAQ,UAAU;IAwClC,KAAK,EAAE,KAAK;IACZ,SAAS,EAAE,oBAAoB,CAAC,KAAK,CAAC;IAxC/C;;;;;;;OAOG;WACW,IAAI,CAAC,KAAK,EACtB,MAAM,EAAE,IAAI,EACZ,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,oBAAoB,CAAC,KAAK,CAAC;IAKxC;;;;;;OAMG;WACW,SAAS,CAAC,KAAK,EAC3B,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,oBAAoB,CAAC,KAAK,CAAC;IAKxC;;OAEG;WACW,IAAI;gBAKhB,MAAM,EAAE,IAAI,EACL,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,oBAAoB,CAAC,KAAK,CAAC,EAC7C,YAAY,yCAAc;IAKrB,mBAAmB,IAAI,KAAK,EAAE;IAI9B,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;IAS7B;;;OAGG;IACI,MAAM,CAAC,YAAY,EAAE,KAAK,GAAG,KAAK;IASlC,UAAU;CAclB"}

package/dist/model/Option.js

@@ -101,4 +101,9 @@ export class Option extends OptionBase {
     orElse(defaultValue) {
         return Provable.if(this.isSome, this.valueType, this.value, defaultValue);
     }
+    toConstant() {
+        const valueConstant = this.valueType.fromFields(this.valueType.toFields(this.value).map((field) => field.toConstant()));
+        const boolConstant = (bool) => Bool.fromFields([bool.toField().toConstant()]);
+        return new Option(boolConstant(this.isSome), valueConstant, this.valueType, boolConstant(this.isForcedSome));
+    }
 }

package/dist/model/RuntimeLike.d.ts

@@ -0,0 +1,11 @@
+export type RuntimeMethodInvocationType = "INCOMING_MESSAGE" | "SIGNATURE";
+export type RuntimeMethodIdMapping = Record<`${string}.${string}`, {
+    methodId: bigint;
+    type: RuntimeMethodInvocationType;
+}>;
+export interface RuntimeLike {
+    get methodIdResolver(): {
+        methodIdMap: () => RuntimeMethodIdMapping;
+    };
+}
+//# sourceMappingURL=RuntimeLike.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RuntimeLike.d.ts","sourceRoot":"","sources":["../../src/model/RuntimeLike.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,2BAA2B,GAAG,kBAAkB,GAAG,WAAW,CAAC;AAE3E,MAAM,MAAM,sBAAsB,GAAG,MAAM,CACzC,GAAG,MAAM,IAAI,MAAM,EAAE,EACrB;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,2BAA2B,CAAA;CAAE,CACxD,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,IAAI,gBAAgB,IAAI;QACtB,WAAW,EAAE,MAAM,sBAAsB,CAAC;KAC3C,CAAC;CACH"}

package/dist/model/RuntimeLike.js

@@ -0,0 +1 @@
+export {};

package/dist/model/StateTransition.d.ts

@@ -1,4 +1,4 @@
-import { Field } from "o1js";
+import { Field, ProvablePure } from "o1js";
 import { Option, ProvableOption } from "./Option";
 declare const ProvableStateTransition_base: (new (value: {
     path: import("o1js/dist/node/lib/field").Field;
@@ -10,7 +10,7 @@ declare const ProvableStateTransition_base: (new (value: {
     to: ProvableOption;
 }) & {
     _isStruct: true;
-} & import("o1js/dist/node/snarky").ProvablePure<{
+} & ProvablePure<{
     path: import("o1js/dist/node/lib/field").Field;
     from: ProvableOption;
     to: ProvableOption;
@@ -68,12 +68,12 @@ export declare class ProvableStateTransition extends ProvableStateTransition_bas
  */
 export declare class StateTransition<Value> {
     path: Field;
-    fromValue: Option<Field> | Option<Value>;
+    fromValue: Option<Value>;
     toValue: Option<Field> | Option<Value>;
     static from<Value>(path: Field, fromValue: Option<Value>): StateTransition<Value>;
     static fromTo<Value>(path: Field, fromValue: Option<Value>, toValue: Option<Value>): StateTransition<Value>;
-    constructor(path: Field, fromValue: Option<Field> | Option<Value>, toValue: Option<Field> | Option<Value>);
-    get from(): Option<import("o1js/dist/node/lib/field").Field> | Option<Value>;
+    constructor(path: Field, fromValue: Option<Value>, toValue: Option<Field> | Option<Value>);
+    get from(): Option<Value>;
     get to(): Option<import("o1js/dist/node/lib/field").Field> | Option<Value>;
     /**
      * Converts a StateTransition to a ProvableStateTransition,
@@ -93,6 +93,7 @@ export declare class StateTransition<Value> {
             value: string[];
         };
     };
+    toConstant(): StateTransition<Value>;
 }
 export {};
 //# sourceMappingURL=StateTransition.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"StateTransition.d.ts","sourceRoot":"","sources":["../../src/model/StateTransition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAU,MAAM,MAAM,CAAC;AAErC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElD;;;;GAIG;AACH,qBAAa,uBAAwB,SAAQ,4BAQ3C;WACc,KAAK,IAAI,uBAAuB;CAO/C;AAED;;;GAGG;AACH,qBAAa,eAAe,CAAC,KAAK;IAcvB,IAAI,EAAE,KAAK;IACX,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;WAfjC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC;WAIjD,MAAM,CAAC,KAAK,EACxB,IAAI,EAAE,KAAK,EACX,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,EACxB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;gBAMf,IAAI,EAAE,KAAK,EACX,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,EACxC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;IAG/C,IAAW,IAAI,qEAId;IAED,IAAW,EAAE,qEAEZ;IAED;;;OAGG;IACI,UAAU,IAAI,uBAAuB;IAQrC,MAAM;;;;;;;;;;;;;CAOd"}
+{"version":3,"file":"StateTransition.d.ts","sourceRoot":"","sources":["../../src/model/StateTransition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,EAAE,YAAY,EAAU,MAAM,MAAM,CAAC;AAEzD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElD;;;;GAIG;AACH,qBAAa,uBAAwB,SAAQ,4BAQ3C;WACc,KAAK,IAAI,uBAAuB;CAO/C;AAED;;;GAGG;AACH,qBAAa,eAAe,CAAC,KAAK;IAcvB,IAAI,EAAE,KAAK;IACX,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;WAfjC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC;WAIjD,MAAM,CAAC,KAAK,EACxB,IAAI,EAAE,KAAK,EACX,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,EACxB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;gBAMf,IAAI,EAAE,KAAK,EACX,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,EACxB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;IAG/C,IAAW,IAAI,kBAId;IAED,IAAW,EAAE,qEAEZ;IAED;;;OAGG;IACI,UAAU,IAAI,uBAAuB;IAQrC,MAAM;;;;;;;;;;;;;IAQN,UAAU,IAAI,eAAe,CAAC,KAAK,CAAC;CAO5C"}

package/dist/model/StateTransition.js

@@ -62,4 +62,7 @@ export class StateTransition {
             to: this.toValue.toJSON(),
         };
     }
+    toConstant() {
+        return new StateTransition(this.path.toConstant(), this.fromValue.toConstant(), this.toValue.toConstant());
+    }
 }

package/dist/model/StateTransitionReduction.d.ts

@@ -0,0 +1,3 @@
+import { StateTransition } from "./StateTransition";
+export declare function reduceStateTransitions(transitions: StateTransition<unknown>[]): StateTransition<unknown>[];
+//# sourceMappingURL=StateTransitionReduction.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"StateTransitionReduction.d.ts","sourceRoot":"","sources":["../../src/model/StateTransitionReduction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,GACtC,eAAe,CAAC,OAAO,CAAC,EAAE,CA0B5B"}

package/dist/model/StateTransitionReduction.js

@@ -0,0 +1,26 @@
+import { StateTransition } from "./StateTransition";
+export function reduceStateTransitions(transitions) {
+    const reduced = [];
+    for (const st of transitions) {
+        if (reduced.length === 0) {
+            reduced.push(st);
+            continue;
+        }
+        const last = reduced.at(-1);
+        if (last.path.equals(st.path).toBoolean()) {
+            if (st.toValue.isSome.toBoolean()) {
+                reduced.pop();
+                reduced.push(new StateTransition(st.path, last.fromValue, st.toValue));
+            }
+            else {
+                // Do nothing, because we discard that ST
+                // { from: 5, to: 10 }, { from: 10, to: none }
+                // cancel the 2nd
+            }
+        }
+        else {
+            reduced.push(st);
+        }
+    }
+    return reduced;
+}

package/dist/protocol/Protocol.d.ts

@@ -6,29 +6,27 @@ import { StateServiceProvider } from "../state/StateServiceProvider";
 import { StateService } from "../state/StateService";
 import { ProtocolModule } from "./ProtocolModule";
 import { ProtocolEnvironment } from "./ProtocolEnvironment";
-import { AccountStateModule } from "../blockmodules/AccountStateModule";
-import { BlockHeightHook } from "../blockmodules/BlockHeightHook";
-import { LastStateRootBlockHook } from "../blockmodules/LastStateRootBlockHook";
-export type GenericProtocolModuleRecord = ModulesRecord<TypedClass<ProtocolModule<unknown>>>;
-interface BlockProverType extends ProtocolModule, BlockProvable {
+import { AccountStateHook } from "../hooks/AccountStateHook";
+import { BlockHeightHook } from "../hooks/BlockHeightHook";
+import { LastStateRootBlockHook } from "../hooks/LastStateRootBlockHook";
+export type ProtocolModulesRecord = ModulesRecord<TypedClass<ProtocolModule<unknown>>>;
+export interface BlockProverType extends ProtocolModule, BlockProvable {
 }
-interface StateTransitionProverType extends ProtocolModule, StateTransitionProvable {
+export interface StateTransitionProverType extends ProtocolModule, StateTransitionProvable {
 }
-export interface ProtocolCustomModulesRecord extends GenericProtocolModuleRecord {
+export type MandatoryProtocolModulesRecord = {
     BlockProver: TypedClass<BlockProverType>;
     StateTransitionProver: TypedClass<StateTransitionProverType>;
-    AccountState: TypedClass<AccountStateModule>;
+    AccountState: TypedClass<AccountStateHook>;
     BlockHeight: TypedClass<BlockHeightHook>;
     LastStateRoot: TypedClass<LastStateRootBlockHook>;
-}
-export interface ProtocolModulesRecord extends GenericProtocolModuleRecord, ProtocolCustomModulesRecord {
-}
+};
 export interface ProtocolDefinition<Modules extends ProtocolModulesRecord> {
     modules: Modules;
     config?: ModulesConfig<Modules>;
 }
-export declare class Protocol<Modules extends ProtocolModulesRecord> extends ModuleContainer<Modules> implements ProtocolEnvironment {
-    static from<Modules extends ProtocolModulesRecord>(modules: ProtocolDefinition<Modules>): TypedClass<Protocol<Modules>>;
+export declare class Protocol<Modules extends ProtocolModulesRecord & MandatoryProtocolModulesRecord> extends ModuleContainer<Modules> implements ProtocolEnvironment {
+    static from<Modules extends ProtocolModulesRecord & MandatoryProtocolModulesRecord>(modules: ProtocolDefinition<Modules>): TypedClass<Protocol<Modules>>;
     definition: ProtocolDefinition<Modules>;
     constructor(definition: ProtocolDefinition<Modules>);
     get stateService(): StateService;
@@ -41,9 +39,4 @@ export declare class Protocol<Modules extends ProtocolModulesRecord> extends Mod
     getAreProofsEnabled(): AreProofsEnabled;
     create(childContainerProvider: ChildContainerProvider): void;
 }
-export declare const VanillaProtocol: {
-    create(): TypedClass<Protocol<ProtocolCustomModulesRecord>>;
-    from<AdditonalModules extends GenericProtocolModuleRecord>(additionalModules: AdditonalModules): TypedClass<Protocol<ProtocolCustomModulesRecord & AdditonalModules>>;
-};
-export {};
 //# sourceMappingURL=Protocol.d.ts.map

package/dist/protocol/Protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Protocol.d.ts","sourceRoot":"","sources":["../../src/protocol/Protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EAEtB,eAAe,EACf,aAAa,EACb,aAAa,EACb,WAAW,EACX,UAAU,EACX,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAa,MAAM,UAAU,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAE5F,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAGxE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAUhF,MAAM,MAAM,2BAA2B,GAAG,aAAa,CACrD,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CACpC,CAAC;AAEF,UAAU,eAAgB,SAAQ,cAAc,EAAE,aAAa;CAAG;AAElE,UAAU,yBACR,SAAQ,cAAc,EACpB,uBAAuB;CAAG;AAE9B,MAAM,WAAW,2BACf,SAAQ,2BAA2B;IACnC,WAAW,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;IACzC,qBAAqB,EAAE,UAAU,CAAC,yBAAyB,CAAC,CAAC;IAC7D,YAAY,EAAE,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAC7C,WAAW,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;IACzC,aAAa,EAAE,UAAU,CAAC,sBAAsB,CAAC,CAAC;CACnD;AAED,MAAM,WAAW,qBACf,SAAQ,2BAA2B,EACjC,2BAA2B;CAAG;AAElC,MAAM,WAAW,kBAAkB,CAAC,OAAO,SAAS,qBAAqB;IACvE,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CACjC;AAED,qBAAa,QAAQ,CAAC,OAAO,SAAS,qBAAqB,CACzD,SAAQ,eAAe,CAAC,OAAO,CAC/B,YAAW,mBAAmB;WAGhB,IAAI,CAAC,OAAO,SAAS,qBAAqB,EACtD,OAAO,EAAE,kBAAkB,CAAC,OAAO,CAAC,GACnC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAQzB,UAAU,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;gBAE5B,UAAU,EAAE,kBAAkB,CAAC,OAAO,CAAC;IAK1D,IAAW,YAAY,IAAI,YAAY,CAEtC;IAED,IAAW,oBAAoB,IAAI,oBAAoB,CAEtD;IAEM,cAAc,CACnB,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAChC,eAAe,EAAE,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;IAY9D,IAAW,mBAAmB,IAAI,mBAAmB,CAEpD;IAED,OAAO,CAAC,QAAQ;IAMhB,IAAW,WAAW,IAAI,aAAa,CAMtC;IAED,IAAW,qBAAqB,IAAI,uBAAuB,CAI1D;IAEM,mBAAmB,IAAI,gBAAgB;IAIvC,MAAM,CAAC,sBAAsB,EAAE,sBAAsB;CAoD7D;AAED,eAAO,MAAM,eAAe;;;CAmB3B,CAAC"}
+{"version":3,"file":"Protocol.d.ts","sourceRoot":"","sources":["../../src/protocol/Protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EAEtB,eAAe,EACf,aAAa,EACb,aAAa,EACb,WAAW,EACX,UAAU,EACX,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAa,MAAM,UAAU,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAE5F,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAUzE,MAAM,MAAM,qBAAqB,GAAG,aAAa,CAC/C,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CACpC,CAAC;AAEF,MAAM,WAAW,eAAgB,SAAQ,cAAc,EAAE,aAAa;CAAG;AAEzE,MAAM,WAAW,yBACf,SAAQ,cAAc,EACpB,uBAAuB;CAAG;AAE9B,MAAM,MAAM,8BAA8B,GAAG;IAC3C,WAAW,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;IACzC,qBAAqB,EAAE,UAAU,CAAC,yBAAyB,CAAC,CAAC;IAC7D,YAAY,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC3C,WAAW,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;IACzC,aAAa,EAAE,UAAU,CAAC,sBAAsB,CAAC,CAAC;CACnD,CAAC;AAEF,MAAM,WAAW,kBAAkB,CAAC,OAAO,SAAS,qBAAqB;IACvE,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CACjC;AAED,qBAAa,QAAQ,CACjB,OAAO,SAAS,qBAAqB,GAAG,8BAA8B,CAExE,SAAQ,eAAe,CAAC,OAAO,CAC/B,YAAW,mBAAmB;WAEhB,IAAI,CAChB,OAAO,SAAS,qBAAqB,GAAG,8BAA8B,EACtE,OAAO,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAQ/D,UAAU,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;gBAE5B,UAAU,EAAE,kBAAkB,CAAC,OAAO,CAAC;IAK1D,IAAW,YAAY,IAAI,YAAY,CAEtC;IAED,IAAW,oBAAoB,IAAI,oBAAoB,CAEtD;IAEM,cAAc,CACnB,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAChC,eAAe,EAAE,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;IAY9D,IAAW,mBAAmB,IAAI,mBAAmB,CAEpD;IAED,OAAO,CAAC,QAAQ;IAMhB,IAAW,WAAW,IAAI,aAAa,CAMtC;IAED,IAAW,qBAAqB,IAAI,uBAAuB,CAI1D;IAEM,mBAAmB,IAAI,gBAAgB;IAIvC,MAAM,CAAC,sBAAsB,EAAE,sBAAsB;CAoD7D"}

package/dist/protocol/Protocol.js

@@ -1,23 +1,17 @@
 import { log, ModuleContainer, } from "@proto-kit/common";
 import { Lifecycle } from "tsyringe";
-import { StateTransitionProver } from "../prover/statetransition/StateTransitionProver";
-import { BlockProver } from "../prover/block/BlockProver";
 import { ProvableTransactionHook } from "./ProvableTransactionHook";
-import { NoopTransactionHook } from "../blockmodules/NoopTransactionHook";
-import { AccountStateModule } from "../blockmodules/AccountStateModule";
+import { NoopTransactionHook } from "../hooks/NoopTransactionHook";
 import { ProvableBlockHook } from "./ProvableBlockHook";
-import { NoopBlockHook } from "../blockmodules/NoopBlockHook";
-import { BlockHeightHook } from "../blockmodules/BlockHeightHook";
-import { LastStateRootBlockHook } from "../blockmodules/LastStateRootBlockHook";
-import { ProvableSettlementHook } from "../settlement/ProvableSettlementHook";
-import { NoopSettlementHook } from "../blockmodules/NoopSettlementHook";
+import { NoopBlockHook } from "../hooks/NoopBlockHook";
+import { ProvableSettlementHook } from "../settlement/modularity/ProvableSettlementHook";
+import { NoopSettlementHook } from "../hooks/NoopSettlementHook";
 const PROTOCOL_INJECTION_TOKENS = {
     ProvableTransactionHook: "ProvableTransactionHook",
     ProvableBlockHook: "ProvableBlockHook",
     ProvableSettlementHook: "ProvableSettlementHook",
 };
 export class Protocol extends ModuleContainer {
-    // .from() to create Protocol
     static from(modules) {
         return class ScopedProtocol extends Protocol {
             constructor() {
@@ -90,20 +84,3 @@ export class Protocol extends ModuleContainer {
         });
     }
 }
-export const VanillaProtocol = {
-    create() {
-        return VanillaProtocol.from({});
-    },
-    from(additionalModules) {
-        return Protocol.from({
-            modules: {
-                StateTransitionProver,
-                BlockProver,
-                AccountState: AccountStateModule,
-                BlockHeight: BlockHeightHook,
-                LastStateRoot: LastStateRootBlockHook,
-                ...additionalModules,
-            },
-        });
-    },
-};

package/dist/protocol/ProtocolModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProtocolModule.d.ts","sourceRoot":"","sources":["../../src/protocol/ProtocolModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,kBAAkB,EAAE,QAAQ,EAE7B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,8BAAsB,cAAc,CAClC,MAAM,GAAG,QAAQ,CACjB,SAAQ,kBAAkB,CAAC,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAEtC,IAAW,QAAQ,IAAI,gBAAgB,GAAG,SAAS,CAElD;IAGM,MAAM,CAAC,sBAAsB,EAAE,sBAAsB,GAAG,IAAI;CAGpE"}
+{"version":3,"file":"ProtocolModule.d.ts","sourceRoot":"","sources":["../../src/protocol/ProtocolModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,kBAAkB,EAClB,QAAQ,EAET,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,8BAAsB,cAAc,CAClC,MAAM,GAAG,QAAQ,CACjB,SAAQ,kBAAkB,CAAC,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAEtC,IAAW,QAAQ,IAAI,gBAAgB,GAAG,SAAS,CAElD;IAGM,MAAM,CAAC,sBAAsB,EAAE,sBAAsB,GAAG,IAAI;CAGpE"}

package/dist/protocol/ProtocolModule.js

@@ -1,4 +1,4 @@
-import { ConfigurableModule, noop } from "@proto-kit/common";
+import { ConfigurableModule, noop, } from "@proto-kit/common";
 export class ProtocolModule extends ConfigurableModule {
     get appChain() {
         return this.protocol?.getAreProofsEnabled();

package/dist/prover/block/BlockProver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BlockProver.d.ts","sourceRoot":"","sources":["../../../src/prover/block/BlockProver.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,EACL,KAAK,KAAK,EAGX,MAAM,MAAM,CAAC;AAEd,OAAO,EACL,gBAAgB,EAEhB,cAAc,EAEd,kBAAkB,EAClB,cAAc,EACf,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EACL,oBAAoB,EACpB,gCAAgC,EAChC,iCAAiC,EAClC,MAAM,4CAA4C,CAAC;AAMpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AAEjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAIhE,OAAO,EACL,aAAa,EACb,wBAAwB,EACxB,gBAAgB,EAChB,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,0BAA0B,EAE3B,MAAM,qCAAqC,CAAC;AAyB7C,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,SAAS,EAAE,KAAK,CAAC;IAEjB;;;OAGG;IACH,gBAAgB,EAAE,KAAK,CAAC;IAExB;;;OAGG;IACH,gBAAgB,EAAE,KAAK,CAAC;IAExB;;;OAGG;IACH,aAAa,EAAE,KAAK,CAAC;IAErB;;;;OAIG;IACH,uBAAuB,EAAE,KAAK,CAAC;IAE/B,oBAAoB,EAAE,KAAK,CAAC;CAC7B;AAMD,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,sBAAsB,EAAE,uBAAuB,CAAC,CAAC;AAChF,MAAM,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;AAE3D,qBAAa,uBAAwB,SAAQ,cAAc,CACzD,sBAAsB,EACtB,uBAAuB,CACxB;IAGG,OAAO,CAAC,QAAQ,CAAC,MAAM;aACP,qBAAqB,EAAE,cAAc,CACnD,gCAAgC,EAChC,iCAAiC,CAClC;aACe,OAAO,EAAE,cAAc,CAAC,SAAS,EAAE,kBAAkB,CAAC;IACtE,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAPV,MAAM,EAAE,WAAW,EACpB,qBAAqB,EAAE,cAAc,CACnD,gCAAgC,EAChC,iCAAiC,CAClC,EACe,OAAO,EAAE,cAAc,CAAC,SAAS,EAAE,kBAAkB,CAAC,EACrD,gBAAgB,EAAE,uBAAuB,CAAC,OAAO,CAAC,EAAE,EACpD,UAAU,EAAE,iBAAiB,CAAC,OAAO,CAAC,EAAE;IAK3D,IAAW,QAAQ,IAAI,gBAAgB,GAAG,SAAS,CAElD;IAED;;;;;;;;;OASG;IACI,gBAAgB,CACrB,KAAK,EAAE,gBAAgB,EACvB,oBAAoB,EAAE,KAAK,CACzB,gCAAgC,EAChC,iCAAiC,CAClC,EACD,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAE,wBAAwB,GACtC,gBAAgB;IAqFZ,yBAAyB,CAC9B,oBAAoB,EAAE,KAAK,CACzB,gCAAgC,EAChC,iCAAiC,CAClC,EACD,aAAa,EAAE,wBAAwB,EACvC,YAAY,EAAE,KAAK,CAAC,IAAI,EAAE,kBAAkB,CAAC;IA6C/C,OAAO,CAAC,iBAAiB;IA8CzB,OAAO,CAAC,sBAAsB;IA2CvB,gBAAgB,CACrB,WAAW,EAAE,sBAAsB,EACnC,UAAU,EAAE,oBAAoB,EAChC,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAE,wBAAwB,GACtC,uBAAuB;IA8B1B,OAAO,CAAC,kBAAkB;IAqBnB,UAAU,CACf,WAAW,EAAE,sBAAsB,EACnC,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,0BAA0B,EACxC,oBAAoB,EAAE,oBAAoB,EAC1C,gBAAgB,EAAE,gBAAgB,GACjC,uBAAuB;IA8JnB,KAAK,CACV,WAAW,EAAE,sBAAsB,EACnC,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,gBAAgB,GACvB,uBAAuB;IAgI1B;;;;OAIG;IACI,gBAAgB,IAAI,cAAc,CACvC,sBAAsB,EACtB,uBAAuB,CACxB;CAkEF;AAED;;;;GAIG;AACH,qBACa,WAAY,SAAQ,cAAe,YAAW,aAAa;aAKpD,qBAAqB,EAAE,kBAAkB,CACvD,gCAAgC,EAChC,iCAAiC,CAClC;aAEe,OAAO,EAAE,kBAAkB,CAAC,SAAS,EAAE,kBAAkB,CAAC;IATrE,cAAc,EAAE,uBAAuB,CAAC;gBAI7B,qBAAqB,EAAE,kBAAkB,CACvD,gCAAgC,EAChC,iCAAiC,CAClC,EAEe,OAAO,EAAE,kBAAkB,CAAC,SAAS,EAAE,kBAAkB,CAAC,EAE1E,gBAAgB,EAAE,uBAAuB,CAAC,OAAO,CAAC,EAAE,EAEpD,UAAU,EAAE,iBAAiB,CAAC,OAAO,CAAC,EAAE;IAYnC,gBAAgB,CACrB,WAAW,EAAE,sBAAsB,EACnC,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,kBAAkB,CAAC,EACzC,aAAa,EAAE,wBAAwB,GACtC,uBAAuB;IASnB,UAAU,CACf,WAAW,EAAE,sBAAsB,EACnC,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,0BAA0B,EACxC,oBAAoB,EAAE,oBAAoB,EAC1C,gBAAgB,EAAE,gBAAgB,GACjC,uBAAuB;IAUnB,KAAK,CACV,WAAW,EAAE,sBAAsB,EACnC,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,gBAAgB,GACvB,uBAAuB;CAG3B"}
+{"version":3,"file":"BlockProver.d.ts","sourceRoot":"","sources":["../../../src/prover/block/BlockProver.ts"],"names":[],"mappings":"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"}