Skip to content
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

Jump to bottom

Runtime changes common #4180

Merged
merged 40 commits into from
Jul 26, 2023
Merged

Runtime changes common #4180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
666fe5c
Handle native and bn254 signatures
Jun 26, 2023
480bc87
bn254 test save
Jun 27, 2023
3ac2541
Remove bn254 implementation
Jun 27, 2023
ed1d4f6
verify_evm_signature and hash_keccak256
Jun 27, 2023
bea6049
test_evm_verify
Jun 27, 2023
d32a9e3
extra info for test_evm_verify
Jun 27, 2023
3869edc
improve and cleanup test_evm_verify
Jun 27, 2023
54cdb4a
Update verify_evm_signature and revome verify_native_signature
Jun 28, 2023
5292982
Remove unused native conversion functions
Jun 30, 2023
215d8ef
initial
Jun 30, 2023
f2264cb
merge parent and fix conflicts
Jun 30, 2023
40bebe8
Update packages and fix errors
Jun 30, 2023
6502b59
minor correction
Jun 30, 2023
9c75b48
Merge pull request #4171 from massalabs/feature/new_signatures_verify
Eitu33 Jun 30, 2023
d633940
cargo clippy fix
Leo-Besancon Jun 30, 2023
b967703
Change the interface to sync with ABI changes (#4170)
Leo-Besancon Jun 30, 2023
821c9a7
improve verify_evm_signature
Jun 30, 2023
969b7d5
Merge branch 'testnet_24' into runtime-changes-common
Leo-Besancon Jun 30, 2023
332520b
Fix after merge
Leo-Besancon Jun 30, 2023
5614d69
Use get_prefix_bounds() helper function
Leo-Besancon Jun 30, 2023
943142c
Added the implementation of generate_event_wasmv1
Leo-Besancon Jun 30, 2023
b73849a
Merge branch 'testnet_24' into runtime-changes-common
Leo-Besancon Jun 30, 2023
fe0995b
Merge remote-tracking branch 'origin/testnet_25' into runtime-changes…
Jul 5, 2023
910ed5e
NativeAmount arithmetic implementation (#4199)
bilboquet Jul 5, 2023
173278f
Runtime changes common leo (#4217)
Leo-Besancon Jul 5, 2023
60bdee0
Implement bs58 to/from bytes (#4223)
bilboquet Jul 6, 2023
d723f84
get_origin_operation_id interface impl & abi cost
Jul 6, 2023
d4fc02b
Implement unsafe_random_wasmv1 in interface (#4231)
Leo-Besancon Jul 7, 2023
8714624
Merge branch 'testnet_25' into runtime-changes-common
Leo-Besancon Jul 7, 2023
a4d0e27
Fix after merge
Leo-Besancon Jul 7, 2023
e14ef78
Merge branch 'testnet_25' into runtime-changes-common
Leo-Besancon Jul 7, 2023
29868c6
Sync with massa-sc-runtime#283
Jul 10, 2023
c3567fa
Rename blake3_hash to hash_blake3 and use blake3 directly (not via ma…
Jul 10, 2023
18cbacb
Clean some name in massa-sc-runtime interface
Jul 10, 2023
cbd143e
Implement init_call_wasmv1
Leo-Besancon Jul 11, 2023
a2f51f5
Sync with massa-sc-runtime#287
Jul 13, 2023
de74bbf
Sync
Leo-Besancon Jul 17, 2023
3cb5508
Merge test25 and fix conflicts
Jul 26, 2023
660ea0b
update runtime version
Jul 26, 2023
c772ee5
use branch instead of rev for runtime package
Jul 26, 2023
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
20 changes: 12 additions & 8 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

88 changes: 44 additions & 44 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,54 +60,54 @@ opt-level = 3 # Speed-up the CI
[workspace.dependencies]

# Internal packages
massa_api = {path = "./massa-api"}
massa_api_exports = {path = "./massa-api-exports"}
massa_async_pool = {path = "./massa-async-pool"}
massa_bootstrap = {path = "./massa-bootstrap"}
massa_channel = {path = "./massa-channel"}
massa_cipher = {path = "./massa-cipher"}
massa_consensus_exports = {path = "./massa-consensus-exports"}
massa_consensus_worker = {path = "./massa-consensus-worker"}
massa_db_exports = {path = "./massa-db-exports"}
massa_db_worker = {path = "./massa-db-worker"}
massa_executed_ops = {path = "./massa-executed-ops"}
massa_execution_exports = {path = "./massa-execution-exports"}
massa_execution_worker = {path = "./massa-execution-worker"}
massa_factory_exports = {path = "./massa-factory-exports"}
massa_factory_worker = {path = "./massa-factory-worker"}
massa_final_state = {path = "./massa-final-state"}
massa_grpc = {path = "./massa-grpc"}
massa_hash = {path = "./massa-hash"}
massa_ledger_exports = {path = "./massa-ledger-exports"}
massa_ledger_worker = {path = "./massa-ledger-worker"}
massa_logging = {path = "./massa-logging"}
massa_metrics = {path = "./massa-metrics"}
massa_models = {path = "./massa-models"}
massa_module_cache = {path = "./massa-module-cache"}
massa_pool_exports = {path = "./massa-pool-exports"}
massa_pool_worker = {path = "./massa-pool-worker"}
massa_pos_exports = {path = "./massa-pos-exports"}
massa_pos_worker = {path = "./massa-pos-worker"}
massa_protocol_exports = {path = "./massa-protocol-exports"}
massa_protocol_worker = {path = "./massa-protocol-worker"}
massa_sdk = {path = "./massa-sdk"}
massa_serialization = {path = "./massa-serialization"}
massa_signature = {path = "./massa-signature"}
massa_storage = {path = "./massa-storage"}
massa_time = {path = "./massa-time"}
massa_versioning = {path = "./massa-versioning"}
massa_wallet = {path = "./massa-wallet"}
massa_api = { path = "./massa-api" }
massa_api_exports = { path = "./massa-api-exports" }
massa_async_pool = { path = "./massa-async-pool" }
massa_bootstrap = { path = "./massa-bootstrap" }
massa_channel = { path = "./massa-channel" }
massa_cipher = { path = "./massa-cipher" }
massa_consensus_exports = { path = "./massa-consensus-exports" }
massa_consensus_worker = { path = "./massa-consensus-worker" }
massa_db_exports = { path = "./massa-db-exports" }
massa_db_worker = { path = "./massa-db-worker" }
massa_executed_ops = { path = "./massa-executed-ops" }
massa_execution_exports = { path = "./massa-execution-exports" }
massa_execution_worker = { path = "./massa-execution-worker" }
massa_factory_exports = { path = "./massa-factory-exports" }
massa_factory_worker = { path = "./massa-factory-worker" }
massa_final_state = { path = "./massa-final-state" }
massa_grpc = { path = "./massa-grpc" }
massa_hash = { path = "./massa-hash" }
massa_ledger_exports = { path = "./massa-ledger-exports" }
massa_ledger_worker = { path = "./massa-ledger-worker" }
massa_logging = { path = "./massa-logging" }
massa_metrics = { path = "./massa-metrics" }
massa_models = { path = "./massa-models" }
massa_module_cache = { path = "./massa-module-cache" }
massa_pool_exports = { path = "./massa-pool-exports" }
massa_pool_worker = { path = "./massa-pool-worker" }
massa_pos_exports = { path = "./massa-pos-exports" }
massa_pos_worker = { path = "./massa-pos-worker" }
massa_protocol_exports = { path = "./massa-protocol-exports" }
massa_protocol_worker = { path = "./massa-protocol-worker" }
massa_sdk = { path = "./massa-sdk" }
massa_serialization = { path = "./massa-serialization" }
massa_signature = { path = "./massa-signature" }
massa_storage = { path = "./massa-storage" }
massa_time = { path = "./massa-time" }
massa_versioning = { path = "./massa-versioning" }
massa_wallet = { path = "./massa-wallet" }

# Massa projects dependencies
massa-proto-rs = {git = "https://github.com/massalabs/massa-proto-rs", "rev" = "18ec02f"}
massa-sc-runtime = {git = "https://github.com/massalabs/massa-sc-runtime", "branch" = "main"}
peernet = {git = "https://github.com/massalabs/PeerNet", "branch" = "main"}
massa-proto-rs = { git = "https://github.com/massalabs/massa-proto-rs", "rev" = "df9f5b24955bd76030add0945338226309531261" }
massa-sc-runtime = { git = "https://github.com/massalabs/massa-sc-runtime", "branch" = "main" }
peernet = { git = "https://github.com/massalabs/PeerNet", "branch" = "main" }

# Common dependencies
transition = {git = "https://github.com/massalabs/transition.git", "rev" = "93fa3bf82f9f5ff421c78536879b7fd1b948ca75"}
unsigned-varint = {version = "0.7.1", "git" = "https://github.com/cyphar/unsigned-varint.git", "branch" = "nom6-errors"}
substruct = {git = "https://github.com/sydhds/substruct", branch = "main"}
machine = {git = "https://github.com/antifuchs/machine", "branch" = "fix-workspace-build"}
transition = { git = "https://github.com/massalabs/transition.git", "rev" = "93fa3bf82f9f5ff421c78536879b7fd1b948ca75" }
unsigned-varint = { version = "0.7.1", "git" = "https://github.com/cyphar/unsigned-varint.git", "branch" = "nom6-errors" }
substruct = { git = "https://github.com/sydhds/substruct", branch = "main" }
machine = { git = "https://github.com/antifuchs/machine", "branch" = "fix-workspace-build" }
aes-gcm = "0.10"
anyhow = "1.0"
async-trait = "0.1.58"
Expand Down
123 changes: 78 additions & 45 deletions massa-execution-worker/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,53 +10,86 @@ edition = "2021"

[features]
sandbox = ["massa_async_pool/sandbox"]
gas_calibration = ["massa-sc-runtime/gas_calibration", "massa_execution_exports/gas_calibration", "massa_final_state/testing", "massa_pos_worker", "massa_ledger_worker", "massa_db_worker", "tempfile"]
testing = ["massa_execution_exports/testing", "massa_ledger_exports/testing", "massa_pos_exports/testing", "massa_final_state/testing", "massa-sc-runtime/testing", "massa_wallet/testing", "tempfile", "massa_pos_worker", "massa_ledger_worker", "massa_metrics/testing", "massa_db_worker", "massa_metrics/testing"]
benchmarking = ["massa-sc-runtime/gas_calibration", "criterion", "massa_pos_worker", "massa_ledger_worker", "massa_db_worker", "tempfile"]
gas_calibration = [
"massa-sc-runtime/gas_calibration",
"massa_execution_exports/gas_calibration",
"massa_final_state/testing",
"massa_pos_worker",
"massa_ledger_worker",
"massa_db_worker",
"tempfile",
]
testing = [
"massa_execution_exports/testing",
"massa_ledger_exports/testing",
"massa_pos_exports/testing",
"massa_final_state/testing",
"massa-sc-runtime/testing",
"massa_wallet/testing",
"tempfile",
"massa_pos_worker",
"massa_ledger_worker",
"massa_metrics/testing",
"massa_db_worker",
"massa_metrics/testing",
]
benchmarking = [
"massa-sc-runtime/gas_calibration",
"criterion",
"massa_pos_worker",
"massa_ledger_worker",
"massa_db_worker",
"tempfile",
]
metrics = []

[dependencies]
anyhow = {workspace = true}
rand = {workspace = true}
rand_xoshiro = {workspace = true}
parking_lot = {workspace = true, "features" = ["deadlock_detection"]}
tracing = {workspace = true}
serde_json = {workspace = true} # BOM UPGRADE Revert to "1.0" if problem
num = {workspace = true, "features" = ["serde"]} # BOM UPGRADE Revert to {"version": "0.4", "features": ["serde"]} if problem
sha2 = {workspace = true}
sha3 = {workspace = true}
libsecp256k1 = {workspace = true}
criterion = {workspace = true, "optional" = true}
tempfile = {workspace = true, "optional" = true} # BOM UPGRADE Revert to {"version": "3.3", "optional": true} if problem
massa_ledger_worker = {workspace = true, "optional" = true}
massa_pos_worker = {workspace = true, "optional" = true}
massa_async_pool = {workspace = true}
massa_channel = {workspace = true}
massa_executed_ops = {workspace = true}
massa_execution_exports = {workspace = true}
massa_models = {workspace = true}
massa_storage = {workspace = true}
massa_hash = {workspace = true}
massa-sc-runtime = {workspace = true}
massa_metrics = {workspace = true}
massa_module_cache = {workspace = true}
massa_serialization = {workspace = true}
massa_signature = {workspace = true}
massa_time = {workspace = true}
massa_ledger_exports = {workspace = true}
massa_pos_exports = {workspace = true}
massa_final_state = {workspace = true}
massa_versioning = {workspace = true}
massa_db_exports = {workspace = true}
massa_db_worker = {workspace = true, "optional" = true}
massa_wallet = {workspace = true}
anyhow = { workspace = true }
blake3 = { workspace = true }
bs58 = { workspace = true }
rand = { workspace = true }
rand_xoshiro = { workspace = true }
parking_lot = { workspace = true, "features" = ["deadlock_detection"] }
tracing = { workspace = true }
serde_json = { workspace = true } # BOM UPGRADE Revert to "1.0" if problem
num = { workspace = true, "features" = [
"serde",
] } # BOM UPGRADE Revert to {"version": "0.4", "features": ["serde"]} if problem
sha2 = { workspace = true }
sha3 = { workspace = true }
libsecp256k1 = { workspace = true }
criterion = { workspace = true, "optional" = true }
tempfile = { workspace = true, "optional" = true } # BOM UPGRADE Revert to {"version": "3.3", "optional": true} if problem
massa_ledger_worker = { workspace = true, "optional" = true }
massa_pos_worker = { workspace = true, "optional" = true }
massa_async_pool = { workspace = true }
massa_channel = { workspace = true }
massa_executed_ops = { workspace = true }
massa_execution_exports = { workspace = true }
massa_models = { workspace = true }
massa_storage = { workspace = true }
massa_hash = { workspace = true }
massa-sc-runtime = { workspace = true }
massa_metrics = { workspace = true }
massa_module_cache = { workspace = true }
massa_serialization = { workspace = true }
massa_signature = { workspace = true }
massa_time = { workspace = true }
massa_ledger_exports = { workspace = true }
massa_pos_exports = { workspace = true }
massa_final_state = { workspace = true }
massa_versioning = { workspace = true }
massa_db_exports = { workspace = true }
massa_db_worker = { workspace = true, "optional" = true }
massa_wallet = { workspace = true }
massa-proto-rs = { workspace = true }

[dev-dependencies]
tokio = {workspace = true, "features" = ["sync"]}
massa_pos_worker = {workspace = true}
massa_ledger_worker = {workspace = true}
serial_test = {workspace = true}
tempfile = {workspace = true} # BOM UPGRADE Revert to "3.2" if problem
hex-literal = {workspace = true}
massa_execution_exports = {workspace = true, "features" = ["testing"]}
massa_final_state = {workspace = true, "features" = ["testing"]}
tokio = { workspace = true, "features" = ["sync"] }
massa_pos_worker = { workspace = true }
massa_ledger_worker = { workspace = true }
serial_test = { workspace = true }
tempfile = { workspace = true } # BOM UPGRADE Revert to "3.2" if problem
hex-literal = { workspace = true }
massa_execution_exports = { workspace = true, "features" = ["testing"] }
massa_final_state = { workspace = true, "features" = ["testing"] }
Loading
Loading