From 9979149452297fc4e97d2e5260bd8688bdc0e063 Mon Sep 17 00:00:00 2001 From: Zaki Manian Date: Fri, 17 Mar 2023 16:04:18 -0400 Subject: [PATCH 1/3] Add missing amino registrations Add missing amino registrations --- module/x/gravity/types/codec.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/x/gravity/types/codec.go b/module/x/gravity/types/codec.go index 01a1963ea..086074da6 100644 --- a/module/x/gravity/types/codec.go +++ b/module/x/gravity/types/codec.go @@ -16,6 +16,8 @@ import ( // provided LegacyAmino codec. These types are used for Amino JSON serialization func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgDelegateKeys{}, "gravity-bridge/", nil) + cdc.RegisterConcrete(&MsgSendToEthereum{}, "gravity-bridge/", nil) + cdc.RegisterConcrete(&MsgCancelSendToEthereum{}, "gravity-bridge/", nil) } var ( From bb09687bb54c3b0a96520b2e4809b6d570e7e0d5 Mon Sep 17 00:00:00 2001 From: Zaki Manian Date: Fri, 17 Mar 2023 16:20:09 -0400 Subject: [PATCH 2/3] Update codec.go Fix registration strings --- module/x/gravity/types/codec.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/x/gravity/types/codec.go b/module/x/gravity/types/codec.go index 086074da6..3f7e3d32f 100644 --- a/module/x/gravity/types/codec.go +++ b/module/x/gravity/types/codec.go @@ -15,9 +15,9 @@ import ( // RegisterLegacyAminoCodec registers the vesting interfaces and concrete types on the // provided LegacyAmino codec. These types are used for Amino JSON serialization func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { - cdc.RegisterConcrete(&MsgDelegateKeys{}, "gravity-bridge/", nil) - cdc.RegisterConcrete(&MsgSendToEthereum{}, "gravity-bridge/", nil) - cdc.RegisterConcrete(&MsgCancelSendToEthereum{}, "gravity-bridge/", nil) + cdc.RegisterConcrete(&MsgDelegateKeys{}, "gravity-bridge/MsgDelegateKeys", nil) + cdc.RegisterConcrete(&MsgSendToEthereum{}, "gravity-bridge/MsgSendToEthereum", nil) + cdc.RegisterConcrete(&MsgCancelSendToEthereum{}, "gravity-bridge/MsgCancelSendToEthereum", nil) } var ( From e1b0fbc588bd07a04ac09567860ae915c609c379 Mon Sep 17 00:00:00 2001 From: Eric Bolten Date: Fri, 17 Mar 2023 16:07:16 -0500 Subject: [PATCH 3/3] rust 1.58 -> 1.63, pin cargo-chef version --- .github/workflows/automated-release.yml | 2 +- orchestrator/Dockerfile | 4 ++-- orchestrator/gorc/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/automated-release.yml b/.github/workflows/automated-release.yml index c408665df..c20e2776f 100644 --- a/.github/workflows/automated-release.yml +++ b/.github/workflows/automated-release.yml @@ -34,7 +34,7 @@ jobs: - name: checkout-code uses: actions/checkout@v2 with: - toolchain: 1.58 + toolchain: 1.63 # Golang Cache - name: go-cache uses: actions/cache@v2 diff --git a/orchestrator/Dockerfile b/orchestrator/Dockerfile index ab075681f..0f991b524 100644 --- a/orchestrator/Dockerfile +++ b/orchestrator/Dockerfile @@ -1,7 +1,7 @@ # Reference: https://www.lpalmieri.com/posts/fast-rust-docker-builds/ -FROM rust:1.58 as cargo-chef-rust -RUN cargo install cargo-chef +FROM rust:1.63 as cargo-chef-rust +RUN cargo install cargo-chef --version 0.1.51 FROM cargo-chef-rust as planner WORKDIR app diff --git a/orchestrator/gorc/Cargo.toml b/orchestrator/gorc/Cargo.toml index 94af8609f..df1127b36 100644 --- a/orchestrator/gorc/Cargo.toml +++ b/orchestrator/gorc/Cargo.toml @@ -3,7 +3,7 @@ name = "gorc" authors = [] version = "2.0.4" edition = "2021" -rust-version = "1.58" +rust-version = "1.63" [dependencies] clap = "3"