interim checkpoint for using upgraded endo bundle-source package

contract/Makefile

@@ -68,6 +68,7 @@ start-contract-mint:
 		--eval src/platform-goals/board-aux.core.js \
 		--eval src/sell-concert-tickets.proposal.js
 
+
 deploy-contract-mint:
 	yarn node scripts/deploy-contract.js \
 		--deploy ./src/sell-concert-tickets.contract.js
@@ -101,3 +102,6 @@ bundles/deploy-swaparoo.js: src/swaparoo.proposal.js
 
 clean:
 	@rm -rf bundles/
+
+patch-bn: 
+	cp ./patch-bn.js ../node_modules/bn.js/lib/bn.js

contract/package.json

@@ -56,7 +56,7 @@
     "@agoric/vat-data": "0.5.3-u14.0",
     "@agoric/vats": "0.15.2-u14.0",
     "@agoric/zoe": "^0.26.3-u14.0",
-    "@endo/bundle-source": "^2.8.0",
+    "@endo/bundle-source": "https://github.com/endojs/endo.git#7277ef6ed47cc9bff0c1df5808c22cc17b4444ad2e25552740f3b7fdce5c5a81",
     "@endo/far": "^0.2.22",
     "@endo/init": "^0.5.60",
     "@endo/marshal": "^0.8.9",

contract/scripts/deploy-contract.js

@@ -58,14 +58,19 @@ const mockExecutionContext = () => {
 };
 
 //
+// const redactImportDecls = txt =>
+// txt.replace(/^\s*import\b\s*(.*)/gm, '// XMPORT: $1');
+
+const hideImportExpr = txt => txt.replace(/\bimport\(/g, 'XMPORT(');
+
 const generateDeployArtifact = async (path, name, { readFile, writeFile }) => {
   // readtemplate
   const template = await readFile('src/auto-deploy.template.js', 'utf-8');
   console.log(template);
   console.log(process.cwd());
   console.log(name);
   // string replace for contract name
-  const finalFile = template.replace('_CONTRACT_NAME_', name);
+  const finalFile = hideImportExpr(template.replace('_CONTRACT_NAME_', name));
 
   //write result to bundles/deploy-name.js
   return writeFile(`bundles/deploy-${name}.js`, finalFile);
@@ -121,7 +126,7 @@ const main = async (bundleDir = 'bundles') => {
       const name = stem(contractEntry);
       await tools.installBundles({ [name]: contractEntry }, progress);
 
-      const generatedCoreEval = `bundles/deploy-${name}.js`;
+      const generatedCoreEval = `bundles/deploy-${name}-entry.js`;
       // TODO: fix
       await generateDeployArtifact(generatedCoreEval, name, fsp);
       console.log({ contractEntry });

contract/tools/e2e-tools.js

@@ -550,10 +550,20 @@ export const makeE2ETools = (
       throw Error('@@TODO: agoric run style');
     }
     const { name, title = name, description = title, entryFile, permit } = info;
+
     const eval0 = {
       code: `bundles/deploy-${name}.js`,
       permit: `bundles/deploy-${name}-permit.json`,
     };
+    const loadResult = await deployBundleCache.load(
+      entryFile,
+      name,
+      console.log,
+    );
+    console.log('loadResult', loadResult);
+    throw 1;
+    await writeFile(eval0.code, loadResult);
+    await writeFile(eval0.permit, JSON.stringify(permit, null, 2));
     await null;
     try {
       const todo = await runMake(`${eval0.code}.done`);
@@ -574,9 +584,6 @@ export const makeE2ETools = (
     const detail = { evals: [eval0], title, description };
 
     // await runPackageScript('build:deployer', entryFile);
-    await bundleCache.load(eval0.code, name, console.log);
-
-    await writeFile(eval0.permit, JSON.stringify(permit, null, 2));
 
     const proposal = await runCoreEval(t, detail, { agd, blockTool });
     await writeFile(

yarn.lock

@@ -8253,7 +8253,7 @@ __metadata:
     "@agoric/xsnap": "npm:0.14.3-u14.0"
     "@agoric/zoe": "npm:^0.26.3-u14.0"
     "@agoric/zone": "npm:0.2.3-u14.0"
-    "@endo/bundle-source": "npm:^2.8.0"
+    "@endo/bundle-source": "https://github.com/endojs/endo.git#7277ef6ed47cc9bff0c1df5808c22cc17b4444ad2e25552740f3b7fdce5c5a81"
     "@endo/eslint-plugin": "npm:^0.5.2"
     "@endo/far": "npm:^0.2.22"
     "@endo/init": "npm:^0.5.60"