@agoric/ertp 0.16.3-upgrade-21-dev-16519b2.0 → 0.16.3-upgrade-22-dev-2f770ff.0.2f770ff

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 (4) hide show
  1. package/package.json +19 -20
  2. package/src/amountMath.d.ts +4 -1
  3. package/src/amountMath.d.ts.map +1 -1
  4. package/src/amountMath.js +8 -6
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@agoric/ertp",
3
- "version": "0.16.3-upgrade-21-dev-16519b2.0+16519b2",
3
+ "version": "0.16.3-upgrade-22-dev-2f770ff.0.2f770ff",
4
4
  "description": "Electronic Rights Transfer Protocol (ERTP). A smart contract framework for exchanging electronic rights",
5
5
  "type": "module",
6
6
  "main": "src/index.js",
@@ -10,9 +10,9 @@
10
10
  "scripts": {
11
11
  "build": "exit 0",
12
12
  "prepack": "yarn run -T tsc --build tsconfig.build.json",
13
- "postpack": "git clean -f '*.d.ts*' '*.tsbuildinfo'",
13
+ "postpack": "git clean -f '*.d.*ts*' '*.tsbuildinfo'",
14
14
  "test": "ava",
15
- "test:c8": "c8 --all $C8_OPTIONS ava",
15
+ "test:c8": "c8 --all ${C8_OPTIONS:-} ava",
16
16
  "test:xs": "yarn test:xs-worker",
17
17
  "test:xs-unit": "exit 0",
18
18
  "test:xs-worker": "SWINGSET_WORKER_TYPE=xs-worker ava -c 2 test/swingsetTests",
@@ -39,25 +39,24 @@
39
39
  },
40
40
  "homepage": "https://github.com/Agoric/agoric-sdk#readme",
41
41
  "dependencies": {
42
- "@agoric/notifier": "workspace:*",
43
- "@agoric/store": "workspace:*",
44
- "@agoric/vat-data": "workspace:*",
45
- "@agoric/zone": "workspace:*",
46
- "@endo/errors": "^1.2.10",
47
- "@endo/eventual-send": "^1.3.1",
48
- "@endo/far": "^1.1.11",
49
- "@endo/marshal": "^1.6.4",
50
- "@endo/nat": "^5.1.0",
51
- "@endo/patterns": "^1.5.0",
52
- "@endo/promise-kit": "^1.1.10"
42
+ "@agoric/notifier": "0.6.3-upgrade-22-dev-2f770ff.0.2f770ff",
43
+ "@agoric/store": "0.9.3-upgrade-22-dev-2f770ff.0.2f770ff",
44
+ "@agoric/vat-data": "0.5.3-upgrade-22-dev-2f770ff.0.2f770ff",
45
+ "@agoric/zone": "0.2.3-upgrade-22-dev-2f770ff.0.2f770ff",
46
+ "@endo/errors": "^1.2.13",
47
+ "@endo/eventual-send": "^1.3.4",
48
+ "@endo/far": "^1.1.14",
49
+ "@endo/marshal": "^1.8.0",
50
+ "@endo/nat": "^5.1.3",
51
+ "@endo/patterns": "^1.7.0",
52
+ "@endo/promise-kit": "^1.1.13"
53
53
  },
54
54
  "devDependencies": {
55
- "@agoric/swingset-vat": "workspace:*",
56
- "@agoric/xsnap": "workspace:*",
57
- "@endo/bundle-source": "^4.0.0",
55
+ "@agoric/swingset-vat": "0.32.3-upgrade-22-dev-2f770ff.0.2f770ff",
56
+ "@endo/bundle-source": "^4.1.2",
58
57
  "@fast-check/ava": "^1.1.5",
59
58
  "ava": "^5.3.0",
60
- "tsd": "^0.31.1"
59
+ "tsd": "^0.33.0"
61
60
  },
62
61
  "files": [
63
62
  "src",
@@ -78,7 +77,7 @@
78
77
  "access": "public"
79
78
  },
80
79
  "typeCoverage": {
81
- "atLeast": 93.1
80
+ "atLeast": 92.99
82
81
  },
83
- "gitHead": "16519b2de1eb2afda2b4ec866f55eadd4bb18223"
82
+ "gitHead": "2f770ff5e26c3aa93f6d3aee5dd2d191b11f8144"
84
83
  }
package/src/amountMath.d.ts CHANGED
@@ -22,7 +22,10 @@ export namespace AmountMath {
22
22
  export function isEmpty(amount: Amount, brand?: Brand): boolean;
23
23
  export { isGTE };
24
24
  export function isEqual<A extends Amount>(leftAmount: A, rightAmount: A, brand?: Brand): boolean;
25
- export function add<A extends Amount>(leftAmount: A, rightAmount: A, brand?: Brand): A;
25
+ export let add: {
26
+ <A extends CopyBag, B extends CopyBag>(leftAmount: CopyBagAmount<A>, rightAmount: CopyBagAmount<B>, brand?: Brand): CopyBagAmount<A | B>;
27
+ <A extends Amount>(leftAmount: A, rightAmount: A, brand?: Brand): A;
28
+ };
26
29
  export function subtract<L extends Amount, R extends Amount>(leftAmount: L, rightAmount: R, brand?: Brand): L extends R ? L : never;
27
30
  export function min<A extends Amount>(x: A, y: A, brand?: Brand): A;
28
31
  export function max<A extends Amount>(x: A, y: A, brand?: Brand): A;
package/src/amountMath.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"amountMath.d.ts","sourceRoot":"","sources":["amountMath.js"],"names":[],"mappings":";;;wBAkBU,CAAC,OAAO,SAAS,EAAE,MAAM,OAAO,SAAS,CAAC;;;;;;;AAY7C,2CADK,SAAS,QAIpB;AA8EM,sCAJoB,CAAC,SAAf,WAAa,SACf,CAAC,GACC,YAAY,CAAC,CAAC,CAIc;;IAwGjC,qBAhBoB,CAAC,SAAd,MAAO,GAAG,CAAE,EAC8B,CAAC,SAA1C,QAAQ,GAAG,OAAO,GAAG,OAAO,GAAG,QAAS,SAC3C,CAAC,gBACD,CAAC,GACC,CAAC,SAAS,MAAM,KAAK,CAAC,GAC1B,SAAS,GACT,CAAC,SAAS,QAAQ,GAChB,SAAS,GACT,CAAC,SAAS,OAAO,GACf,cAAc,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,GAC9B,CAAC,SAAS,OAAO,GACf,cAAc,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACjC,CAAC,SAAS,QAAQ,GAChB,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,GACf,KAAK,CAQrB;IAUO,uBALc,CAAC,SAAV,MAAQ,SACV,KAAK,iBACL,CAAC,GACC,CAAC,CAWb;IASS,yBALY,CAAC,SAAV,MAAQ,SACV,KAAK,UACL,CAAC,GACC,CAAC,CAAC,OAAO,CAAC,CAE4C;0BAKzD;QACT,CAAK,KAAK,EAAE,KAAK,GAAG,OAAO,KAAK,CAAC,CAAC;QAClC,CAAK,CAAC,SAAS,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;KACjE;IAiBiB,oCAJC,CAAC,SAAV,MAAQ,UACV,CAAC,GACC,CAAC,CAQb;IAQQ,gCAJE,MAAM,UACN,KAAK,GACH,OAAO,CASnB;;IAYQ,wBANa,CAAC,SAAV,MAAQ,cACV,CAAC,eACD,CAAC,UACD,KAAK,GACH,OAAO,CAKnB;IAcI,oBANiB,CAAC,SAAV,MAAQ,cACV,CAAC,eACD,CAAC,UACD,KAAK,GACH,CAAC,CAOb;IAeS,yBAPY,CAAC,SAAV,MAAQ,EACC,CAAC,SAAV,MAAQ,cACV,CAAC,eACD,CAAC,UACD,KAAK,GACH,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAOnC;IAUI,oBANiB,CAAC,SAAV,MAAQ,KACV,CAAC,KACD,CAAC,UACD,KAAK,GACH,CAAC,CAQ8B;IAUvC,oBANiB,CAAC,SAAV,MAAQ,KACV,CAAC,KACD,CAAC,UACD,KAAK,GACH,CAAC,CAQ8B;;AAKvC,qCADK,MAAM,yCAKjB;iCA7XoJ,YAAY;iCAAZ,YAAY;2BAAZ,YAAY;8BAAZ,YAAY;6BAD9H,gBAAgB;6BAAhB,gBAAgB;8BACkG,YAAY;+BAAZ,YAAY;mCAAZ,YAAY;mCAAZ,YAAY;+BAAZ,YAAY;4BAAZ,YAAY;AA4JjK;;;;;;;;;;;;GAYG;AACH,uBANyB,CAAC,SAAZ,SAAU,cACb,OAAO,CAAC,CAAC,eACT,OAAO,CAAC,CAAC,UACT,MAAM,CAAC,CAAC,GACN,OAAO,CAKnB"}
1
+ {"version":3,"file":"amountMath.d.ts","sourceRoot":"","sources":["amountMath.js"],"names":[],"mappings":";;;wBAkBU,CAAC,OAAO,SAAS,EAAE,MAAM,OAAO,SAAS,CAAC;;;;;;;AAY7C,2CADK,SAAS,QAIpB;AA8EM,sCAJoB,CAAC,SAAf,WAAa,SACf,CAAC,GACC,YAAY,CAAC,CAAC,CAIc;;IAwGjC,qBAhBoB,CAAC,SAAd,MAAO,GAAG,CAAE,EAC8B,CAAC,SAA1C,QAAQ,GAAG,OAAO,GAAG,OAAO,GAAG,QAAS,SAC3C,CAAC,gBACD,CAAC,GACC,CAAC,SAAS,MAAM,KAAK,CAAC,GAC1B,SAAS,GACT,CAAC,SAAS,QAAQ,GAChB,SAAS,GACT,CAAC,SAAS,OAAO,GACf,cAAc,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,GAC9B,CAAC,SAAS,OAAO,GACf,cAAc,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACjC,CAAC,SAAS,QAAQ,GAChB,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,GACf,KAAK,CAQrB;IAUO,uBALc,CAAC,SAAV,MAAQ,SACV,KAAK,iBACL,CAAC,GACC,CAAC,CAWb;IASS,yBALY,CAAC,SAAV,MAAQ,SACV,KAAK,UACL,CAAC,GACC,CAAC,CAAC,OAAO,CAAC,CAE4C;0BAKzD;QACT,CAAK,KAAK,EAAE,KAAK,GAAG,OAAO,KAAK,CAAC,CAAC;QAClC,CAAK,CAAC,SAAS,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;KACjE;IAiBiB,oCAJC,CAAC,SAAV,MAAQ,UACV,CAAC,GACC,CAAC,CAQb;IAQQ,gCAJE,MAAM,UACN,KAAK,GACH,OAAO,CASnB;;IAYQ,wBANa,CAAC,SAAV,MAAQ,cACV,CAAC,eACD,CAAC,UACD,KAAK,GACH,OAAO,CAKnB;oBAQS;QACT,CAAK,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,OAAO,EACnC,UAAU,EAAE,cAAc,CAAC,CAAC,EAC5B,WAAW,EAAE,cAAc,CAAC,CAAC,EAC7B,KAAK,CAAC,EAAE,KAAK,GACZ,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5B,CAAK,CAAC,SAAS,MAAM,EAAE,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC;KACrE;IAqBM,yBAPY,CAAC,SAAV,MAAQ,EACC,CAAC,SAAV,MAAQ,cACV,CAAC,eACD,CAAC,UACD,KAAK,GACH,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAOnC;IAUI,oBANiB,CAAC,SAAV,MAAQ,KACV,CAAC,KACD,CAAC,UACD,KAAK,GACH,CAAC,CAQ8B;IAUvC,oBANiB,CAAC,SAAV,MAAQ,KACV,CAAC,KACD,CAAC,UACD,KAAK,GACH,CAAC,CAQ8B;;AAKvC,qCADK,MAAM,yCAKjB;iCA/XoJ,YAAY;iCAAZ,YAAY;2BAAZ,YAAY;8BAAZ,YAAY;6BAD9H,gBAAgB;6BAAhB,gBAAgB;8BACkG,YAAY;+BAAZ,YAAY;mCAAZ,YAAY;mCAAZ,YAAY;+BAAZ,YAAY;4BAAZ,YAAY;AA4JjK;;;;;;;;;;;;GAYG;AACH,uBANyB,CAAC,SAAZ,SAAU,cACb,OAAO,CAAC,CAAC,eACT,OAAO,CAAC,CAAC,UACT,MAAM,CAAC,CAAC,GACN,OAAO,CAKnB"}
package/src/amountMath.js CHANGED
@@ -318,16 +318,18 @@ export const AmountMath = {
318
318
  * amount, it usually means including all of the elements from both left and
319
319
  * right.
320
320
  *
321
- * @template {Amount} A
322
- * @param {A} leftAmount
323
- * @param {A} rightAmount
324
- * @param {Brand} [brand]
325
- * @returns {A}
321
+ * @type {{
322
+ * <A extends CopyBag, B extends CopyBag>(
323
+ * leftAmount: CopyBagAmount<A>,
324
+ * rightAmount: CopyBagAmount<B>,
325
+ * brand?: Brand,
326
+ * ): CopyBagAmount<A | B>;
327
+ * <A extends Amount>(leftAmount: A, rightAmount: A, brand?: Brand): A;
328
+ * }}
326
329
  */
327
330
  add: (leftAmount, rightAmount, brand = undefined) => {
328
331
  const h = checkLRAndGetHelpers(leftAmount, rightAmount, brand);
329
332
  const value = h.doAdd(...coerceLR(h, leftAmount, rightAmount));
330
- // @ts-expect-error different subtype
331
333
  return harden({ brand: leftAmount.brand, value });
332
334
  },
333
335
  /**