@agoric/smart-wallet 0.5.4-dev-a55bc1e.0 → 0.5.4-dev-da4e171.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 +14 -14
- package/src/smartWallet.d.ts.map +1 -1
- package/src/smartWallet.js +23 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agoric/smart-wallet",
|
|
3
|
-
"version": "0.5.4-dev-
|
|
3
|
+
"version": "0.5.4-dev-da4e171.0+da4e171",
|
|
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-
|
|
20
|
-
"@agoric/swingset-vat": "0.32.3-dev-
|
|
21
|
-
"@agoric/zone": "0.2.3-dev-
|
|
19
|
+
"@agoric/cosmic-proto": "0.4.1-dev-da4e171.0+da4e171",
|
|
20
|
+
"@agoric/swingset-vat": "0.32.3-dev-da4e171.0+da4e171",
|
|
21
|
+
"@agoric/zone": "0.2.3-dev-da4e171.0+da4e171",
|
|
22
22
|
"@endo/bundle-source": "^3.2.2",
|
|
23
23
|
"@endo/captp": "^4.1.1",
|
|
24
24
|
"@endo/init": "^1.1.1",
|
|
@@ -26,15 +26,15 @@
|
|
|
26
26
|
"import-meta-resolve": "^2.2.1"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@agoric/assert": "0.6.1-dev-
|
|
30
|
-
"@agoric/casting": "0.4.3-dev-
|
|
31
|
-
"@agoric/ertp": "0.16.3-dev-
|
|
32
|
-
"@agoric/internal": "0.3.3-dev-
|
|
33
|
-
"@agoric/notifier": "0.6.3-dev-
|
|
34
|
-
"@agoric/store": "0.9.3-dev-
|
|
35
|
-
"@agoric/vat-data": "0.5.3-dev-
|
|
36
|
-
"@agoric/vats": "0.15.2-dev-
|
|
37
|
-
"@agoric/zoe": "0.26.3-dev-
|
|
29
|
+
"@agoric/assert": "0.6.1-dev-da4e171.0+da4e171",
|
|
30
|
+
"@agoric/casting": "0.4.3-dev-da4e171.0+da4e171",
|
|
31
|
+
"@agoric/ertp": "0.16.3-dev-da4e171.0+da4e171",
|
|
32
|
+
"@agoric/internal": "0.3.3-dev-da4e171.0+da4e171",
|
|
33
|
+
"@agoric/notifier": "0.6.3-dev-da4e171.0+da4e171",
|
|
34
|
+
"@agoric/store": "0.9.3-dev-da4e171.0+da4e171",
|
|
35
|
+
"@agoric/vat-data": "0.5.3-dev-da4e171.0+da4e171",
|
|
36
|
+
"@agoric/vats": "0.15.2-dev-da4e171.0+da4e171",
|
|
37
|
+
"@agoric/zoe": "0.26.3-dev-da4e171.0+da4e171",
|
|
38
38
|
"@endo/eventual-send": "^1.2.1",
|
|
39
39
|
"@endo/far": "^1.1.1",
|
|
40
40
|
"@endo/marshal": "^1.4.1",
|
|
@@ -70,5 +70,5 @@
|
|
|
70
70
|
"typeCoverage": {
|
|
71
71
|
"atLeast": 93.99
|
|
72
72
|
},
|
|
73
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "da4e17183306815220996aeaa531ea5293c25382"
|
|
74
74
|
}
|
package/src/smartWallet.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smartWallet.d.ts","sourceRoot":"","sources":["smartWallet.js"],"names":[],"mappings":"AAiOA,kDAAmD;AAiB5C,4CAHI,OAAO,kBAAkB,EAAE,OAAO,UAClC,YAAY;;;
|
|
1
|
+
{"version":3,"file":"smartWallet.d.ts","sourceRoot":"","sources":["smartWallet.js"],"names":[],"mappings":"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"}
|
package/src/smartWallet.js
CHANGED
|
@@ -906,7 +906,7 @@ export const prepareSmartWallet = (baggage, shared) => {
|
|
|
906
906
|
* Find the live payments for the offer and deposit them back in the appropriate purses.
|
|
907
907
|
*
|
|
908
908
|
* @param {OfferId} offerId
|
|
909
|
-
* @returns {Promise<
|
|
909
|
+
* @returns {Promise<Amount[]>}
|
|
910
910
|
*/
|
|
911
911
|
async tryReclaimingWithdrawnPayments(offerId) {
|
|
912
912
|
const { facets } = this;
|
|
@@ -917,8 +917,9 @@ export const prepareSmartWallet = (baggage, shared) => {
|
|
|
917
917
|
if (liveOfferPayments.has(offerId)) {
|
|
918
918
|
const brandPaymentRecord = liveOfferPayments.get(offerId);
|
|
919
919
|
if (!brandPaymentRecord) {
|
|
920
|
-
return;
|
|
920
|
+
return [];
|
|
921
921
|
}
|
|
922
|
+
const out = [];
|
|
922
923
|
// Use allSettled to ensure we attempt all the deposits, regardless of
|
|
923
924
|
// individual rejections.
|
|
924
925
|
await Promise.allSettled(
|
|
@@ -928,10 +929,16 @@ export const prepareSmartWallet = (baggage, shared) => {
|
|
|
928
929
|
const purseP = facets.helper.purseForBrand(b);
|
|
929
930
|
|
|
930
931
|
// Now send it back to the purse.
|
|
931
|
-
return E(purseP)
|
|
932
|
+
return E(purseP)
|
|
933
|
+
.deposit(p)
|
|
934
|
+
.then(amt => {
|
|
935
|
+
out.push(amt);
|
|
936
|
+
});
|
|
932
937
|
}),
|
|
933
938
|
);
|
|
939
|
+
return harden(out);
|
|
934
940
|
}
|
|
941
|
+
return [];
|
|
935
942
|
},
|
|
936
943
|
},
|
|
937
944
|
|
|
@@ -1052,6 +1059,19 @@ export const prepareSmartWallet = (baggage, shared) => {
|
|
|
1052
1059
|
* @throws if the seat can't be found or E(seatRef).tryExit() fails.
|
|
1053
1060
|
*/
|
|
1054
1061
|
async tryExitOffer(offerId) {
|
|
1062
|
+
const { facets } = this;
|
|
1063
|
+
const amts = await facets.payments
|
|
1064
|
+
.tryReclaimingWithdrawnPayments(offerId)
|
|
1065
|
+
.catch(e => {
|
|
1066
|
+
facets.helper.logWalletError(
|
|
1067
|
+
'recovery failed reclaiming payments',
|
|
1068
|
+
e,
|
|
1069
|
+
);
|
|
1070
|
+
return [];
|
|
1071
|
+
});
|
|
1072
|
+
if (amts.length > 0) {
|
|
1073
|
+
facets.helper.logWalletInfo('reclaimed', amts, 'from', offerId);
|
|
1074
|
+
}
|
|
1055
1075
|
const seatRef = this.state.liveOfferSeats.get(offerId);
|
|
1056
1076
|
await E(seatRef).tryExit();
|
|
1057
1077
|
},
|