From fdb7868ae42cef6b7e2b1ec7f505e4b3b2c2e553 Mon Sep 17 00:00:00 2001 From: Daniel Kirchner Date: Wed, 26 Jan 2022 10:51:48 +0100 Subject: [PATCH] Switch solc-js branch for testing. --- scripts/bytecodecompare/storebytecode.sh | 2 +- scripts/ci/lz4-block-codec.wasm | Bin 0 -> 558 bytes .../bytecode_reports_for_modified_binaries.sh | 2 +- test/externalTests/common.sh | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 scripts/ci/lz4-block-codec.wasm diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh index 1c300662b..106259e23 100755 --- a/scripts/bytecodecompare/storebytecode.sh +++ b/scripts/bytecodecompare/storebytecode.sh @@ -44,7 +44,7 @@ TMPDIR=$(mktemp -d) 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 diff --git a/scripts/ci/lz4-block-codec.wasm b/scripts/ci/lz4-block-codec.wasm new file mode 100644 index 0000000000000000000000000000000000000000..f48e33f7cc0e7f0460981421eed4d9bca9098ab0 GIT binary patch literal 558 zcma)(zfQw25XSG1ow%5`NQ^9(?A@3=#RwvG>MMXsm$X$yK?o2c?~8Z^1Q#127Njoz zKKXp#&u7EU{T2ZLCv?qy-(#Nym?3U}x)pB>c0yz3$ zdPgjK!7I~5n0kSl1-r@!RhAlVgvBhzC_DoYj#}cnjOMX++F`}TX=~E4KlPEgu5vPp zU)YYpd$F40PEb_~x(IiQG3}UAEw#=7qkGt|>q2a+z(UMig(E3a$~e7?rmI~%J&0E% zo)fFQ<9r2L`%it4;j$FnkPU*04mwzJ7~p4*0#M%L0Gyo(V6w9TY<5L}BD*p`DG+r$ xjT!_M^3+w7;1tcmH2LHqJe@S6 literal 0 HcmV?d00001 diff --git a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh index be151bca8..3d308808b 100755 --- a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh +++ b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh @@ -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 diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh index 10df97525..655c41aa5 100644 --- a/test/externalTests/common.sh +++ b/test/externalTests/common.sh @@ -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