feat: Support publishing source bundles to chain and installing hash bundles to Zoe #4975

kriskowal · 2022-03-31T01:08:01Z

This stack of changes-in-progress will address:

For manual verification, clone dapp-fungible-faucet, check out publish-bundle, and run these commands in separate sessions:

agoric start local-solo
agoric start local-chain
DEBUG=agoric:deploy agoric deploy ./contract/deploy.js

dckc · 2022-04-07T18:22:11Z

packages/agoric-cli/src/deploy.js

          const { packageDescriptorText } =
            await readContainingPackageDescriptor(
              read,
-              `file://${moduleFile}`,
+              url.pathToFileURL(moduleFile),


something tells me "portable" also means powerful / ambient

It certainly at least means “sensitive to platform”. The big difference is the treatment of drive letters as absolute paths instead of concatenating them like c:/users/kris/endo/d:/users/kris/ etc.

dckc · 2022-04-07T18:23:57Z

packages/publish-bundle/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License


How did you scaffold this new project? Would you please leave some clues in the commit message?

I’ll leave a note. It’s only semi automatic.

kriskowal · 2022-04-29T00:06:20Z

packages/agoric-cli/src/deploy.js

@@ -1,17 +1,23 @@
-/* global process setTimeout setInterval clearInterval */
+/* eslint-env node */


Spread the word.

hm. I kinda like the explicit list.

Oh, indeed. I must have been cross-eyed when I wrote this because I thought that the environment might provide a better hint than any types for all these globals to TypeScript, but this is an eslint pragma so it probably does not.

packages/agoric-cli/src/deploy.js

packages/agoric-cli/src/publish.js

packages/agoric-cli/src/start.js

packages/solo/test/test-home.js

packages/zoe/src/contractFacet/internal-types.js

kriskowal · 2022-04-29T01:25:54Z

packages/zoe/src/zoeService/zoe.js

@@ -62,7 +62,8 @@ const makeZoeKit = (
    shutdownZoeVat,
  );

-  const getBundleCapFromID = bundleID => E(vatAdminSvc).getBundleCap(bundleID);
+  const getBundleCapFromID = bundleID =>
+    E(vatAdminSvc).waitForBundleCap(bundleID);


@warner This was the most surgical change I could make to ensure that E(zoe).install(hashBundle) would wait for the chain to receive the bundle separately. This might be giving us a hint that getBundleCap should behave like waitForBundleCap, rather than having separate methods, or it might be a hint that getBundleCapFromID defined here should be renamed waitForBundleCapWithID or some such.

I think this is fine. I vaguely remember thinking that Zoe's E(zoe).install() should wait for the bundle to be installed out-of-band, so that you can only get an installation handle for installations that are actually functional, and aren't waiting for a bundle install that might never happen. And since E(zoe).install() is interacting with a wrapper function (which sometimes comes from the fake vatadmin service), that wrapper function should do the waiting, which means that when it calls the real vatadmin service, it should be using waitForBundleCap instead of getBundleCap.

I've assumed that other (non-zoe, non-agoric) uses/users of swingset and vatAdminService may have legitimate reasons to query for a bundleID and want a negative answer (instead of an unbounded pause), which means keeping getBundleCap as the form that doesn't wait, and Zoe can use waitForBundleCap (which does).

And yeah, at some point renaming this zoe thing waitForBundleCapFromID might make sense.

Incidentally, while investigating this function, I found it is named getBundleCapFromID here and in installationStorage.js, but getBundleCapForID in zoe.js, which is a bit confusing for code spelunkers.

kriskowal · 2022-04-29T01:26:53Z

packages/zoe/tools/fakeVatAdmin.js

+    waitForBundleCap: bundleID => {
+      if (!idToBundleCap.has(bundleID)) {
+        idToBundleCap.init(bundleID, fakeBundleCap());
+      }
+      return Promise.resolve(idToBundleCap.get(bundleID));
+    },


@warner For the fake, I duplicated getBundleCap. This might be another hint that I should just change the behavior of the real getBundleCap.

kriskowal · 2022-04-29T01:31:20Z

packages/agoric-cli/src/publish.js

+      removeCallback();
+    }
+  };
+


@michaelfig This would be a good place to wait for an event from the chain telling us whether the INSTALL_BUNDLE action succeeded or failed, probably by laying a trap somewhere keyed on the hash of the bundle we attempted to install. I think I’ll need you looking over my shoulder for that project.

Otherwise, this hangs indefinitely if publishing fails.

The correct way to do that is via the WebSocket, as done for swingset deliver transactions in chain-cosmos-sdk.js.

kriskowal · 2022-04-29T01:36:52Z

packages/cosmic-swingset/src/block-manager.js

+        p = (async () => {
+          const bundle = JSON.parse(action.bundle);
+          harden(bundle);
+          return validateAndInstallBundle(bundle);


After this would be a good time to emit an “event” as to whether the installation worked or not. My understanding from @michaelfig is that this could arrive in the Agoric deploy script via its WebSocket connection, so publishBundle would need a mechanism to connect a listener for a particular bundle hash’s installBundle resolution on chain.

Actually, after succeeding in JS, the event should be emitted from Golang, and tracked in deploy-bundle via a Tendermint RPC WebSocket subscription (not the ag-solo WebSocket).

kriskowal · 2022-05-03T00:51:32Z

Commits are individually reviewable.

dckc

I browsed it; I don't see any problems.

I hope to try it out soonish.

turadg

Read commit by commit. I don't know much about bundling mechanics but the code LGTM.

One request: the new package.json has older deps than the rest of agoric-sdk; update those so yarn.lock doesn't take on new versions unnecessarily.

dckc · 2022-05-03T03:34:36Z

What would it cost to measure code coverage?

michaelfig

A few comments, and as @turadg suggested, please don't remove the SourceBundle type.

golang/cosmos/x/swingset/keeper/msg_server.go

packages/agoric-cli/src/deploy.js

michaelfig · 2022-05-05T23:20:25Z

packages/agoric-cli/src/publish.js

+      removeCallback();
+    }
+  };
+


The correct way to do that is via the WebSocket, as done for swingset deliver transactions in chain-cosmos-sdk.js.

michaelfig · 2022-05-05T23:22:51Z

packages/cosmic-swingset/src/block-manager.js

+        p = (async () => {
+          const bundle = JSON.parse(action.bundle);
+          harden(bundle);
+          return validateAndInstallBundle(bundle);


Actually, after succeeding in JS, the event should be emitted from Golang, and tracked in deploy-bundle via a Tendermint RPC WebSocket subscription (not the ag-solo WebSocket).

packages/solo/src/web.js

yarn.lock

michaelfig

Looks great! Please fix the lint.

packages/solo/package.json

…scripts

…definitions

dckc reviewed Apr 7, 2022

View reviewed changes

kriskowal force-pushed the kris-hash-bundle-stack branch 3 times, most recently from 64ce117 to ad30144 Compare April 28, 2022 02:47

kriskowal force-pushed the kris-hash-bundle-stack branch 2 times, most recently from c07e88c to 05127ce Compare April 28, 2022 21:36

kriskowal commented Apr 29, 2022

View reviewed changes

kriskowal requested review from michaelfig and warner April 29, 2022 01:27

kriskowal commented Apr 29, 2022

View reviewed changes

kriskowal force-pushed the kris-hash-bundle-stack branch 4 times, most recently from e27a2a2 to 454afd3 Compare May 3, 2022 00:26

kriskowal changed the title ~~WIP hash bundle stack~~ feat: Support publishing source bundles to chain and installing hash bundles to Zoe May 3, 2022

kriskowal marked this pull request as ready for review May 3, 2022 00:51

kriskowal requested a review from turadg as a code owner May 3, 2022 00:51

dckc reviewed May 3, 2022

View reviewed changes

turadg approved these changes May 3, 2022

View reviewed changes

michaelfig requested changes May 5, 2022

View reviewed changes

kriskowal force-pushed the kris-hash-bundle-stack branch 4 times, most recently from 29fc204 to 28caec7 Compare May 25, 2022 21:20

kriskowal requested a review from michaelfig May 25, 2022 23:16

michaelfig reviewed May 26, 2022

View reviewed changes

packages/solo/package.json Show resolved Hide resolved

kriskowal added 17 commits May 26, 2022 20:21

fix(solo): Portable file path to URL in start

f5d53ec

fix(solo): Portable file path to URL in chain-cosmos-sdk

08368d4

feat(solo): Add /connections and /install-bundle HTTP routes

01cdbc9

refactor(solo): Remove superfluous bundle preinit

3fded16

fix(solo): Add missing extension to test-env import

ea3a1bf

fix(solo): Relax extraneous xsnap dependency

616f26e

fix(agoric-cli): Portable file path to URL in deploy

9d2788d

feat(agoric-cli): Inject publishBundle and listConnections to deploy …

69647a2

…scripts

fixup remove publish-bundle

d6062eb

feat(golang/cosmos): Add InstallBundle RPC message types to Protobuf …

2d11fde

…definitions

feat(golang/cosmos): Implement SDK InstallBundle message type

b69b94f

feat(cosmic-swingset): Handle InstallBundle messages

e3ae969

feat(agd): Add install-bundle command

6d3e227

fix(zoe): Note #4974 subsume installBundleID in install

815c035

feat(zoe): Support installation of hash bundles

8f9ad75

chore: Sync Endo versions

99c6931

chore: Update yarn.lock

90c545f

kriskowal force-pushed the kris-hash-bundle-stack branch from bc20c89 to 90c545f Compare May 27, 2022 03:21

kriskowal added the automerge:rebase Automatically rebase updates, then merge label May 27, 2022

mergify bot merged commit 98d3580 into master May 27, 2022

mergify bot deleted the kris-hash-bundle-stack branch May 27, 2022 03:54

This was referenced May 27, 2022

install-bundle transaction message #4396

Closed

Add hash bundle support to Zoe install #4974

Closed

feat: Use publishBundle to deploy contract to chain Agoric/dapp-fungible-faucet#46

Merged

This was referenced May 28, 2022

Chain ACKs publish bundle #5460

Closed

Use publishBundle if available Agoric/testnet-load-generator#85

Merged

dckc mentioned this pull request Jun 15, 2022

connection refused when deploying dapp-fungible-faucet to devnet #5601

Closed

dckc mentioned this pull request Jul 25, 2022

install Inter protocol defi contracts after boostrap using publishBundle #5819

Closed

Chris-Hibbert mentioned this pull request Dec 11, 2023

fix(zoe): Fix guards to accurately guard args #8642

Merged

Chris-Hibbert mentioned this pull request Dec 28, 2023

Why is makeZoeInstanceStorageManager()'s instance parameter typed M.or(InstanceHandleShape, BundleShape)? #8645

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Support publishing source bundles to chain and installing hash bundles to Zoe #4975

feat: Support publishing source bundles to chain and installing hash bundles to Zoe #4975

kriskowal commented Mar 31, 2022 •

edited

Loading

dckc Apr 7, 2022

kriskowal Apr 8, 2022

dckc Apr 7, 2022

kriskowal Apr 8, 2022

kriskowal Apr 29, 2022

dckc May 2, 2022

kriskowal May 3, 2022

kriskowal Apr 29, 2022

warner May 27, 2022

kriskowal Apr 29, 2022

kriskowal Apr 29, 2022

michaelfig May 5, 2022

kriskowal Apr 29, 2022

michaelfig May 5, 2022

kriskowal commented May 3, 2022

dckc left a comment

turadg left a comment

dckc commented May 3, 2022

michaelfig left a comment

michaelfig May 5, 2022

michaelfig May 5, 2022

michaelfig left a comment

		@@ -1,17 +1,23 @@
		/* global process setTimeout setInterval clearInterval */
		/* eslint-env node */

feat: Support publishing source bundles to chain and installing hash bundles to Zoe #4975

feat: Support publishing source bundles to chain and installing hash bundles to Zoe #4975

Conversation

kriskowal commented Mar 31, 2022 • edited Loading

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

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

kriskowal commented May 3, 2022

dckc left a comment

Choose a reason for hiding this comment

turadg left a comment

Choose a reason for hiding this comment

dckc commented May 3, 2022

michaelfig left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

michaelfig left a comment

Choose a reason for hiding this comment

kriskowal commented Mar 31, 2022 •

edited

Loading