Skip to content

Switch solc-js branch for testing. #12585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ekpyron wants to merge 2 commits into from
Closed

Switch solc-js branch for testing. #12585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a06d36d
fixup! bytecode compare: Stop depending on solc-js internal structure…
cameel Jan 25, 2022
fdb7868
Switch solc-js branch for testing.
ekpyron Jan 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions scripts/bytecodecompare/storebytecode.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,18 @@ TMPDIR=$(mktemp -d)

if [[ "$SOLC_EMSCRIPTEN" = "On" ]]
then
echo "Installing solc-js..."
# npm install solc
git clone --depth 1 https://github.com/ethereum/solc-js.git solc-js
git clone --depth 1 -b "fix/root-export-wrapped-solcjson" https://github.com/stephensli/solc-js.git solc-js
cp "$REPO_ROOT/emscripten_build/libsolc/soljson.js" solc-js/
pushd solc-js/
npm install
npm run build
popd

cp "$REPO_ROOT/scripts/bytecodecompare/prepare_report.js" .
( npm install solc-js/ )
npm install solc-js/

echo "Running the compiler..."
# shellcheck disable=SC2035
./prepare_report.js *.sol > report.txt
Expand Down
Binary file added scripts/ci/lz4-block-codec.wasm
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ script_dir="$solidity_dir/scripts"

cd "$tmp_dir"

git clone https://github.com/ethereum/solc-js.git "$solcjs_dir"
git clone -b "fix/root-export-wrapped-solcjson" https://github.com/stephensli/solc-js.git "$solcjs_dir"
cd "$solcjs_dir"
npm install
npm run build
Expand Down
2 changes: 1 addition & 1 deletion test/externalTests/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function setup_solc
if [[ $binary_type == solcjs ]]
then
printLog "Setting up solc-js..."
git clone --depth 1 -b "$solcjs_branch" https://github.com/ethereum/solc-js.git "$install_dir"
git clone --depth 1 -b "fix/root-export-wrapped-solcjson" https://github.com/stephensli/solc-js.git "$install_dir"

pushd "$install_dir"
npm install
Expand Down