feat: swap contract #10

dckc · 2024-02-21T22:31:44Z

refs #9

This meets all the requirements I know of (oops; save 1... deploying on chain):

contract
wallet style test to specify the interface with the front end
- snapshot of offer sent by client
factor boot-tools, wallet-tools out of test-swaparoo
core eval code
Note: deployment to a running chain postponed to tooling to deploy / start multiple contracts #15

Invitation specs - n/a (client side)
Offer shapes - 1 of 3 makeInvitation calls has an offer shape; is that enough?
Depends on Client docs - n/a (client side)
Lesson plan + video - n/a

It's a minimal effort job. I copied test-swap-wallet.js from dapp-swaparoo, ran it, and then fixed the errors until it passed. In all cases, copying verbatim from dapp-swaparoo sufficed.

Reviewers: please distinguish correctness feedback from style. Here's hoping we find time to make the code exemplary in style as well as correct, but I'm not sure how much of that we should do at this point.

Chris-Hibbert

Looks fine to me.

Chris-Hibbert

comments and questions. All non blocking.

Chris-Hibbert · 2024-03-06T18:52:08Z

contract/src/objectTools.js

+/** @type { <T extends Record<string, ERef<any>>>(obj: T) => Promise<{ [K in keyof T]: Awaited<T[K]>}> } */
+export const allValues = async obj => {
+  const es = await Promise.all(
+    entries(obj).map(([k, vp]) => Promise.resolve(vp).then(v => [k, v])),


merely a suggestion:

Suggested change

entries(obj).map(([k, vp]) => Promise.resolve(vp).then(v => [k, v])),

entries(obj).map(([k, vp]) => E.when(vp, v => [k, v])),

Chris-Hibbert · 2024-03-06T19:26:13Z

contract/test/wallet-tools.js

+    });
+    await E(addressAdmin).default(DEPOSIT_FACET_KEY, depositFacet);
+
+    const getContractInvitation = invitationSpec => {


[style]: would it be helpful to declare a type for invitationSpec?

Chris-Hibbert · 2024-03-06T19:28:16Z

contract/test/wallet-tools.js

+    };
+
+    const getPurseInvitation = async invitationSpec => {
+      //   const { instance, description } = invitationSpec;


is this line obsolete?

it's sort of part of the todo... which I have just todone

Chris-Hibbert · 2024-03-06T19:42:27Z

contract/test/wallet-tools.js

+      // XXX throwing here is unhandled somehow.
+      const seat = await E(zoe).offer(invitation, proposal, pmts, offerArgs);
+      seatById.set(offerSpec.id, seat);
+      //   console.log(address, offerSpec.id, 'got seat');


trace() is useful for log messages you don't want to lose.

Chris-Hibbert · 2024-03-06T19:51:14Z

contract/test/test-swap-wallet.js

+
+  const { bundleCache } = t.context;
+  const bundle = await bundleCache.load(assets.swaparoo, contractName);
+  const bundleID = `b1-${bundle.endoZipBase64Sha512}`;


I just saw a helper for this, didn't I?

Chris-Hibbert · 2024-03-06T19:57:02Z

contract/test/test-swap-wallet.js

+
+  const cowAmount = AmountMath.make(
+    wellKnown.brand.BLD,
+    //   makeCopyBag([['Milky White', 1n]]),


[non-blocking]: is something broken with non-fungibles?

non-fungibles (at least: that particular one) aren't conveniently available in an end-to-end testing context (#16)

As I mentioned, I keep moving bits of stuff up and down my stack of PRs... I should think about this one a bit more...

LuqiPan

Some non-blocking comments after reading through the contract, I'm reading the tests next.

contract/src/swaparoo.contract.js

LuqiPan · 2024-03-06T20:10:10Z

contract/src/swaparoo.contract.js

+      });
+    };
+
+    const { want, give } = firstSeat.getProposal();


nitpick

Rename these to { firstSeatWant, firstSeatGive } so it's a little bit easier to read?

that added a bunch of line wrapping. { want: want1, give: give1 } seems like a happy medium

- prune dead code - avoid ++ - fix shadow

- prune dead code - add static types

- one-line await is too clever

- factor our bundle-tools - prune boardAux hack - move type burden inside contract starters' - initialize balances - punt chainStorage until we use CapData across vats - chore(boot-tools): produce BLD, startUpgradable

- chore: notifier -> async iterator - seatLike: return on payout amounts - missing param decl; lint - prune unused makeWalletFactory - getPayouts -> getPayoutAmounts, with type - docs(wallet-tools): invitationSpec types

https://github.com/agoric-labs/dapp-swaparoo/blob/main/contract/test/test-swap-wallet.js cb6cd8f

- OfferStatus -> offerStatus - use seatLike - getPayoutAmounts - clean up TODO

- refactor: use wallet-tools - refactor: follow x.contract.js pattern - refactor: use getBundleId helper

- refactor: clarify want1, give1 - style: lint

dckc requested review from LuqiPan and Chris-Hibbert February 21, 2024 22:31

dckc force-pushed the dc-swap-contract branch from c7e72f9 to 3d6685e Compare February 21, 2024 23:55

Chris-Hibbert reviewed Feb 22, 2024

View reviewed changes

dckc changed the base branch from main to 939-mint-tickets February 23, 2024 08:34

dckc mentioned this pull request Feb 23, 2024

contract: swap, pay, vote #9

Closed

3 tasks

dckc force-pushed the dc-swap-contract branch 2 times, most recently from a2f3f1a to aa79dc3 Compare March 1, 2024 23:49

dckc marked this pull request as ready for review March 4, 2024 23:55

dckc requested a review from Chris-Hibbert March 6, 2024 01:43

Base automatically changed from 939-mint-tickets to main March 6, 2024 04:57

Chris-Hibbert approved these changes Mar 6, 2024

View reviewed changes

LuqiPan reviewed Mar 6, 2024

View reviewed changes

dckc added 17 commits March 12, 2024 12:42

chore(sell-concert-tickets-proposal): powers types

49c81f0

fixup(test-sell-concet-tickets-contract): types

c40ef86

build(contract): devdeps: vats, smart-wallet, xsnap, nat

65d5128

build(contract): lint:types; skip lint for generated code

3186c3e

build: borrow @agoric/vats patch from swaparoo 0a94313

e729b72

build: patch vats at postinstall

e430782

chore(fixHub): copy b8be868

ef6ed53

chore(fixHub): validate early

b9eaf5f

chore(collectFees): copy from swaparoo ade0474

270f1c7

chore(swaparoo): borrow contract code from 85c1a17

049a816

fix(swaparoo): handle undefined offerArgs

932f83c

- prune dead code - avoid ++ - fix shadow

chore(start-contract-proposal): borrow from swaparoo 33f5dde

d1078b1

chore(start-contract-proposal): swap bootstrap types

ed1662f

- prune dead code - add static types

fixup(swaparoo.proposal): typo

81af4c4

refactor(bundle-tools): factor out of boot-tools

333dc62

chore: objectTools 4c4c0d1

cfc913b

refactor(objectTools): use E.when

74ae5a0

- one-line await is too clever

dckc added 11 commits March 12, 2024 14:20

chore(boot-tools): copy b8be868

f93c6b2

chore(boot-tools): provisionSmartWallet, installBundles, runCoreEval

f74b4a0

- factor our bundle-tools - prune boardAux hack - move type burden inside contract starters' - initialize balances - punt chainStorage until we use CapData across vats - chore(boot-tools): produce BLD, startUpgradable

chore(wallet-tools): copy 80ed3cf

cbcf01d

fix(wallet-tools): select among >1 pending invitations

7bf4b24

- chore: notifier -> async iterator - seatLike: return on payout amounts - missing param decl; lint - prune unused makeWalletFactory - getPayouts -> getPayoutAmounts, with type - docs(wallet-tools): invitationSpec types

chore(test-swap-wallet): copy from swaparoo

1f035fa

https://github.com/agoric-labs/dapp-swaparoo/blob/main/contract/test/test-swap-wallet.js cb6cd8f

chore(test-swap-wallet): lint, types, etc.

2f33cd8

- OfferStatus -> offerStatus - use seatLike - getPayoutAmounts - clean up TODO

refactor(test-swap-wallet): use boot-tools, object-tools

065b0cc

- refactor: use wallet-tools - refactor: follow x.contract.js pattern - refactor: use getBundleId helper

refactor(swaparoo): follow X.proposal.js pattern

7637311

refactor(swaparoo): use fixHub

5ebd71c

- refactor: clarify want1, give1 - style: lint

test(swap): snapshot offers

b0151da

chore(swap): generated snapshots

7028fce

dckc force-pushed the dc-swap-contract branch from 4ca2292 to 7028fce Compare March 12, 2024 19:22

dckc merged commit c49ac22 into main Mar 12, 2024
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: swap contract #10

feat: swap contract #10

dckc commented Feb 21, 2024 •

edited

Loading

Chris-Hibbert left a comment

Chris-Hibbert left a comment

Chris-Hibbert Mar 6, 2024

Chris-Hibbert Mar 6, 2024

Chris-Hibbert Mar 6, 2024

dckc Mar 12, 2024

Chris-Hibbert Mar 6, 2024

Chris-Hibbert Mar 6, 2024

Chris-Hibbert Mar 6, 2024

dckc Mar 6, 2024

LuqiPan left a comment

LuqiPan Mar 6, 2024

dckc Mar 12, 2024

	entries(obj).map(([k, vp]) => Promise.resolve(vp).then(v => [k, v])),
	entries(obj).map(([k, vp]) => E.when(vp, v => [k, v])),

feat: swap contract #10

feat: swap contract #10

Conversation

dckc commented Feb 21, 2024 • edited Loading

Chris-Hibbert left a comment

Choose a reason for hiding this comment

Chris-Hibbert left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LuqiPan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dckc commented Feb 21, 2024 •

edited

Loading