@agoric/smart-wallet 0.5.4-dev-0ea09b0.0.0ea09b0 → 0.5.4-dev-0b910ea.0.0b910ea
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 +36 -8
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-0b910ea.0.0b910ea",
|
|
4
4
|
"description": "Wallet contract",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "src/index.js",
|
|
@@ -18,9 +18,9 @@
|
|
|
18
18
|
"lint:eslint": "yarn run -T eslint ."
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
|
-
"@agoric/casting": "0.4.3-dev-
|
|
22
|
-
"@agoric/cosmic-proto": "0.4.1-dev-
|
|
23
|
-
"@agoric/swingset-vat": "0.32.3-dev-
|
|
21
|
+
"@agoric/casting": "0.4.3-dev-0b910ea.0.0b910ea",
|
|
22
|
+
"@agoric/cosmic-proto": "0.4.1-dev-0b910ea.0.0b910ea",
|
|
23
|
+
"@agoric/swingset-vat": "0.32.3-dev-0b910ea.0.0b910ea",
|
|
24
24
|
"@endo/bundle-source": "^4.1.2",
|
|
25
25
|
"@endo/captp": "^4.4.8",
|
|
26
26
|
"@endo/init": "^1.1.12",
|
|
@@ -28,15 +28,15 @@
|
|
|
28
28
|
"import-meta-resolve": "^4.1.0"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
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/vow": "0.1.1-dev-
|
|
38
|
-
"@agoric/zoe": "0.26.3-dev-
|
|
39
|
-
"@agoric/zone": "0.2.3-dev-
|
|
31
|
+
"@agoric/ertp": "0.16.3-dev-0b910ea.0.0b910ea",
|
|
32
|
+
"@agoric/internal": "0.3.3-dev-0b910ea.0.0b910ea",
|
|
33
|
+
"@agoric/notifier": "0.6.3-dev-0b910ea.0.0b910ea",
|
|
34
|
+
"@agoric/store": "0.9.3-dev-0b910ea.0.0b910ea",
|
|
35
|
+
"@agoric/vat-data": "0.5.3-dev-0b910ea.0.0b910ea",
|
|
36
|
+
"@agoric/vats": "0.15.2-dev-0b910ea.0.0b910ea",
|
|
37
|
+
"@agoric/vow": "0.1.1-dev-0b910ea.0.0b910ea",
|
|
38
|
+
"@agoric/zoe": "0.26.3-dev-0b910ea.0.0b910ea",
|
|
39
|
+
"@agoric/zone": "0.2.3-dev-0b910ea.0.0b910ea",
|
|
40
40
|
"@endo/errors": "^1.2.13",
|
|
41
41
|
"@endo/eventual-send": "^1.3.4",
|
|
42
42
|
"@endo/far": "^1.1.14",
|
|
@@ -77,5 +77,5 @@
|
|
|
77
77
|
"engines": {
|
|
78
78
|
"node": "^20.9 || ^22.11"
|
|
79
79
|
},
|
|
80
|
-
"gitHead": "
|
|
80
|
+
"gitHead": "0b910eab0eaa75ad6e59126116767a3a6d8f4854"
|
|
81
81
|
}
|
package/src/smartWallet.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smartWallet.d.ts","sourceRoot":"","sources":["smartWallet.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"smartWallet.d.ts","sourceRoot":"","sources":["smartWallet.js"],"names":[],"mappings":"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"}
|
package/src/smartWallet.js
CHANGED
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
StorageNodeShape,
|
|
16
16
|
} from '@agoric/internal';
|
|
17
17
|
import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
|
|
18
|
-
import { M, mustMatch } from '@agoric/store';
|
|
18
|
+
import { M, matches, mustMatch } from '@agoric/store';
|
|
19
19
|
import {
|
|
20
20
|
appendToStoredArray,
|
|
21
21
|
provideLazy,
|
|
@@ -36,6 +36,7 @@ import {
|
|
|
36
36
|
import {
|
|
37
37
|
AmountKeywordRecordShape,
|
|
38
38
|
PaymentPKeywordRecordShape,
|
|
39
|
+
InvitationElementShape,
|
|
39
40
|
} from '@agoric/zoe/src/typeGuards.js';
|
|
40
41
|
import { prepareVowTools } from '@agoric/vow';
|
|
41
42
|
import { makeDurableZone } from '@agoric/zone/durable.js';
|
|
@@ -50,7 +51,7 @@ import { prepareOfferWatcher, makeWatchOfferOutcomes } from './offerWatcher.js';
|
|
|
50
51
|
* @import {EMarshaller} from '@agoric/internal/src/marshal/wrap-marshaller.js';
|
|
51
52
|
* @import {Amount, Brand, Issuer, Payment, Purse} from '@agoric/ertp';
|
|
52
53
|
* @import {WeakMapStore, MapStore} from '@agoric/store'
|
|
53
|
-
* @import {InvitationDetails, PaymentPKeywordRecord, Proposal, UserSeat} from '@agoric/zoe';
|
|
54
|
+
* @import {InvitationAmount, InvitationDetails, PaymentPKeywordRecord, Proposal, UserSeat} from '@agoric/zoe';
|
|
54
55
|
* @import {CopyRecord} from '@endo/pass-style';
|
|
55
56
|
* @import {EReturn} from '@endo/far';
|
|
56
57
|
* @import {OfferId, OfferStatus, OfferSpec, InvokeEntryMessage, ResultPlan} from './offers.js';
|
|
@@ -235,13 +236,13 @@ const trace = makeTracer('SmrtWlt');
|
|
|
235
236
|
*/
|
|
236
237
|
const namesOf = async (target, nameHub) => {
|
|
237
238
|
const entries = await E(nameHub).entries();
|
|
238
|
-
const
|
|
239
|
+
const results = [];
|
|
239
240
|
for (const [name, candidate] of entries) {
|
|
240
241
|
if (candidate === target) {
|
|
241
|
-
|
|
242
|
+
results.push(name);
|
|
242
243
|
}
|
|
243
244
|
}
|
|
244
|
-
return harden(
|
|
245
|
+
return harden(results);
|
|
245
246
|
};
|
|
246
247
|
|
|
247
248
|
/**
|
|
@@ -363,6 +364,31 @@ export const prepareSmartWallet = (baggage, shared) => {
|
|
|
363
364
|
|
|
364
365
|
const makeAmountWatcher = prepareAmountWatcher();
|
|
365
366
|
|
|
367
|
+
/**
|
|
368
|
+
* @param {Amount} amount
|
|
369
|
+
* @returns {Amount}
|
|
370
|
+
*/
|
|
371
|
+
const cleanAmountForPublish = amount => {
|
|
372
|
+
mustMatch(amount, AmountShape);
|
|
373
|
+
if (
|
|
374
|
+
!matches(amount.brand, shared.invitationBrand) ||
|
|
375
|
+
!matches(amount.value, M.arrayOf(InvitationElementShape))
|
|
376
|
+
) {
|
|
377
|
+
return amount;
|
|
378
|
+
}
|
|
379
|
+
|
|
380
|
+
const invitationAmount = /** @type {InvitationAmount} */ (amount);
|
|
381
|
+
const filteredInvitationValue = invitationAmount.value.map(
|
|
382
|
+
({ handle: _, ...filteredInvitationDetails }) =>
|
|
383
|
+
filteredInvitationDetails,
|
|
384
|
+
);
|
|
385
|
+
|
|
386
|
+
return harden({
|
|
387
|
+
brand: shared.invitationBrand,
|
|
388
|
+
value: filteredInvitationValue,
|
|
389
|
+
});
|
|
390
|
+
};
|
|
391
|
+
|
|
366
392
|
/**
|
|
367
393
|
* @param {UniqueParams} unique
|
|
368
394
|
* @returns {State}
|
|
@@ -561,7 +587,7 @@ export const prepareSmartWallet = (baggage, shared) => {
|
|
|
561
587
|
}
|
|
562
588
|
void updateRecorderKit.recorder.write({
|
|
563
589
|
updated: 'balance',
|
|
564
|
-
currentAmount: balance,
|
|
590
|
+
currentAmount: cleanAmountForPublish(balance),
|
|
565
591
|
});
|
|
566
592
|
const { helper } = this.facets;
|
|
567
593
|
helper.publishCurrentState();
|
|
@@ -578,9 +604,11 @@ export const prepareSmartWallet = (baggage, shared) => {
|
|
|
578
604
|
void currentRecorderKit.recorder.write({
|
|
579
605
|
purses: [...purseBalances.values()].map(a => ({
|
|
580
606
|
brand: a.brand,
|
|
581
|
-
balance: a,
|
|
607
|
+
balance: cleanAmountForPublish(a),
|
|
582
608
|
})),
|
|
583
|
-
offerToUsedInvitation: [...offerToUsedInvitation.entries()]
|
|
609
|
+
offerToUsedInvitation: [...offerToUsedInvitation.entries()].map(
|
|
610
|
+
([offerId, a]) => [offerId, cleanAmountForPublish(a)],
|
|
611
|
+
),
|
|
584
612
|
offerToPublicSubscriberPaths: [
|
|
585
613
|
...offerToPublicSubscriberPaths.entries(),
|
|
586
614
|
],
|