removed unused package.json scripts

Author: Jovonni

contract/package.json

@@ -11,8 +11,6 @@
     "docker:make": "docker compose exec agd make -C /workspace/contract",
     "make:help": "make list",
     "start": "make clean start",
-    "start2": "make clean start2",
-    "build2": "yarn build:deployer2",
     "build:deployer": "rollup -c rollup.config.mjs",
     "build:deployer2": "echo \"deployer2\"; agoric run scripts/build-contract-deployer.js",
     "deploy": "make dev-working",

contract/tools/e2e-tools.js

@@ -112,7 +112,7 @@ export const provisionSmartWallet = async (
     delay,
     chainId = 'agoriclocal',
     // whale = 'validator',
-    whale = 'alice',
+    whale = 'user1',
     progress = console.log,
   },
 ) => {
@@ -291,8 +291,8 @@ const voteLatestProposalAndWait = async ({
   });
 
   const deposit = '50000000ubld';
-  // const sigOpts = { from: validator, chainId, yes: true };
-  const sigOpts = { from: 'genesis', chainId, yes: true };
+  const sigOpts = { from: _validator, chainId, yes: true };
+  // const sigOpts = { from: 'genesis', chainId, yes: true };
   await agd.tx(['gov', 'deposit', lastProposalId, deposit], sigOpts);
 
   await blockTool.waitForBlock(1, { before: 'vote', on: lastProposalId });
@@ -339,7 +339,7 @@ const runCoreEval = async (
     blockTool,
     chainId = 'agoriclocal',
     // proposer = 'validator',
-    proposer = 'alice',
+    proposer = 'user1',
     deposit = `10${BLD}`,
   },
 ) => {
@@ -429,6 +429,9 @@ export const makeE2ETools = (
 
   const vstorage = makeVStorage(lcd);
 
+
+
+
   const installBundles = async (bundleRoots, progress) => {
     await null;
     /** @type {Record<string, import('../test/boot-tools.js').CachedBundle>} */
@@ -484,33 +487,54 @@ export const makeE2ETools = (
       // }
 
       // install the bundle using the copied JSON file
+      // const execArgs = [
+      //   'compose',
+      //   'exec',
+      //   'agd',
+      //   'agd',
+      //   'tx',
+      //   'swingset',
+      //   'install-bundle',
+      //   // `@/root/bundles/bundle-${name}.json`,
+      //   `/bundles/bundle-${name}.json`,
+      //   '--gas',
+      //   'auto',
+      //   '--from',
+      //   `${installer}`,
+      //   '--chain-id',
+      //   `${chainId}`,
+      //   '--yes',
+      //   '--output',
+      //   'json',
+      // ];
+
       const execArgs = [
-        'tx',
-        'swingset',
-        'install-bundle',
-        // `@/root/bundles/bundle-${name}.json`,
-        `/bundles/bundle-${name}.json`,
-        '--gas',
-        'auto',
-        '--from',
-        `${installer}`,
-        '--chain-id',
-        `${chainId}`,
-        '--yes',
-        '--output',
-        'json',
+        'compose',
+        'exec',
+        'agd',
+        'agd',
+        'keys',
+        'list'
       ];
+
+      
       // const execArgs = [
       //   'keys', 'list'
       // ];
       // const execArgs = [
       //   'status'
       // ];
 
-      const output = execFileSync('agd', execArgs, { encoding: 'utf-8' });
+      const output = execFileSync('docker', execArgs, { encoding: 'utf-8' });
       console.log(output)
       const tx = JSON.parse(output);
 
+      // const tx = await agd.tx(
+      //   ['swingset', 'install-bundle', `@${fullPath}`, '--gas', 'auto'],
+      //   { from: "user1", chainId, yes: true },
+      // );
+
+      console.log("tx: ", tx)
       progress({ id: shortId, installTx: tx.txhash, height: tx.height });
       const confirm = { installed: true };
 
@@ -540,6 +564,11 @@ export const makeE2ETools = (
     return harden(bundles);
   };
 
+
+
+
+
+
   /**
    * @param {{
    *   name: string,