-
Notifications
You must be signed in to change notification settings - Fork 289
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
support move language v6 and new gas meter (#3838)
* [compiler] update move [compiler] Upgrade Move and fix compiler error [clippy] Fix clippy error * Merge branch 'master' into update_move * gen new stdlib * fix warning: add phantom for merkle distributor * update move version fix merkle tree test * fix Identifier merge * Update module_upgrade_test.rs * update script update move * check commit * 1.add table native functions 2.gen new stdlib 3.add table native function gas cost in vmconfig * 1.add StateKey,MoveExt, SessionId,MoveResolveExt 2.add session finish_with_extension 3.change WriteSet , TransactionOutput, StateKeyView * add contract_api.json * 1.add halley genesis * gen new stdlib * Merge branch 'master' into update_move * add move table extension flush * add statedb support move table extension with commit and flush * add table item test code * fix warnings * update move repo * fix fmt * reset proxima * add proxima genesis_config.json * branch update_move add docker build * add table_info storage * update starcoin-framework repo * fix clippy warnings * gen new stdlib, reset proxima genesis * add TableItemProof * add TableItemProof * fmt Cargo.toml * add TableItemProof unit_test * change StateKeyView serde Field attributes * [Feature]Add string module (#3626) * add string * fix string * add string in stdlib * new stdlib * Fix String module native * Fix cargo move * add pr build_test * fix execute script (#3705) * add config * fix run script * fix mpm package table test (#3715) * [dev branch]table extension compatible dry run (#3706) * change dry_out return value * reset proxima * close #3732 * mpm: remove tmp code * [dev]Update docker_build.yml docker/setup-buildx-action to 2, Dockerfile rustup version to 1.25.1 (#3771) * Update docker_build.yml * Update Dockerfile * [dev] remove starcoin-x package,update script and config (#3772) * [dev] remove starcoin-x package * remove in toml * update mold flag * remove starcoin-x alias * add back test scripts * fix powershell * use BAD_TRANSACTION_FEE_CURRENCY for test gas_schedule: change max gas unit of test env to 400_000_000 [dev branch] move update use new gas meter imp (#3795) * use GasParameter replace costTable * compat GasCost and GasConstants * ErrorContext change to ErrorDescription * update GasConstants member function * ErrorContext change to ErrorDescription * update move TableHandle def * 1.refactor gas-algebra-ext 2.add gas_params for starcoin_vm * 1.add move stdlib nursery GasParam * update starcoin_natives gas_params * update VmConfig to gas_params * add vmconfig to gas_schedule test * add gas meter calc function * update starcoin_vm get gas_params * temp remove table_info column * update starcoin-framework * add test stdlib precompiled * update move_stdlib params * Package transaction publish bundle logic * Update move dep for fixing transactional test harness * comment StarcoinFramework checkpoint * compatible legacy AccountDataCache * move bytecode v6 * update starcoin-framework Co-authored-by: jolestar <[email protected]> Co-authored-by: fikgol <[email protected]> Co-authored-by: WGB5445 <[email protected]> * abi support u16, u32, u256 * update rpc schema --------- Co-authored-by: LemonHX <[email protected]> Co-authored-by: WGB5445 <[email protected]> Co-authored-by: caojiafeng <[email protected]> Co-authored-by: jiangying <[email protected]> Co-authored-by: jolestar <[email protected]> Co-authored-by: fikgol <[email protected]>
- Loading branch information
1 parent
cc57e47
commit 7a23803
Showing
323 changed files
with
8,431 additions
and
1,955 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -77,7 +77,9 @@ members = [ | |
"vm/transaction-builder-generator", | ||
"vm/move-coverage", | ||
"vm/resource-viewer", | ||
"vm/starcoin-gas", | ||
"vm/dev", | ||
"vm/gas-algebra-ext", | ||
"vm/move-explain", | ||
"vm/move-package-manager", | ||
"vm/vm-status-translator", | ||
|
@@ -178,7 +180,9 @@ default-members = [ | |
"vm/transaction-builder-generator", | ||
"vm/move-coverage", | ||
"vm/resource-viewer", | ||
"vm/starcoin-gas", | ||
"vm/dev", | ||
"vm/gas-algebra-ext", | ||
"vm/move-explain", | ||
"vm/move-package-manager", | ||
"vm/vm-status-translator", | ||
|
@@ -215,7 +219,7 @@ debug-assertions = false | |
codegen-units = 1 | ||
|
||
[workspace.package] | ||
authors = ["Starcoin Core Dev <[email protected]>", ] | ||
authors = ["Starcoin Core Dev <[email protected]>"] | ||
edition = "2021" | ||
homepage = "https://starcoin.org" | ||
license = "Apache-2.0" | ||
|
@@ -246,18 +250,18 @@ bitflags = "1.3.2" | |
bs58 = "0.3.1" | ||
byteorder = "1.3.4" | ||
bytes = "1" | ||
chrono = { version = "0.4.19", default-features = false, features = ["clock", ] } | ||
clap = { version = "3", features = ["derive", ] } | ||
chrono = { version = "0.4.19", default-features = false, features = ["clock"] } | ||
clap = { version = "3", features = ["derive"] } | ||
cli-table = "0.3.2" | ||
coarsetime = "0.1.22" | ||
codespan = { version = "0.8.0", features = ["serialization", ] } | ||
codespan = { version = "0.8.0", features = ["serialization"] } | ||
codespan-reporting = "0.11" | ||
colored = "2.0.0" | ||
criterion = "0.3" | ||
crossbeam-channel = "0.5.6" | ||
cryptonight-rs = { path = "consensus/cryptonight-rs" } | ||
csv = "~1" | ||
ctrlc = { version = "3.2.2", features = ["termination", ] } | ||
ctrlc = { version = "3.2.2", features = ["termination"] } | ||
cucumber = { package = "cucumber_rust", version = "^0.6.0" } | ||
darling = "0.10.2" | ||
dashmap = "~5" | ||
|
@@ -280,12 +284,12 @@ futures-retry = "0.6" | |
futures-timer = "3.0" | ||
futures-util = "~0.3" | ||
git-version = "0.3.5" | ||
governor = { version = "0.4.2", features = ["dashmap", ] } | ||
governor = { version = "0.4.2", features = ["dashmap"] } | ||
heck = "0.3.3" | ||
hex = "0.4" | ||
hmac = "0.12.1" | ||
hyper = { version = "0.14.12", features = ["full", ] } | ||
include_dir = { version = "0.6.2", features = ["search", ] } | ||
hyper = { version = "0.14.12", features = ["full"] } | ||
include_dir = { version = "0.6.2", features = ["search"] } | ||
indicatif = "0.16.2" | ||
ip_network = "0.3.4" | ||
io-lifetimes = "0.7.2" | ||
|
@@ -296,8 +300,10 @@ jsonrpc-client-transports = "18" | |
jsonrpc-core = "18" | ||
jsonrpc-core-client = "18" | ||
jsonrpc-derive = "18" | ||
openrpc-derive = {git = "https://github.com/starcoinorg/openrpc-rs",rev = "42e9fdc00036a24c560c2827e84cf4e078edbd0d",features=["jsonrpc"]} | ||
openrpc-schema = {git = "https://github.com/starcoinorg/openrpc-rs",rev = "42e9fdc00036a24c560c2827e84cf4e078edbd0d"} | ||
openrpc-derive = { git = "https://github.com/starcoinorg/openrpc-rs", rev = "42e9fdc00036a24c560c2827e84cf4e078edbd0d", features = [ | ||
"jsonrpc", | ||
] } | ||
openrpc-schema = { git = "https://github.com/starcoinorg/openrpc-rs", rev = "42e9fdc00036a24c560c2827e84cf4e078edbd0d" } | ||
|
||
jsonrpc-http-server = "18" | ||
jsonrpc-ipc-server = "18" | ||
|
@@ -314,33 +320,36 @@ libsecp256k1 = "0.7.1" | |
linked-hash-map = "0.5.6" | ||
linked_hash_set = "0.1.3" | ||
log = { version = "0.4.16" } | ||
log4rs = { version = "1.0.0", features = ["background_rotation", "gzip", ] } | ||
log4rs = { version = "1.0.0", features = ["background_rotation", "gzip"] } | ||
lru = "0.7.8" | ||
merkletree = { git = "https://github.com/filecoin-project/merkletree", rev = "3b1d98c43b341aed935152c5c1535c17d1b21d20" } | ||
mirai-annotations = "1.10.1" | ||
move-binary-format = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-bytecode-source-map = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-bytecode-verifier = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-cli = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-command-line-common = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-compiler = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-core-types = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-coverage = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-disassembler = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-docgen = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-errmapgen = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-ir-compiler = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-ir-types = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-model = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-package = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-prover = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-prover-test-utils = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-resource-viewer = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-stdlib = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-transactional-test-runner = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-unit-test = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-vm-runtime = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-vm-types = { git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03" } | ||
move-binary-format = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-bytecode-source-map = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-bytecode-verifier = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-cli = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-command-line-common = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-compiler = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-core-types = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-coverage = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-disassembler = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-docgen = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-errmapgen = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-ir-compiler = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-ir-types = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-model = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-package = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-prover = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-prover-test-utils = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-resource-viewer = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-stdlib = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-transactional-test-runner = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-unit-test = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-vm-runtime = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-vm-types = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-table-extension = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
move-vm-test-utils = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } | ||
|
||
names = { version = "0.14.0", default-features = false } | ||
network-api = { path = "network/api", package = "network-api" } | ||
network-p2p = { path = "network-p2p" } | ||
|
@@ -375,7 +384,7 @@ regex = "1.6.0" | |
ripemd160 = "0.9.1" | ||
rlp = "0.4" | ||
rlp-derive = "0.1" | ||
rocksdb = { default-features = false, features = ["lz4", ], version = "0.18" } | ||
rocksdb = { default-features = false, features = ["lz4"], version = "0.18" } | ||
rpassword = "~5" | ||
rust-argon2 = "0.8" | ||
rust-embed = "6.3.0" | ||
|
@@ -425,7 +434,7 @@ starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev | |
starcoin-decrypt = { path = "commons/decrypt" } | ||
starcoin-dev = { path = "vm/dev" } | ||
starcoin-executor = { path = "executor" } | ||
starcoin-framework = { git = "https://github.com/starcoinorg/starcoin-framework", rev = "cf1deda180af40a8b3e26c0c7b548c4c290cd7e7" } | ||
starcoin-framework = { git = "https://github.com/starcoinorg/starcoin-framework", rev = "a7eff4fa3e08cecfed09edf3dbf9d216832d7414" } | ||
starcoin-genesis = { path = "genesis" } | ||
starcoin-logger = { path = "commons/logger" } | ||
starcoin-metrics = { path = "commons/metrics" } | ||
|
@@ -434,6 +443,8 @@ starcoin-miner-client = { path = "cmd/miner_client" } | |
starcoin-miner-client-api = { path = "cmd/miner_client/api" } | ||
starcoin-move-compiler = { path = "vm/compiler" } | ||
starcoin-move-explain = { path = "vm/move-explain" } | ||
starcoin-gas-algebra-ext = { path = "vm/gas-algebra-ext" } | ||
starcoin-gas = { path = "vm/starcoin-gas" } | ||
starcoin-natives = { path = "vm/natives" } | ||
starcoin-network = { path = "network" } | ||
starcoin-network-rpc = { path = "network-rpc" } | ||
|
@@ -471,24 +482,34 @@ stdlib = { path = "vm/stdlib" } | |
stest = { path = "commons/stest" } | ||
stest-macro = { path = "commons/stest/stest-macro" } | ||
stream-task = { path = "commons/stream-task" } | ||
syn = { version = "1.0", features = ["full", "extra-traits", "visit", "fold", ] } | ||
syn = { version = "1.0.107", features = [ | ||
"full", | ||
"extra-traits", | ||
"visit", | ||
"fold", | ||
] } | ||
sysinfo = "0.25.1" | ||
tempfile = "3.2.0" | ||
test-helper = { path = "test-helper" } | ||
textwrap = "0.14.0" | ||
thiserror = "1.0" | ||
timeout-join-handler = { path = "commons/timeout-join-handler" } | ||
tiny-keccak = { version = "2", features = ["keccak", ] } | ||
tiny-keccak = { version = "2", features = ["keccak"] } | ||
tiny_http = "0.8.2" | ||
tokio = { version = "^1", features = ["full", ] } | ||
tokio-executor = { version = "0.2.0-alpha.6", features = ["blocking", ] } | ||
tokio = { version = "^1", features = ["full"] } | ||
tokio-executor = { version = "0.2.0-alpha.6", features = ["blocking"] } | ||
toml = "0.5.9" | ||
trace-time = "0.1" | ||
tracing = "0.1.34" | ||
transaction-pool = "2.0.3" | ||
uint = "0.9.3" | ||
unsigned-varint = { version = "0.6.0", features = ["futures", "asynchronous_codec", ] } | ||
vm = { package = "move-binary-format", git = "https://github.com/starcoinorg/move", rev = "2b85bf33378a4469e40b10e7bed815bdbefc5d03", features = ["fuzzing", ] } | ||
unsigned-varint = { version = "0.6.0", features = [ | ||
"futures", | ||
"asynchronous_codec", | ||
] } | ||
vm = { package = "move-binary-format", git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c", features = [ | ||
"fuzzing", | ||
] } | ||
vm-status-translator = { path = "vm/vm-status-translator" } | ||
void = "1.0.2" | ||
walkdir = "2.3.1" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.