Skip to content

Commit

Permalink
chore: removing cvm along with no_std support (#4346)
Browse files Browse the repository at this point in the history
  • Loading branch information
RustNinja authored Nov 28, 2023
2 parents 21ec39e + 6df642f commit bedfb8a
Show file tree
Hide file tree
Showing 93 changed files with 113 additions and 18,177 deletions.
67 changes: 2 additions & 65 deletions .github/workflows/pr-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,6 @@ jobs:
**/*.nix
**/*.sol
**/*.toml
code/cvm/evm/lib/forge-std
code/cvm/evm/lib/openzeppelin-contracts
code/cvm/evm/lib/protobuf3-solidity-lib
code/cvm/evm/lib/yui-ibc-solidity
code/cvm/evm/lib/solidity-bytes-utils
flake/eth-pos-devnet
- run: echo ${{ steps.lfs-warning.outputs.lfsFiles }}

Expand Down Expand Up @@ -228,62 +223,6 @@ jobs:
- id: ok
run: echo "ok=true" >> "$GITHUB_OUTPUT"

build-cosmos-cosmwasm:
outputs:
ok: ${{ steps.ok.outputs.ok }}
name: build-cosmos-cosmwasm
needs:
- privilege-check
runs-on:
- x86_64-linux-32C-128GB-2TB
concurrency:
group: ${{ inputs.github_workflow }}-build-cosmos-cosmwasm-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
steps:
- name: Set up Cachix
uses: cachix/cachix-action@586bf280495080c5a6d4868237ad28a860e4b309
with:
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
name: composable
installCommand: "true"
skipAddingSubstituter: true
- uses: actions/checkout@v3
with:
lfs: true
ref: ${{ inputs.github_event_pull_request_head_sha || github.sha }}
persist-credentials: false
- name: Build all packages
uses: "./.github/templates/watch-exec"
with:
command: nix -- build .#cvm-mount
- id: ok
run: echo "ok=true" >> "$GITHUB_OUTPUT"

build-evm:
outputs:
ok: ${{ steps.ok.outputs.ok }}
name: build-evm
needs:
- privilege-check
runs-on: ubuntu-latest
concurrency:
group: ${{ inputs.github_workflow }}-build-evm-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
steps:
- uses: nixbuild/nix-quick-install-action@v24
- uses: actions/checkout@v3
with:
lfs: true
ref: ${{ inputs.github_event_pull_request_head_sha || github.sha }}
persist-credentials: false
- uses: nixbuild/nixbuild-action@v19
with:
nixbuild_token: ${{ secrets.NIXBUILD_TOKEN }}
generate_summary_for: "job"
- run: nix build .#evm-cvm-gateway --no-update-lock-file --accept-flake-config --extra-experimental-features "flakes nix-command"
- id: ok
run: echo "ok=true" >> "$GITHUB_OUTPUT"

build-all-ci-packages:
name: build-all-ci-packages
outputs:
Expand Down Expand Up @@ -479,7 +418,6 @@ jobs:
- build-all-docs-packages
- build-all-misc-packages
- build-all-production-deps
- build-cosmos-cosmwasm
- dependency-review
- nix-flake-check
- devnet-integration-tests
Expand All @@ -493,12 +431,11 @@ jobs:
echo "build-all-ci-packages" ${{ needs.build-all-ci-packages.outputs.ok }}
echo "build-all-rust-qa-packages" ${{ needs.build-all-rust-qa-packages.outputs.ok }}
echo "devnet-integration-tests" ${{ needs.devnet-integration-tests.outputs.ok }}
echo "build-cosmos-cosmwasm" ${{ needs.build-cosmos-cosmwasm.outputs.ok }}
- if: ${{ needs.nix-flake-check.outputs.ok == 'true' && needs.dependency-review.outputs.ok == 'true' && needs.build-all-production-deps.outputs.ok == 'true' && needs.build-all-misc-packages.outputs.ok == 'true' && needs.build-all-docs-packages.outputs.ok == 'true' && needs.build-all-ci-packages.outputs.ok == 'true' && needs.build-all-rust-qa-packages.outputs.ok == 'true' && needs.devnet-integration-tests.outputs.ok == 'true' && needs.build-cosmos-cosmwasm.outputs.ok == 'true' }}
- if: ${{ needs.nix-flake-check.outputs.ok == 'true' && needs.dependency-review.outputs.ok == 'true' && needs.build-all-production-deps.outputs.ok == 'true' && needs.build-all-misc-packages.outputs.ok == 'true' && needs.build-all-docs-packages.outputs.ok == 'true' && needs.build-all-ci-packages.outputs.ok == 'true' && needs.build-all-rust-qa-packages.outputs.ok == 'true' && needs.devnet-integration-tests.outputs.ok == 'true' }}
run: |
echo "All dependencies built well"
exit 0
- if: ${{ !(needs.nix-flake-check.outputs.ok == 'true' && needs.dependency-review.outputs.ok == 'true' && needs.build-all-production-deps.outputs.ok == 'true' && needs.build-all-misc-packages.outputs.ok == 'true' && needs.build-all-docs-packages.outputs.ok == 'true' && needs.build-all-ci-packages.outputs.ok == 'true' && needs.build-all-rust-qa-packages.outputs.ok == 'true' && needs.devnet-integration-tests.outputs.ok == 'true' && needs.build-cosmos-cosmwasm.outputs.ok == 'true') }}
- if: ${{ !(needs.nix-flake-check.outputs.ok == 'true' && needs.dependency-review.outputs.ok == 'true' && needs.build-all-production-deps.outputs.ok == 'true' && needs.build-all-misc-packages.outputs.ok == 'true' && needs.build-all-docs-packages.outputs.ok == 'true' && needs.build-all-ci-packages.outputs.ok == 'true' && needs.build-all-rust-qa-packages.outputs.ok == 'true' && needs.devnet-integration-tests.outputs.ok == 'true' ) }}
run: |
echo "Some of dependencies (see jobs graph, needs attributes, and output of this job) failed"
exit 42
Expand Down
15 changes: 0 additions & 15 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
[submodule "code/cvm/evm/lib/openzeppelin-contracts"]
path = code/cvm/evm/lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
[submodule "code/cvm/evm/lib/protobuf3-solidity-lib"]
path = code/cvm/evm/lib/protobuf3-solidity-lib
url = https://github.com/lazyledger/protobuf3-solidity-lib
[submodule "code/cvm/evm/lib/forge-std"]
path = code/cvm/evm/lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "flake/eth-pos-devnet"]
path = flake/eth-pos-devnet
url = https://github.com/OffchainLabs/eth-pos-devnet.git
[submodule "code/cvm/evm/lib/solidity-bytes-utils"]
path = code/cvm/evm/lib/solidity-bytes-utils
url = https://github.com/GNSPS/solidity-bytes-utils
[submodule "code/cvm/evm/lib/yui-ibc-solidity"]
path = code/cvm/evm/lib/yui-ibc-solidity
url = https://github.com/hyperledger-labs/yui-ibc-solidity
43 changes: 0 additions & 43 deletions code/Cargo.lock

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

3 changes: 0 additions & 3 deletions code/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ members = [
"utils/collator-sidecar",
"utils/common",
"utils/price-feed",
"cvm/cosmwasm/contracts/gateway",
"cvm/cosmwasm/contracts/executor",
"cvm/lib/core/",
]
resolver = "2"
Expand Down Expand Up @@ -148,7 +146,6 @@ democracy = { package = "pallet-democracy", git = "https://github.com/paritytech
executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }


sc-consensus-beefy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
sc-consensus-beefy-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
sp-beefy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
Expand Down
10 changes: 6 additions & 4 deletions code/composable-nodes.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@
cargoArtifacts = self'.packages.common-deps;
cargoBuildCommand = "cargo build --release --package ${name}";
cargoExtraArgs = "--features=builtin-wasm";
CW_XC_GATEWAY_WASM_PATH =
"${self'.packages.xc-cw-contracts}/lib/cw_xc_gateway.wasm";
CW_XC_EXECUTOR_WASM_PATH =
"${self'.packages.xc-cw-contracts}/lib/cw_xc_executor.wasm";
CW_CVM_GATEWAY_WASM_PATH = "${
self.inputs.cvm.packages."${system}".cw-cvm-gateway
}/lib/cw_cvm_gateway.wasm";
CW_CVM_EXECUTOR_WASM_PATH = "${
self.inputs.cvm.packages."${system}".cw-cvm-executor
}/lib/cw_cvm_executor.wasm";
CW_20_BASE_WASM_PATH = self'.packages.cw20_base;
PICASSO_RUNTIME = "${picasso-runtime}/lib/runtime.optimized.wasm";
COMPOSABLE_RUNTIME =
Expand Down
1 change: 0 additions & 1 deletion code/cvm/.gitignore

This file was deleted.

35 changes: 0 additions & 35 deletions code/cvm/cosmwasm/contracts/executor/Cargo.toml

This file was deleted.

96 changes: 0 additions & 96 deletions code/cvm/cosmwasm/contracts/executor/README.md

This file was deleted.

9 changes: 0 additions & 9 deletions code/cvm/cosmwasm/contracts/executor/clippy.toml

This file was deleted.

20 changes: 0 additions & 20 deletions code/cvm/cosmwasm/contracts/executor/src/authenticate.rs

This file was deleted.

27 changes: 0 additions & 27 deletions code/cvm/cosmwasm/contracts/executor/src/bin/interpreter.rs

This file was deleted.

Loading

0 comments on commit bedfb8a

Please sign in to comment.