Skip to content

Commit

Permalink
fix: cluster connection
Browse files Browse the repository at this point in the history
gcranju committed Jan 22, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 369f91b + 1164117 commit b7c9015
Showing 119 changed files with 9,496 additions and 569 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/basic-rust.yml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache Rust dependencies
uses: Swatinem/rust-cache@v2
@@ -42,7 +42,7 @@ jobs:
working-directory: contracts/cosmwasm-vm
steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache Rust dependencies
uses: Swatinem/rust-cache@v2
5 changes: 2 additions & 3 deletions .github/workflows/build-and-publish-cosmwasm.yml
Original file line number Diff line number Diff line change
@@ -9,14 +9,13 @@ on:
paths:
- contracts/cosmwasm-vm/**
- libraries/common/rust/**
- .github/workflows/deploy-cosmwasm-contracts.yml
jobs:
Build:
name: Build Cosmasm Contracts
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

@@ -25,7 +24,7 @@ jobs:
bash ./scripts/optimize-cosmwasm.sh
- name: Archive artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: cosmwasm-contracts
path: artifacts
4 changes: 2 additions & 2 deletions .github/workflows/build-and-publish-javascore.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Build Javascore
working-directory: contracts/javascore
@@ -21,7 +21,7 @@ jobs:
./gradlew zipOutputOptimizedJars
- name: Archive artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: javascore-contracts
path: ./contracts/javascore/build/javascore-contracts.zip
3 changes: 1 addition & 2 deletions .github/workflows/codecov-javascore.yml
Original file line number Diff line number Diff line change
@@ -9,15 +9,14 @@ on:
- main
paths:
- 'contracts/javascore/**'
- '.github/workflows/codecov-javascore.yml'
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
jobs:
Coverage-Codecov:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
- name: Javascore contracts coverage
3 changes: 1 addition & 2 deletions .github/workflows/cosmwasm-contracts-code-coverage.yml
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@ on:
- "**"
paths:
- "contracts/cosmwasm-vm/**"
- ".github/workflows/cosmwasm-contracts-code-coverage.yml"
push:
branches:
- main
@@ -22,7 +21,7 @@ jobs:
CARGO_TERM_COLOR: always
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

3 changes: 1 addition & 2 deletions .github/workflows/deploy-cosmwasm-contracts.yml
Original file line number Diff line number Diff line change
@@ -6,15 +6,14 @@ on:
paths:
- contracts/cosmwasm-vm/**
- libraries/common/rust/**
- .github/workflows/deploy-cosmwasm-contracts.yml
- scripts/optimize-cosmwasm.sh
jobs:
Build:
name: Build & Deploy Cosmasm Contracts
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

2 changes: 1 addition & 1 deletion .github/workflows/java-contracts-test.yml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

2 changes: 1 addition & 1 deletion .github/workflows/publish_maven.yml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build jar
working-directory: contracts/javascore
run: ./gradlew clean build
2 changes: 1 addition & 1 deletion .github/workflows/release-tag-manager.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: '0'
token: ${{ secrets.GITHUB_TOKEN }}
62 changes: 31 additions & 31 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

@@ -29,35 +29,35 @@ jobs:
with:
name: javascore-contracts
path: ./contracts/javascore/build/javascore-contracts.zip
# build_wasm:
# name: Build Cosmwasm Contracts
# runs-on: ubuntu-latest
# steps:
# - name: Checkout sources
# uses: actions/checkout@v3
# with:
# submodules: true
build_wasm:
name: Build Cosmwasm Contracts
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v3
with:
submodules: true

# - name: Cache Rust dependencies
# uses: Swatinem/rust-cache@v2
# - name: Compile WASM
# run: |
# # rustup component add rustfmt --toolchain 1.78.0-x86_64-unknown-linux-gnu
# # rustup component add clippy --toolchain 1.78.0-x86_64-unknown-linux-gnu
# bash ./scripts/optimize-cosmwasm.sh
# cd artifacts/archway && zip -r ../../cosmwasm-contracts.zip . -j
- name: Cache Rust dependencies
uses: Swatinem/rust-cache@v2
- name: Compile WASM
run: |
# rustup component add rustfmt --toolchain 1.78.0-x86_64-unknown-linux-gnu
# rustup component add clippy --toolchain 1.78.0-x86_64-unknown-linux-gnu
bash ./scripts/optimize-cosmwasm.sh
cd artifacts/archway && zip -r ../../cosmwasm-contracts.zip . -j
# - name: Upload Artifacts
# uses: actions/upload-artifact@v4
# with:
# name: cosmwasm-contracts
# path: cosmwasm-contracts.zip
- name: Upload Artifacts
uses: actions/upload-artifact@v4
with:
name: cosmwasm-contracts
path: cosmwasm-contracts.zip
build_solidity:
name: Build Solidity Contracts
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
- name: Install Foundry
@@ -83,7 +83,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
- name: Install stable toolchain
@@ -128,11 +128,11 @@ jobs:
name: javascore-contracts
path: javascore-contracts

# - name: Download Cosmwasm Artifacts
# uses: actions/download-artifact@v4
# with:
# name: cosmwasm-contracts
# path: cosmwasm-contracts
- name: Download Cosmwasm Artifacts
uses: actions/download-artifact@v4
with:
name: cosmwasm-contracts
path: cosmwasm-contracts

- name: Download Solidity Artifacts
uses: actions/download-artifact@v4
@@ -149,8 +149,8 @@ jobs:
- name: Unzip Javascore Artifacts
run: unzip javascore-contracts/javascore-contracts.zip -d javascore-contracts && rm -rf javascore-contracts/javascore-contracts.zip

# - name: Unzip Cosmwasm Artifacts
# run: unzip cosmwasm-contracts/cosmwasm-contracts.zip -d cosmwasm-contracts && rm -rf cosmwasm-contracts/cosmwasm-contracts.zip
- name: Unzip Cosmwasm Artifacts
run: unzip cosmwasm-contracts/cosmwasm-contracts.zip -d cosmwasm-contracts && rm -rf cosmwasm-contracts/cosmwasm-contracts.zip

- name: Unzip Cosmwasm Artifacts
run: unzip solidity-contracts/solidity-contracts.zip -d solidity-contracts && rm -rf solidity-contracts/solidity-contracts.zip
2 changes: 1 addition & 1 deletion .github/workflows/solidity-contracts-test.yml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ jobs:
name: xCall-Multi Solidity Tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

2 changes: 1 addition & 1 deletion .github/workflows/solidity-cov.yml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ jobs:
CARGO_TERM_COLOR: always
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
- name: Install Foundry
4 changes: 2 additions & 2 deletions .github/workflows/stellar-build-and-test.yml
Original file line number Diff line number Diff line change
@@ -20,14 +20,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: 1.79.0
toolchain: 1.81.0
target: wasm32-unknown-unknown
override: true
profile: minimal
2 changes: 1 addition & 1 deletion .github/workflows/sui-move-build-test.yml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ jobs:
REPO_OWNER: MystenLabs
REPO_NAME: sui
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

2 changes: 1 addition & 1 deletion .github/workflows/uat-deploy-java-contracts.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Retrieve the secret and decode it to a file
working-directory: contracts/javascore
39 changes: 30 additions & 9 deletions Cargo.lock

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

6 changes: 1 addition & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
[workspace]
members = [
"contracts/cosmwasm-vm/*",
"contracts/soroban/contracts/*",
"contracts/soroban/libs/*"
"contracts/cosmwasm-vm/*"
]

[workspace.package]
@@ -38,8 +36,6 @@ cw-common={ git="https://github.com/icon-project/IBC-Integration.git", branch =
cw-mock-dapp = {path="contracts/cosmwasm-vm/cw-mock-dapp"}
cw-mock-dapp-multi = { path="contracts/cosmwasm-vm/cw-mock-dapp-multi"}

soroban-sdk = "21.6.0"

[profile.release]
opt-level = 'z'
debug = false
Loading

0 comments on commit b7c9015

Please sign in to comment.