Skip to content

Commit

Permalink
Merge branch 'develop' into chore/aleksuss/redundant_crate
Browse files Browse the repository at this point in the history
  • Loading branch information
@aleksuss
aleksuss authored Jul 11, 2023
2 parents 4f3d533 + 79cb327 commit d0e22f7
Show file tree
Hide file tree
Showing 14 changed files with 332 additions and 258 deletions.
19 changes: 13 additions & 6 deletions .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ jobs:
uses: actions/checkout@v3
- name: Restore cache
run: |
cache-util restore cargo_git cargo_registry yarn_cache
cache-util restore aurora-engine-target@generic@${{ hashFiles('**/Cargo.lock') }}:target
cache-util restore cargo_git cargo_registry yarn_cache rocksdb:/root/rocksdb
cache-util restore aurora-engine-target@tests@${{ hashFiles('**/Cargo.lock') }}:target
- name: Preparing rocksdb library
run: scripts/ci/build_rocksdb.sh
- name: Build contracts
run: cargo make build-contracts
- name: Test contracts
Expand All @@ -40,7 +42,7 @@ jobs:
- name: Save cache
run: |
cache-util save cargo_git cargo_registry yarn_cache
cache-util msave aurora-engine-target@generic@${{ hashFiles('**/Cargo.lock') }}:target
cache-util msave aurora-engine-target@tests@${{ hashFiles('**/Cargo.lock') }}:target
test_modexp:
name: Test modexp suite (mainnet, testnet)
Expand All @@ -53,17 +55,22 @@ jobs:
uses: actions/checkout@v3
- name: Restore cache
run: |
cache-util restore cargo_git cargo_registry yarn_cache
cache-util restore aurora-engine-target@generic@${{ hashFiles('**/Cargo.lock') }}:target
cache-util restore cargo_git cargo_registry yarn_cache rocksdb:/root/rocksdb
cache-util restore aurora-engine-target@modexp@${{ hashFiles('**/Cargo.lock') }}:target
- name: Preparing rocksdb library
run: scripts/ci/build_rocksdb.sh
- name: Test mainnet bench-modexp
run: cargo make --profile mainnet bench-modexp
- name: Test testnet bench-modexp
run: cargo make --profile testnet bench-modexp
- name: Save cache
run: |
cache-util save cargo_git cargo_registry yarn_cache
cache-util msave aurora-engine-target@generic@${{ hashFiles('**/Cargo.lock') }}:target
cache-util msave aurora-engine-target@modexp@${{ hashFiles('**/Cargo.lock') }}:target
env:
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: 0
ROCKSDB_INCLUDE_DIR: /root/rocksdb/include
ROCKSDB_LIB_DIR: /root/rocksdb/lib
ROCKSDB_STATIC: 1
61 changes: 36 additions & 25 deletions Cargo.lock
View file

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

111 changes: 87 additions & 24 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,90 @@
[workspace.package]
authors = ["Aurora Labs <hello@aurora.dev>"]
edition = "2021"
homepage = "https://github.com/aurora-is-near/aurora-engine"
repository = "https://github.com/aurora-is-near/aurora-engine"
license = "CC0-1.0"
readme = "README.md"
publish = false

[workspace.dependencies]
aurora-engine = { path = "engine", default-features = false }
aurora-engine-precompiles = { path = "engine-precompiles", default-features = false }
aurora-engine-sdk = { path = "engine-sdk", default-features = false }
aurora-engine-transactions = { path = "engine-transactions", default-features = false }
aurora-engine-types = { path = "engine-types", default-features = false }
aurora-engine-modexp = { path = "engine-modexp", default-features = false }
aurora-engine-test-doubles = { path = "engine-test-doubles" }
engine-standalone-storage = { path = "engine-standalone-storage" }
engine-standalone-tracing = { path = "engine-standalone-tracing", default-features = false, features = ["impl-serde"] }

base64 = { version = "0.21", default-features = false, features = ["alloc"] }
bitflags = { version = "1", default-features = false }
bn = { version = "0.5", package = "zeropool-bn", default-features = false }
borsh = { version = "0.10", default-features = false }
borsh-compat = { version = "0.9", package = "borsh", default-features = false }
bstr = "1"
byte-slice-cast = { version = "1", default-features = false }
criterion = "0.5"
digest = "0.10"
ethabi = { version = "18", default-features = false }
evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false }
evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false, features = ["std"] }
evm-gasometer = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false, features = ["std", "tracing"] }
evm-runtime = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false, features = ["std", "tracing"] }
git2 = "0.17"
hex = { version = "0.4", default-features = false, features = ["alloc"] }
ibig = { version = "0.3", default-features = false, features = ["num-traits"] }
libsecp256k1 = { version = "0.7", default-features = false }
near-crypto = "0.16"
near-primitives = "0.16"
near-primitives-core = "0.16"
near-sdk-sim = { git = "https://github.com/aurora-is-near/near-sdk-rs.git", rev = "cc4d4aaf2e1f7297aa060b342ca3ef3ff8e67003" }
near-vm-errors = "0.16"
near-vm-logic = "0.16"
near-vm-runner = { version = "0.16", default-features = false, features = [ "wasmer2_vm", "wasmtime_vm" ] }
num = { version = "0.4", default-features = false, features = ["alloc"] }
postgres = "0.19"
primitive-types = { version = "0.12", default-features = false, features = ["rlp", "serde_no_std"] }
rand = "0.8"
ripemd = { version = "0.1", default-features = false }
rlp = { version = "0.5", default-features = false }
rocksdb = { version = "0.19", default-features = false }
serde = { version = "1", default-features = false, features = ["alloc", "derive"] }
serde_json = { version = "1", default-features = false, features = ["alloc"] }
sha2 = { version = "0.10", default-features = false }
sha3 = { version = "0.10", default-features = false }
tempfile = "3"
test-case = "3.1"
walrus = "0.20"
wee_alloc = { version = "0.4", default-features = false }


[workspace]
resolver = "2"
members = [
"engine",
"engine-test-doubles",
"engine-modexp",
"engine-precompiles",
"engine-sdk",
"engine-standalone-storage",
"engine-standalone-tracing",
"engine-tests",
"engine-transactions",
"engine-types",
]

exclude = [
"etc/tests/state-migration-test",
"etc/tests/ft-receiver",
"etc/tests/benchmark-contract",
"etc/tests/self-contained-5bEgfRQ",
"etc/tests/fibonacci",
"etc/tests/modexp-bench",
"etc/xcc-router",
]

[profile.release]
opt-level = 3
debug = false
Expand Down Expand Up @@ -26,27 +113,3 @@ rpath = false
# it to actually happen when running tests with --release
lto = true
opt-level = 3

[workspace]
resolver = "2"
members = [
"engine",
"engine-test-doubles",
"engine-modexp",
"engine-precompiles",
"engine-sdk",
"engine-standalone-storage",
"engine-standalone-tracing",
"engine-tests",
"engine-transactions",
"engine-types",
]
exclude = [
"etc/tests/state-migration-test",
"etc/tests/ft-receiver",
"etc/tests/benchmark-contract",
"etc/tests/self-contained-5bEgfRQ",
"etc/tests/fibonacci",
"etc/tests/modexp-bench",
"etc/xcc-router",
]
24 changes: 10 additions & 14 deletions engine-modexp/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
[package]
name = "aurora-engine-modexp"
version = "1.0.0"
authors = ["Aurora Labs <hello@aurora.dev>"]
edition = "2021"
description = ""
documentation = ""
readme = true
homepage = "https://github.com/aurora-is-near/aurora-engine"
repository = "https://github.com/aurora-is-near/aurora-engine"
license = "CC0-1.0"
publish = false
authors.workspace = true
edition.workspace = true
readme.workspace = true
homepage.workspace = true
repository.workspace = true
license.workspace = true
publish.workspace = true
autobenches = false

[dependencies]
ibig = { version = "0.3.6", default-features = false, features = ["num-traits"] }
num = { version = "0.4.0", default-features = false, features = ["alloc"] }
hex = { version = "0.4", default-features = false, features = ["alloc"] }

[dev-dependencies]
hex.workspace = true
num.workspace = true
ibig.workspace = true

[features]
default = ["std"]
Expand Down
Loading

0 comments on commit d0e22f7

Please sign in to comment.