Skip to content

Commit dae5edd

Browse files
committed
migrate the move repository into the third_party directory
remove unused files update the evm crate to 0.41.1
1 parent 6b23bf1 commit dae5edd

File tree

6,040 files changed

+586182
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,040 files changed

+586182
-110
lines changed

Cargo.lock

+1,118-75
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+30-33
Original file line numberDiff line numberDiff line change
@@ -357,39 +357,36 @@ handlebars = "4.2.2"
357357

358358
# Note: the BEGIN and END comments below are required for external tooling. Do not remove.
359359
# BEGIN MOVE DEPENDENCIES
360-
move-abigen = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
361-
move-binary-format = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
362-
move-bytecode-verifier = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
363-
move-bytecode-utils = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
364-
move-cli = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
365-
move-command-line-common = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
366-
move-compiler = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
367-
move-core-types = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
368-
move-coverage = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
369-
move-disassembler = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
370-
move-docgen = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
371-
move-errmapgen = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
372-
move-ir-compiler = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
373-
move-model = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
374-
move-package = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
375-
move-prover = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
376-
move-prover-boogie-backend = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
377-
move-stackless-bytecode = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
378-
move-prover-test-utils = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
379-
move-resource-viewer = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
380-
move-stackless-bytecode-interpreter = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
381-
move-stdlib = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24", features = ["testing"] }
382-
move-symbol-pool = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
383-
#move-table-extension = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
384-
move-transactional-test-runner = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
385-
move-unit-test = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24", features = ["table-extension"] }
386-
move-vm-runtime = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24", features = ["stacktrace", "debugging", "testing"] }
387-
move-vm-test-utils = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24", features = ["table-extension"] }
388-
move-vm-types = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
389-
read-write-set = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
390-
read-write-set-dynamic = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
391-
move-bytecode-source-map = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }
392-
move-ir-types = { git = "https://github.com/rooch-network/move", rev = "e8783853c750d952d277efed937049c0c5a7bb24" }# END MOVE DEPENDENCIES
360+
move-abigen = { path = "third_party/move/language/move-prover/move-abigen" }
361+
move-binary-format = { path = "third_party/move/language/move-binary-format" }
362+
move-bytecode-verifier = { path = "third_party/move/language/move-bytecode-verifier" }
363+
move-bytecode-utils = { path = "third_party/move/language/tools/move-bytecode-utils" }
364+
move-cli = { path = "third_party/move/language/tools/move-cli" }
365+
move-command-line-common = { path = "third_party/move/language/move-command-line-common" }
366+
move-compiler = { path = "third_party/move/language/move-compiler" }
367+
move-core-types = { path = "third_party/move/language/move-core/types" }
368+
move-coverage = { path = "third_party/move/language/tools/move-coverage" }
369+
move-disassembler = { path = "third_party/move/language/tools/move-disassembler" }
370+
move-docgen = { path = "third_party/move/language/move-prover/move-docgen" }
371+
move-errmapgen = { path = "third_party/move/language/move-prover/move-errmapgen" }
372+
move-ir-compiler = { path = "third_party/move/language/move-ir-compiler" }
373+
move-model = { path = "third_party/move/language/move-model" }
374+
move-package = { path = "third_party/move/language/tools/move-package" }
375+
move-prover = { path = "third_party/move/language/move-prover" }
376+
move-prover-boogie-backend = { path = "third_party/move/language/move-prover/boogie-backend" }
377+
move-stackless-bytecode = { path = "third_party/move/language/move-prover/bytecode" }
378+
move-prover-test-utils = { path = "third_party/move/language/move-prover/test-utils" }
379+
move-resource-viewer = { path = "third_party/move/language/tools/move-resource-viewer" }
380+
move-stdlib = { path = "third_party/move/language/move-stdlib", features = ["testing"] }
381+
move-symbol-pool = { path = "third_party/move/language/move-symbol-pool" }
382+
move-transactional-test-runner = { path = "third_party/move/language/testing-infra/transactional-test-runner" }
383+
move-unit-test = { path = "third_party/move/language/tools/move-unit-test", features = ["table-extension"] }
384+
move-vm-runtime = { path = "third_party/move/language/move-vm/runtime", features = ["stacktrace", "debugging", "testing"] }
385+
move-vm-test-utils = { path = "third_party/move/language/move-vm/test-utils", features = ["table-extension"] }
386+
move-vm-types = { path = "third_party/move/language/move-vm/types" }
387+
move-bytecode-source-map = { path = "third_party/move/language/move-ir-compiler/move-bytecode-source-map" }
388+
move-ir-types = { path = "third_party/move/language/move-ir/types" }# END MOVE DEPENDENCIES
389+
393390
# keep this for convenient debug Move in local repo
394391
# [patch.'https://github.com/rooch-network/move']
395392
# move-abigen = { path = "../move/language/move-prover/move-abigen" }

rustfmt.toml

-2
This file was deleted.

third_party/move/CODE_OF_CONDUCT.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Code of Conduct
2+
3+
The Diem Core project has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://developers.diem.com/docs/policies/code-of-conduct) so that you can understand what actions will and will not be tolerated.

third_party/move/CONTRIBUTING.md

+160
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
---
2+
id: contributing
3+
title: Contributing to Move
4+
---
5+
6+
To contribute to the Move implementation, first start with the proper
7+
development copy.
8+
9+
To get the development installation with all the necessary dependencies for
10+
linting, testing, and building the documentation, run the following:
11+
```bash
12+
git clone https://github.com/move-language/move.git
13+
cd move
14+
./scripts/dev_setup.sh # with optional [-t -b -p -y -d -n -v], see the script for more details
15+
cargo build
16+
cargo xtest
17+
```
18+
19+
20+
## Developer Workflow
21+
22+
Changes to the project are proposed through pull requests. The general pull
23+
request workflow is as follows:
24+
25+
1. Fork the repo and create a topic branch off of `main`.
26+
2. If you have added code that should be tested, add unit tests.
27+
3. If you have changed APIs, update the documentation. Make sure the
28+
documentation builds.
29+
4. Ensure all tests and lints pass on each and every commit that is part of
30+
your pull request. `cargo x lint && cargo xfmt && cargo xclippy --all-targets`
31+
5. Submit your pull request.
32+
33+
## Authoring Clean Commits
34+
35+
#### Logically Separate Commits
36+
37+
Commits should be
38+
[atomic](https://en.wikipedia.org/wiki/Atomic_commit#Atomic_commit_convention)
39+
and broken down into logically separate changes. Diffs should also be made easy
40+
for reviewers to read and review so formatting fixes or code moves should not
41+
be included in commits with actual code changes.
42+
43+
#### Meaningful Commit Messages
44+
45+
Commit messages are important and incredibly helpful for others when they dig
46+
through the commit history in order to understand why a particular change
47+
was made and what problem it was intending to solve. For this reason commit
48+
messages should be well written and conform with the following format:
49+
50+
All commit messages should begin with a single short (50 character max) line
51+
summarizing the change and should skip the full stop. This is the title of the
52+
commit. It is also preferred that this summary be prefixed with "[area]" where
53+
the area is an identifier for the general area of the code being modified, e.g.
54+
55+
```
56+
* [ci] enforce whitelist of nightly features
57+
* [language] removing VerificationPass trait
58+
```
59+
60+
Following the commit title (unless it alone is self-explanatory), there should
61+
be a single blank line followed by the commit body which includes more
62+
detailed, explanatory text as separate paragraph(s). It is recommended that the
63+
commit body be wrapped at 72 characters so that Git has plenty of room to
64+
indent the text while still keeping everything under 80 characters overall.
65+
66+
The commit body should provide a meaningful commit message, which:
67+
* Explains the problem the change tries to solve, i.e. what is wrong
68+
with the current code without the change.
69+
* Justifies the way the change solves the problem, i.e. why the
70+
result with the change is better.
71+
* Alternative solutions considered but discarded, if any.
72+
73+
#### References in Commit Messages
74+
75+
If you want to reference a previous commit in the history of the project, use
76+
the format "abbreviated sha1 (subject, date)", with the subject enclosed in a
77+
pair of double-quotes, like this:
78+
79+
```bash
80+
Commit 895b53510 ("[vm] use slices instead of evecotrs", 2021-08-19)
81+
noticed that ...
82+
```
83+
84+
This invocation of `git show` can be used to obtain this format:
85+
86+
```bash
87+
git show -s --date=short --pretty='format:%h ("%s", %ad)' <commit>
88+
```
89+
90+
If a commit references an issue please add a reference to the body of your
91+
commit message, e.g. `issue #1234` or `fixes #456`. Using keywords like
92+
`fixes`, `resolves`, or `closes` will cause the corresponding issue to be
93+
closed when the pull request is merged.
94+
95+
Avoid adding any `@` mentions to commit messages, instead add them to the PR
96+
cover letter.
97+
98+
## Responding to Reviewer Feedback
99+
100+
During the review process a reviewer may ask you to make changes to your pull
101+
request. If a particular commit needs to be changed, that commit should be
102+
amended directly. Changes in response to a review *should not* be made in
103+
separate commits on top of your PR unless it logically makes sense to have
104+
separate, distinct commits for those changes. This helps keep the commit
105+
history clean.
106+
107+
If your pull request is out-of-date and needs to be updated because `main`
108+
has advanced, you should rebase your branch on top of the latest main by
109+
doing the following:
110+
111+
```bash
112+
git fetch upstream
113+
git checkout topic
114+
git rebase -i upstream/main
115+
```
116+
117+
You *should not* update your branch by merging the latest main into your
118+
branch. Merge commits included in PRs tend to make it more difficult for the
119+
reviewer to understand the change being made, especially if the merge wasn't
120+
clean and needed conflicts to be resolved. As such, PRs with merge commits will
121+
be rejected.
122+
123+
## Bisect-able History
124+
125+
It is important that the project history is bisect-able so that when
126+
regressions are identified we can easily use `git bisect` to be able to
127+
pin-point the exact commit which introduced the regression. This requires that
128+
every commit is able to be built and passes all lints and tests. So if your
129+
pull request includes multiple commits be sure that each and every commit is
130+
able to be built and passes all checks performed by CI.
131+
132+
133+
## Issues
134+
135+
Move uses [GitHub issues](https://github.com/move-language/move/issues) to track
136+
bugs. Please include necessary information and instructions to reproduce your
137+
issue.
138+
139+
## Major feature requests
140+
141+
Please begin by checking the following locations for duplicate requests:
142+
* [Approved feature proposals awaiting implementation](https://github.com/move-language/move/issues?q=is%3Aissue+is%3Aopen+label%3A%22accepted+feature+awaiting+implementation%22)
143+
* [Feature proposals under discussion](https://github.com/move-language/move/issues?q=is%3Aissue+is%3Aopen+label%3A%22proposed+feature+in+discussion%22)
144+
* [Language feature request graveyard](GRAVEYARD.md)
145+
146+
If your feature is not in any of these locations, please add a new feature request using the following format:
147+
148+
```
149+
Sponsor: your_github_id
150+
151+
## Status: initial proposal
152+
153+
## Rationale
154+
A detailed description of the problem the proposed feature seeks to solve. This should explain why the problem is important for smart contract programmers and why it is impossible (or unacceptably unpleasant) to solve with the existing language constructs. Examples are strongly recommended.
155+
156+
## Design
157+
Explain the key decisions to be made in designing the feature. This can be organized as fully fleshed out design, a list of design options with pros and cons, or a list of questions to be answered. A proposed feature should have a very strong/clear rationale, but it is ok if many key design questions are open--the Move community and core contributors can help with this.
158+
```
159+
160+
A Move core contributor will either add a `proposed_feature_to_be_discussed` tag and queue the feature for discussion at a future Move community meeting (and change the "Status" to reflect the meeting date), or will request changes that must be made to the issue before it is ready for discussion.

0 commit comments

Comments
 (0)