@proto-kit/protocol 0.1.1-develop.1665 → 0.1.1-develop.1689
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.
- package/dist/hooks/AccountStateHook.d.ts +1 -1
- package/dist/model/network/NetworkState.d.ts +2 -2
- package/dist/model/transaction/SignedTransaction.d.ts +5 -2
- package/dist/model/transaction/SignedTransaction.d.ts.map +1 -1
- package/dist/model/transaction/ValueOption.d.ts +14 -0
- package/dist/model/transaction/ValueOption.d.ts.map +1 -1
- package/dist/prover/block/BlockProvable.d.ts +22 -10
- package/dist/prover/block/BlockProvable.d.ts.map +1 -1
- package/dist/prover/block/BlockProver.d.ts.map +1 -1
- package/dist/prover/block/BlockProver.js +10 -4
- package/dist/prover/block/BlockProver.js.map +1 -1
- package/dist/prover/statetransition/StateTransitionProver.d.ts.map +1 -1
- package/dist/prover/statetransition/StateTransitionProver.js +6 -2
- package/dist/prover/statetransition/StateTransitionProver.js.map +1 -1
- package/dist/settlement/contracts/BridgeContract.d.ts +2 -2
- package/dist/settlement/contracts/BridgeContract.d.ts.map +1 -1
- package/dist/settlement/contracts/BridgeContract.js +2 -2
- package/dist/settlement/contracts/BridgeContract.js.map +1 -1
- package/dist/settlement/contracts/SettlementSmartContract.d.ts +2 -2
- package/dist/settlement/contracts/SettlementSmartContract.d.ts.map +1 -1
- package/dist/settlement/contracts/SettlementSmartContract.js +2 -2
- package/dist/settlement/contracts/SettlementSmartContract.js.map +1 -1
- package/dist/settlement/messages/Deposit.d.ts +1 -1
- package/dist/settlement/messages/OutgoingMessageArgument.d.ts +31 -0
- package/dist/settlement/messages/OutgoingMessageArgument.d.ts.map +1 -1
- package/dist/settlement/messages/Withdrawal.d.ts +2 -0
- package/dist/settlement/messages/Withdrawal.d.ts.map +1 -0
- package/dist/settlement/messages/Withdrawal.js +3 -0
- package/dist/settlement/messages/Withdrawal.js.map +1 -0
- package/dist/state/SimpleAsyncStateService.d.ts +6 -0
- package/dist/state/SimpleAsyncStateService.d.ts.map +1 -0
- package/dist/state/SimpleAsyncStateService.js +2 -0
- package/dist/state/SimpleAsyncStateService.js.map +1 -0
- package/dist/state/context/RuntimeMethodExecutionContext.d.ts +1 -1
- package/dist/utils/StateTransitionReductionList.d.ts +11 -0
- package/dist/utils/StateTransitionReductionList.d.ts.map +1 -0
- package/dist/utils/StateTransitionReductionList.js +61 -0
- package/dist/utils/StateTransitionReductionList.js.map +1 -0
- package/package.json +3 -3
- package/src/prover/block/BlockProver.ts +27 -21
- package/src/prover/statetransition/StateTransitionProver.ts +11 -7
- package/src/settlement/contracts/BridgeContract.ts +2 -2
- package/src/settlement/contracts/SettlementSmartContract.ts +2 -2
|
@@ -15,7 +15,7 @@ declare const CurrentBlock_base: (new (value: {
|
|
|
15
15
|
};
|
|
16
16
|
} & {
|
|
17
17
|
fromValue: (value: {
|
|
18
|
-
height: bigint | UInt64;
|
|
18
|
+
height: number | bigint | UInt64;
|
|
19
19
|
}) => {
|
|
20
20
|
height: UInt64;
|
|
21
21
|
};
|
|
@@ -109,7 +109,7 @@ declare const NetworkState_base: (new (value: {
|
|
|
109
109
|
} & {
|
|
110
110
|
fromValue: (value: {
|
|
111
111
|
block: CurrentBlock | {
|
|
112
|
-
height: bigint | UInt64;
|
|
112
|
+
height: number | bigint | UInt64;
|
|
113
113
|
};
|
|
114
114
|
previous: PreviousBlock | {
|
|
115
115
|
rootHash: string | number | bigint | import("o1js/dist/node/lib/provable/field").Field;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Bool, Field, Signature, UInt64 } from "o1js";
|
|
1
|
+
import { Bool, Field, Scalar, Signature, UInt64 } from "o1js";
|
|
2
2
|
import { RuntimeTransaction } from "./RuntimeTransaction";
|
|
3
3
|
declare const SignedTransaction_base: (new (value: {
|
|
4
4
|
transaction: RuntimeTransaction;
|
|
@@ -39,7 +39,10 @@ declare const SignedTransaction_base: (new (value: {
|
|
|
39
39
|
value: any;
|
|
40
40
|
};
|
|
41
41
|
};
|
|
42
|
-
signature:
|
|
42
|
+
signature: Signature | {
|
|
43
|
+
r: bigint | import("o1js/dist/node/lib/provable/field").Field;
|
|
44
|
+
s: bigint | Scalar;
|
|
45
|
+
};
|
|
43
46
|
}) => {
|
|
44
47
|
transaction: RuntimeTransaction;
|
|
45
48
|
signature: Signature;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SignedTransaction.d.ts","sourceRoot":"","sources":["../../../src/model/transaction/SignedTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"SignedTransaction.d.ts","sourceRoot":"","sources":["../../../src/model/transaction/SignedTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAU,MAAM,EAAE,MAAM,MAAM,CAAC;AAEtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE1D,qBAAa,iBAAkB,SAAQ,sBAGrC;WACc,gBAAgB,CAAC,IAAI,EAAE;QACnC,QAAQ,EAAE,KAAK,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,KAAK,CAAC;KACjB,GAAG,KAAK,EAAE;WAIG,KAAK,IAAI,iBAAiB;IAWjC,IAAI,IAAI,KAAK;IAIb,gBAAgB,IAAI,KAAK,EAAE;IAS3B,iBAAiB,IAAI,IAAI;CAMjC"}
|
|
@@ -56,6 +56,13 @@ declare const UInt64Option_base: {
|
|
|
56
56
|
isSome: import("o1js/dist/node/lib/provable/bool").Bool;
|
|
57
57
|
value: UInt64;
|
|
58
58
|
});
|
|
59
|
+
toCanonical?: ((x: {
|
|
60
|
+
isSome: import("o1js/dist/node/lib/provable/bool").Bool;
|
|
61
|
+
value: UInt64;
|
|
62
|
+
}) => {
|
|
63
|
+
isSome: import("o1js/dist/node/lib/provable/bool").Bool;
|
|
64
|
+
value: UInt64;
|
|
65
|
+
}) | undefined;
|
|
59
66
|
toInput: (x: {
|
|
60
67
|
isSome: import("o1js/dist/node/lib/provable/bool").Bool;
|
|
61
68
|
value: UInt64;
|
|
@@ -141,6 +148,13 @@ declare const PublicKeyOption_base: {
|
|
|
141
148
|
isSome: import("o1js/dist/node/lib/provable/bool").Bool;
|
|
142
149
|
value: PublicKey;
|
|
143
150
|
});
|
|
151
|
+
toCanonical?: ((x: {
|
|
152
|
+
isSome: import("o1js/dist/node/lib/provable/bool").Bool;
|
|
153
|
+
value: PublicKey;
|
|
154
|
+
}) => {
|
|
155
|
+
isSome: import("o1js/dist/node/lib/provable/bool").Bool;
|
|
156
|
+
value: PublicKey;
|
|
157
|
+
}) | undefined;
|
|
144
158
|
toInput: (x: {
|
|
145
159
|
isSome: import("o1js/dist/node/lib/provable/bool").Bool;
|
|
146
160
|
value: PublicKey;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValueOption.d.ts","sourceRoot":"","sources":["../../../src/model/transaction/ValueOption.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,SAAS,EAAU,MAAM,EAAE,MAAM,MAAM,CAAC
|
|
1
|
+
{"version":3,"file":"ValueOption.d.ts","sourceRoot":"","sources":["../../../src/model/transaction/ValueOption.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,SAAS,EAAU,MAAM,EAAE,MAAM,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuBzE,qBAAa,YAAa,SAAQ,iBAAoC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzE,qBAAa,eAAgB,SAAQ,oBAEpC;CAAG"}
|
|
@@ -404,9 +404,12 @@ declare const BlockProverTransactionArguments_base: (new (value: {
|
|
|
404
404
|
value: any;
|
|
405
405
|
};
|
|
406
406
|
};
|
|
407
|
-
signature:
|
|
407
|
+
signature: Signature | {
|
|
408
|
+
r: bigint | import("o1js/dist/node/lib/provable/field").Field;
|
|
409
|
+
s: bigint | import("o1js/dist/node/lib/provable/scalar").Scalar;
|
|
410
|
+
};
|
|
408
411
|
verificationKeyAttestation: RuntimeVerificationKeyAttestation | {
|
|
409
|
-
verificationKey: import("o1js/dist/node/lib/proof-system/
|
|
412
|
+
verificationKey: import("o1js/dist/node/lib/proof-system/verification-key").VerificationKey | {
|
|
410
413
|
data: string;
|
|
411
414
|
hash: import("o1js/dist/node/lib/provable/field").Field;
|
|
412
415
|
} | {
|
|
@@ -556,9 +559,12 @@ declare const BlockProverSingleTransactionExecutionData_base: (new (value: {
|
|
|
556
559
|
value: any;
|
|
557
560
|
};
|
|
558
561
|
};
|
|
559
|
-
signature:
|
|
562
|
+
signature: Signature | {
|
|
563
|
+
r: bigint | import("o1js/dist/node/lib/provable/field").Field;
|
|
564
|
+
s: bigint | import("o1js/dist/node/lib/provable/scalar").Scalar;
|
|
565
|
+
};
|
|
560
566
|
verificationKeyAttestation: RuntimeVerificationKeyAttestation | {
|
|
561
|
-
verificationKey: import("o1js/dist/node/lib/proof-system/
|
|
567
|
+
verificationKey: import("o1js/dist/node/lib/proof-system/verification-key").VerificationKey | {
|
|
562
568
|
data: string;
|
|
563
569
|
hash: import("o1js/dist/node/lib/provable/field").Field;
|
|
564
570
|
} | {
|
|
@@ -573,7 +579,7 @@ declare const BlockProverSingleTransactionExecutionData_base: (new (value: {
|
|
|
573
579
|
};
|
|
574
580
|
networkState: NetworkState | {
|
|
575
581
|
block: import("../../model/network/NetworkState").CurrentBlock | {
|
|
576
|
-
height: bigint | import("o1js/dist/node/lib/provable/int").UInt64;
|
|
582
|
+
height: number | bigint | import("o1js/dist/node/lib/provable/int").UInt64;
|
|
577
583
|
};
|
|
578
584
|
previous: import("../../model/network/NetworkState").PreviousBlock | {
|
|
579
585
|
rootHash: string | number | bigint | import("o1js/dist/node/lib/provable/field").Field;
|
|
@@ -755,9 +761,12 @@ declare const BlockProverMultiTransactionExecutionData_base: (new (value: {
|
|
|
755
761
|
value: any;
|
|
756
762
|
};
|
|
757
763
|
};
|
|
758
|
-
signature:
|
|
764
|
+
signature: Signature | {
|
|
765
|
+
r: bigint | import("o1js/dist/node/lib/provable/field").Field;
|
|
766
|
+
s: bigint | import("o1js/dist/node/lib/provable/scalar").Scalar;
|
|
767
|
+
};
|
|
759
768
|
verificationKeyAttestation: RuntimeVerificationKeyAttestation | {
|
|
760
|
-
verificationKey: import("o1js/dist/node/lib/proof-system/
|
|
769
|
+
verificationKey: import("o1js/dist/node/lib/proof-system/verification-key").VerificationKey | {
|
|
761
770
|
data: string;
|
|
762
771
|
hash: import("o1js/dist/node/lib/provable/field").Field;
|
|
763
772
|
} | {
|
|
@@ -783,9 +792,12 @@ declare const BlockProverMultiTransactionExecutionData_base: (new (value: {
|
|
|
783
792
|
value: any;
|
|
784
793
|
};
|
|
785
794
|
};
|
|
786
|
-
signature:
|
|
795
|
+
signature: Signature | {
|
|
796
|
+
r: bigint | import("o1js/dist/node/lib/provable/field").Field;
|
|
797
|
+
s: bigint | import("o1js/dist/node/lib/provable/scalar").Scalar;
|
|
798
|
+
};
|
|
787
799
|
verificationKeyAttestation: RuntimeVerificationKeyAttestation | {
|
|
788
|
-
verificationKey: import("o1js/dist/node/lib/proof-system/
|
|
800
|
+
verificationKey: import("o1js/dist/node/lib/proof-system/verification-key").VerificationKey | {
|
|
789
801
|
data: string;
|
|
790
802
|
hash: import("o1js/dist/node/lib/provable/field").Field;
|
|
791
803
|
} | {
|
|
@@ -800,7 +812,7 @@ declare const BlockProverMultiTransactionExecutionData_base: (new (value: {
|
|
|
800
812
|
};
|
|
801
813
|
networkState: NetworkState | {
|
|
802
814
|
block: import("../../model/network/NetworkState").CurrentBlock | {
|
|
803
|
-
height: bigint | import("o1js/dist/node/lib/provable/int").UInt64;
|
|
815
|
+
height: number | bigint | import("o1js/dist/node/lib/provable/int").UInt64;
|
|
804
816
|
};
|
|
805
817
|
previous: import("../../model/network/NetworkState").PreviousBlock | {
|
|
806
818
|
rootHash: string | number | bigint | import("o1js/dist/node/lib/provable/field").Field;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BlockProvable.d.ts","sourceRoot":"","sources":["../../../src/prover/block/BlockProvable.ts"],"names":[],"mappings":"AACA,OAAO,EACL,IAAI,EACJ,YAAY,EACZ,KAAK,EACL,KAAK,EACL,SAAS,EAET,IAAI,EACL,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAE,iCAAiC,EAAE,MAAM,4CAA4C,CAAC;AAG/F,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,SAAS,EAAE,KAAK,CAAC;IAEjB;;;OAGG;IACH,eAAe,EAAE,mBAAmB,CAAC;IAErC;;;OAGG;IACH,YAAY,EAAE,YAAY,CAAC;IAE3B;;;OAGG;IACH,aAAa,EAAE,KAAK,CAAC;IAErB;;;;OAIG;IACH,uBAAuB,EAAE,mBAAmB,CAAC;IAE7C,gBAAgB,EAAE,oBAAoB,CAAC;IAEvC,gBAAgB,EAAE,mBAAmB,CAAC;IAEtC,cAAc,EAAE,qBAAqB,CAAC;IAEtC,WAAW,EAAE,KAAK,CAAC;CACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGD,qBAAa,2BAA4B,SAAQ,gCAW/C;WACc,oBAAoB,CAChC,KAAK,EAAE,gBAAgB,GACtB,2BAA2B;WAchB,kBAAkB,CAC9B,WAAW,EAAE,2BAA2B,EACxC,YAAY,EAAE,YAAY,GACzB,gBAAgB;CAwBpB;AAED,qBAAa,sBAAuB,SAAQ,2BAA2B;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE1E,qBAAa,uBAAwB,SAAQ,4BAW3C;IACO,MAAM,CAAC,KAAK,EAAE,sBAAsB,EAAE,MAAM,EAAE,IAAI,GAAG,IAAI;CAUjE;AAED,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAClC,sBAAsB,EACtB,uBAAuB,CACxB,CAAC
|
|
1
|
+
{"version":3,"file":"BlockProvable.d.ts","sourceRoot":"","sources":["../../../src/prover/block/BlockProvable.ts"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|
|
@@ -457,7 +457,9 @@ export class BlockProverProgrammable extends ZkProgrammable {
|
|
|
457
457
|
BlockProverSingleTransactionExecutionData,
|
|
458
458
|
],
|
|
459
459
|
async method(publicInput, runtimeProof, executionData) {
|
|
460
|
-
return
|
|
460
|
+
return {
|
|
461
|
+
publicOutput: await proveTransaction(publicInput, runtimeProof, executionData),
|
|
462
|
+
};
|
|
461
463
|
},
|
|
462
464
|
},
|
|
463
465
|
proveTransactions: {
|
|
@@ -467,7 +469,9 @@ export class BlockProverProgrammable extends ZkProgrammable {
|
|
|
467
469
|
BlockProverMultiTransactionExecutionData,
|
|
468
470
|
],
|
|
469
471
|
async method(publicInput, runtimeProof1, runtimeProof2, executionData) {
|
|
470
|
-
return
|
|
472
|
+
return {
|
|
473
|
+
publicOutput: await proveTransactions(publicInput, runtimeProof1, runtimeProof2, executionData),
|
|
474
|
+
};
|
|
471
475
|
},
|
|
472
476
|
},
|
|
473
477
|
proveBlock: {
|
|
@@ -480,7 +484,9 @@ export class BlockProverProgrammable extends ZkProgrammable {
|
|
|
480
484
|
(SelfProof),
|
|
481
485
|
],
|
|
482
486
|
async method(publicInput, networkState, blockWitness, stateTransitionProof, deferSTs, afterBlockRootWitness, transactionProof) {
|
|
483
|
-
return
|
|
487
|
+
return {
|
|
488
|
+
publicOutput: await proveBlock(publicInput, networkState, blockWitness, stateTransitionProof, deferSTs, afterBlockRootWitness, transactionProof),
|
|
489
|
+
};
|
|
484
490
|
},
|
|
485
491
|
},
|
|
486
492
|
merge: {
|
|
@@ -489,7 +495,7 @@ export class BlockProverProgrammable extends ZkProgrammable {
|
|
|
489
495
|
(SelfProof),
|
|
490
496
|
],
|
|
491
497
|
async method(publicInput, proof1, proof2) {
|
|
492
|
-
return await merge(publicInput, proof1, proof2);
|
|
498
|
+
return { publicOutput: await merge(publicInput, proof1, proof2) };
|
|
493
499
|
},
|
|
494
500
|
},
|
|
495
501
|
},
|
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StateTransitionProver.d.ts","sourceRoot":"","sources":["../../../src/prover/statetransition/StateTransitionProver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,cAAc,EAEd,cAAc,EACd,gBAAgB,EAChB,KAAK,cAAc,EACnB,KAAK,eAAe,EAGpB,uBAAuB,EACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAkC,MAAM,MAAM,CAAC;AAI7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EACL,kBAAkB,EAClB,4BAA4B,EAE7B,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,gCAAgC,EAAE,MAAM,yCAAyC,CAAC;AAE3F,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,gCAAgC,EAChC,iCAAiC,EAClC,MAAM,2BAA2B,CAAC;AAUnC,UAAU,mCAAmC;IAC3C,YAAY,EAAE,gCAAgC,CAAC;IAC/C,SAAS,EAAE,oBAAoB,CAAC;IAChC,aAAa,EAAE,KAAK,CAAC;IACrB,cAAc,EAAE,qBAAqB,CAAC;CACvC;AAOD;;;GAGG;AACH,qBAAa,iCAAkC,SAAQ,cAAc,CACnE,gCAAgC,EAChC,iCAAiC,CAClC;IAEG,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBAArB,qBAAqB,EAAE,IAAI,CAC1C,qBAAqB,EACrB,kBAAkB,CACnB;IAKH,IAAW,gBAAgB,IAAI,gBAAgB,GAAG,SAAS,CAE1D;IAEM,gBAAgB,IAAI,cAAc,CACvC,gCAAgC,EAChC,iCAAiC,CAClC,EAAE;
|
|
1
|
+
{"version":3,"file":"StateTransitionProver.d.ts","sourceRoot":"","sources":["../../../src/prover/statetransition/StateTransitionProver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,cAAc,EAEd,cAAc,EACd,gBAAgB,EAChB,KAAK,cAAc,EACnB,KAAK,eAAe,EAGpB,uBAAuB,EACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAkC,MAAM,MAAM,CAAC;AAI7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EACL,kBAAkB,EAClB,4BAA4B,EAE7B,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,gCAAgC,EAAE,MAAM,yCAAyC,CAAC;AAE3F,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,gCAAgC,EAChC,iCAAiC,EAClC,MAAM,2BAA2B,CAAC;AAUnC,UAAU,mCAAmC;IAC3C,YAAY,EAAE,gCAAgC,CAAC;IAC/C,SAAS,EAAE,oBAAoB,CAAC;IAChC,aAAa,EAAE,KAAK,CAAC;IACrB,cAAc,EAAE,qBAAqB,CAAC;CACvC;AAOD;;;GAGG;AACH,qBAAa,iCAAkC,SAAQ,cAAc,CACnE,gCAAgC,EAChC,iCAAiC,CAClC;IAEG,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBAArB,qBAAqB,EAAE,IAAI,CAC1C,qBAAqB,EACrB,kBAAkB,CACnB;IAKH,IAAW,gBAAgB,IAAI,gBAAgB,GAAG,SAAS,CAE1D;IAEM,gBAAgB,IAAI,cAAc,CACvC,gCAAgC,EAChC,iCAAiC,CAClC,EAAE;IAuEH,OAAO,CAAC,qBAAqB;IAqB7B;;;OAGG;IACI,gBAAgB,CACrB,KAAK,EAAE,mCAAmC,EAC1C,KAAK,EAAE,4BAA4B,EACnC,SAAS,EAAE,kBAAkB;IA2F/B;;;OAGG;IACI,eAAe,CACpB,YAAY,EAAE,gCAAgC,EAC9C,UAAU,EAAE,uBAAuB,EACnC,OAAO,EAAE,uBAAuB,EAChC,KAAK,SAAI;IAuBX,OAAO,CAAC,qBAAqB;IAgB7B;;OAEG;IAEU,UAAU,CACrB,WAAW,EAAE,gCAAgC,EAC7C,KAAK,EAAE,4BAA4B,EACnC,SAAS,EAAE,kBAAkB,EAC7B,mBAAmB,EAAE,gCAAgC,GACpD,OAAO,CAAC,iCAAiC,CAAC;IAiChC,KAAK,CAChB,WAAW,EAAE,gCAAgC,EAC7C,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,iCAAiC,CAAC;CAmE9C;AAED,qBACa,qBACX,SAAQ,cACR,YACE,uBAAuB,EACvB,yBAAyB,EACzB,gBAAgB;IAEX,cAAc,EAAE,iCAAiC,CAAC;;IAO5C,OAAO,CAClB,QAAQ,EAAE,eAAe,GACxB,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC;IAI1B,UAAU,CACf,WAAW,EAAE,gCAAgC,EAC7C,KAAK,EAAE,4BAA4B,EACnC,SAAS,EAAE,kBAAkB,EAC7B,oBAAoB,EAAE,gCAAgC,GACrD,OAAO,CAAC,iCAAiC,CAAC;IAStC,KAAK,CACV,WAAW,EAAE,gCAAgC,EAC7C,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,iCAAiC,CAAC;CAG9C"}
|
|
@@ -50,7 +50,9 @@ export class StateTransitionProverProgrammable extends ZkProgrammable {
|
|
|
50
50
|
AppliedStateTransitionBatchState,
|
|
51
51
|
],
|
|
52
52
|
async method(publicInput, batch, witnesses, currentAppliedBatch) {
|
|
53
|
-
return
|
|
53
|
+
return {
|
|
54
|
+
publicOutput: await instance.proveBatch(publicInput, batch, witnesses, currentAppliedBatch),
|
|
55
|
+
};
|
|
54
56
|
},
|
|
55
57
|
},
|
|
56
58
|
merge: {
|
|
@@ -59,7 +61,9 @@ export class StateTransitionProverProgrammable extends ZkProgrammable {
|
|
|
59
61
|
StateTransitionSelfProofClass,
|
|
60
62
|
],
|
|
61
63
|
async method(publicInput, proof1, proof2) {
|
|
62
|
-
return
|
|
64
|
+
return {
|
|
65
|
+
publicOutput: await instance.merge(publicInput, proof1, proof2),
|
|
66
|
+
};
|
|
63
67
|
},
|
|
64
68
|
},
|
|
65
69
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StateTransitionProver.js","sourceRoot":"","sources":["../../../src/prover/statetransition/StateTransitionProver.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAGL,cAAc,EACd,cAAc,EAKd,0BAA0B,GAE3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EACL,kBAAkB,EAClB,4BAA4B,EAC5B,mBAAmB,GACpB,MAAM,0CAA0C,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,gCAAgC,EAAE,MAAM,yCAAyC,CAAC;AAE3F,OAAO,EAGL,gCAAgC,EAChC,iCAAiC,GAClC,MAAM,2BAA2B,CAAC;AAEnC,MAAM,MAAM,GAAG;IACb,mBAAmB,EAAE,CAAC,QAAgB,EAAE,IAAY,EAAE,EAAE,CACtD,GAAG,QAAQ,iBAAiB,IAAI,EAAE;IAEpC,uBAAuB,EAAE,CAAC,KAAa,EAAE,EAAE,CACzC,gDAAgD,KAAK,GAAG;CAC3D,CAAC;AASF,MAAM,6BAA6B,GAAG,CAAA,SAGrC,CAAA,CAAC;AAEF;;;GAGG;AACH,MAAM,OAAO,iCAAkC,SAAQ,cAGtD;IACC,YACmB,qBAGhB;QAED,KAAK,EAAE,CAAC;QALS,0BAAqB,GAArB,qBAAqB,CAGrC;IAGH,CAAC;IAED,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC;IACrD,CAAC;IAEM,gBAAgB;QAIrB,MAAM,QAAQ,GAAG,IAAI,CAAC;QAEtB,MAAM,OAAO,GAAG,SAAS,CAAC;YACxB,IAAI,EAAE,uBAAuB;YAC7B,WAAW,EAAE,gCAAgC;YAC7C,YAAY,EAAE,iCAAiC;YAE/C,OAAO,EAAE;gBACP,UAAU,EAAE;oBACV,aAAa,EAAE;wBACb,4BAA4B;wBAC5B,kBAAkB;wBAClB,gCAAgC;qBACjC;oBAED,KAAK,CAAC,MAAM,CACV,WAA6C,EAC7C,KAAmC,EACnC,SAA6B,EAC7B,mBAAqD;wBAErD,OAAO,MAAM,QAAQ,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"StateTransitionProver.js","sourceRoot":"","sources":["../../../src/prover/statetransition/StateTransitionProver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AccountUpdate, Bool, Field, Permissions, PublicKey, SmartContract, State,
|
|
1
|
+
import { AccountUpdate, Bool, Field, Permissions, PublicKey, SmartContract, State, TokenContract, VerificationKey } from "o1js";
|
|
2
2
|
import { TypedClass } from "@proto-kit/common";
|
|
3
3
|
import { OutgoingMessageArgumentBatch, OutgoingMessageArgument } from "../messages/OutgoingMessageArgument";
|
|
4
4
|
import { OutgoingMessageProcessor } from "../modularity/OutgoingMessageProcessor";
|
|
@@ -71,7 +71,7 @@ export declare class BridgeContractContext {
|
|
|
71
71
|
messageInputs: any[][];
|
|
72
72
|
};
|
|
73
73
|
}
|
|
74
|
-
export declare abstract class BridgeContractBase extends
|
|
74
|
+
export declare abstract class BridgeContractBase extends TokenContract {
|
|
75
75
|
static args: {
|
|
76
76
|
SettlementContract: (TypedClass<SettlementContractType> & typeof SmartContract) | undefined;
|
|
77
77
|
messageProcessors: OutgoingMessageProcessor<unknown>[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BridgeContract.d.ts","sourceRoot":"","sources":["../../../src/settlement/contracts/BridgeContract.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,IAAI,EAEJ,KAAK,EAEL,WAAW,EAGX,SAAS,EACT,aAAa,EACb,KAAK,EAGL,
|
|
1
|
+
{"version":3,"file":"BridgeContract.d.ts","sourceRoot":"","sources":["../../../src/settlement/contracts/BridgeContract.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,IAAI,EAEJ,KAAK,EAEL,WAAW,EAGX,SAAS,EACT,aAAa,EACb,KAAK,EAGL,aAAa,EAEb,eAAe,EAChB,MAAM,MAAM,CAAC;AACd,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG5D,OAAO,EAEL,4BAA4B,EAE5B,uBAAuB,EACxB,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAGlF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAExE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACxB,qBAAqB,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAEpC,sBAAsB,EAAE,CACtB,KAAK,EAAE,4BAA4B,KAChC,OAAO,CAAC,KAAK,CAAC,CAAC;IACpB,MAAM,EAAE,CAAC,cAAc,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzD,cAAc,EAAE,CACd,IAAI,EAAE,eAAe,GAAG,SAAS,EACjC,gBAAgB,EAAE,OAAO,EACzB,WAAW,EAAE,WAAW,EACxB,yBAAyB,EAAE,SAAS,KACjC,OAAO,CAAC,aAAa,CAAC,CAAC;IAE5B,eAAe,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACjD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGF,qBAAa,kBAAmB,SAAQ,uBAGtC;CAAG;AAEL,qBAEa,qBAAqB;IACzB,IAAI,EAAE;QACX,aAAa,EAAE,GAAG,EAAE,EAAE,CAAC;KACxB,CAAyB;CAC3B;AAED,8BAAsB,kBAAmB,SAAQ,aAAa;IAC5D,OAAc,IAAI,EAAE;QAClB,kBAAkB,EACd,CAAC,UAAU,CAAC,sBAAsB,CAAC,GAAG,OAAO,aAAa,CAAC,GAC3D,SAAS,CAAC;QACd,iBAAiB,EAAE,wBAAwB,CAAC,OAAO,CAAC,EAAE,CAAC;QACvD,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;gBAEiB,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,KAAK;IAItD,QAAQ,CAAC,yBAAyB,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAErD,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAEjC,QAAQ,CAAC,qBAAqB,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAE7C;;;;;OAKG;IACU,cAAc,CACzB,eAAe,EAAE,eAAe,GAAG,SAAS,EAC5C,gBAAgB,EAAE,OAAO,EACzB,WAAW,EAAE,WAAW,EACxB,yBAAyB,EAAE,SAAS;IAgCzB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,mBAAmB,CAAC,IAAI,EAAE,KAAK;IAoB5C,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,iBAAiB;IA2BlB,cAAc,CACnB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,uBAAuB,EAC7B,OAAO,EAAE,IAAI;;;;;;;;;IA2EF,0BAA0B,CAAC,KAAK,EAAE,4BAA4B;cAqD3D,UAAU,CAAC,cAAc,EAAE,aAAa;CA0BzD;AAED,qBAAa,cACX,SAAQ,kBACR,YAAW,kBAAkB;IAEJ,yBAAyB,mBAAsB;IAEnD,SAAS,2DAAkB;IAE3B,qBAAqB,2DAAkB;IAG/C,eAAe,CAAC,IAAI,EAAE,KAAK;IAK3B,sBAAsB,CAAC,KAAK,EAAE,4BAA4B;IAK1D,MAAM,CAAC,cAAc,EAAE,aAAa;CAGlD"}
|
|
@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import { AccountUpdate, Bool, Experimental, Field, method, Poseidon, Provable, PublicKey, State, state, Struct,
|
|
10
|
+
import { AccountUpdate, Bool, Experimental, Field, method, Poseidon, Provable, PublicKey, State, state, Struct, TokenContract, TokenId, } from "o1js";
|
|
11
11
|
import { noop, range } from "@proto-kit/common";
|
|
12
12
|
import { container, injectable, singleton } from "tsyringe";
|
|
13
13
|
import { OUTGOING_MESSAGE_BATCH_SIZE, OutgoingMessageArgumentBatch, createMessageStruct, } from "../messages/OutgoingMessageArgument";
|
|
@@ -28,7 +28,7 @@ BridgeContractContext = __decorate([
|
|
|
28
28
|
injectable(),
|
|
29
29
|
singleton()
|
|
30
30
|
], BridgeContractContext);
|
|
31
|
-
export class BridgeContractBase extends
|
|
31
|
+
export class BridgeContractBase extends TokenContract {
|
|
32
32
|
constructor(address, tokenId) {
|
|
33
33
|
super(address, tokenId);
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BridgeContract.js","sourceRoot":"","sources":["../../../src/settlement/contracts/BridgeContract.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACL,aAAa,EACb,IAAI,EACJ,YAAY,EACZ,KAAK,EACL,MAAM,EAEN,QAAQ,EACR,QAAQ,EACR,SAAS,EAET,KAAK,EACL,KAAK,EACL,MAAM,EACN,
|
|
1
|
+
{"version":3,"file":"BridgeContract.js","sourceRoot":"","sources":["../../../src/settlement/contracts/BridgeContract.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { TypedClass, ChildVerificationKeyService } from "@proto-kit/common";
|
|
2
|
-
import { AccountUpdate, Field, PublicKey, Signature, SmartContract, State, UInt32, AccountUpdateForest,
|
|
2
|
+
import { AccountUpdate, Field, PublicKey, Signature, SmartContract, State, UInt32, AccountUpdateForest, TokenContract, PrivateKey, VerificationKey, Permissions, DynamicProof } from "o1js";
|
|
3
3
|
import { NetworkState } from "../../model/network/NetworkState";
|
|
4
4
|
import { BlockProverPublicInput, BlockProverPublicOutput } from "../../prover/block/BlockProvable";
|
|
5
5
|
import { ProvableSettlementHook } from "../modularity/ProvableSettlementHook";
|
|
@@ -79,7 +79,7 @@ export interface SettlementContractType {
|
|
|
79
79
|
addTokenBridge: (tokenId: Field, address: PublicKey, dispatchContract: PublicKey) => Promise<void>;
|
|
80
80
|
}
|
|
81
81
|
export declare const BATCH_SIGNATURE_PREFIX: import("o1js/dist/node/lib/provable/field").Field;
|
|
82
|
-
export declare abstract class SettlementSmartContractBase extends
|
|
82
|
+
export declare abstract class SettlementSmartContractBase extends TokenContract {
|
|
83
83
|
static args: {
|
|
84
84
|
DispatchContract: TypedClass<DispatchContractType & SmartContract>;
|
|
85
85
|
hooks: ProvableSettlementHook<unknown>[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettlementSmartContract.d.ts","sourceRoot":"","sources":["../../../src/settlement/contracts/SettlementSmartContract.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EAEV,2BAA2B,EAE5B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,aAAa,EAEb,KAAK,EAEL,SAAS,EACT,SAAS,EACT,aAAa,EACb,KAAK,EAEL,MAAM,EACN,mBAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"SettlementSmartContract.d.ts","sourceRoot":"","sources":["../../../src/settlement/contracts/SettlementSmartContract.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
10
|
import { prefixToField, mapSequential, LinkedMerkleTree, } from "@proto-kit/common";
|
|
11
|
-
import { Bool, Field, method, PublicKey, Signature, State, state, UInt32, AccountUpdateForest,
|
|
11
|
+
import { Bool, Field, method, PublicKey, Signature, State, state, UInt32, AccountUpdateForest, TokenContract, PrivateKey, Struct, Provable, TokenId, DynamicProof, } from "o1js";
|
|
12
12
|
import { NetworkState } from "../../model/network/NetworkState";
|
|
13
13
|
import { BlockHashMerkleTree } from "../../prover/block/accummulators/BlockHashMerkleTree";
|
|
14
14
|
import { BlockProverPublicInput, BlockProverPublicOutput, } from "../../prover/block/BlockProvable";
|
|
@@ -40,7 +40,7 @@ export const BATCH_SIGNATURE_PREFIX = prefixToField("pk-batchSignature");
|
|
|
40
40
|
// signedSettlements: boolean | undefined;
|
|
41
41
|
// };
|
|
42
42
|
// }
|
|
43
|
-
export class SettlementSmartContractBase extends
|
|
43
|
+
export class SettlementSmartContractBase extends TokenContract {
|
|
44
44
|
constructor() {
|
|
45
45
|
super(...arguments);
|
|
46
46
|
this.events = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettlementSmartContract.js","sourceRoot":"","sources":["../../../src/settlement/contracts/SettlementSmartContract.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACL,aAAa,EAEb,aAAa,EAEb,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,IAAI,EACJ,KAAK,EACL,MAAM,EACN,SAAS,EACT,SAAS,EAET,KAAK,EACL,KAAK,EACL,MAAM,EACN,mBAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"SettlementSmartContract.js","sourceRoot":"","sources":["../../../src/settlement/contracts/SettlementSmartContract.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ declare const Deposit_base: (new (value: {
|
|
|
33
33
|
x: bigint | import("o1js/dist/node/lib/provable/field").Field;
|
|
34
34
|
isOdd: boolean | import("o1js/dist/node/lib/provable/bool").Bool;
|
|
35
35
|
};
|
|
36
|
-
amount: bigint | UInt64;
|
|
36
|
+
amount: number | bigint | UInt64;
|
|
37
37
|
}) => {
|
|
38
38
|
tokenId: import("o1js/dist/node/lib/provable/field").Field;
|
|
39
39
|
address: PublicKey;
|
|
@@ -154,6 +154,37 @@ export declare function createMessageStruct<T>(type: FlexibleProvablePure<T>): {
|
|
|
154
154
|
} extends import("o1js/dist/node/bindings/lib/generic").GenericProvable<T, any, import("o1js/dist/node/lib/provable/field").Field> ? T : T);
|
|
155
155
|
messageType: import("o1js/dist/node/lib/provable/field").Field;
|
|
156
156
|
});
|
|
157
|
+
toCanonical?: ((x: {
|
|
158
|
+
value: T | (Omit<import("o1js/dist/node/lib/provable/types/provable-intf").Provable<import("o1js/dist/node/bindings/lib/provable-generic").NonMethods<T>, any>, "fromFields"> & {
|
|
159
|
+
fromFields: (fields: import("o1js/dist/node/lib/provable/field").Field[]) => import("o1js/dist/node/bindings/lib/provable-generic").NonMethods<T>;
|
|
160
|
+
} & {
|
|
161
|
+
toInput: (x: import("o1js/dist/node/bindings/lib/provable-generic").NonMethods<T>) => {
|
|
162
|
+
fields?: import("o1js/dist/node/lib/provable/field").Field[] | undefined;
|
|
163
|
+
packed?: [import("o1js/dist/node/lib/provable/field").Field, number][] | undefined;
|
|
164
|
+
};
|
|
165
|
+
toJSON: (x: import("o1js/dist/node/bindings/lib/provable-generic").NonMethods<T>) => any;
|
|
166
|
+
fromJSON: (x: any) => import("o1js/dist/node/bindings/lib/provable-generic").NonMethods<T>;
|
|
167
|
+
empty: () => import("o1js/dist/node/bindings/lib/provable-generic").NonMethods<T>;
|
|
168
|
+
} & (new (...args: any) => T) & {
|
|
169
|
+
_isStruct: true;
|
|
170
|
+
} extends import("o1js/dist/node/bindings/lib/generic").GenericProvable<T, any, import("o1js/dist/node/lib/provable/field").Field> ? T : T);
|
|
171
|
+
messageType: import("o1js/dist/node/lib/provable/field").Field;
|
|
172
|
+
}) => {
|
|
173
|
+
value: T | (Omit<import("o1js/dist/node/lib/provable/types/provable-intf").Provable<import("o1js/dist/node/bindings/lib/provable-generic").NonMethods<T>, any>, "fromFields"> & {
|
|
174
|
+
fromFields: (fields: import("o1js/dist/node/lib/provable/field").Field[]) => import("o1js/dist/node/bindings/lib/provable-generic").NonMethods<T>;
|
|
175
|
+
} & {
|
|
176
|
+
toInput: (x: import("o1js/dist/node/bindings/lib/provable-generic").NonMethods<T>) => {
|
|
177
|
+
fields?: import("o1js/dist/node/lib/provable/field").Field[] | undefined;
|
|
178
|
+
packed?: [import("o1js/dist/node/lib/provable/field").Field, number][] | undefined;
|
|
179
|
+
};
|
|
180
|
+
toJSON: (x: import("o1js/dist/node/bindings/lib/provable-generic").NonMethods<T>) => any;
|
|
181
|
+
fromJSON: (x: any) => import("o1js/dist/node/bindings/lib/provable-generic").NonMethods<T>;
|
|
182
|
+
empty: () => import("o1js/dist/node/bindings/lib/provable-generic").NonMethods<T>;
|
|
183
|
+
} & (new (...args: any) => T) & {
|
|
184
|
+
_isStruct: true;
|
|
185
|
+
} extends import("o1js/dist/node/bindings/lib/generic").GenericProvable<T, any, import("o1js/dist/node/lib/provable/field").Field> ? T : T);
|
|
186
|
+
messageType: import("o1js/dist/node/lib/provable/field").Field;
|
|
187
|
+
}) | undefined;
|
|
157
188
|
fromFields: (fields: import("o1js/dist/node/lib/provable/field").Field[]) => {
|
|
158
189
|
value: T | (Omit<import("o1js/dist/node/lib/provable/types/provable-intf").Provable<import("o1js/dist/node/bindings/lib/provable-generic").NonMethods<T>, any>, "fromFields"> & {
|
|
159
190
|
fromFields: (fields: import("o1js/dist/node/lib/provable/field").Field[]) => import("o1js/dist/node/bindings/lib/provable-generic").NonMethods<T>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutgoingMessageArgument.d.ts","sourceRoot":"","sources":["../../../src/settlement/messages/OutgoingMessageArgument.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,oBAAoB,EAAoB,MAAM,MAAM,CAAC;AAC3E,OAAO,EAEL,2BAA2B,EAC5B,MAAM,mBAAmB,CAAC;AAK3B,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAE7C,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"OutgoingMessageArgument.d.ts","sourceRoot":"","sources":["../../../src/settlement/messages/OutgoingMessageArgument.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,oBAAoB,EAAoB,MAAM,MAAM,CAAC;AAC3E,OAAO,EAEL,2BAA2B,EAC5B,MAAM,mBAAmB,CAAC;AAK3B,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAE7C,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAKnE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAED,qBAAa,uBAAwB,SAAQ,4BAG3C;WACc,KAAK,IAAI,uBAAuB;CAM/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAED,qBAAa,4BAA6B,SAAQ,iCAOhD;WACc,YAAY,CAAC,iBAAiB,EAAE,uBAAuB,EAAE;CAcxE"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Withdrawal.d.ts","sourceRoot":"","sources":["../../../src/settlement/messages/Withdrawal.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Withdrawal.js","sourceRoot":"","sources":["../../../src/settlement/messages/Withdrawal.ts"],"names":[],"mappings":";AAGA,cAAc"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SimpleAsyncStateService.d.ts","sourceRoot":"","sources":["../../src/state/SimpleAsyncStateService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAE7B,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,KAAK,EAAE,GAAG,SAAS,CAAC,CAAC;IAClD,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAChE"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SimpleAsyncStateService.js","sourceRoot":"","sources":["../../src/state/SimpleAsyncStateService.ts"],"names":[],"mappings":""}
|
|
@@ -67,7 +67,7 @@ declare const RuntimeMethodExecutionDataStruct_base: (new (value: {
|
|
|
67
67
|
};
|
|
68
68
|
networkState: NetworkState | {
|
|
69
69
|
block: import("../../model/network/NetworkState").CurrentBlock | {
|
|
70
|
-
height: bigint | import("o1js/dist/node/lib/provable/int").UInt64;
|
|
70
|
+
height: number | bigint | import("o1js/dist/node/lib/provable/int").UInt64;
|
|
71
71
|
};
|
|
72
72
|
previous: import("../../model/network/NetworkState").PreviousBlock | {
|
|
73
73
|
rootHash: string | number | bigint | import("o1js/dist/node/lib/provable/field").Field;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { ProvableStateTransition, StateTransition } from "../model/StateTransition";
|
|
2
|
+
import { ProvableReductionHashList } from "./ProvableReductionHashList";
|
|
3
|
+
export declare class StateTransitionReductionList extends ProvableReductionHashList<ProvableStateTransition> {
|
|
4
|
+
push(value: ProvableStateTransition): this;
|
|
5
|
+
pushWithMetadata(value: ProvableStateTransition): {
|
|
6
|
+
popLast: import("o1js/dist/node/lib/provable/bool").Bool;
|
|
7
|
+
value: ProvableStateTransition;
|
|
8
|
+
};
|
|
9
|
+
}
|
|
10
|
+
export declare function reduceStateTransitions(transitions: StateTransition<unknown>[]): StateTransition<unknown>[];
|
|
11
|
+
//# sourceMappingURL=StateTransitionReductionList.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"StateTransitionReductionList.d.ts","sourceRoot":"","sources":["../../src/utils/StateTransitionReductionList.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,uBAAuB,EACvB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAExE,qBAAa,4BAA6B,SAAQ,yBAAyB,CAAC,uBAAuB,CAAC;IAC3F,IAAI,CAAC,KAAK,EAAE,uBAAuB;IAMnC,gBAAgB,CAAC,KAAK,EAAE,uBAAuB;;;;CAyCvD;AAED,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,GACtC,eAAe,CAAC,OAAO,CAAC,EAAE,CA0B5B"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { Provable } from "o1js";
|
|
2
|
+
import { ProvableOption } from "../model/Option";
|
|
3
|
+
import { ProvableStateTransition, StateTransition, } from "../model/StateTransition";
|
|
4
|
+
import { ProvableReductionHashList } from "./ProvableReductionHashList";
|
|
5
|
+
export class StateTransitionReductionList extends ProvableReductionHashList {
|
|
6
|
+
push(value) {
|
|
7
|
+
this.pushWithMetadata(value);
|
|
8
|
+
return this;
|
|
9
|
+
}
|
|
10
|
+
pushWithMetadata(value) {
|
|
11
|
+
return this.pushAndReduce(value, (previous) => {
|
|
12
|
+
const pathsMatch = previous.path.equals(value.path);
|
|
13
|
+
// Take the previous.from if the paths match, otherwise leave ST as is
|
|
14
|
+
const from = Provable.if(pathsMatch, ProvableOption, previous.from, value.from);
|
|
15
|
+
// In case we have a layout like
|
|
16
|
+
// { from: 5, to: 10 }, { from: 10, to: none }
|
|
17
|
+
// we just take the first and discard the second
|
|
18
|
+
const to = Provable.if(value.to.isSome.or(pathsMatch.not()), ProvableOption, value.to, previous.to);
|
|
19
|
+
const transition = new ProvableStateTransition({
|
|
20
|
+
path: value.path,
|
|
21
|
+
from: new ProvableOption(from),
|
|
22
|
+
to: new ProvableOption(to),
|
|
23
|
+
});
|
|
24
|
+
// Assert that connection is correct
|
|
25
|
+
previous.to.value
|
|
26
|
+
.equals(value.from.value)
|
|
27
|
+
.or(previous.to.isSome
|
|
28
|
+
.not()
|
|
29
|
+
.and(previous.from.value.equals(value.from.value)))
|
|
30
|
+
.or(pathsMatch.not())
|
|
31
|
+
.assertTrue();
|
|
32
|
+
return [transition, pathsMatch];
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
export function reduceStateTransitions(transitions) {
|
|
37
|
+
const reduced = [];
|
|
38
|
+
transitions.forEach((st) => {
|
|
39
|
+
if (reduced.length === 0) {
|
|
40
|
+
reduced.push(st);
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
const last = reduced.at(-1);
|
|
44
|
+
if (last.path.equals(st.path).toBoolean()) {
|
|
45
|
+
if (st.toValue.isSome.toBoolean()) {
|
|
46
|
+
reduced.pop();
|
|
47
|
+
reduced.push(new StateTransition(st.path, last.fromValue, st.toValue));
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
// Do nothing, because we discard that ST
|
|
51
|
+
// { from: 5, to: 10 }, { from: 10, to: none }
|
|
52
|
+
// cancel the 2nd
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
reduced.push(st);
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
return reduced;
|
|
60
|
+
}
|
|
61
|
+
//# sourceMappingURL=StateTransitionReductionList.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"StateTransitionReductionList.js","sourceRoot":"","sources":["../../src/utils/StateTransitionReductionList.ts"],"names":[],"mappings":"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"}
|
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.
|
|
6
|
+
"version": "0.1.1-develop.1689+67e6fdf4",
|
|
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": "^
|
|
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": "
|
|
35
|
+
"gitHead": "67e6fdf49caf9744de439fcc564874f2420b8b97"
|
|
36
36
|
}
|
|
@@ -932,11 +932,13 @@ export class BlockProverProgrammable extends ZkProgrammable<
|
|
|
932
932
|
runtimeProof: DynamicRuntimeProof,
|
|
933
933
|
executionData: BlockProverSingleTransactionExecutionData
|
|
934
934
|
) {
|
|
935
|
-
return
|
|
936
|
-
|
|
937
|
-
|
|
938
|
-
|
|
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
|
|
957
|
-
|
|
958
|
-
|
|
959
|
-
|
|
960
|
-
|
|
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
|
|
984
|
-
|
|
985
|
-
|
|
986
|
-
|
|
987
|
-
|
|
988
|
-
|
|
989
|
-
|
|
990
|
-
|
|
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
|
},
|
|
@@ -100,12 +100,14 @@ export class StateTransitionProverProgrammable extends ZkProgrammable<
|
|
|
100
100
|
witnesses: MerkleWitnessBatch,
|
|
101
101
|
currentAppliedBatch: AppliedStateTransitionBatchState
|
|
102
102
|
) {
|
|
103
|
-
return
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
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
|
|
125
|
+
return {
|
|
126
|
+
publicOutput: await instance.merge(publicInput, proof1, proof2),
|
|
127
|
+
};
|
|
124
128
|
},
|
|
125
129
|
},
|
|
126
130
|
},
|
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
State,
|
|
13
13
|
state,
|
|
14
14
|
Struct,
|
|
15
|
-
|
|
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
|
|
67
|
+
export abstract class BridgeContractBase extends TokenContract {
|
|
68
68
|
public static args: {
|
|
69
69
|
SettlementContract:
|
|
70
70
|
| (TypedClass<SettlementContractType> & typeof SmartContract)
|
|
@@ -17,7 +17,7 @@ import {
|
|
|
17
17
|
state,
|
|
18
18
|
UInt32,
|
|
19
19
|
AccountUpdateForest,
|
|
20
|
-
|
|
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
|
|
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);
|