@proto-kit/protocol 0.1.1-develop.1661 → 0.1.1-develop.1688

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. package/dist/hooks/AccountStateHook.d.ts +1 -0
  2. package/dist/hooks/AccountStateHook.d.ts.map +1 -1
  3. package/dist/hooks/AccountStateHook.js +8 -0
  4. package/dist/hooks/AccountStateHook.js.map +1 -1
  5. package/dist/protocol/ProvableTransactionHook.d.ts +1 -0
  6. package/dist/protocol/ProvableTransactionHook.d.ts.map +1 -1
  7. package/dist/protocol/ProvableTransactionHook.js +3 -0
  8. package/dist/protocol/ProvableTransactionHook.js.map +1 -1
  9. package/dist/prover/block/BlockProver.d.ts +1 -0
  10. package/dist/prover/block/BlockProver.d.ts.map +1 -1
  11. package/dist/prover/block/BlockProver.js +21 -7
  12. package/dist/prover/block/BlockProver.js.map +1 -1
  13. package/dist/state/assert/assert.js +1 -1
  14. package/dist/state/assert/assert.js.map +1 -1
  15. package/package.json +3 -3
  16. package/src/prover/block/BlockProver.ts +27 -21
  17. package/src/prover/statetransition/StateTransitionProver.ts +11 -7
  18. package/src/settlement/contracts/BridgeContract.ts +2 -2
  19. package/src/settlement/contracts/SettlementSmartContract.ts +2 -2
package/dist/hooks/AccountStateHook.d.ts CHANGED
@@ -47,6 +47,7 @@ export declare class AccountStateHook extends ProvableTransactionHook {
47
47
  accountState: StateMap<PublicKey, AccountState>;
48
48
  beforeTransaction({ transaction, }: BeforeTransactionHookArguments): Promise<void>;
49
49
  afterTransaction(): Promise<void>;
50
+ removeTransactionWhen({ transaction, }: BeforeTransactionHookArguments): Promise<boolean>;
50
51
  }
51
52
  export {};
52
53
  //# sourceMappingURL=AccountStateHook.d.ts.map
package/dist/hooks/AccountStateHook.d.ts.map CHANGED
@@ -1 +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;AAIjD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EACL,uBAAuB,EACvB,8BAA8B,EAC/B,MAAM,qCAAqC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG7C,qBAAa,YAAa,SAAQ,iBAEhC;CAAG;AAEL,qBACa,gBAAiB,SAAQ,uBAAuB;IAC3C,YAAY,oCAG1B;IAEW,iBAAiB,CAAC,EAC7B,WAAW,GACZ,EAAE,8BAA8B;IA4BpB,gBAAgB;CAG9B"}
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;AAIjD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EACL,uBAAuB,EACvB,8BAA8B,EAC/B,MAAM,qCAAqC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG7C,qBAAa,YAAa,SAAQ,iBAEhC;CAAG;AAEL,qBACa,gBAAiB,SAAQ,uBAAuB;IAC3C,YAAY,oCAG1B;IAEW,iBAAiB,CAAC,EAC7B,WAAW,GACZ,EAAE,8BAA8B;IA4BpB,gBAAgB;IAKhB,qBAAqB,CAAC,EACjC,WAAW,GACZ,EAAE,8BAA8B,GAAG,OAAO,CAAC,OAAO,CAAC;CAWrD"}
package/dist/hooks/AccountStateHook.js CHANGED
@@ -41,6 +41,14 @@ export let AccountStateHook = class AccountStateHook extends ProvableTransaction
41
41
  async afterTransaction() {
42
42
  noop();
43
43
  }
44
+ // Under these conditions we want the tx removed from the mempool.
45
+ async removeTransactionWhen({ transaction, }) {
46
+ const sender = transaction.sender.value;
47
+ const aso = await this.accountState.get(sender);
48
+ const accountState = aso.orElse(new AccountState({ nonce: UInt64.zero }));
49
+ const currentNonce = accountState.nonce;
50
+ return transaction.nonce.value.lessThan(currentNonce).toBoolean();
51
+ }
44
52
  };
45
53
  __decorate([
46
54
  state(),
package/dist/hooks/AccountStateHook.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AccountStateHook.js","sourceRoot":"","sources":["../../src/hooks/AccountStateHook.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAC;AACxD,OAAO,EACL,uBAAuB,GAExB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,MAAM,OAAO,YAAa,SAAQ,MAAM,CAAC;IACvC,KAAK,EAAE,MAAM;CACd,CAAC;CAAG;AAGE,WAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,uBAAuB;IAAtD;;QACW,iBAAY,GAAG,QAAQ,CAAC,IAAI,CAC1C,SAAS,EACT,YAAY,CACb,CAAC;IAmCJ,CAAC;IAjCQ,KAAK,CAAC,iBAAiB,CAAC,EAC7B,WAAW,GACoB;QAC/B,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;QAExC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEhD,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAE1E,MAAM,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC;QAExC,+EAA+E;QAC/E,MAAM,CACJ,YAAY;aACT,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC;aAC/B,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EACtC,GAAG,EAAE,CACH,+BAA+B,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,sBAAsB,YAAY,CAAC,QAAQ,EAAE,EAAE,CACnH,CAAC;QAEF,kFAAkF;QAClF,gCAAgC;QAChC,sFAAsF;QACtF,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CACtC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CACnE,CAAC;QAEF,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,YAAY,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC;IAEM,KAAK,CAAC,gBAAgB;QAC3B,IAAI,EAAE,CAAC;IACT,CAAC;CACF,CAAA;AAtCiB;IAAf,KAAK,EAAE;;sDAGN;AAJS,gBAAgB;IAD5B,UAAU,EAAE;GACA,gBAAgB,CAuC5B"}
1
+ {"version":3,"file":"AccountStateHook.js","sourceRoot":"","sources":["../../src/hooks/AccountStateHook.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAC;AACxD,OAAO,EACL,uBAAuB,GAExB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,MAAM,OAAO,YAAa,SAAQ,MAAM,CAAC;IACvC,KAAK,EAAE,MAAM;CACd,CAAC;CAAG;AAGE,WAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,uBAAuB;IAAtD;;QACW,iBAAY,GAAG,QAAQ,CAAC,IAAI,CAC1C,SAAS,EACT,YAAY,CACb,CAAC;IAkDJ,CAAC;IAhDQ,KAAK,CAAC,iBAAiB,CAAC,EAC7B,WAAW,GACoB;QAC/B,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;QAExC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEhD,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAE1E,MAAM,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC;QAExC,+EAA+E;QAC/E,MAAM,CACJ,YAAY;aACT,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC;aAC/B,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EACtC,GAAG,EAAE,CACH,+BAA+B,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,sBAAsB,YAAY,CAAC,QAAQ,EAAE,EAAE,CACnH,CAAC;QAEF,kFAAkF;QAClF,gCAAgC;QAChC,sFAAsF;QACtF,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CACtC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CACnE,CAAC;QAEF,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,YAAY,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC;IAEM,KAAK,CAAC,gBAAgB;QAC3B,IAAI,EAAE,CAAC;IACT,CAAC;IAED,kEAAkE;IAC3D,KAAK,CAAC,qBAAqB,CAAC,EACjC,WAAW,GACoB;QAC/B,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;QAExC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEhD,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAE1E,MAAM,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC;QAExC,OAAO,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,SAAS,EAAE,CAAC;IACpE,CAAC;CACF,CAAA;AArDiB;IAAf,KAAK,EAAE;;sDAGN;AAJS,gBAAgB;IAD5B,UAAU,EAAE;GACA,gBAAgB,CAsD5B"}
package/dist/protocol/ProvableTransactionHook.d.ts CHANGED
@@ -30,5 +30,6 @@ export interface AfterTransactionHookArguments extends BeforeTransactionHookArgu
30
30
  export declare abstract class ProvableTransactionHook<Config = NoConfig> extends TransitioningProtocolModule<Config> {
31
31
  abstract beforeTransaction(executionData: BeforeTransactionHookArguments): Promise<void>;
32
32
  abstract afterTransaction(execution: AfterTransactionHookArguments): Promise<void>;
33
+ removeTransactionWhen(execution: BeforeTransactionHookArguments): Promise<boolean>;
33
34
  }
34
35
  //# sourceMappingURL=ProvableTransactionHook.d.ts.map
package/dist/protocol/ProvableTransactionHook.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ProvableTransactionHook.d.ts","sourceRoot":"","sources":["../../src/protocol/ProvableTransactionHook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EACV,gBAAgB,EAChB,2BAA2B,EAC5B,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E,MAAM,MAAM,sBAAsB,GAAG,IAAI,CACvC,2BAA2B,EACzB,kBAAkB,GAClB,yBAAyB,GACzB,sBAAsB,GACtB,eAAe,CAClB,CAAC;AAEF,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,IAAI,CACT,gBAAgB,EACd,iBAAiB,GACjB,yBAAyB,GACzB,kBAAkB,GAClB,eAAe,CAClB;;;;;EAcF;AAED;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,kBAAkB,EAClB,kBAAkB,GAAG,iBAAiB,CACvC,CAAC;AAEF,MAAM,WAAW,8BAA8B;IAC7C,WAAW,EAAE,kBAAkB,CAAC;IAChC,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,sBAAsB,CAAC;CAChC;AAED,MAAM,WAAW,6BACf,SAAQ,8BAA8B;IACtC,aAAa,EAAE,iBAAiB,CAAC;CAClC;AAED,8BAAsB,uBAAuB,CAC3C,MAAM,GAAG,QAAQ,CACjB,SAAQ,2BAA2B,CAAC,MAAM,CAAC;aAC3B,iBAAiB,CAC/B,aAAa,EAAE,8BAA8B,GAC5C,OAAO,CAAC,IAAI,CAAC;aAEA,gBAAgB,CAC9B,SAAS,EAAE,6BAA6B,GACvC,OAAO,CAAC,IAAI,CAAC;CACjB"}
1
+ {"version":3,"file":"ProvableTransactionHook.d.ts","sourceRoot":"","sources":["../../src/protocol/ProvableTransactionHook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EACV,gBAAgB,EAChB,2BAA2B,EAC5B,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E,MAAM,MAAM,sBAAsB,GAAG,IAAI,CACvC,2BAA2B,EACzB,kBAAkB,GAClB,yBAAyB,GACzB,sBAAsB,GACtB,eAAe,CAClB,CAAC;AAEF,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,IAAI,CACT,gBAAgB,EACd,iBAAiB,GACjB,yBAAyB,GACzB,kBAAkB,GAClB,eAAe,CAClB;;;;;EAcF;AAED;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,kBAAkB,EAClB,kBAAkB,GAAG,iBAAiB,CACvC,CAAC;AAEF,MAAM,WAAW,8BAA8B;IAC7C,WAAW,EAAE,kBAAkB,CAAC;IAChC,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,sBAAsB,CAAC;CAChC;AAED,MAAM,WAAW,6BACf,SAAQ,8BAA8B;IACtC,aAAa,EAAE,iBAAiB,CAAC;CAClC;AAED,8BAAsB,uBAAuB,CAC3C,MAAM,GAAG,QAAQ,CACjB,SAAQ,2BAA2B,CAAC,MAAM,CAAC;aAC3B,iBAAiB,CAC/B,aAAa,EAAE,8BAA8B,GAC5C,OAAO,CAAC,IAAI,CAAC;aAEA,gBAAgB,CAC9B,SAAS,EAAE,6BAA6B,GACvC,OAAO,CAAC,IAAI,CAAC;IAEH,qBAAqB,CAChC,SAAS,EAAE,8BAA8B,GACxC,OAAO,CAAC,OAAO,CAAC;CAGpB"}
package/dist/protocol/ProvableTransactionHook.js CHANGED
@@ -9,5 +9,8 @@ export function toProvableHookBlockState(state) {
9
9
  };
10
10
  }
11
11
  export class ProvableTransactionHook extends TransitioningProtocolModule {
12
+ async removeTransactionWhen(execution) {
13
+ return false;
14
+ }
12
15
  }
13
16
  //# sourceMappingURL=ProvableTransactionHook.js.map
package/dist/protocol/ProvableTransactionHook.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ProvableTransactionHook.js","sourceRoot":"","sources":["../../src/protocol/ProvableTransactionHook.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAU5E,MAAM,UAAU,wBAAwB,CACtC,KAMC;IAED,MAAM,EACJ,eAAe,EACf,uBAAuB,EACvB,gBAAgB,EAChB,aAAa,GACd,GAAG,KAAK,CAAC;IACV,OAAO;QACL,gBAAgB,EAAE,eAAe,CAAC,UAAU;QAC5C,uBAAuB,EAAE,uBAAuB,CAAC,UAAU;QAC3D,oBAAoB,EAAE,gBAAgB,CAAC,UAAU;QACjD,aAAa;KACd,CAAC;AACJ,CAAC;AAwBD,MAAM,OAAgB,uBAEpB,SAAQ,2BAAmC;CAQ5C"}
1
+ {"version":3,"file":"ProvableTransactionHook.js","sourceRoot":"","sources":["../../src/protocol/ProvableTransactionHook.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAU5E,MAAM,UAAU,wBAAwB,CACtC,KAMC;IAED,MAAM,EACJ,eAAe,EACf,uBAAuB,EACvB,gBAAgB,EAChB,aAAa,GACd,GAAG,KAAK,CAAC;IACV,OAAO;QACL,gBAAgB,EAAE,eAAe,CAAC,UAAU;QAC5C,uBAAuB,EAAE,uBAAuB,CAAC,UAAU;QAC3D,oBAAoB,EAAE,gBAAgB,CAAC,UAAU;QACjD,aAAa;KACd,CAAC;AACJ,CAAC;AAwBD,MAAM,OAAgB,uBAEpB,SAAQ,2BAAmC;IASpC,KAAK,CAAC,qBAAqB,CAChC,SAAyC;QAEzC,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
package/dist/prover/block/BlockProver.d.ts CHANGED
@@ -55,6 +55,7 @@ export declare class BlockProverProgrammable extends ZkProgrammable<BlockProverP
55
55
  executeBlockHooks<T extends BeforeBlockHookArguments | AfterBlockHookArguments>(hook: (module: ProvableBlockHook<unknown>, networkState: NetworkState, args: T) => Promise<NetworkState>, hookArguments: T, inputNetworkState: NetworkState): Promise<{
56
56
  batch: AppliedStateTransitionBatch;
57
57
  result: NetworkState;
58
+ rawStatus: import("o1js/dist/node/lib/provable/bool").Bool;
58
59
  }>;
59
60
  addTransactionToBundle<T extends Pick<BlockProverState, "transactionList" | "eternalTransactionsList" | "incomingMessages">>(state: T, isMessage: Bool, transaction: RuntimeTransaction): T;
60
61
  private verifyVerificationKeyAttestation;
package/dist/prover/block/BlockProver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BlockProver.d.ts","sourceRoot":"","sources":["../../../src/prover/block/BlockProver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BlockProver.d.ts","sourceRoot":"","sources":["../../../src/prover/block/BlockProver.ts"],"names":[],"mappings":"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"}
package/dist/prover/block/BlockProver.js CHANGED
@@ -76,7 +76,7 @@ export class BlockProverProgrammable extends ZkProgrammable {
76
76
  const { isMessage } = runtimeOutput;
77
77
  const beforeTxHookArguments = toBeforeTransactionHookArgument(executionData, networkState, state);
78
78
  // Apply beforeTransaction hook state transitions
79
- const beforeBatch = await this.executeTransactionHooks(async (module, args) => await module.beforeTransaction(args), beforeTxHookArguments);
79
+ const beforeBatch = await this.executeTransactionHooks(async (module, args) => await module.beforeTransaction(args), beforeTxHookArguments, isMessage);
80
80
  state = this.addTransactionToBundle(state, runtimeOutput.isMessage, transaction);
81
81
  state.pendingSTBatches.push(beforeBatch);
82
82
  state.pendingSTBatches.push({
@@ -87,7 +87,7 @@ export class BlockProverProgrammable extends ZkProgrammable {
87
87
  const afterTxHookArguments = toAfterTransactionHookArgument(executionData, networkState, state, runtimeOutput);
88
88
  // Switch to different state set for afterTx hooks
89
89
  this.stateServiceProvider.popCurrentStateService();
90
- const afterBatch = await this.executeTransactionHooks(async (module, args) => await module.afterTransaction(args), afterTxHookArguments);
90
+ const afterBatch = await this.executeTransactionHooks(async (module, args) => await module.afterTransaction(args), afterTxHookArguments, isMessage);
91
91
  state.pendingSTBatches.push(afterBatch);
92
92
  // Check transaction integrity against appProof
93
93
  const blockTransactionHash = transaction.hash();
@@ -126,16 +126,19 @@ export class BlockProverProgrammable extends ZkProgrammable {
126
126
  applied,
127
127
  });
128
128
  }
129
- async executeTransactionHooks(hook, hookArguments) {
130
- const { batch } = await this.executeHooks(hookArguments, async () => {
129
+ async executeTransactionHooks(hook, hookArguments, isMessage) {
130
+ const { batch, rawStatus } = await this.executeHooks(hookArguments, async () => {
131
131
  for (const module of this.transactionHooks) {
132
132
  // eslint-disable-next-line no-await-in-loop
133
133
  await hook(module, hookArguments);
134
134
  }
135
- });
135
+ }, isMessage);
136
+ // This is going to set applied to false in case the hook fails
137
+ // (that's only possible for messages though as others are hard-asserted)
138
+ batch.applied = rawStatus;
136
139
  return batch;
137
140
  }
138
- async executeHooks(contextArguments, method) {
141
+ async executeHooks(contextArguments, method, isMessage = undefined) {
139
142
  const executionContext = container.resolve(RuntimeMethodExecutionContext);
140
143
  executionContext.clear();
141
144
  // Setup context for potential calls to runtime methods.
@@ -146,10 +149,21 @@ export class BlockProverProgrammable extends ZkProgrammable {
146
149
  const result = await method();
147
150
  executionContext.afterMethod();
148
151
  const { stateTransitions, status, statusMessage } = executionContext.current().result;
149
- status.assertTrue(`Transaction hook call failed: ${statusMessage ?? "-"}`);
152
+ // See https://github.com/proto-kit/framework/issues/321 for why we do this here
153
+ if (isMessage !== undefined) {
154
+ // isMessage is defined for all tx hooks
155
+ status
156
+ .or(isMessage)
157
+ .assertTrue(`Transaction hook call failed for non-message tx: ${statusMessage ?? "-"}`);
158
+ }
159
+ else {
160
+ // isMessage is undefined for all block hooks
161
+ status.assertTrue(`Block hook call failed: ${statusMessage ?? "-"}`);
162
+ }
150
163
  return {
151
164
  batch: this.constructBatch(stateTransitions, Bool(true)),
152
165
  result,
166
+ rawStatus: status,
153
167
  };
154
168
  }
155
169
  async executeBlockHooks(hook, hookArguments, inputNetworkState) {
package/dist/prover/block/BlockProver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BlockProver.js","sourceRoot":"","sources":["../../../src/prover/block/BlockProver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BlockProver.js","sourceRoot":"","sources":["../../../src/prover/block/BlockProver.ts"],"names":[],"mappings":"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"}
package/dist/state/assert/assert.js CHANGED
@@ -16,7 +16,7 @@ export function assert(condition, message) {
16
16
  const previousStatus = executionContext.current().result.status;
17
17
  const status = condition.and(previousStatus);
18
18
  Provable.asProver(() => {
19
- if (!condition.toBoolean()) {
19
+ if (!condition.toBoolean() && previousStatus.toBoolean()) {
20
20
  const messageString = message !== undefined && typeof message === "function"
21
21
  ? message()
22
22
  : message;
package/dist/state/assert/assert.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"assert.js","sourceRoot":"","sources":["../../../src/state/assert/assert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,QAAQ,EAAE,MAAM,MAAM,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AAEzF;;;;;;;;GAQG;AACH,MAAM,UAAU,MAAM,CAAC,SAAe,EAAE,OAAiC;IACvE,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAC1E,MAAM,cAAc,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;IAChE,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAE7C,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE;QACrB,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE;YAC1B,MAAM,aAAa,GACjB,OAAO,KAAK,SAAS,IAAI,OAAO,OAAO,KAAK,UAAU;gBACpD,CAAC,CAAC,OAAO,EAAE;gBACX,CAAC,CAAC,OAAO,CAAC;YAEd,2DAA2D;YAC3D,6BAA6B;YAC7B,IAAI,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,WAAW,IAAI,KAAK,CAAC,EAAE;gBACtD,GAAG,CAAC,KAAK,CAAC,oBAAoB,EAAE,aAAa,CAAC,CAAC;aAChD;YACD,gBAAgB,CAAC,gBAAgB,CAAC,aAAa,EAAE,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC;SACrE;IACH,CAAC,CAAC,CAAC;IAEH,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AACrC,CAAC"}
1
+ {"version":3,"file":"assert.js","sourceRoot":"","sources":["../../../src/state/assert/assert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,QAAQ,EAAE,MAAM,MAAM,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AAEzF;;;;;;;;GAQG;AACH,MAAM,UAAU,MAAM,CAAC,SAAe,EAAE,OAAiC;IACvE,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAC1E,MAAM,cAAc,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;IAChE,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAE7C,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE;QACrB,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,cAAc,CAAC,SAAS,EAAE,EAAE;YACxD,MAAM,aAAa,GACjB,OAAO,KAAK,SAAS,IAAI,OAAO,OAAO,KAAK,UAAU;gBACpD,CAAC,CAAC,OAAO,EAAE;gBACX,CAAC,CAAC,OAAO,CAAC;YAEd,2DAA2D;YAC3D,6BAA6B;YAC7B,IAAI,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,WAAW,IAAI,KAAK,CAAC,EAAE;gBACtD,GAAG,CAAC,KAAK,CAAC,oBAAoB,EAAE,aAAa,CAAC,CAAC;aAChD;YACD,gBAAgB,CAAC,gBAAgB,CAAC,aAAa,EAAE,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC;SACrE;IACH,CAAC,CAAC,CAAC;IAEH,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AACrC,CAAC"}
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "license": "MIT",
4
4
  "private": false,
5
5
  "type": "module",
6
- "version": "0.1.1-develop.1661+ec6f5592",
6
+ "version": "0.1.1-develop.1688+a8257e42",
7
7
  "scripts": {
8
8
  "build": "tsc -p tsconfig.json",
9
9
  "dev": "tsc -p tsconfig.json --watch",
@@ -24,7 +24,7 @@
24
24
  },
25
25
  "peerDependencies": {
26
26
  "@proto-kit/common": "*",
27
- "o1js": "^1.6.0",
27
+ "o1js": "^2.10.0",
28
28
  "ts-pattern": "^4.3.0",
29
29
  "tsyringe": "^4.10.0"
30
30
  },
@@ -32,5 +32,5 @@
32
32
  "@jest/globals": "^29.5.0",
33
33
  "@types/lodash": "^4.14.194"
34
34
  },
35
- "gitHead": "ec6f55921b35d7faaab233f1ca9cf591c6263d01"
35
+ "gitHead": "a8257e428f8cda2b7252ead17e29482d2fdb0575"
36
36
  }
package/src/prover/block/BlockProver.ts CHANGED
@@ -932,11 +932,13 @@ export class BlockProverProgrammable extends ZkProgrammable<
932
932
  runtimeProof: DynamicRuntimeProof,
933
933
  executionData: BlockProverSingleTransactionExecutionData
934
934
  ) {
935
- return await proveTransaction(
936
- publicInput,
937
- runtimeProof,
938
- executionData
939
- );
935
+ return {
936
+ publicOutput: await proveTransaction(
937
+ publicInput,
938
+ runtimeProof,
939
+ executionData
940
+ ),
941
+ };
940
942
  },
941
943
  },
942
944
 
@@ -953,12 +955,14 @@ export class BlockProverProgrammable extends ZkProgrammable<
953
955
  runtimeProof2: DynamicRuntimeProof,
954
956
  executionData: BlockProverMultiTransactionExecutionData
955
957
  ) {
956
- return await proveTransactions(
957
- publicInput,
958
- runtimeProof1,
959
- runtimeProof2,
960
- executionData
961
- );
958
+ return {
959
+ publicOutput: await proveTransactions(
960
+ publicInput,
961
+ runtimeProof1,
962
+ runtimeProof2,
963
+ executionData
964
+ ),
965
+ };
962
966
  },
963
967
  },
964
968
 
@@ -980,15 +984,17 @@ export class BlockProverProgrammable extends ZkProgrammable<
980
984
  afterBlockRootWitness: WitnessedRootWitness,
981
985
  transactionProof: BlockProverProof
982
986
  ) {
983
- return await proveBlock(
984
- publicInput,
985
- networkState,
986
- blockWitness,
987
- stateTransitionProof,
988
- deferSTs,
989
- afterBlockRootWitness,
990
- transactionProof
991
- );
987
+ return {
988
+ publicOutput: await proveBlock(
989
+ publicInput,
990
+ networkState,
991
+ blockWitness,
992
+ stateTransitionProof,
993
+ deferSTs,
994
+ afterBlockRootWitness,
995
+ transactionProof
996
+ ),
997
+ };
992
998
  },
993
999
  },
994
1000
 
@@ -1003,7 +1009,7 @@ export class BlockProverProgrammable extends ZkProgrammable<
1003
1009
  proof1: BlockProverProof,
1004
1010
  proof2: BlockProverProof
1005
1011
  ) {
1006
- return await merge(publicInput, proof1, proof2);
1012
+ return { publicOutput: await merge(publicInput, proof1, proof2) };
1007
1013
  },
1008
1014
  },
1009
1015
  },
package/src/prover/statetransition/StateTransitionProver.ts CHANGED
@@ -100,12 +100,14 @@ export class StateTransitionProverProgrammable extends ZkProgrammable<
100
100
  witnesses: MerkleWitnessBatch,
101
101
  currentAppliedBatch: AppliedStateTransitionBatchState
102
102
  ) {
103
- return await instance.proveBatch(
104
- publicInput,
105
- batch,
106
- witnesses,
107
- currentAppliedBatch
108
- );
103
+ return {
104
+ publicOutput: await instance.proveBatch(
105
+ publicInput,
106
+ batch,
107
+ witnesses,
108
+ currentAppliedBatch
109
+ ),
110
+ };
109
111
  },
110
112
  },
111
113
 
@@ -120,7 +122,9 @@ export class StateTransitionProverProgrammable extends ZkProgrammable<
120
122
  proof1: StateTransitionProof,
121
123
  proof2: StateTransitionProof
122
124
  ) {
123
- return await instance.merge(publicInput, proof1, proof2);
125
+ return {
126
+ publicOutput: await instance.merge(publicInput, proof1, proof2),
127
+ };
124
128
  },
125
129
  },
126
130
  },
package/src/settlement/contracts/BridgeContract.ts CHANGED
@@ -12,7 +12,7 @@ import {
12
12
  State,
13
13
  state,
14
14
  Struct,
15
- TokenContractV2,
15
+ TokenContract,
16
16
  TokenId,
17
17
  VerificationKey,
18
18
  } from "o1js";
@@ -64,7 +64,7 @@ export class BridgeContractContext {
64
64
  } = { messageInputs: [] };
65
65
  }
66
66
 
67
- export abstract class BridgeContractBase extends TokenContractV2 {
67
+ export abstract class BridgeContractBase extends TokenContract {
68
68
  public static args: {
69
69
  SettlementContract:
70
70
  | (TypedClass<SettlementContractType> & typeof SmartContract)
package/src/settlement/contracts/SettlementSmartContract.ts CHANGED
@@ -17,7 +17,7 @@ import {
17
17
  state,
18
18
  UInt32,
19
19
  AccountUpdateForest,
20
- TokenContractV2,
20
+ TokenContract,
21
21
  PrivateKey,
22
22
  VerificationKey,
23
23
  Permissions,
@@ -105,7 +105,7 @@ export const BATCH_SIGNATURE_PREFIX = prefixToField("pk-batchSignature");
105
105
  // };
106
106
  // }
107
107
 
108
- export abstract class SettlementSmartContractBase extends TokenContractV2 {
108
+ export abstract class SettlementSmartContractBase extends TokenContract {
109
109
  // This pattern of injecting args into a smartcontract is currently the only
110
110
  // viable solution that works given the inheritance issues of o1js
111
111
  // public static args = container.resolve(SettlementSmartContractStaticArgs);