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

Upgraded CosmWasm runtime in Picasso to latest dependencies #3677

Merged
merged 7 commits into from
Jun 12, 2023
Merged

Upgraded CosmWasm runtime in Picasso to latest dependencies #3677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
764aa06
cw upgrade
dzmitry-lahoda Jun 9, 2023
f5efe46
killed
dzmitry-lahoda Jun 9, 2023
d650b42
fuck
dzmitry-lahoda Jun 9, 2023
08b7928
fmt and review fixes
dzmitry-lahoda Jun 10, 2023
f44118c
forgot to push
dzmitry-lahoda Jun 10, 2023
75b8ecb
workflow clean up
dzmitry-lahoda Jun 10, 2023
2b0f55b
removed bridge security, added transaction id, clarified more on salt…
dzmitry-lahoda Jun 11, 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
38 changes: 32 additions & 6 deletions .github/workflows/pr-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,38 @@ 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
if: ${{ inputs.flow == 'push' || inputs.flow == 'pr_from_branch' }}
uses: cachix/cachix-action@586bf280495080c5a6d4868237ad28a860e4b309
with:
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
name: composable-community
- uses: actions/checkout@v3
if: ${{ inputs.flow == 'push' || inputs.flow == 'pr_from_branch' }}
with:
lfs: true
ref: ${{ inputs.github_event_pull_request_head_sha || github.sha }}
persist-credentials: false
- name: Build all packages
if: ${{ inputs.flow == 'push' || inputs.flow == 'pr_from_branch' }}
uses: "./.github/templates/watch-exec"
with:
command: nix -- build .#xcvm-tests --keep-going
- id: ok
run: echo "ok=true" >> "$GITHUB_OUTPUT"

build-all-ci-packages:
name: build-all-ci-packages
outputs:
Expand Down Expand Up @@ -520,7 +552,6 @@ jobs:
files: |
release-artifacts/to-upload/*

# this should be split and commit docker are from here, but latest from release
push-docker-images:
name: push-docker-images
if: ${{ inputs.github_event_name == 'push' || (inputs.github_event_name == 'pull_request' && inputs.github_event_pull_request_head_repo_id == 383289760) }}
Expand Down Expand Up @@ -559,11 +590,6 @@ jobs:
lfs: true
ref: ${{ inputs.github_event_pull_request_head_sha || github.sha }}
persist-credentials: false
- name: Nix flake show
run: |
nix --version
nix show-config
nix flake show --allow-import-from-derivation --show-trace --fallback --debug --print-build-logs --keep-failed
- name: Build all packages
uses: "./.github/templates/watch-exec"
with:
Expand Down
141 changes: 119 additions & 22 deletions code/Cargo.lock
View file
Open in desktop

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

18 changes: 9 additions & 9 deletions code/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,25 +323,25 @@ subxt = { git = "https://github.com/paritytech/subxt", rev = "2a913a3aa99a07f7ac
# Only needed until the configs get merged into xcm-builder: https://github.com/paritytech/polkadot/pull/7165
invarch-xcm-builder = { git = "https://github.com/InvArch/InvArch-XCM-Builder", rev = "c704c0f2d4c436f96eff10d06c197527b46b3536", default-features = false }

wasm-instrument = { version = "0.4.0", default-features = false }
wasmi = { version = "0.30.0", default-features = false }
wasmi-validation = { version = "0.5", default-features = false }

cosmwasm-vm = { git = "https://github.com/ComposableFi/cosmwasm-vm", rev = "c2a4fe2c764710c0db15c571135bc37619a289d5", default-features = false, features = [
"ibc3",
"iterator",
"stargate",
] }
cosmwasm-vm-wasmi = { git = "https://github.com/ComposableFi/cosmwasm-vm", rev = "c2a4fe2c764710c0db15c571135bc37619a289d5", default-features = false, features = [
cosmwasm-vm = { git = "https://github.com/ComposableFi/cosmwasm-vm", rev = "71520ece331c3d759f1cdb2a2f7e8d4e26bbffe9", default-features = false }
cosmwasm-vm-wasmi = { git = "https://github.com/ComposableFi/cosmwasm-vm", rev = "71520ece331c3d759f1cdb2a2f7e8d4e26bbffe9", default-features = false }
serde-json-wasm = { git = "https://github.com/dzmitry-lahoda-forks/serde-json-wasm", rev = "8a7e522c0e4de36a6dfb535766f26a9941017d81", default-features = false }

cosmwasm-std = { git = "https://github.com/dzmitry-lahoda-forks/cosmwasm", rev = "1277597cbf380a8d04dbe676d9cb344ca31634b6", default-features = false, features = [
"iterator",
"stargate",
"cosmwasm_1_2",
] }


serde = { version = '1.0.136', default-features= false, features = ["derive"] }

serde_json = { version = "1.0.82", default-features = false, features = [
"alloc",
] }

serde-json-wasm = { version = "0.5.1", default-features = false }

#######################################
# DO NOT DELETE PATCHES, BUT COMMENT OUT
Expand Down
Loading