@agoric/network 0.1.1-dev-fa844b5.0 → 0.1.1-dev-a477bee.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/network",
-  "version": "0.1.1-dev-fa844b5.0+fa844b5",
+  "version": "0.1.1-dev-a477bee.0+a477bee",
   "description": "Agoric's network protocol API",
   "type": "module",
   "main": "./src/index.js",
@@ -21,19 +21,19 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-fa844b5.0+fa844b5",
-    "@agoric/internal": "0.3.3-dev-fa844b5.0+fa844b5",
-    "@agoric/store": "0.9.3-dev-fa844b5.0+fa844b5",
-    "@agoric/vat-data": "0.5.3-dev-fa844b5.0+fa844b5",
+    "@agoric/assert": "0.6.1-dev-a477bee.0+a477bee",
+    "@agoric/internal": "0.3.3-dev-a477bee.0+a477bee",
+    "@agoric/store": "0.9.3-dev-a477bee.0+a477bee",
+    "@agoric/vat-data": "0.5.3-dev-a477bee.0+a477bee",
     "@endo/base64": "^1.0.3",
     "@endo/far": "^1.1.0",
     "@endo/patterns": "^1.3.0",
     "@endo/promise-kit": "^1.1.0"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-fa844b5.0+fa844b5",
-    "@agoric/swingset-vat": "0.32.3-dev-fa844b5.0+fa844b5",
-    "@agoric/zone": "0.2.3-dev-fa844b5.0+fa844b5",
+    "@agoric/swingset-liveslots": "0.10.3-dev-a477bee.0+a477bee",
+    "@agoric/swingset-vat": "0.32.3-dev-a477bee.0+a477bee",
+    "@agoric/zone": "0.2.3-dev-a477bee.0+a477bee",
     "@endo/bundle-source": "^3.2.1",
     "ava": "^5.3.0",
     "c8": "^9.1.0"
@@ -70,5 +70,5 @@
   "typeCoverage": {
     "atLeast": 89.74
   },
-  "gitHead": "fa844b51a10ab02af61af19207c164c99c2d8d8c"
+  "gitHead": "a477bee3be6e0e98b9346c0640380e276cf8423e"
 }

package/src/network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["network.js"],"names":[],"mappings":"AA8BA;;;;GAIG;AACH,kCAFW,MAAM,YAahB;AA4rCD;;;;;GAKG;AACH,qDAHW,OAAO,mBAAmB,EAAE,IAAI,sBAChC;;;;;;;;EAAiD;;;;IAmCpD;;;;;OAKG;qCAHQ,QAAQ,cACR,QAAQ,GACN,WAAW,kBAAkB,CAAC;;;IA+D3C;;;;;OAKG;yBAJQ,OAAO,IAAI,CAAC,aACZ,QAAQ,iBACR,OAAO,aAAa,CAAC;;GAgDvC;AA53CD;;;GAGG;AACH,qCAAsC;AAG/B,0CADK,OAAO,aAWlB;AA2IM,0CARI,OAAO,cAAc,EAAE,IAAI,YAC3B,OAAO,aAAa,EAAE,MAAM,CAAC,SAAS,iBAAiB,CAAC,CAAC,SACzD,QAAQ,YACR,OAAO,aAAa,EAAE,MAAM,CAAC,SAAS,iBAAiB,CAAC,CAAC,SACzD,QAAQ,kBACR,CAAC,IAAI,EAAE,cAAc,KAAK,UAAU,yEAgD9C;AAi6BM,6CAHI,OAAO,mBAAmB,EAAE,IAAI,UAChC;;;;;;;;EAAiD,qBAM/C,OAAO,eAAe,CAAC,KACrB,QAAQ,CA2BtB;AAOM,+CAFI,OAAO,mBAAmB,EAAE,IAAI;;QAsCnC;;;;WAIG;+BAHQ,UAAU,SACV,KAAK,sBACL,iBAAiB;QAU5B;;;;WAIG;6BAHQ,UAAU,YACV,WAAW;;;;YAftB;;;;eAIG;mCAHQ,UAAU,SACV,KAAK,sBACL,iBAAiB;YAU5B;;;;eAIG;iCAHQ,UAAU,YACV,WAAW;;;;GAyB7B;;WAtrCa,QAAQ,EAAE;cACV,OAAO,aAAa,EAAE,MAAM,CAAC,SAAS,iBAAiB,CAAC,CAAC,EAAE;WAC3D,SAAS,MAAM,EAAE,UAAU,CAAC;aAC5B,aAAa,QAAQ,CAAC;OACtB,CAAC,GAAC,CAAC;OACH,CAAC,GAAC,CAAC"}
+{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["network.js"],"names":[],"mappings":"AA8BA;;;;GAIG;AACH,kCAFW,MAAM,YAahB;AAwsCD;;;;;GAKG;AACH,qDAHW,OAAO,mBAAmB,EAAE,IAAI,sBAChC;;;;;;;;EAAiD;;;;IAmCpD;;;;;OAKG;qCAHQ,QAAQ,cACR,QAAQ,GACN,WAAW,kBAAkB,CAAC;;;IA+D3C;;;;;OAKG;yBAJQ,OAAO,IAAI,CAAC,aACZ,QAAQ,iBACR,OAAO,aAAa,CAAC;;GAgDvC;AAx4CD;;;GAGG;AACH,qCAAsC;AAG/B,0CADK,OAAO,aAWlB;AA2IM,0CARI,OAAO,cAAc,EAAE,IAAI,YAC3B,OAAO,aAAa,EAAE,MAAM,CAAC,SAAS,iBAAiB,CAAC,CAAC,SACzD,QAAQ,YACR,OAAO,aAAa,EAAE,MAAM,CAAC,SAAS,iBAAiB,CAAC,CAAC,SACzD,QAAQ,kBACR,CAAC,IAAI,EAAE,cAAc,KAAK,UAAU,yEAgD9C;AA66BM,6CAHI,OAAO,mBAAmB,EAAE,IAAI,UAChC;;;;;;;;EAAiD,qBAM/C,OAAO,eAAe,CAAC,KACrB,QAAQ,CA2BtB;AAOM,+CAFI,OAAO,mBAAmB,EAAE,IAAI;;QAsCnC;;;;WAIG;+BAHQ,UAAU,SACV,KAAK,sBACL,iBAAiB;QAU5B;;;;WAIG;6BAHQ,UAAU,YACV,WAAW;;;;YAftB;;;;eAIG;mCAHQ,UAAU,SACV,KAAK,sBACL,iBAAiB;YAU5B;;;;eAIG;iCAHQ,UAAU,YACV,WAAW;;;;GAyB7B;;WAlsCa,QAAQ,EAAE;cACV,OAAO,aAAa,EAAE,MAAM,CAAC,SAAS,iBAAiB,CAAC,CAAC,EAAE;WAC3D,SAAS,MAAM,EAAE,UAAU,CAAC;aAC5B,aAAa,QAAQ,CAAC;OACtB,CAAC,GAAC,CAAC;OACH,CAAC,GAAC,CAAC"}

package/src/network.js

@@ -962,9 +962,21 @@ const prepareBinder = (zone, powers) => {
         },
       },
       binderOutboundConnectWatcher: {
-        onFulfilled({ handler: rchandler }, watchContext) {
-          const { lastFailure, remoteAddr, localAddr, lchandler, port } =
-            watchContext;
+        onFulfilled(
+          {
+            handler: rchandler,
+            remoteAddress: negotiatedRemoteAddress,
+            localAddress: negotiatedLocalAddress,
+          },
+          watchContext,
+        ) {
+          const {
+            lastFailure,
+            lchandler,
+            localAddr: requestedLocalAddress,
+            remoteAddr: requestedRemoteAddress,
+            port,
+          } = watchContext;
 
           const { currentConnections } = this.state;
 
@@ -979,11 +991,11 @@ const prepareBinder = (zone, powers) => {
             /** @type {import('@agoric/vow').Remote<Required<ConnectionHandler>>} */ (
               lchandler
             ),
-            localAddr,
+            negotiatedLocalAddress || requestedLocalAddress,
             /** @type {import('@agoric/vow').Remote<Required<ConnectionHandler>>} */ (
               rchandler
             ),
-            remoteAddr,
+            negotiatedRemoteAddress || requestedRemoteAddress,
             makeConnection,
             current,
           )[0];