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.

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

Merge upstream #68

Merged
merged 5 commits into from
Nov 14, 2023
Merged

Merge upstream #68

merged 5 commits into from
Nov 14, 2023

Commits on Nov 2, 2023

  1. Make itp-utils purely no-std (integritee-network#1481)

    * make itp-utils purely no-std
    
    * code fixes after itp-utils change
    
    * [itp-utils] fix test compilation
    clangenb authored Nov 2, 2023
    Configuration menu
    Copy the full SHA
    b177c23 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. [refactor] untangle ita_stf dependencies (integritee-network#1484)

    * get rid of ita_stf::Getter dependencies
    
    * introduce trait TrustedCallSigning
    
    * fix cli build
    
    * WIP: started removing generic hashes TxHash and BlockHash for top pool. not sure if this works out nicely
    
    * feels alright to remove hash generic. intermediate commit
    
    * progressing with hardcoded HAsh
    
    * getting there...now need to solve hashing of TOP
    
    * taplo fmt
    
    * finally looping back to app-libs errors now
    
    * hopefully fixed executor_test
    
    * finally got to enclave_runtime crate now
    
    * enclave builds. holy moly!
    
    * sidechain build works
    
    * cargo fix root workspace
    
    * more cleanup manual
    
    * before messing with ParenchainHeader generic
    
    * ParentchainHeader untangled in executor
    
    * builds
    
    * no more dependency on app-libs from core-primitives! builds
    
    * fixing unit tests
    
    * before fixing ChainApi type args
    
    * before messing with AuthorApiMock
    
    * fixed unit test build
    
    * clean build
    
    * taplo fmt
    
    * fix evm build and fmt
    
    * fix executing_tops_from_pool_works unit test
    
    * fix evm cli build
    
    * fix nonce_is_computed_correctly enclave test
    
    * fix executor tests
    
    * get rid of log-jamming pretty-print for debug logging
    
    * fix cargo test
    
    * fix enclave tests
    
    * fix evm build
    
    * add debug logs for indirect unshielding which fails
    
    * add pool status getter and fix M6 demo
    
    * fix unit tests
    
    * remove auto-inserted extern crate core
    
    * std feature cleanup and minors
    
    * rename error and cosmetics
    brenzi authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    c54fd17 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. enable cargo test for environments without an sgx sdk, and extract …

    …the `cargo test` from the docker build command. (integritee-network#1480)
    
    * [docker] Don't run cargo test as part of the build process, but add it as a separate command instead
    
    * [GHA] add --release to test command
    
    * [GHA] remove cargo test command, as it will not work anyhow.
    
    * remove unnecessary change
    
    * [GHA] fix workflow syntax
    
    * [GHA] fix docker flag
    
    * [service] remove static linking to `Enclave_u` for cargo tests
    
    * don't link against anything if we run tests
    
    * fix build.rs for test and builds
    
    * [GHA] fix cargo test flag
    
    * fix toml fmt
    
    * [GHA] run cargo test on integritee builder
    
    * [GHA] remove cargo test from the matrix
    
    * [GHA] fix syntax
    
    * [GHA] run cargo test not in container but on host directly
    
    * [buil_and_test] run without rustup
    
    * [buil_and_test] run cargo test on the github actions runner again
    
    * working `cargo test` implementation
    
    * [build_and_test] fix feature flag
    
    * [enclave-api] rename `real-ffi` to `implement-ffi`
    
    * [enclave-api] remove obsolete compiler error
    
    * toml fmt
    
    * fix clippy warnings in itp-enclave-api
    
    * [service] extract main file to a separate file
    
    * remove more clippy warnings from enclave-api
    
    * fix clippy warnings in setup file
    
    * allow unused functions due to link-binary flag
    
    * fix clippy
    
    * fix teeracle clippy
    
    * [integritee-service] fix feature gating
    
    * remove redundant feature flags
    
    * [GHA] execute cargo test with --release flag
    
    * [GHA] fix cargo test
    clangenb authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    7a4e28f View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/master' into cl/merge-upstream-c…

    …argo-test
    
    # Conflicts:
    #	Cargo.lock
    #	app-libs/stf/src/getter.rs
    #	app-libs/stf/src/trusted_call.rs
    #	build.Dockerfile
    #	core-primitives/stf-primitives/src/types.rs
    #	core-primitives/top-pool-author/src/author.rs
    #	enclave-runtime/Cargo.lock
    clangenb committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    fd1bb3e View commit details
    Browse the repository at this point in the history
  3. merge fixes

    clangenb committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    d46fb87 View commit details
    Browse the repository at this point in the history