Merge pull request #8007 from Agoric/mfig-fix-endo-types

refactor: adapt types for newer `@endo/eventual-send`
Agoric · Jul 6, 2023 · e90f87b · e90f87b
2 parents c50ca19 + 426d613
commit e90f87b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/packages/vats/src/vat-bank.js b/packages/vats/src/vat-bank.js
@@ -614,7 +614,7 @@ const prepareBankManager = (
       /**
        * @param {string} denom
        * @param {AssetIssuerKit} feeKit
-       * @returns {import('@endo/far').EOnly<DepositFacet>}
+       * @returns {ERef<import('@endo/far').EOnly<DepositFacet>>}
        */
       getRewardDistributorDepositFacet(denom, feeKit) {
         const { bankChannel } = this.state;

diff --git a/packages/vats/test/bootstrapTests/supports.js b/packages/vats/test/bootstrapTests/supports.js
@@ -31,7 +31,7 @@ const trace = makeTracer('BSTSupport', false);
 
 /** @typedef {Awaited<ReturnType<import('@agoric/vats/src/core/lib-boot').makeBootstrap>>} BootstrapRootObject */
 
-/** @type {Record<keyof BootstrapRootObject, keyof BootstrapRootObject>} */
+/** @type {{ [P in keyof BootstrapRootObject]: P }} */
 export const bootstrapMethods = {
   bootstrap: 'bootstrap',
   consumeItem: 'consumeItem',

diff --git a/packages/wallet/api/src/lib-wallet.js b/packages/wallet/api/src/lib-wallet.js
@@ -726,7 +726,7 @@ export function makeWalletRoot({
         // eslint-disable-next-line no-use-before-define
         p = makeEmptyPurse(petnameForBrand, petnameForBrand, true);
       } else {
-        p = Promise.resolve();
+        p = Promise.resolve(undefined);
       }
       return E.when(p, _ => petnameForBrand);
     };

diff --git a/scripts/get-packed-versions.sh b/scripts/get-packed-versions.sh
@@ -7,6 +7,11 @@
 # the destination repository.
 set -xueo pipefail
 
+cache_bust=true
+case $1 in
+--no-cache-bust) cache_bust=false; shift ;;
+esac
+
 WORKDIR=${1:-.}
 cd -- "$WORKDIR" 1>&2
 
@@ -27,12 +32,24 @@ yarn --silent workspaces info | jq -r '.[].location' | while read -r dir; do
   stem=$(echo "$name" | sed -e 's!^@!!; s!/!-!g;')
   file="$(pwd)/${stem}-v${version}.tgz"
 
+  # Clean up.
+  rm -f "${stem}"-v*.tgz
+
   # Create the tarball.
   yarn pack 1>&2
 
+  if $cache_bust; then
+    # Bust the cache!
+    sum=$(sha1sum "$file" | sed -e 's/ .*//')
+    dst="$(pwd)/${stem}-v${version}-${sum}.tgz"
+    mv "$file" "$dst"
+  else
+    dst=$file
+  fi
+
   # Write out the version entry.
-  jq -s --arg name "$name" --arg file "$file" \
-      '{ key: $name, value: ("file:" + $file) }' < /dev/null
+  jq -n --arg name "$name" --arg file "$dst" \
+      '{ key: $name, value: ("file:" + $file) }'
 
   popd 1>&2
   ##################