Skip to content
This repository has been archived by the owner on Sep 9, 2024. It is now read-only.

Commit

Permalink
Merge pull request #16 from huff-language/wsl2
Browse files Browse the repository at this point in the history 
Wsl2: Unmounted wsl instances
  • Loading branch information
@Maddiaa0
Maddiaa0 authored Sep 2, 2022
2 parents 64c19ca + 419a621 commit bd0585d
Show file tree
Hide file tree
Showing 5 changed files with 186 additions and 187 deletions.
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "huff-language",
"version": "0.0.28",
"version": "0.0.30",
"displayName": "Huff",
"preview": true,
"icon": "resources/huff.png",
Expand Down
125 changes: 62 additions & 63 deletions src/features/debugger/debuggerUtils.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
const vscode = require("vscode");
const commandExists = require("command-exists");
const fs = require("fs");
const {execSync, spawnSync} = require("child_process");
const { isWsl } = require("../../settings");
const { execSync, spawnSync } = require("child_process");


/**Deploy Contract
Expand All @@ -16,30 +15,30 @@ const { isWsl } = require("../../settings");
* @returns
*/
function deployContract(
bytecode,
config,
bytecode,
config,
cwd
) {
if (config.stateChecked || config.storageChecked){
) {
if (config.stateChecked || config.storageChecked) {
console.log("resetting state")
checkStateRepoExistence(config.statePath, cwd)
}
const statePath = `${(isWsl) ? ("/mnt/" + config.mountedDrive) : ""}${cwd}/${config.statePath}`
const command = `hevm exec --code ${bytecode} --address ${config.hevmContractAddress} --create --caller ${config.hevmCaller} --gas 0xffffffff ${(config.stateChecked || config.storageChecked) ? "--state " + statePath : ""}`

const statePath = `${(config.mountedDrive) ? ("/mnt/" + config.mountedDrive) : ""}${cwd}/${config.statePath}`
const command = `hevm exec --code ${bytecode} --address ${config.hevmContractAddress} --create --caller ${config.hevmCaller} --gas 0xffffffff ${(config.stateChecked || config.storageChecked) ? "--state " + statePath : ""}`
console.log(command)

// cache command
writeHevmCommand(command, config.tempHevmCommandFilename, cwd);

// execute command
// const result = execSync("`cat " + cwd + "/" + config.tempHevmCommandFilename + "`", {cwd: cwd});
const hevmCommand = craftTerminalCommand(cwd, config);
try{
try {
const result = executeCommand(cwd, command)
console.log(result)
return result
}catch (e) {
} catch (e) {
console.log("deployment failure")
console.log(e.message)
console.log("e.stdout", e.stdout.toString());
Expand All @@ -57,24 +56,24 @@ function deployContract(
*
* @param {String} command
*/
function runInUserTerminal(command){
const terminal = vscode.window.createTerminal({name: "Huff debug"});
function runInUserTerminal(command) {
const terminal = vscode.window.createTerminal({ name: "Huff debug" });
terminal.sendText(command);
terminal.show();
}
}


function writeHevmCommand(command, file, cwd){
function writeHevmCommand(command, file, cwd) {

try { !fs.accessSync(`${cwd}/cache`) }
catch (e) {fs.mkdirSync(`${cwd}/cache`) }
catch (e) { fs.mkdirSync(`${cwd}/cache`) }
fs.writeFileSync(`${cwd}/${file}`, command);
}


function purgeCache(cwd){
try { fs.rmSync(`${cwd}/cache`, {recursive:true}) }
catch (e){console.log("Cache didn't exist")};
function purgeCache(cwd) {
try { fs.rmSync(`${cwd}/cache`, { recursive: true }) }
catch (e) { console.log("Cache didn't exist") };
}

function checkStateRepoExistence(statePath, cwd) {
Expand All @@ -89,42 +88,42 @@ function checkStateRepoExistence(statePath, cwd) {
* TODO: Windows compatibility
* @param statePath
*/
function resetStateRepo(statePath, cwd) {
function resetStateRepo(statePath, cwd) {
console.log("Creating state repository...")
const fullPath = cwd + "/" + statePath;

// delete old state
try{ fs.rmSync(fullPath, {recursive:true}) }
catch (e){console.log("Cache didn't exist")};
try { fs.rmSync(fullPath, { recursive: true }) }
catch (e) { console.log("Cache didn't exist") };

// check if a cache folder exists
try { !fs.accessSync(`${cwd}/cache`) }
catch (e) {fs.mkdirSync(`${cwd}/cache`) }
catch (e) { fs.mkdirSync(`${cwd}/cache`) }
fs.mkdirSync(fullPath);


const initStateRepositoryCommand = `git init`;
const setHuffAsCommitter = `git config user.name "huff" && git config user.email "huff"`;
const initCommit = `git commit --allow-empty -m "init"`;
execSync(initStateRepositoryCommand, {cwd: fullPath})
execSync(setHuffAsCommitter, {cwd: fullPath})
execSync(initCommit, {cwd: fullPath})
execSync(initStateRepositoryCommand, { cwd: fullPath })
execSync(setHuffAsCommitter, { cwd: fullPath })
execSync(initCommit, { cwd: fullPath })
console.log("Created state repository...")
}

}

/**Compile
*
* @param {String} sourceDirectory The location in which the users workspace is - where the child processes should be executed
* @param {String} fileName
* @returns
*/

/**Compile
*
* @param {String} sourceDirectory The location in which the users workspace is - where the child processes should be executed
* @param {String} fileName
* @returns
*/
function compile(sourceDirectory, fileName) {
console.log("Compiling contract...")

// having issues with the function level debugger
const command = `huffc ${fileName} --bytecode`
const bytecode = execSync(command, {cwd: sourceDirectory});
const bytecode = execSync(command, { cwd: sourceDirectory });
return `0x${bytecode.toString()}`;
}

Expand All @@ -141,13 +140,13 @@ function compile(sourceDirectory, fileName) {
*/
function compileFromFile(source, filename, cwd) {
writeHevmCommand(source, filename, cwd);

const command = `huffc ${filename} --bytecode`
let bytecode;

// if huffc is not found, then try add huffup to path
try {
bytecode = execSync(command, {cwd: cwd });
bytecode = execSync(command, { cwd: cwd });
} catch (e) {
try {
bytecode = executeCommand(cwd, command);
Expand All @@ -156,13 +155,13 @@ function compileFromFile(source, filename, cwd) {
registerError(
e,
"Huffc was not found in the system path, add it to $PATH or install here: https://github.com/huff-language/huff-rs"
)
)
return false;
}
}

// remove temp file
fs.rmSync(`${cwd}/${filename}`);
fs.rmSync(`${cwd}/${filename}`);
return `0x${bytecode.toString()}`;
}

Expand All @@ -172,7 +171,7 @@ function compileFromFile(source, filename, cwd) {
* @param {String} filename
* @param {String} cwd
*/
function createTempFile(source, filename, cwd){
function createTempFile(source, filename, cwd) {
fs.writeFileSync(`${cwd}/${filename}`, source);
}

Expand All @@ -185,11 +184,11 @@ function createTempFile(source, filename, cwd){
* @param {String} cwd
* @param {String} tempMacroFilename
* @param {String} macro
*/
*/
function writeMacro(cwd, tempMacroFilename, macro) {
fs.writeFileSync(`${cwd}/${tempMacroFilename}.huff`, macro);
}


/**Check Hevm Installation
*
Expand Down Expand Up @@ -217,7 +216,7 @@ async function checkHuffcInstallation() {
* @param {*} command
* @returns
*/
async function checkInstallation(command){
async function checkInstallation(command) {
try {
// Depending on what enviornment the code is running in, check if a command is installed
if (vscode.env.remoteName === "wsl") {
Expand All @@ -232,17 +231,17 @@ async function checkInstallation(command){
// Fallback to use the commandExists package
await commandExists(command);
return true;
} catch (e){
} catch (e) {
registerError(
e,
`${command} installation required - install here: ${getInstallationLink(command)}`
)
)
return false;
}
}

function craftTerminalCommand(cwd, config){
return "`cat " + ((isWsl) ? ("/mnt/" + config.mountedDrive) : "") + cwd + "/" + config.tempHevmCommandFilename + "`";
function craftTerminalCommand(cwd, config) {
return "`cat " + ((config.mountedDrive) ? ("/mnt/" + config.mountedDrive) : "") + cwd + "/" + config.tempHevmCommandFilename + "`";
}

/**Execute Command
Expand All @@ -253,12 +252,12 @@ function craftTerminalCommand(cwd, config){
* @param {String} command
* @returns
*/
function executeCommand(cwd, command){
function executeCommand(cwd, command) {
// Depending on what enviornment the code is running in, check if a command is installed
if (vscode.env.remoteName === "wsl") {
// check installation using unix command executed in wsl
console.log(`wsl bash -l -c "${command}"`)

const output = spawnSync('wsl bash -l -c "' + command + '"', {
shell: true,
cwd
Expand All @@ -270,8 +269,8 @@ function executeCommand(cwd, command){
}
}
const output = execSync(command, {
cwd: cwd,
env: {...process.env, PATH: `${process.env.PATH}:${process.env.HOME}/.huff/bin`}
cwd: cwd,
env: { ...process.env, PATH: `${process.env.PATH}:${process.env.HOME}/.huff/bin` }
});
return output.toString();
}
Expand All @@ -282,9 +281,9 @@ function executeCommand(cwd, command){
* @param {String} command
* @returns {String} link
*/
function getInstallationLink(command){
switch (command){
case ("huffc") : {
function getInstallationLink(command) {
switch (command) {
case ("huffc"): {
return "https://github.com/huff-language/huff-rs";
}
case ("hevm"): {
Expand All @@ -301,7 +300,7 @@ function getInstallationLink(command){
* Check for both hevm and huffc installations
* @returns {Promise<Boolean>}
*/
async function checkInstallations(){
async function checkInstallations() {
const results = await Promise.all([
checkHevmInstallation(),
checkHuffcInstallation
Expand All @@ -326,10 +325,10 @@ async function registerError(e, message) {
* @param {String} bytes
*/
const formatEvenBytes = (bytes) => {
if (bytes.length % 2) {
return bytes.replace("0x", "0x0");
}
return bytes;
if (bytes.length % 2) {
return bytes.replace("0x", "0x0");
}
return bytes;
};


Expand Down
Loading

0 comments on commit bd0585d

Please sign in to comment.