Skip to content

Compatibility fixes for solc-js TypeScript migration #12583

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

Merged
ekpyron merged 5 commits into from
Jan 26, 2022
Merged

Compatibility fixes for solc-js TypeScript migration #12583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1cd4ffc
bytecode compare: Stop depending on solc-js internal structure and in…
cameel Jan 25, 2022
8011d23
Release checklist: switch to a command that automatically downloads t…
cameel Jan 25, 2022
cdaa6dd
Adjust workflow with solc-js checkout now that it's on TypeScrpt
cameel Jan 25, 2022
4e39513
Changelog entry for the TypeScript migration
cameel Jan 25, 2022
f46e333
fixup! bytecode compare: Stop depending on solc-js internal structure…
cameel Jan 25, 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
1 change: 1 addition & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Bugfixes:

Solc-Js:
* The wrapper now requires at least nodejs v10.
* The code has been ported to TypeScript.


### 0.8.11 (2021-12-20)
Expand Down
2 changes: 1 addition & 1 deletion ReleaseChecklist.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
### Release solc-js
- [ ] Wait until solc-bin was properly deployed. You can test this via remix - a test run through remix is advisable anyway.
- [ ] Increment the version number, create a pull request for that, merge it after tests succeeded.
- [ ] Run ``node verifyVersion.js && npm publish`` in the updated ``solc-js`` repository.
- [ ] Run ``npm run updateBinary && npm publish`` in the updated ``solc-js`` repository.
- [ ] Create a tag using ``git tag --annotate v$VERSION`` and push it with ``git push --tags``.

### Post-release
Expand Down
2 changes: 1 addition & 1 deletion scripts/bytecodecompare/prepare_report.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const process = require('process')
const fs = require('fs')

const compiler = require('./solc-js/wrapper.js')(require('./solc-js/soljson.js'))
const compiler = require('solc')


function loadSource(sourceFileName, stripSMTPragmas)
Expand Down
9 changes: 8 additions & 1 deletion 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
( cd solc-js; npm install )
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/

echo "Running the compiler..."
# shellcheck disable=SC2035
./prepare_report.js *.sol > report.txt
Expand Down
4 changes: 3 additions & 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 @@ -109,6 +109,7 @@ cd "$tmp_dir"
git clone https://github.com/ethereum/solc-js.git "$solcjs_dir"
cd "$solcjs_dir"
npm install
npm run build

cd "${solc_bin_dir}/${platform}/"
echo "Commit range: ${base_ref}..${top_ref}"
Expand Down Expand Up @@ -147,11 +148,12 @@ for binary_name in $platform_binaries; do

if [[ $platform == emscripten-wasm32 ]] || [[ $platform == emscripten-asmjs ]]; then
ln -sf "${solc_bin_dir}/${platform}/${binary_name}" "${solcjs_dir}/soljson.js"
ln -sf "${solc_bin_dir}/${platform}/${binary_name}" "${solcjs_dir}/dist/soljson.js"
ln -s "${solcjs_dir}" solc-js
cp "${script_dir}/bytecodecompare/prepare_report.js" prepare_report.js

validate_reported_version \
"$(solc-js/solc.js --version)" \
"$(solc-js/dist/solc.js --version)" \
"$solidity_version_and_commit"

# shellcheck disable=SC2035
Expand Down
1 change: 1 addition & 0 deletions scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ mkdir -p "${OUTPUTDIR}"/bin
echo "Prepare solc-js."
cd /root/solc-js
npm install >/dev/null 2>&1
npm run build >/dev/null 2>&1
Copy link
Collaborator Author

@cameel cameel Jan 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure about this one and these scripts are not actively tested but I'm adding it just in case.


echo "Install semver helper."
npm install -g semver >/dev/null 2>&1
Expand Down
3 changes: 2 additions & 1 deletion test/externalTests/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ function setup_solc
pushd "$install_dir"
npm install
cp "$binary_path" soljson.js
SOLCVERSION=$(./solc.js --version)
npm run build
SOLCVERSION=$(dist/solc.js --version)
popd
else
printLog "Setting up solc..."
Expand Down