@agoric/vats 0.15.2-dev-e8c4189.0 → 0.15.2-dev-9c9e5cf.0

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@agoric/vats",
3
- "version": "0.15.2-dev-e8c4189.0+e8c4189",
3
+ "version": "0.15.2-dev-9c9e5cf.0+9c9e5cf",
4
4
  "description": "Agoric's Vat library",
5
5
  "type": "module",
6
6
  "main": "./index.js",
@@ -22,19 +22,19 @@
22
22
  "author": "Agoric",
23
23
  "license": "Apache-2.0",
24
24
  "dependencies": {
25
- "@agoric/cosmic-proto": "0.4.1-dev-e8c4189.0+e8c4189",
26
- "@agoric/ertp": "0.16.3-dev-e8c4189.0+e8c4189",
27
- "@agoric/governance": "0.10.4-dev-e8c4189.0+e8c4189",
28
- "@agoric/internal": "0.3.3-dev-e8c4189.0+e8c4189",
29
- "@agoric/network": "0.1.1-dev-e8c4189.0+e8c4189",
30
- "@agoric/notifier": "0.6.3-dev-e8c4189.0+e8c4189",
31
- "@agoric/store": "0.9.3-dev-e8c4189.0+e8c4189",
32
- "@agoric/swingset-vat": "0.32.3-dev-e8c4189.0+e8c4189",
33
- "@agoric/time": "0.3.3-dev-e8c4189.0+e8c4189",
34
- "@agoric/vat-data": "0.5.3-dev-e8c4189.0+e8c4189",
35
- "@agoric/vow": "0.1.1-dev-e8c4189.0+e8c4189",
36
- "@agoric/zoe": "0.26.3-dev-e8c4189.0+e8c4189",
37
- "@agoric/zone": "0.2.3-dev-e8c4189.0+e8c4189",
25
+ "@agoric/cosmic-proto": "0.4.1-dev-9c9e5cf.0+9c9e5cf",
26
+ "@agoric/ertp": "0.16.3-dev-9c9e5cf.0+9c9e5cf",
27
+ "@agoric/governance": "0.10.4-dev-9c9e5cf.0+9c9e5cf",
28
+ "@agoric/internal": "0.3.3-dev-9c9e5cf.0+9c9e5cf",
29
+ "@agoric/network": "0.1.1-dev-9c9e5cf.0+9c9e5cf",
30
+ "@agoric/notifier": "0.6.3-dev-9c9e5cf.0+9c9e5cf",
31
+ "@agoric/store": "0.9.3-dev-9c9e5cf.0+9c9e5cf",
32
+ "@agoric/swingset-vat": "0.32.3-dev-9c9e5cf.0+9c9e5cf",
33
+ "@agoric/time": "0.3.3-dev-9c9e5cf.0+9c9e5cf",
34
+ "@agoric/vat-data": "0.5.3-dev-9c9e5cf.0+9c9e5cf",
35
+ "@agoric/vow": "0.1.1-dev-9c9e5cf.0+9c9e5cf",
36
+ "@agoric/zoe": "0.26.3-dev-9c9e5cf.0+9c9e5cf",
37
+ "@agoric/zone": "0.2.3-dev-9c9e5cf.0+9c9e5cf",
38
38
  "@endo/errors": "^1.2.4",
39
39
  "@endo/far": "^1.1.4",
40
40
  "@endo/import-bundle": "^1.2.1",
@@ -46,7 +46,7 @@
46
46
  "jessie.js": "^0.3.4"
47
47
  },
48
48
  "devDependencies": {
49
- "@agoric/swingset-liveslots": "0.10.3-dev-e8c4189.0+e8c4189",
49
+ "@agoric/swingset-liveslots": "0.10.3-dev-9c9e5cf.0+9c9e5cf",
50
50
  "@endo/bundle-source": "^3.3.0",
51
51
  "@endo/init": "^1.1.3",
52
52
  "ava": "^5.3.0",
@@ -78,5 +78,5 @@
78
78
  "typeCoverage": {
79
79
  "atLeast": 91.52
80
80
  },
81
- "gitHead": "e8c41897954c755ca08665e512bcf33dd8f53a77"
81
+ "gitHead": "9c9e5cf884e5f48554300d91ff7629773256f628"
82
82
  }
@@ -1 +1 @@
1
- {"version":3,"file":"localchain.d.ts","sourceRoot":"","sources":["localchain.js"],"names":[],"mappings":"AASA;;;;;;GAMG;AAEH;;;;;;;;;;;;GAYG;AAEH;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH;;;;;;;GAaG;AAMI,kDAHI,OAAO,mBAAmB,EAAE,IAAI,aAChC,QAAQ;;QA2BX;;;;;;WAMG;2BALQ,KAAK,CAAC,KAAK,CAAC,+BACZ;YACV,OAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5B,cAAkB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;SAC/B;;;;QAYJ;;;WAGG;0BAFQ,KAAK,CAAC,KAAK,CAAC,GACV,WAAW,MAAM,CAAC,KAAK,CAAC,CAAC;QAUtC;;;;;;;;;WASG;yBAJQ,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,mBACpB,OAAO,GAEL,WAAW,MAAM,CAAC,KAAK,CAAC,CAAC;QAYtC;;;;;;WAMG;yBAFQ,MAAM,CAAC,KAAK,CAAC,GACX,WAAW,OAAO,CAAC,KAAK,CAAC,CAAC;QAOvC;;;;;;;;;;;;;;;;;;WAkBG;kBARwB,EAAE,SAAf,SAAS,EAAG,YAEf,EAAE,GACA,iCAAiC,CAAC,GACzC,CAAa,IAAR,MAAM,EAAE,GAAG,SAAS,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAC7C,CAAC;QAkBL;;;WAGG;8BAFQ,SAAS,GACP,WAAW,kBAAkB,CAAC;;GAQhD;AAEH;;;;GAIG;AAEH,mEAAmE;AAEnE;;;;GAMG;AAiHI,6CAHI,OAAO,mBAAmB,EAAE,IAAI,YAChC,QAAQ;6BARN,gBAAgB;QA9ErB;;;;;;;WAOG;uBADU,WAAW,iBAAiB,CAAC;QAU1C;;;;;;;;WAQG;cAHuB,CAAC,SAAd,SAAW;;oBACb,CAAC,GACC,WAAW,SAAS,WAAW,CAAC,CAAC,CAAC,CAAC;QAShD;;;;;;;;;;;;;WAaG;kBARuD,EAAE,SAA9C,OAAO,sBAAsB,EAAE,SAAS,EAAG,YAC9C,EAAE,GACA,iCAAiC,CAAC,GACzC,CAAa,IAAR,MAAM,EAAE,GAAG,SAAS;YAC9B,KAAW,CAAC,EAAE,MAAM,CAAC;YACrB,KAAW,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SAC1B,CAAC,GACH,CAAC;;EAiDZ;;;;;;;;;;;;;8CAvTwB,CAAC,SAAZ,OAAO,EAAG,IACX,OAAO,CAAC,CAAC,CAAC;4BAaV;IACZ,MAAU,EAAE,oBAAoB,aAAa,CAAC,CAAC;IAC/C,IAAQ,EAAE,IAAI,CAAC;IACf,QAAY,EAAE,OAAO,eAAe,EAAE,kBAAkB,CAAC;CACtD;+BAIS;IACZ,MAAU,EAAE,oBAAoB,aAAa,CAAC,CAAC;IAC/C,WAAe,EAAE,WAAW,CAAC;IAC7B,QAAY,EAAE,OAAO,eAAe,EAAE,kBAAkB,CAAC;CACtD;mCA0JS,OAAO,CACnB,UAAc,CAAC,UAAU,CAAC,OAAO,2BAA2B,CAAC,CAAC,CAC3D;gCAGU,oBAAoB,CAAC,SAAS,CAAC;8BAiI/B,UAAU,CAAC,OAAO,sBAAsB,CAAC;yBACzC,UAAU,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;8BAlUpB,aAAa;gCAAb,aAAa;+BADF,sBAAsB;gCAAtB,sBAAsB;8BAAtB,sBAAsB;+BAExB,oBAAoB;wCAApB,oBAAoB;yCAE9B,YAAY;0BADd,eAAe;iCAAf,eAAe"}
1
+ {"version":3,"file":"localchain.d.ts","sourceRoot":"","sources":["localchain.js"],"names":[],"mappings":"AAcA;;;;;;GAMG;AAEH;;;;;;;;;;;;GAYG;AAEH;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH;;;;;;;GAaG;AAMI,kDAHI,OAAO,mBAAmB,EAAE,IAAI,aAChC,QAAQ;;QA2BX;;;;;;WAMG;2BALQ,KAAK,CAAC,KAAK,CAAC,+BACZ;YACV,OAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5B,cAAkB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;SAC/B;;;;QAYJ;;;WAGG;0BAFQ,KAAK,CAAC,KAAK,CAAC,GACV,WAAW,MAAM,CAAC,KAAK,CAAC,CAAC;QAUtC;;;;;;;;;WASG;yBAJQ,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,mBACpB,OAAO,GAEL,WAAW,MAAM,CAAC,KAAK,CAAC,CAAC;QAYtC;;;;;;WAMG;yBAFQ,MAAM,CAAC,KAAK,CAAC,GACX,WAAW,OAAO,CAAC,KAAK,CAAC,CAAC;QAOvC;;;;;;;;;;;;;;;;;;WAkBG;kBARwB,EAAE,SAAf,SAAS,EAAG,YAEf,EAAE,GACA,iCAAiC,CAAC,GACzC,CAAa,IAAR,MAAM,EAAE,GAAG,SAAS,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAC7C,CAAC;QAkBL;;;WAGG;8BAFQ,SAAS,GACP,WAAW,kBAAkB,CAAC;;GAQhD;AAEH;;;;GAIG;AAEH,mEAAmE;AAEnE;;;;GAMG;AAiHI,6CAHI,OAAO,mBAAmB,EAAE,IAAI,YAChC,QAAQ;6BARN,gBAAgB;QA9ErB;;;;;;;WAOG;uBADU,WAAW,iBAAiB,CAAC;QAU1C;;;;;;;;WAQG;cAHuB,CAAC,SAAd,SAAW;;oBACb,CAAC,GACC,WAAW,SAAS,WAAW,CAAC,CAAC,CAAC,CAAC;QAShD;;;;;;;;;;;;;WAaG;kBARuD,EAAE,SAA9C,OAAO,sBAAsB,EAAE,SAAS,EAAG,YAC9C,EAAE,GACA,iCAAiC,CAAC,GACzC,CAAa,IAAR,MAAM,EAAE,GAAG,SAAS;YAC9B,KAAW,CAAC,EAAE,MAAM,CAAC;YACrB,KAAW,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SAC1B,CAAC,GACH,CAAC;;EAiDZ;;;;;;;;;;;;;8CAvTwB,CAAC,SAAZ,OAAO,EAAG,IACX,OAAO,CAAC,CAAC,CAAC;4BAaV;IACZ,MAAU,EAAE,oBAAoB,aAAa,CAAC,CAAC;IAC/C,IAAQ,EAAE,IAAI,CAAC;IACf,QAAY,EAAE,OAAO,eAAe,EAAE,kBAAkB,CAAC;CACtD;+BAIS;IACZ,MAAU,EAAE,oBAAoB,aAAa,CAAC,CAAC;IAC/C,WAAe,EAAE,WAAW,CAAC;IAC7B,QAAY,EAAE,OAAO,eAAe,EAAE,kBAAkB,CAAC;CACtD;mCA0JS,OAAO,CACnB,UAAc,CAAC,UAAU,CAAC,OAAO,2BAA2B,CAAC,CAAC,CAC3D;gCAGU,oBAAoB,CAAC,SAAS,CAAC;8BAiI/B,UAAU,CAAC,OAAO,sBAAsB,CAAC;yBACzC,UAAU,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;8BAlUpB,aAAa;gCAAb,aAAa;+BADF,sBAAsB;gCAAtB,sBAAsB;8BAAtB,sBAAsB;+BAExB,oBAAoB;wCAApB,oBAAoB;yCAE9B,YAAY;0BADd,eAAe;iCAAf,eAAe"}
package/src/localchain.js CHANGED
@@ -2,7 +2,12 @@
2
2
  import { Fail } from '@endo/errors';
3
3
  import { E } from '@endo/far';
4
4
  import { M } from '@endo/patterns';
5
- import { AmountShape, BrandShape, PaymentShape } from '@agoric/ertp';
5
+ import {
6
+ AmountPatternShape,
7
+ AmountShape,
8
+ BrandShape,
9
+ PaymentShape,
10
+ } from '@agoric/ertp';
6
11
  import { Shape as NetworkShape } from '@agoric/network';
7
12
 
8
13
  const { Vow$ } = NetworkShape;
@@ -49,7 +54,7 @@ export const LocalChainAccountI = M.interface('LocalChainAccount', {
49
54
  getAddress: M.callWhen().returns(Vow$(M.string())),
50
55
  getBalance: M.callWhen(BrandShape).returns(Vow$(AmountShape)),
51
56
  deposit: M.callWhen(PaymentShape)
52
- .optional(M.pattern())
57
+ .optional(AmountPatternShape)
53
58
  .returns(Vow$(AmountShape)),
54
59
  withdraw: M.callWhen(AmountShape).returns(Vow$(PaymentShape)),
55
60
  executeTx: M.callWhen(M.arrayOf(M.record())).returns(
@@ -1 +1 @@
1
- {"version":3,"file":"vat-bank.d.ts","sourceRoot":"","sources":["vat-bank.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vat-bank.d.ts","sourceRoot":"","sources":["vat-bank.js"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"vat-localchain.d.ts","sourceRoot":"","sources":["vat-localchain.js"],"names":[],"mappings":"AAOO;IASH;;;;;OAKG;2BADQ,OAAO,iBAAiB,EAAE,gBAAgB;;;;;oCASoxQ,sBAAsB;iBAAwK,CAAC;;;;;IAbxgR;;;;;OAKG;2BADQ,OAAO,iBAAiB,EAAE,gBAAgB;;;;;;iBASk9Q,CAAC;;;;GAH3gR;4BAEa,UAAU,CAAC,OAAO,eAAe,CAAC"}
1
+ {"version":3,"file":"vat-localchain.d.ts","sourceRoot":"","sources":["vat-localchain.js"],"names":[],"mappings":"AAOO;IASH;;;;;OAKG;2BADQ,OAAO,iBAAiB,EAAE,gBAAgB;;;;;oCASwzQ,sBAAsB;iBAAwK,CAAC;;;;;IAb5iR;;;;;OAKG;2BADQ,OAAO,iBAAiB,EAAE,gBAAgB;;;;;;iBASs/Q,CAAC;;;;GAH/iR;4BAEa,UAAU,CAAC,OAAO,eAAe,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"virtual-purse.d.ts","sourceRoot":"","sources":["virtual-purse.js"],"names":[],"mappings":"AAkBO,qDAHI,OAAO,gBACP,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6DjB;AAsMM,0CADK,OAAO,cAAc,EAAE,IAAI,SAK1B,IAAI,CAAC,sBAAsB,CAAC,qDAE5B;IACV,MAAU,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAChC,KAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACxB,IAAQ,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7B,WAAe,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;CAClC,KAQS,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CA0BnD;qBA9OY,CACZ,GAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EACvB,cAAkB,CAAC,EAAE,OAAO,KACrB,OAAO,CAAC,MAAM,CAAC;qBAET,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;;;;;;;;;;;;gBAK/C,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;;;;;;;gBAIjC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;;;;;iBAIjC,CAAC,KAAK,EAAE,KAAK,KAAK,WAAW,CAAC,MAAM,CAAC;;2BArB1B,WAAW"}
1
+ {"version":3,"file":"virtual-purse.d.ts","sourceRoot":"","sources":["virtual-purse.js"],"names":[],"mappings":"AAmBO,qDAHI,OAAO,gBACP,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+DjB;AAwNM,0CADK,OAAO,cAAc,EAAE,IAAI,SAK1B,IAAI,CAAC,sBAAsB,CAAC,qDAE5B;IACV,MAAU,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAChC,KAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACxB,IAAQ,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7B,WAAe,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;CAClC,KAQS,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CA0BnD;qBAhQY,CACZ,GAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EACvB,cAAkB,CAAC,EAAE,OAAO,KACrB,OAAO,CAAC,MAAM,CAAC;qBAET,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;;;;;;;;;;;;gBAK/C,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;;;;;;;gBAIjC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;;;;;iBAIjC,CAAC,KAAK,EAAE,KAAK,KAAK,WAAW,CAAC,MAAM,CAAC;;2BArB1B,WAAW"}
@@ -1,16 +1,17 @@
1
1
  import { Fail } from '@endo/errors';
2
2
  import { E } from '@endo/far';
3
3
  import { isPromise } from '@endo/promise-kit';
4
- import { getInterfaceGuardPayload } from '@endo/patterns';
4
+ import { getInterfaceGuardPayload, matches } from '@endo/patterns';
5
5
 
6
6
  import { M } from '@agoric/store';
7
7
  import {
8
+ AmountPatternShape,
8
9
  AmountShape,
9
10
  BrandShape,
10
11
  DepositFacetShape,
11
12
  NotifierShape,
12
13
  PaymentShape,
13
- } from '@agoric/ertp/src/typeGuards.js';
14
+ } from '@agoric/ertp';
14
15
 
15
16
  /**
16
17
  * @param {Pattern} [brandShape]
@@ -35,7 +36,7 @@ export const makeVirtualPurseKitIKit = (
35
36
  // to this raw method to validate that this remotable is actually
36
37
  // a live payment of the correct brand with sufficient funds.
37
38
  deposit: M.callWhen(PaymentShape)
38
- .optional(M.pattern())
39
+ .optional(AmountPatternShape)
39
40
  .returns(amountShape),
40
41
  getDepositFacet: M.callWhen().returns(DepositFacetShape),
41
42
  withdraw: M.callWhen(amountShape).returns(PaymentShape),
@@ -48,7 +49,9 @@ export const makeVirtualPurseKitIKit = (
48
49
  });
49
50
 
50
51
  const RetainRedeemI = M.interface('RetainRedeem', {
51
- retain: M.callWhen(PaymentShape).optional(amountShape).returns(amountShape),
52
+ retain: M.callWhen(PaymentShape)
53
+ .optional(AmountPatternShape)
54
+ .returns(amountShape),
52
55
  redeem: M.callWhen(amountShape).returns(PaymentShape),
53
56
  });
54
57
 
@@ -56,7 +59,7 @@ export const makeVirtualPurseKitIKit = (
56
59
  retain: getInterfaceGuardPayload(RetainRedeemI).methodGuards.retain,
57
60
  redeem: getInterfaceGuardPayload(RetainRedeemI).methodGuards.redeem,
58
61
  recoverableClaim: M.callWhen(M.await(PaymentShape))
59
- .optional(amountShape)
62
+ .optional(AmountPatternShape)
60
63
  .returns(PaymentShape),
61
64
  });
62
65
 
@@ -102,6 +105,22 @@ export const makeVirtualPurseKitIKit = (
102
105
  * current balance iterable for a given brand.
103
106
  */
104
107
 
108
+ /**
109
+ * Until https://github.com/Agoric/agoric-sdk/issues/9407 is fixed, this
110
+ * function restricts the `optAmountShape`, if provided, to be a concrete
111
+ * `Amount` rather than a `Pattern` as it is supposed to be.
112
+ *
113
+ * TODO: Once https://github.com/Agoric/agoric-sdk/issues/9407 is fixed, remove
114
+ * this function and all calls to it.
115
+ *
116
+ * @param {Pattern} [optAmountShape]
117
+ */
118
+ const legacyRestrictAmountShapeArg = optAmountShape => {
119
+ if (optAmountShape && !matches(optAmountShape, AmountShape)) {
120
+ throw Fail`optAmountShape if provided, must still be a concrete Amount due to https://github.com/Agoric/agoric-sdk/issues/9407`;
121
+ }
122
+ };
123
+
105
124
  /** @param {import('@agoric/zone').Zone} zone */
106
125
  const prepareVirtualPurseKit = zone =>
107
126
  zone.exoClassKit(
@@ -139,6 +158,7 @@ const prepareVirtualPurseKit = zone =>
139
158
  * @returns {Promise<Payment<'nat'>>}
140
159
  */
141
160
  async recoverableClaim(payment, optAmountShape) {
161
+ legacyRestrictAmountShapeArg(optAmountShape);
142
162
  const {
143
163
  state: { recoveryPurse },
144
164
  } = this;
@@ -166,6 +186,7 @@ const prepareVirtualPurseKit = zone =>
166
186
  minter: {
167
187
  /** @type {Retain} */
168
188
  async retain(payment, optAmountShape) {
189
+ legacyRestrictAmountShapeArg(optAmountShape);
169
190
  !!this.state.mint || Fail`minter cannot retain without a mint.`;
170
191
  return E(this.state.issuer).burn(payment, optAmountShape);
171
192
  },