Skip to content
New issue

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

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

Already on GitHub? # to your account

Adds metering to WASM bytecode as part of conversion process per @axic #397

Closed
wants to merge 1 commit into from

Conversation

lrettig
Copy link

@lrettig lrettig commented Jan 15, 2018

No description provided.

@lrettig
Copy link
Author

lrettig commented Jan 15, 2018

Note that this PR includes #395, #396, needed to merge those in before updating convert_wast.py

@lrettig
Copy link
Author

lrettig commented Jan 15, 2018

Cf ewasm/wasm-metering#7

@winsvega
Copy link
Collaborator

wait why we need a workaround like this. could testeth just compile wasm ?
ethereum/aleth#4754

@axic
Copy link
Member

axic commented Jan 17, 2018

Note: @jwasinger's script to compile wast-to-wasm will not be needed once ethereum/aleth#4754 is merged.

Also, this PR will not be needed once metering is implemented properly.

@@ -1,3 +1,6 @@
[submodule "src/GeneralStateTestsFiller/stEWASMTests/utils/wabt"]
path = src/GeneralStateTestsFiller/stEWASMTests/utils/wabt
url = https://github.com/webassembly/wabt
[submodule "src/GeneralStateTestsFiller/stEWASMTests/utils/wasm-metering"]
Copy link
Collaborator

Choose a reason for hiding this comment

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

do we really need submodule?

mv wat2wasm ../..
```

Install wasm-metering
Copy link
Collaborator

Choose a reason for hiding this comment

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

whats wasm-metering?

@axic
Copy link
Member

axic commented Jan 18, 2018

@winsvega this is all testing code merging into @jwasinger's branch. It is not meant to be merged into master. Please disregard it.

@jwasinger
Copy link
Contributor

jwasinger commented Jan 19, 2018

@lrettig , please squash these commits and I will merge. also can you remove unwanted changes from this PR? A lot of files are touched/changed which are seemingly irrelevant to stated the purpose of this PR

@lrettig
Copy link
Author

lrettig commented Jan 19, 2018

Working on it

Integrate @axic's metering tool (wasm-metering) into `convert_wast.py`.
Update README.

Add metering to convert_wast script, update README, change wasm-metering branch
@lrettig
Copy link
Author

lrettig commented Jan 19, 2018

Squashed, back to you

@axic
Copy link
Member

axic commented Jan 22, 2018

@jwasinger can you merge this and push the commits to ewasm/tests ?

@jwasinger
Copy link
Contributor

merged here: ewasm@edfcdc9

@jwasinger jwasinger closed this Jan 22, 2018
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants