@agoric/smart-wallet 0.5.4-dev-4874a7f.0 → 0.5.4-dev-54b2e2b.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/smart-wallet",
3
- "version": "0.5.4-dev-4874a7f.0+4874a7f",
3
+ "version": "0.5.4-dev-54b2e2b.0+54b2e2b",
4
4
  "description": "Wallet contract",
5
5
  "type": "module",
6
6
  "scripts": {
@@ -16,9 +16,9 @@
16
16
  "lint:eslint": "eslint ."
17
17
  },
18
18
  "devDependencies": {
19
- "@agoric/cosmic-proto": "0.4.1-dev-4874a7f.0+4874a7f",
20
- "@agoric/swingset-vat": "0.32.3-dev-4874a7f.0+4874a7f",
21
- "@agoric/zone": "0.2.3-dev-4874a7f.0+4874a7f",
19
+ "@agoric/cosmic-proto": "0.4.1-dev-54b2e2b.0+54b2e2b",
20
+ "@agoric/swingset-vat": "0.32.3-dev-54b2e2b.0+54b2e2b",
21
+ "@agoric/zone": "0.2.3-dev-54b2e2b.0+54b2e2b",
22
22
  "@endo/bundle-source": "^3.2.3",
23
23
  "@endo/captp": "^4.2.0",
24
24
  "@endo/init": "^1.1.2",
@@ -26,15 +26,16 @@
26
26
  "import-meta-resolve": "^2.2.1"
27
27
  },
28
28
  "dependencies": {
29
- "@agoric/assert": "0.6.1-dev-4874a7f.0+4874a7f",
30
- "@agoric/casting": "0.4.3-dev-4874a7f.0+4874a7f",
31
- "@agoric/ertp": "0.16.3-dev-4874a7f.0+4874a7f",
32
- "@agoric/internal": "0.3.3-dev-4874a7f.0+4874a7f",
33
- "@agoric/notifier": "0.6.3-dev-4874a7f.0+4874a7f",
34
- "@agoric/store": "0.9.3-dev-4874a7f.0+4874a7f",
35
- "@agoric/vat-data": "0.5.3-dev-4874a7f.0+4874a7f",
36
- "@agoric/vats": "0.15.2-dev-4874a7f.0+4874a7f",
37
- "@agoric/zoe": "0.26.3-dev-4874a7f.0+4874a7f",
29
+ "@agoric/assert": "0.6.1-dev-54b2e2b.0+54b2e2b",
30
+ "@agoric/casting": "0.4.3-dev-54b2e2b.0+54b2e2b",
31
+ "@agoric/ertp": "0.16.3-dev-54b2e2b.0+54b2e2b",
32
+ "@agoric/internal": "0.3.3-dev-54b2e2b.0+54b2e2b",
33
+ "@agoric/notifier": "0.6.3-dev-54b2e2b.0+54b2e2b",
34
+ "@agoric/store": "0.9.3-dev-54b2e2b.0+54b2e2b",
35
+ "@agoric/vat-data": "0.5.3-dev-54b2e2b.0+54b2e2b",
36
+ "@agoric/vats": "0.15.2-dev-54b2e2b.0+54b2e2b",
37
+ "@agoric/vow": "0.1.1-dev-54b2e2b.0+54b2e2b",
38
+ "@agoric/zoe": "0.26.3-dev-54b2e2b.0+54b2e2b",
38
39
  "@endo/eventual-send": "^1.2.2",
39
40
  "@endo/far": "^1.1.2",
40
41
  "@endo/marshal": "^1.5.0",
@@ -70,5 +71,5 @@
70
71
  "typeCoverage": {
71
72
  "atLeast": 94.36
72
73
  },
73
- "gitHead": "4874a7f9fdf2ad6cf43ffb2721037ae3c486f111"
74
+ "gitHead": "54b2e2b893dd18c54681e9d8ac5ce4bca9b13899"
74
75
  }
@@ -1,4 +1,4 @@
1
- export function watchOfferOutcomes(watchers: OutcomeWatchers, seat: UserSeat): Promise<[unknown, 0 | 1, PaymentPKeywordRecord]>;
1
+ export function watchOfferOutcomes(watchers: OutcomeWatchers, seat: UserSeat): Promise<any[]>;
2
2
  export function prepareOfferWatcher(baggage: import("@agoric/vat-data").Baggage): (walletHelper: any, deposit: any, offerSpec: OfferSpec, address: string, invitationAmount: import("@agoric/ertp/src/types.js").SetAmount<import("@endo/patterns").Key>, seatRef: UserSeat<unknown>) => import("@endo/exo").GuardedKit<{
3
3
  helper: {
4
4
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"offerWatcher.d.ts","sourceRoot":"","sources":["offerWatcher.js"],"names":[],"mappings":"AAoEO,6CAHI,eAAe,QACf,QAAQ,oDAQlB;AAkCM,6CAFI,OAAO,kBAAkB,EAAE,OAAO,iNAyHnC,WAAS;;QAhGX;;WAEG;yCADQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;QAQlC;;;;;WAKG;sCAJQ,MAAM,oBACN,MAAM,CAAC,KAAK,CAAC,oBACb,OAAO,YAAY,EAAE,gBAAgB,qBACrC,OAAO,YAAY,EAAE,iBAAiB;QAkBjD,uDAAuD;8BAA3C,QAAQ,GAAG,qBAAqB;QAoC5C;;;;;;WAMG;yBADQ,KAAK;;IAclB,gDAAgD;oBAArC,eAAe,CAAC,gBAAgB,CAAC;IA+B5C,+CAA+C;mBAApC,eAAe,CAAC,eAAe,CAAC;IAwB3C,iDAAiD;qBAAtC,eAAe,CAAC,iBAAiB,CAAC;GA2BlD;;;;gCArRkB,CAAC,oBACP,eAAe,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;8BAI7B;IACZ,aAAiB,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACjD,eAAmB,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACjD,cAAkB,EAAE,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;CAC5D;+BA+QU,UAAU,CAAC,OAAO,mBAAmB,CAAC;2BACtC,UAAU,CAAC,gBAAgB,CAAC;+BAhSd,aAAa;8BAEd,kBAAkB;2CADL,YAAY;oCAEnB,4BAA4B"}
1
+ {"version":3,"file":"offerWatcher.d.ts","sourceRoot":"","sources":["offerWatcher.js"],"names":[],"mappings":"AAwEO,6CAHI,eAAe,QACf,QAAQ,kBAWlB;AAkCM,6CAFI,OAAO,kBAAkB,EAAE,OAAO,iNAoHnB,WAAW;;QA3F7B;;WAEG;yCADQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;QAQlC;;;;;WAKG;sCAJQ,MAAM,oBACN,MAAM,CAAC,KAAK,CAAC,oBACb,OAAO,YAAY,EAAE,gBAAgB,qBACrC,OAAO,YAAY,EAAE,iBAAiB;QAkBjD,uDAAuD;8BAA3C,QAAQ,GAAG,qBAAqB;QAoC5C;;;;;;WAMG;yBADQ,KAAK;;IAclB,gDAAgD;oBAArC,eAAe,CAAC,gBAAgB,CAAC;IA+B5C,+CAA+C;mBAApC,eAAe,CAAC,eAAe,CAAC;IAwB3C,iDAAiD;qBAAtC,eAAe,CAAC,iBAAiB,CAAC;GA2BlD;;;;gCAzRkB,CAAC,oBACP,eAAe,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;8BAI7B;IACZ,aAAiB,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACjD,eAAmB,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACjD,cAAkB,EAAE,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;CAC5D;+BAmRU,UAAU,CAAC,OAAO,mBAAmB,CAAC;2BACtC,UAAU,CAAC,gBAAgB,CAAC;+BApSd,aAAa;8BAEd,kBAAkB;2CADL,YAAY;oCAEnB,4BAA4B"}
@@ -9,9 +9,12 @@ import {
9
9
  } from '@agoric/zoe/src/typeGuards.js';
10
10
  import { AmountShape } from '@agoric/ertp/src/typeGuards.js';
11
11
  import { deeplyFulfilledObject, objectMap } from '@agoric/internal';
12
+ import { heapVowTools } from '@agoric/vow/vat.js';
12
13
 
13
14
  import { UNPUBLISHED_RESULT } from './offers.js';
14
15
 
16
+ const { when, allVows } = heapVowTools;
17
+
15
18
  /**
16
19
  * @import {OfferSpec} from "./offers.js";
17
20
  * @import {ContinuingOfferResult} from "./types.js";
@@ -37,7 +40,8 @@ import { UNPUBLISHED_RESULT } from './offers.js';
37
40
  * @param {UserSeat} seat
38
41
  */
39
42
  const watchForOfferResult = ({ resultWatcher }, seat) => {
40
- const p = E(seat).getOfferResult();
43
+ // NOTE: this enables upgrade of the contract, NOT upgrade of the smart-wallet. See #9308
44
+ const p = when(E(seat).getOfferResult());
41
45
  watchPromise(p, resultWatcher, seat);
42
46
  return p;
43
47
  };
@@ -67,11 +71,14 @@ const watchForPayout = ({ paymentWatcher }, seat) => {
67
71
  * @param {UserSeat} seat
68
72
  */
69
73
  export const watchOfferOutcomes = (watchers, seat) => {
70
- return Promise.all([
71
- watchForOfferResult(watchers, seat),
72
- watchForNumWants(watchers, seat),
73
- watchForPayout(watchers, seat),
74
- ]);
74
+ // NOTE: this enables upgrade of the contract, NOT upgrade of the smart-wallet. See #9308
75
+ return when(
76
+ allVows([
77
+ watchForOfferResult(watchers, seat),
78
+ watchForNumWants(watchers, seat),
79
+ watchForPayout(watchers, seat),
80
+ ]),
81
+ );
75
82
  };
76
83
 
77
84
  const offerWatcherGuard = harden({