Fixed e2e makefile target to use deploy-cli instead of deploy-script.js

contract/Makefile

@@ -20,6 +20,8 @@ VOTE_OPTION=yes
 CLIENTADDR=agoric12j5kzvrwunqvrga5vm4zpy3mkeh3lvyld0amz5
 CLIENT_OSMO_ADDR=osmo1rhvgsqq96n3qyv3u0zlwleyaunpmal6uhnam4z
 
+DEPLOY=npx --no-install tsx ../e2e-testing/scripts/deploy-cli.ts
+
 .PHONY: list
 # https://stackoverflow.com/a/73159833/7963
 list:
@@ -259,26 +261,7 @@ test-orca:
 
 # todo remove clean install steps after debugging
 e2e:
-	make clean
-	make cleanc
-	yarn cache clean
-	kubectl exec -i agoriclocal-genesis-0 -c validator -- bash -c "yarn cache clean"
-	kubectl exec -i agoriclocal-genesis-0 -c validator -- bash -c "rm -rf -v /root/*"
-# yarn run build:deployer
-	make copy-project  
-	kubectl exec -i agoriclocal-genesis-0 -c validator -- bash -c "cd /root/ ; yarn install"
-	kubectl exec -i agoriclocal-genesis-0 -c validator -- bash -c "cd /root/ ; yarn add @endo/[email protected]"
-#kubectl exec -i agoriclocal-genesis-0 -c validator -- bash -c "cd /root/ ; yarn add @agoric/[email protected]"
-	kubectl exec -i agoriclocal-genesis-0 -c validator -- bash -c "cd /root/ ; yarn add @agoric/[email protected]"
-	kubectl exec -i agoriclocal-genesis-0 -c validator -- bash -c "cd /root/ ; yarn add @agoric/[email protected]"
-	kubectl exec -i agoriclocal-genesis-0 -c validator -- bash -c "cd /root/ ; yarn build:deployer"
-
-# yarn node scripts/deploy-contract.js --install /root/src/orca.contract.js --eval /root/src/orca.proposal.js
-	yarn node scripts/deploy-contract.js --install ${PWD}/src/orca.contract.js,${PWD}/src/orca.proposal.js --eval /root/src/orca.proposal.js
-
-# todo: figure out why this sequence # is always off by 1 forcing a retry
-# yarn node script/deploy-contract.js
-
+	$(DEPLOY) src/builder/init-orca.js
 lint:
 	yarn lint --fix-dry-run --ignore-pattern "*patch*" 
 

contract/test/orca-multichain.test.js

@@ -21,7 +21,7 @@ const configFile = nodeRequire.resolve('../../e2e-testing/config.yaml');
 const test = anyTest;
 
 const contractName = 'orca';
-const contractBuilder = './test/builder/init-orca.js';
+const contractBuilder = './src/builder/init-orca.js';
 
 const makeTestContext = async t => {
   t.log('configure starship regisry', configFile);

contract/tools/e2e-tools.js

@@ -572,7 +572,7 @@ export const makeE2ETools = (
       // generate plan, etc
       // const keyring = await makeKeyring(tools);
       // const deployBuilder = makeDeployBuilder(tools, fse.readJSON, execa);
-      const contractBuilder = './test/builder/init-orca.js';
+      const contractBuilder = './src/builder/init-orca.js';
       // await deployBuilder(contractBuilder);
       const { stdout } = await execa`agoric run ${contractBuilder}`;
       const match = stdout.match(/ (?<name>[-\w]+)-permit.json/);