Skip to content

Commit

Permalink
CI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Kayanski committed Nov 18, 2024
1 parent 6459a1b commit ae5f055
Show file tree
Hide file tree
Showing 77 changed files with 1,083 additions and 169 deletions.
77 changes: 58 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,17 @@ jobs:
name: Import GPG Key
command: |
echo -e "$GPG_PRIVATE_KEY" | gpg --import
echo -e "trust\n5\ny\n" | gpg --command-fd 0 --edit-key 4C19E4CC17E67B7B
echo -e "trust\n5\ny\n" | gpg --command-fd 0 --edit-key $GPG_KEY_ID
- run:
name: Configure Git for Signing
command: |
git config --global user.signingkey 4C19E4CC17E67B7B
git config --global user.signingkey $GPG_KEY_ID
git config --global commit.gpgSign true
echo "test" | gpg --clearsign
- run:
name: "Create build branch"
command: |
git config --global user.name 'CircleCI'
git config --global user.email '[email protected]'
git config --global user.name "$GIT_NAME"
git config --global user.email "$GIT_EMAIL"
# Pull latest changes
git pull origin $CIRCLE_BRANCH
git checkout -b "$CIRCLE_BRANCH-build"
Expand Down Expand Up @@ -172,11 +171,21 @@ jobs:
- framework/target/debug/build
- framework/target/debug/deps
key: cargocache-v2-build-rust:1.80.0-{{ checksum "framework/Cargo.lock" }}
- run:
name: Import GPG Key
command: |
echo -e "$GPG_PRIVATE_KEY" | gpg --import
echo -e "trust\n5\ny\n" | gpg --command-fd 0 --edit-key $GPG_KEY_ID
- run:
name: Configure Git for Signing
command: |
git config --global user.signingkey $GPG_KEY_ID
git config --global commit.gpgSign true
- run:
name: Commit and push framework artifacts
command: |
git config --global user.name 'CircleCI'
git config --global user.email '[email protected]'
git config --global user.name "$GIT_NAME"
git config --global user.email "$GIT_EMAIL"
# Pull latest changes
git pull
# Check for wasm changes
Expand Down Expand Up @@ -230,11 +239,21 @@ jobs:
command: |
set -e
./scripts/wasm-modules-ci.sh
- run:
name: Import GPG Key
command: |
echo -e "$GPG_PRIVATE_KEY" | gpg --import
echo -e "trust\n5\ny\n" | gpg --command-fd 0 --edit-key $GPG_KEY_ID
- run:
name: Configure Git for Signing
command: |
git config --global user.signingkey $GPG_KEY_ID
git config --global commit.gpgSign true
- run:
name: Commit and push module artifacts
command: |
git config --global user.name 'CircleCI'
git config --global user.email '[email protected]'
git config --global user.name "$GIT_NAME"
git config --global user.email "$GIT_EMAIL"
# Pull latest changes
git pull
# Check for wasm changes
Expand Down Expand Up @@ -287,11 +306,21 @@ jobs:
cargo install just
# Run script
just schema
- run:
name: Import GPG Key
command: |
echo -e "$GPG_PRIVATE_KEY" | gpg --import
echo -e "trust\n5\ny\n" | gpg --command-fd 0 --edit-key $GPG_KEY_ID
- run:
name: Configure Git for Signing
command: |
git config --global user.signingkey $GPG_KEY_ID
git config --global commit.gpgSign true
- run:
name: Commit and push schemas
command: |
git config --global user.name 'CircleCI'
git config --global user.email '[email protected]'
git config --global user.name "$GIT_NAME"
git config --global user.email "$GIT_EMAIL"
# Pull latest changes
git pull
# Check for schema changes
Expand All @@ -314,11 +343,21 @@ jobs:
steps:
- setup_remote_docker
- checkout
- run:
name: Import GPG Key
command: |
echo -e "$GPG_PRIVATE_KEY" | gpg --import
echo -e "trust\n5\ny\n" | gpg --command-fd 0 --edit-key $GPG_KEY_ID
- run:
name: Configure Git for Signing
command: |
git config --global user.signingkey $GPG_KEY_ID
git config --global commit.gpgSign true
- run:
name: "Merge build branch"
command: |
git config --global user.name 'CircleCI'
git config --global user.email '[email protected]'
git config --global user.name "$GIT_NAME"
git config --global user.email "$GIT_EMAIL"
# Pull latest changes
git pull origin $CIRCLE_BRANCH
git fetch origin "$CIRCLE_BRANCH-build"
Expand Down Expand Up @@ -382,25 +421,25 @@ jobs:
name: Import GPG Key
command: |
echo -e "$GPG_PRIVATE_KEY" | gpg --import
echo -e "trust\n5\ny\n" | gpg --command-fd 0 --edit-key 4C19E4CC17E67B7B
echo -e "trust\n5\ny\n" | gpg --command-fd 0 --edit-key $GPG_KEY_ID
- run:
name: Configure Git for Signing
command: |
git config --global user.signingkey 4C19E4CC17E67B7B
git config --global user.signingkey $GPG_KEY_ID
git config --global commit.gpgSign true
- run:
name: Commit and push deploy file
command: |
git config --global user.name 'CircleCI'
git config --global user.email '[email protected]'
git config --global user.name "$GIT_NAME"
git config --global user.email "$GIT_EMAIL"
git add framework/scripts --force
git commit -S -m 'Update deploy deploy file [skip ci]'
git push origin $CIRCLE_BRANCH
- run:
name: Commit and push state file
command: |
git config --global user.name 'CircleCI'
git config --global user.email '[email protected]'
git config --global user.name "$GIT_NAME"
git config --global user.email "$GIT_EMAIL"
cp ~/.cw-orchestrator/state.json ./framework/scripts/
git add ./framework/scripts/state.json
git commit -S -m 'Update deploy deploy file [skip ci]'
Expand Down
14 changes: 9 additions & 5 deletions framework/Cargo.lock

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

1 change: 1 addition & 0 deletions framework/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ schemars = "0.8"
serde = { version = "1.0", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.50" }
protobuf = { version = "2", features = ["with-bytes"] }
anybuf = { version = "0.5.0" }

clap = { version = "4.0.32", features = ["derive"] }
semver = "1.0"
Expand Down
Binary file modified framework/artifacts/abstract_account-xion.wasm
Binary file not shown.
Binary file modified framework/artifacts/abstract_account.wasm
Binary file not shown.
Binary file modified framework/artifacts/abstract_ans_host.wasm
Binary file not shown.
Binary file modified framework/artifacts/abstract_ibc_client.wasm
Binary file not shown.
Binary file modified framework/artifacts/abstract_ibc_host.wasm
Binary file not shown.
Binary file modified framework/artifacts/abstract_ica_client.wasm
Binary file not shown.
Binary file modified framework/artifacts/abstract_module_factory.wasm
Binary file not shown.
Binary file modified framework/artifacts/abstract_registry.wasm
Binary file not shown.
16 changes: 8 additions & 8 deletions framework/artifacts/checksums.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
4bf416becdfe632df49cf8a7462752961066253bc85e6ffdafd77980d0fd8edb abstract_account-xion.wasm
b04a125da587f70baacb6767044dcea01272ceb41808a820a43bac08a65b4f57 abstract_account.wasm
55f36c4d96e50542da91b6b1cb6069fffb5ceda297fec483d21caae728ad0834 abstract_ans_host.wasm
80e0a350981b11d8964c998d906a9c222da7f86173485faf6675efb3e827d54b abstract_ibc_client.wasm
c320daf8e81a2e33252d30e436727085ca01ec81519b6b183aa62281c14b1fc6 abstract_ibc_host.wasm
45316f6d205dc28279484ab3aa5bc23df2e58da274aeb2d8d7a4fc25176bdc65 abstract_ica_client.wasm
496205b8d14615376ea9a5d12b002e9051e1cb17a1c34abc9ad91d50f7ff9bfd abstract_module_factory.wasm
6041ca5e0f446878477d55ab174468581db51484a776da1efb506cd60d2e6276 abstract_registry.wasm
46f96a9b57877d657f2307749b6a4d150a54e92b01792e5ead03549d05bfbddd abstract_account-xion.wasm
6ebc59bb33ff7f56558f4858620de20f5317c9ff5faa05561d70ec36c726b572 abstract_account.wasm
74a263c82e7e86fa005ec61837028d94744edc5aa9b82fc4158f6c1c8e3a05fb abstract_ans_host.wasm
cba47eeef944c280896ffa476c2b0691c887d42b783ab737913fec6789c4e0c5 abstract_ibc_client.wasm
86b17814e6bbbec839393e33a94d874af4983c3509aaa002376322d7a035af8f abstract_ibc_host.wasm
7e48c5df669d9df94e992d0d1a71f1ec77296047305a29acb7a12337375aaf70 abstract_ica_client.wasm
de67580e7ad572ea9826444d37c23a8c01fedd2fd48bfc39a3e4f40ddfe3a4c7 abstract_module_factory.wasm
6dbf24ac779fa3b607f94a51ded057db762cee51282f0c89b6b0552fa0e2bfa3 abstract_registry.wasm
5 changes: 4 additions & 1 deletion framework/contracts/native/ibc-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,17 @@ abstract-sdk = { workspace = true }
abstract-macros = { workspace = true }
semver = { workspace = true }
cw-paginate = "2.0.0"
anybuf = "0.5.0"
anybuf = { workspace = true }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
workspace-hack = { version = "0.1", path = "../../../workspace-hack" }

[dev-dependencies]
cosmwasm-schema = { workspace = true }
abstract-testing = { workspace = true }
cw-orch = { workspace = true }
cw-orch-interchain = { workspace = true }
abstract-interface = { workspace = true, features = ["interchain"] }

ibc-proto = { version = "0.47.0", default-features = false }
prost = { version = "0.13.1", default-features = false }
Expand Down
16 changes: 16 additions & 0 deletions framework/contracts/native/ibc-client/src/anybuf.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(unused)]

use anybuf::Anybuf;

pub struct Coin {
Expand Down Expand Up @@ -85,6 +87,20 @@ pub mod ibc {
.append_string(8, &self.memo)
}
}

pub struct MsgTransferResponse {
pub sequence: u64, // 1
}

impl MsgTransferResponse {
pub fn decode(data: &cosmwasm_std::Binary) -> Result<Self, anybuf::BufanyError> {
let bufany = anybuf::Bufany::deserialize(data.as_ref())?;
let sequence = bufany
.uint64(1)
.ok_or(anybuf::BufanyError::UnexpectedEndOfData)?;
Ok(Self { sequence })
}
}
}

#[cfg(test)]
Expand Down
Loading

0 comments on commit ae5f055

Please sign in to comment.