@cancore/contracts 0.2.0-rc.3 → 0.2.0-rc.7

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.
@@ -1,5 +1,5 @@
1
1
  {
2
- "$comment": "Filler protocol v1 (frozen, RC): `requestId` = keccak256(utf8(requestId)); each vector names the string it hashes. Domain CancoreFillerProtocol v1, no chainId, no verifyingContract. Digests by ethers TypedDataEncoder.",
2
+ "$comment": "Filler protocol v1, settlement design (variant A, CAN-2139; protocol.md §3.3): `requestId` = keccak256(utf8(requestId)), each vector names the string it hashes; `fillerId` is the quoting filler's id as a string. Signed by the message key. Domain CancoreFillerProtocol v1, no chainId, no verifyingContract. Digests by ethers TypedDataEncoder.",
3
3
  "primaryType": "FillerQuote",
4
4
  "domain": {
5
5
  "name": "CancoreFillerProtocol",
@@ -9,7 +9,7 @@
9
9
  "version"
10
10
  ]
11
11
  },
12
- "typeString": "FillerQuote(bytes32 requestId,address filler,uint256 amountOut,uint64 validUntil,uint64 nonce)",
12
+ "typeString": "FillerQuote(bytes32 requestId,string fillerId,uint256 amountOut,uint64 validUntil,uint64 nonce)",
13
13
  "types": {
14
14
  "FillerQuote": [
15
15
  {
@@ -17,8 +17,8 @@
17
17
  "type": "bytes32"
18
18
  },
19
19
  {
20
- "name": "filler",
21
- "type": "address"
20
+ "name": "fillerId",
21
+ "type": "string"
22
22
  },
23
23
  {
24
24
  "name": "amountOut",
@@ -40,36 +40,36 @@
40
40
  "requestIdString": "req-7f3a9c21-4d88-4e5b-9a1e-0c2f6b8d4e31",
41
41
  "message": {
42
42
  "requestId": "0x4b719538a6492794ff50c3ddbfde37e42bc802b9063ff4356c0945b5e9639f24",
43
- "filler": "0x742d35cc6634c0532925a3b844bc454e4438f44e",
43
+ "fillerId": "acme-markets",
44
44
  "amountOut": "999000000",
45
45
  "validUntil": "1790000060",
46
46
  "nonce": "1"
47
47
  },
48
- "digest": "0xdfbd4a1d732d8a105714d38ed6c46b8ee6e299e8bf90990ac502ebaea19fbe70"
48
+ "digest": "0xe3b63a6ae2730532fb841002059d6e8c92124d95e98c09857d7e0f5ba3512e3b"
49
49
  },
50
50
  {
51
- "note": "every integer at its maximum, 64-character request id",
51
+ "note": "every integer at its maximum, 64-character request id, 63-character fillerId",
52
52
  "requestIdString": "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
53
53
  "message": {
54
54
  "requestId": "0xed68c8357dc6066eb99776f6a12613ca306bb78066e20c62fe30eafcc78ace8b",
55
- "filler": "0xffffffffffffffffffffffffffffffffffffffff",
55
+ "fillerId": "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz",
56
56
  "amountOut": "115792089237316195423570985008687907853269984665640564039457584007913129639935",
57
57
  "validUntil": "18446744073709551615",
58
58
  "nonce": "18446744073709551615"
59
59
  },
60
- "digest": "0xc4f6d68322e4db0d5a93dadc7e490af67f615187f0e823e2b667485493976035"
60
+ "digest": "0x44f94a3bd804f9a24e94d2b731e75f8cb48c31257726185e7f1330d628032364"
61
61
  },
62
62
  {
63
- "note": "zero values, one-character request id",
63
+ "note": "zero values, one-character request id, one-character fillerId",
64
64
  "requestIdString": "!",
65
65
  "message": {
66
66
  "requestId": "0x3275a893b2c93461554cf2a4dd7f413d56decdd6f3fdf0589dbb8bc4fd742386",
67
- "filler": "0x0000000000000000000000000000000000000000",
67
+ "fillerId": "0",
68
68
  "amountOut": "0",
69
69
  "validUntil": "0",
70
70
  "nonce": "0"
71
71
  },
72
- "digest": "0xb0fd33938ca8ba7c8fcac62ad4e6cb008b2b05f384491c60b292db295acbc5ab"
72
+ "digest": "0xfd2112078aeedf176c9d476e5afd3a6da22c69abaaed33904b2a042754d9925f"
73
73
  }
74
74
  ]
75
75
  }
@@ -23,6 +23,7 @@
23
23
  "note": "ticket.offer of the fixture order; `sig` is excluded from the body",
24
24
  "body": {
25
25
  "type": "ticket.offer",
26
+ "id": "g-20",
26
27
  "fillerId": "acme-markets",
27
28
  "sentAt": 1790000020000,
28
29
  "orderHash": "0x585ec61a0813109803da9d47aea37a165f7df1371553f1e4ea8c139cf74058a6",
@@ -46,16 +47,17 @@
46
47
  "acceptBy": 1790000023000,
47
48
  "sig": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001b"
48
49
  },
49
- "jcs": "{\"acceptBy\":1790000023000,\"amountOut\":\"999000000\",\"attempt\":0,\"fillerId\":\"acme-markets\",\"order\":{\"createdAt\":\"1790000000\",\"destination\":\"0x0000000000000000000000000000000000000000000000000000000000066eee\",\"feeBps\":\"30\",\"fillDeadline\":\"1790000600\",\"inputAmount\":\"1003000000\",\"inputToken\":\"0x1c7d4b196cb0c7b01d743fbc6116a902379c7238\",\"minReceived\":\"999000000\",\"originChainId\":\"11155111\",\"outputAsset\":\"0x00000000000000000000000075faf114eafb1bdbe2f0316df893fd58ce46aa4d\",\"recipient\":\"0x000000000000000000000000742d35cc6634c0532925a3b844bc454e4438f44e\",\"user\":\"0xa11ce00000000000000000000000000000000001\"},\"orderHash\":\"0x585ec61a0813109803da9d47aea37a165f7df1371553f1e4ea8c139cf74058a6\",\"sentAt\":1790000020000,\"type\":\"ticket.offer\",\"validFrom\":\"1790000040\",\"validUntil\":\"1790000400\"}",
50
+ "jcs": "{\"acceptBy\":1790000023000,\"amountOut\":\"999000000\",\"attempt\":0,\"fillerId\":\"acme-markets\",\"id\":\"g-20\",\"order\":{\"createdAt\":\"1790000000\",\"destination\":\"0x0000000000000000000000000000000000000000000000000000000000066eee\",\"feeBps\":\"30\",\"fillDeadline\":\"1790000600\",\"inputAmount\":\"1003000000\",\"inputToken\":\"0x1c7d4b196cb0c7b01d743fbc6116a902379c7238\",\"minReceived\":\"999000000\",\"originChainId\":\"11155111\",\"outputAsset\":\"0x00000000000000000000000075faf114eafb1bdbe2f0316df893fd58ce46aa4d\",\"recipient\":\"0x000000000000000000000000742d35cc6634c0532925a3b844bc454e4438f44e\",\"user\":\"0xa11ce00000000000000000000000000000000001\"},\"orderHash\":\"0x585ec61a0813109803da9d47aea37a165f7df1371553f1e4ea8c139cf74058a6\",\"sentAt\":1790000020000,\"type\":\"ticket.offer\",\"validFrom\":\"1790000040\",\"validUntil\":\"1790000400\"}",
50
51
  "message": {
51
- "bodyHash": "0x7f50c68dc394bea871ccfb1ce50d1e4f048b1551f4ead0cb7bb8aa4d1c5d508e"
52
+ "bodyHash": "0x9761fd334e3181da88a7535ed44b41ad489861149416d59559afeff730e6aca7"
52
53
  },
53
- "digest": "0x335a1f5b61815b6afa8c76b211fa287a8baaa7447e3e5e967763848e1706c287"
54
+ "digest": "0xe9fe85265890cbe31ec53a5edd4fcd2309fcad75f82de04e9772cd480adfc242"
54
55
  },
55
56
  {
56
57
  "note": "quote.ack",
57
58
  "body": {
58
59
  "type": "quote.ack",
60
+ "id": "g-9",
59
61
  "fillerId": "acme-markets",
60
62
  "sentAt": 1789999991001,
61
63
  "re": "q-1",
@@ -65,26 +67,27 @@
65
67
  "status": "COUNTED",
66
68
  "sig": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001b"
67
69
  },
68
- "jcs": "{\"fillerId\":\"acme-markets\",\"quoteHash\":\"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\",\"re\":\"q-1\",\"receivedAt\":1789999991000,\"requestId\":\"req-7f3a9c21-4d88-4e5b-9a1e-0c2f6b8d4e31\",\"sentAt\":1789999991001,\"status\":\"COUNTED\",\"type\":\"quote.ack\"}",
70
+ "jcs": "{\"fillerId\":\"acme-markets\",\"id\":\"g-9\",\"quoteHash\":\"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\",\"re\":\"q-1\",\"receivedAt\":1789999991000,\"requestId\":\"req-7f3a9c21-4d88-4e5b-9a1e-0c2f6b8d4e31\",\"sentAt\":1789999991001,\"status\":\"COUNTED\",\"type\":\"quote.ack\"}",
69
71
  "message": {
70
- "bodyHash": "0xbc95d5d881aa645ad9201e5f1ba7fd2a1b870c6e1fd01724e60f26761ca42ba7"
72
+ "bodyHash": "0x3ac71a88363d0cfbf721dc01913a0701358a201fc5ffa1241265c507d9ef49ce"
71
73
  },
72
- "digest": "0xe2dc671bd1b44bfa129667c6d6e4758cc223989845b92940530fae6ac4dca2e3"
74
+ "digest": "0xc9912d2414f6eb8c78a4b9327bddf42de058b9b7f41f64ee938b347cb8d9427b"
73
75
  },
74
76
  {
75
77
  "note": "auth.challenge: the one frame without fillerId",
76
78
  "body": {
77
79
  "type": "auth.challenge",
80
+ "id": "g-1",
78
81
  "sentAt": 1789999980000,
79
82
  "nonce": "0x63ed6389bd2a1d23bb678583c227172bda874e82b97b1c170bfeeb4373b4b0d5",
80
83
  "expiresAt": "1790000030",
81
84
  "sig": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001b"
82
85
  },
83
- "jcs": "{\"expiresAt\":\"1790000030\",\"nonce\":\"0x63ed6389bd2a1d23bb678583c227172bda874e82b97b1c170bfeeb4373b4b0d5\",\"sentAt\":1789999980000,\"type\":\"auth.challenge\"}",
86
+ "jcs": "{\"expiresAt\":\"1790000030\",\"id\":\"g-1\",\"nonce\":\"0x63ed6389bd2a1d23bb678583c227172bda874e82b97b1c170bfeeb4373b4b0d5\",\"sentAt\":1789999980000,\"type\":\"auth.challenge\"}",
84
87
  "message": {
85
- "bodyHash": "0xbd5fc99755c347292e1ed46407714d4250b12d6de2417c40bc020bf9d0893c36"
88
+ "bodyHash": "0x3b18b7f3fb449214fba90add5344539a1a1053a7f851f6b147b50af4e7ac33c6"
86
89
  },
87
- "digest": "0xfcb5a01ac6595cb1964991fac05b9230cbcaa90392c8371464c40337da2cd328"
90
+ "digest": "0x4d8c912572367e3bdda6bceb31820513a3b45775c88f14132199a0e86e39df2e"
88
91
  }
89
92
  ]
90
93
  }
@@ -1,5 +1,5 @@
1
1
  {
2
- "$comment": "Filler protocol v1 (frozen, RC): Field order orderHash, attempt, validFrom, validUntil (CAN-1842 A2). Domain CancoreFillerProtocol v1, no chainId, no verifyingContract. Digests by ethers TypedDataEncoder.",
2
+ "$comment": "Filler protocol v1, settlement design (variant A, CAN-2139; protocol.md §3.3): Field order orderHash, attempt, validFrom, validUntil, fillerId, deliveryKey, repayTo. deliveryKey = the address that sends fill (the zero address for a Canton destination); repayTo = where settle pays, encoded for the source chain (§3.15). Signed by the message key; the issued FillTicket carries the same deliveryKey and repayTo (S-22). Domain CancoreFillerProtocol v1, no chainId, no verifyingContract. Digests by ethers TypedDataEncoder.",
3
3
  "primaryType": "TicketIntent",
4
4
  "domain": {
5
5
  "name": "CancoreFillerProtocol",
@@ -9,7 +9,7 @@
9
9
  "version"
10
10
  ]
11
11
  },
12
- "typeString": "TicketIntent(bytes32 orderHash,uint32 attempt,uint64 validFrom,uint64 validUntil)",
12
+ "typeString": "TicketIntent(bytes32 orderHash,uint32 attempt,uint64 validFrom,uint64 validUntil,string fillerId,address deliveryKey,bytes32 repayTo)",
13
13
  "types": {
14
14
  "TicketIntent": [
15
15
  {
@@ -27,19 +27,61 @@
27
27
  {
28
28
  "name": "validUntil",
29
29
  "type": "uint64"
30
+ },
31
+ {
32
+ "name": "fillerId",
33
+ "type": "string"
34
+ },
35
+ {
36
+ "name": "deliveryKey",
37
+ "type": "address"
38
+ },
39
+ {
40
+ "name": "repayTo",
41
+ "type": "bytes32"
30
42
  }
31
43
  ]
32
44
  },
33
45
  "vectors": [
34
46
  {
35
- "note": "intent on the fixture ticket",
47
+ "note": "intent on the fixture ticket: EVM source and destination",
36
48
  "message": {
37
49
  "orderHash": "0x585ec61a0813109803da9d47aea37a165f7df1371553f1e4ea8c139cf74058a6",
38
50
  "attempt": 0,
39
51
  "validFrom": "1790000040",
40
- "validUntil": "1790000400"
52
+ "validUntil": "1790000400",
53
+ "fillerId": "acme-markets",
54
+ "deliveryKey": "0x742d35cc6634c0532925a3b844bc454e4438f44e",
55
+ "repayTo": "0x0000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc"
56
+ },
57
+ "digest": "0xd56c4d45d5405c70c5220da1c3e49d6051b0370a3040d1709ae097b37f3ba041"
58
+ },
59
+ {
60
+ "note": "Canton destination: deliveryKey is the zero address, repayTo the padded EVM payout address",
61
+ "message": {
62
+ "orderHash": "0x585ec61a0813109803da9d47aea37a165f7df1371553f1e4ea8c139cf74058a6",
63
+ "attempt": 2,
64
+ "validFrom": "1790000100",
65
+ "validUntil": "1790000400",
66
+ "fillerId": "acme-markets",
67
+ "deliveryKey": "0x0000000000000000000000000000000000000000",
68
+ "repayTo": "0x0000000000000000000000003c44cdddb6a900fa2b585dd299e03d12fa4293bc"
69
+ },
70
+ "digest": "0x472bb7ba922e513713469a165faf96cf09b28b2ea06a09b524c86debb245a498"
71
+ },
72
+ {
73
+ "note": "Canton source: repayTo = keccak256(utf8(partyId)) of the filler party",
74
+ "repayToParty": "acme-markets::1220acdeacdeacdeacdeacdeacdeacdeacdeacdeacdeacdeacdeacdeacdeacdeacde",
75
+ "message": {
76
+ "orderHash": "0x770f1ebba8ab5b96e3efbed39c0f630d56f934f9f232771abaccdb0cf17ca204",
77
+ "attempt": 1,
78
+ "validFrom": "1789999500",
79
+ "validUntil": "1789999800",
80
+ "fillerId": "acme-markets",
81
+ "deliveryKey": "0x742d35cc6634c0532925a3b844bc454e4438f44e",
82
+ "repayTo": "0xe61d35ec4ca48f587165d3138bd11c79b42e52f6de0cec4b9e2d4350017f1e87"
41
83
  },
42
- "digest": "0xf3a07f98be564fb062f1574d933fc33f40e5c9e36c0fec83d3b3c4c15e9199c2"
84
+ "digest": "0x3275e22a2cb1a588dc8cc8cd81d5adac7a37d268fae8c4680aa0bf5ba3748e51"
43
85
  },
44
86
  {
45
87
  "note": "every integer at its maximum",
@@ -47,9 +89,12 @@
47
89
  "orderHash": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
48
90
  "attempt": 4294967295,
49
91
  "validFrom": "18446744073709551615",
50
- "validUntil": "18446744073709551615"
92
+ "validUntil": "18446744073709551615",
93
+ "fillerId": "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz",
94
+ "deliveryKey": "0xffffffffffffffffffffffffffffffffffffffff",
95
+ "repayTo": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
51
96
  },
52
- "digest": "0xfc7e1cd80e6b3d6efc98bb80656c57f0dd5bc994126ee21f78de5880ce57b103"
97
+ "digest": "0x76b8eb102ed001f2a87fe13d2b121aa4ab35c871f657d49beba7eab4a7c5128b"
53
98
  },
54
99
  {
55
100
  "note": "zero",
@@ -57,9 +102,12 @@
57
102
  "orderHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
58
103
  "attempt": 0,
59
104
  "validFrom": "0",
60
- "validUntil": "0"
105
+ "validUntil": "0",
106
+ "fillerId": "",
107
+ "deliveryKey": "0x0000000000000000000000000000000000000000",
108
+ "repayTo": "0x0000000000000000000000000000000000000000000000000000000000000000"
61
109
  },
62
- "digest": "0xd55f2a9c08605111f25c5b6b93b90f060b1c1318e46c40d8f0e6e3668828aaa7"
110
+ "digest": "0x28a00667600c0cf54721d77ac4a3ad6f7d976165bab8cfe6922ee94f97205c1a"
63
111
  }
64
112
  ]
65
113
  }
@@ -26,10 +26,10 @@
26
26
  {
27
27
  "note": "receipt of the fixture ticket (illustrative signature 0x11…11 ‖ 0x1b)",
28
28
  "message": {
29
- "ticketHash": "0x466bc75e5efad07ad975aeea9ec731902bc804461686a6c8f76ef4fd50297819",
29
+ "ticketHash": "0x8eaef6b8d59e72288487b0def58e0eb9200fa7600170351af985111eaec5a0a9",
30
30
  "ticketSigHash": "0x9d30145c6e97cad96cf7cee181ac9d5b879dea7fed0730d7197e84e28487292b"
31
31
  },
32
- "digest": "0x17d874287b30326bf0bcc1d56425b6346d928bd7dec201e4521c6f33a85eddc9"
32
+ "digest": "0xa262dc6cb1498cad75349dd3fb456ba8993b3b396c560bec12770f6fbc577c25"
33
33
  },
34
34
  {
35
35
  "note": "all ones",