Merge pull request #6217 from Agoric/wallet-offer-status

feat: Wallet UI offer status
Agoric · Sep 16, 2022 · ece86db · ece86db
2 parents 7d9afc0 + 6e8811f
commit ece86db
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/packages/cosmic-swingset/Makefile b/packages/cosmic-swingset/Makefile
@@ -122,7 +122,6 @@ scenario2-setup-nobuild:
 	$(AGCH) --home=t1/bootstrap keys add bootstrap --keyring-backend=test
 	$(AGCH) --home=t1/bootstrap keys show -a bootstrap --keyring-backend=test > t1/bootstrap-address
 	$(AGCH) --home=t1/n0 add-genesis-account `cat t1/bootstrap-address` $(BOOT_COINS)
-	# Create
 	# Create the (singleton) chain node.
 	$(AGCH) --home=t1/n0 --keyring-dir=t1/bootstrap gentx --keyring-backend=test bootstrap 73000000ubld --chain-id=$(CHAIN_ID)
 	$(AGCH) --home=t1/n0 collect-gentxs
@@ -214,7 +213,7 @@ t1-provision-one-with-powers: wait-for-cosmos
 		  t1/$(BASE_PORT) $$addr $(AGORIC_POWERS) -ojson | tee /dev/stderr | grep -q '"code":0'; }
 
 # Send some USDC to the vbank/provision module account where it can be traded for IST.
-fund-provision-pool: wait-for-cosmos
+fund-provision-pool:
 	$(MAKE) ACCT_ADDR=agoric1megzytg65cyrgzs6fvzxgrcqvwwl7ugpt62346 SOLO_COINS=1234000000ibc/usdc1234 fund-acct
 
 fund-acct: wait-for-cosmos

diff --git a/packages/wallet/api/src/marshal-contexts.js b/packages/wallet/api/src/marshal-contexts.js
@@ -17,7 +17,7 @@ const { details: X, quote: q } = assert;
  * @returns {specimen is BoardId}
  */
 const isBoardId = specimen => {
-  return typeof specimen === 'string' && !!specimen.match(/board[^:]/);
+  return typeof specimen === 'string' && !!specimen.match(/^board[^:]/);
 };
 
 /**
@@ -104,6 +104,7 @@ const initSlotVal = (table, slot, val) => {
 
 /**
  * Make context for exporting wallet data where brands etc. can be recognized by boardId.
+ * Export for use outside the smart wallet.
  *
  * When serializing wallet state for, there's a tension between
  *
@@ -235,7 +236,8 @@ const defaultMakePresence = iface => {
 };
 
 /**
- * Make context for unserializing wallet or board data.
+ * Make context for marshalling wallet or board data.
+ * To be imported into the client, which never exports objects.
  *
  * @param {(iface: string) => unknown} [makePresence]
  */
@@ -295,7 +297,8 @@ export const makeImportContext = (makePresence = defaultMakePresence) => {
      */
     fromMyWallet: (slot, iface) => {
       if (!slot) {
-        return makePresence('dummy');
+        // Empty or null slots are neither in the wallet nor the board.
+        return makePresence(`${slot}`);
       }
       const { kind, id } = parseWalletSlot(walletObjects, slot);
       return kind

diff --git a/packages/wallet/ui/src/service/Offers.js b/packages/wallet/ui/src/service/Offers.js
@@ -40,8 +40,7 @@ export const getOfferService = (
   const acceptOffer = async id => {
     const offer = offers.get(id);
     assert(offer, `Tried to accept undefined offer ${id}`);
-    const action = offer.spendAction;
-    return signSpendAction(action);
+    return signSpendAction(offer.spendAction);
   };
 
   const cancelOffer = _id => {
@@ -64,6 +63,7 @@ export const getOfferService = (
       chainOffersNotifier,
     )) {
       state?.forEach(offer => {
+        console.log('chain offer', offer);
         const splitId = offer.id.split('#');
         const rawId = splitId[splitId.length - 1];
         if (offers.has(rawId)) {

diff --git a/packages/wallet/ui/src/util/WalletBackendAdapter.js b/packages/wallet/ui/src/util/WalletBackendAdapter.js
@@ -194,10 +194,22 @@ export const makeWalletBridgeFromFollower = (
         }
         case 'offerStatus': {
           const { status } = updateRecord;
-          offers[status.id] = status;
-          notifierKits.offers.updater.updateState(
-            harden(Object.values(offers)),
-          );
+          console.log('offerStatus', { status, offers });
+          const oldOffer = offers[status.id];
+          if (
+            oldOffer &&
+            oldOffer.status !== 'accept' &&
+            'numWantsSatisfied' in status
+          ) {
+            offers[status.id] = {
+              ...oldOffer,
+              id: `${status.id}`,
+              status: 'accept',
+            };
+            notifierKits.offers.updater.updateState(
+              harden(Object.values(offers)),
+            );
+          }
           break;
         }
         default: {
@@ -253,6 +265,7 @@ export const makeWalletBridgeFromFollower = (
   // smart-wallet format.
   const addOfferPSMHack = async details => {
     const {
+      id,
       instanceHandleBoardId: instance, // This actually is the instance handle, not an ID.
       invitationMaker: { method },
       proposalTemplate: { give, want },
@@ -297,7 +310,9 @@ export const makeWalletBridgeFromFollower = (
       instancePetname: `instance@${instanceBoardId}`,
       spendAction: JSON.stringify(spendAction),
     };
-    return offerService.addOffer(fullOffer);
+    offerService.addOffer(fullOffer);
+    offers[id] = fullOffer;
+    return id;
   };
 
   const walletBridge = Far('follower wallet bridge', {