fix: accomodate modified offer ids

Agoric · Mar 16, 2020 · 38d367d · 38d367d
1 parent 41c1278
commit 38d367d
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 15 deletions.
diff --git a/packages/agoric-cli/agoric-wallet-build/asset-manifest.json b/packages/agoric-cli/agoric-wallet-build/asset-manifest.json
@@ -1,19 +1,19 @@
 {
   "files": {
-    "main.js": "./static/js/main.8b821acd.chunk.js",
-    "main.js.map": "./static/js/main.8b821acd.chunk.js.map",
+    "main.js": "./static/js/main.2de9e919.chunk.js",
+    "main.js.map": "./static/js/main.2de9e919.chunk.js.map",
     "runtime-main.js": "./static/js/runtime-main.6d19b3b8.js",
     "runtime-main.js.map": "./static/js/runtime-main.6d19b3b8.js.map",
     "static/js/2.8b396fe9.chunk.js": "./static/js/2.8b396fe9.chunk.js",
     "static/js/2.8b396fe9.chunk.js.map": "./static/js/2.8b396fe9.chunk.js.map",
     "index.html": "./index.html",
-    "precache-manifest.dc3db1e8ecb4d6dc99cf7c3550f46d0c.js": "./precache-manifest.dc3db1e8ecb4d6dc99cf7c3550f46d0c.js",
+    "precache-manifest.81ac76d1232f29be088449d54b9983b8.js": "./precache-manifest.81ac76d1232f29be088449d54b9983b8.js",
     "service-worker.js": "./service-worker.js",
     "static/js/2.8b396fe9.chunk.js.LICENSE.txt": "./static/js/2.8b396fe9.chunk.js.LICENSE.txt"
   },
   "entrypoints": [
     "static/js/runtime-main.6d19b3b8.js",
     "static/js/2.8b396fe9.chunk.js",
-    "static/js/main.8b821acd.chunk.js"
+    "static/js/main.2de9e919.chunk.js"
   ]
 }
diff --git a/packages/agoric-cli/agoric-wallet-build/index.html b/packages/agoric-cli/agoric-wallet-build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"/><title>Simple Wallet</title></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,l,a=r[0],f=r[1],i=r[2],p=0,s=[];p<a.length;p++)l=a[p],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(c&&c(r);s.length;)s.shift()();return u.push.apply(u,i||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,a=1;a<t.length;a++){var f=t[a];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="./";var a=this["webpackJsonp@agoric/wallet-frontend"]=this["webpackJsonp@agoric/wallet-frontend"]||[],f=a.push.bind(a);a.push=r,a=a.slice();for(var i=0;i<a.length;i++)r(a[i]);var c=f;t()}([])</script><script src="./static/js/2.8b396fe9.chunk.js"></script><script src="./static/js/main.8b821acd.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"/><title>Simple Wallet</title></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,l,a=r[0],f=r[1],i=r[2],p=0,s=[];p<a.length;p++)l=a[p],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(c&&c(r);s.length;)s.shift()();return u.push.apply(u,i||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,a=1;a<t.length;a++){var f=t[a];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="./";var a=this["webpackJsonp@agoric/wallet-frontend"]=this["webpackJsonp@agoric/wallet-frontend"]||[],f=a.push.bind(a);a.push=r,a=a.slice();for(var i=0;i<a.length;i++)r(a[i]);var c=f;t()}([])</script><script src="./static/js/2.8b396fe9.chunk.js"></script><script src="./static/js/main.2de9e919.chunk.js"></script></body></html>
diff --git a/...ifest.dc3db1e8ecb4d6dc99cf7c3550f46d0c.js → ...ifest.81ac76d1232f29be088449d54b9983b8.js b/...ifest.dc3db1e8ecb4d6dc99cf7c3550f46d0c.js → ...ifest.81ac76d1232f29be088449d54b9983b8.js
@@ -1,6 +1,6 @@
 self.__precacheManifest = (self.__precacheManifest || []).concat([
   {
-    "revision": "a560f397591079a24291619556e42872",
+    "revision": "65d7edb98e16dd32be252e15edb2365b",
     "url": "./index.html"
   },
   {
@@ -12,8 +12,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "./static/js/2.8b396fe9.chunk.js.LICENSE.txt"
   },
   {
-    "revision": "6a350d0cd7abf187436b",
-    "url": "./static/js/main.8b821acd.chunk.js"
+    "revision": "5c87fd89f127e4b73851",
+    "url": "./static/js/main.2de9e919.chunk.js"
   },
   {
     "revision": "ce519bdb244b322bcd66",

diff --git a/packages/agoric-cli/agoric-wallet-build/service-worker.js b/packages/agoric-cli/agoric-wallet-build/service-worker.js
@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "./precache-manifest.dc3db1e8ecb4d6dc99cf7c3550f46d0c.js"
+  "./precache-manifest.81ac76d1232f29be088449d54b9983b8.js"
 );
 
 self.addEventListener('message', (event) => {

diff --git a/...et-build/static/js/main.8b821acd.chunk.js → ...et-build/static/js/main.2de9e919.chunk.js b/...et-build/static/js/main.8b821acd.chunk.js → ...et-build/static/js/main.2de9e919.chunk.js
diff --git a/packages/agoric-cli/agoric-wallet-build/static/js/main.2de9e919.chunk.js.map b/packages/agoric-cli/agoric-wallet-build/static/js/main.2de9e919.chunk.js.map
diff --git a/packages/agoric-cli/agoric-wallet-build/static/js/main.8b821acd.chunk.js.map b/packages/agoric-cli/agoric-wallet-build/static/js/main.8b821acd.chunk.js.map
diff --git a/packages/cosmic-swingset/lib/ag-solo/vats/lib-wallet.js b/packages/cosmic-swingset/lib/ag-solo/vats/lib-wallet.js
@@ -196,11 +196,13 @@ export async function makeWallet(
   async function addOffer(
     rawOfferDesc,
     hooks = undefined,
-    requestContext = {},
+    requestContext = { origin: 'unknown' },
   ) {
-    const { id } = rawOfferDesc;
+    const { id: rawId } = rawOfferDesc;
+    const id = `${requestContext.origin}#${rawId}`;
     const offerDesc = {
       ...rawOfferDesc,
+      id,
       requestContext,
       status: undefined,
       wait: undefined,
@@ -213,6 +215,7 @@ export async function makeWallet(
 
     // Our inbox state may have an enriched offerDesc.
     updateInboxState(id, idToOfferDesc.get(id));
+    return id;
   }
 
   function declineOffer(id) {

diff --git a/packages/wallet-frontend/src/components/Inbox.jsx b/packages/wallet-frontend/src/components/Inbox.jsx
@@ -144,7 +144,7 @@ export default function Inbox() {
               id,
               instanceRegKey,
               instancePetname,
-              offerRulesTemplate: { offer = {}, want = {} },
+              offerRulesTemplate: { offer = {}, want = {} } = {},
               status,
               wait,
             }) => (