From 71bf1f92589ee7ce9820aaec7f7f622bf3cd3bfb Mon Sep 17 00:00:00 2001 From: yihuang Date: Tue, 30 May 2023 12:23:30 +0800 Subject: [PATCH] Problem: v1.0.8 hotfix version is not released (#1052) Solution: - cherry-pick ibc-go update and cosmos-sdk revert Update CHANGELOG.md Signed-off-by: yihuang Update CHANGELOG.md Signed-off-by: yihuang fix --- .github/workflows/build.yml | 3 +++ CHANGELOG.md | 7 +++++++ default.nix | 2 +- go.mod | 6 +++--- go.sum | 8 ++++---- gomod2nix.toml | 10 +++++----- 6 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 11515b9e7b..4bfd4f76a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,6 +82,9 @@ jobs: export PKG_CONFIG_PATH=$HOME/.nix-profile/lib/pkgconfig export CGO_CFLAGS="$(pkg-config --cflags rocksdb)" CGO_LDFLAGS="$(pkg-config --libs rocksdb)" export LD_LIBRARY_PATH=$HOME/.nix-profile/lib + export GLIBC="$(nix build nixpkgs#stdenv.cc.libc.out --no-link --print-out-paths)" + export CGO_LDFLAGS="$CGO_LDFLAGS -Wl,--dynamic-linker=$GLIBC/lib/ld-linux-x86-64.so.2" + echo $CGO_LDFLAGS cd ./versiondb go test -v -mod=readonly ./... -tags rocksdb,grocksdb_clean_link -coverprofile=coverage.txt if: steps.changed-files.outputs.any_changed == 'true' diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a25a6afb1..32c828100c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +*May 30, 2023* + +## v1.0.8 + +- [#1038](https://github.com/crypto-org-chain/cronos/pull/1038) Update ibc-go to `v5.2.1`. +- [#1052](https://github.com/crypto-org-chain/cronos/pull/1052) Revert accidental breaking change in `v1.0.7`. + *April 13, 2023* ## v1.0.7 diff --git a/default.nix b/default.nix index 3882f18f4d..f1a3ce5fa8 100644 --- a/default.nix +++ b/default.nix @@ -9,7 +9,7 @@ , static ? stdenv.hostPlatform.isStatic }: let - version = "v1.0.7"; + version = "v1.0.8"; pname = "cronosd"; tags = [ "ledger" "netgo" network "rocksdb" "grocksdb_no_link" ]; ldflags = lib.concatStringsSep "\n" ([ diff --git a/go.mod b/go.mod index b44b7217b6..0a59947d2b 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( cosmossdk.io/math v1.0.0-beta.4 github.com/armon/go-metrics v0.4.1 github.com/cosmos/cosmos-sdk v0.46.11 - github.com/cosmos/ibc-go/v5 v5.2.0 + github.com/cosmos/ibc-go/v5 v5.2.1 github.com/crypto-org-chain/cronos/versiondb v0.0.0 github.com/ethereum/go-ethereum v1.10.26 github.com/evmos/ethermint v0.6.1-0.20221101220534-a8ea4eceb6d9 @@ -25,6 +25,7 @@ require ( github.com/tendermint/tendermint v0.34.27 github.com/tendermint/tm-db v0.6.7 golang.org/x/exp v0.0.0-20230206171751-46f607a40771 + golang.org/x/sys v0.6.0 google.golang.org/genproto v0.0.0-20230323212658-478b75c54725 google.golang.org/grpc v1.54.0 google.golang.org/protobuf v1.30.0 @@ -190,7 +191,6 @@ require ( golang.org/x/net v0.8.0 // indirect golang.org/x/oauth2 v0.6.0 // indirect golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.6.0 // indirect golang.org/x/term v0.6.0 // indirect golang.org/x/text v0.8.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect @@ -209,7 +209,7 @@ replace ( github.com/cometbft/cometbft-db => github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6 // Ref: https://forum.cosmos.network/t/ibc-security-advisory-dragonberry/7702 github.com/confio/ics23/go => github.com/confio/ics23/go v0.9.0 - github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.12-0.20230403084236-f89d955e03e2 + github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.46.3-0.20230530021201-0a93ffb1f9d4 github.com/crypto-org-chain/cronos/versiondb => ./versiondb github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.19-deepcopy-jumptable github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.20.10-cronos diff --git a/go.sum b/go.sum index 7da3d4133a..c450f8a305 100644 --- a/go.sum +++ b/go.sum @@ -1004,8 +1004,6 @@ github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P github.com/cosmos/cosmos-proto v1.0.0-alpha7/go.mod h1:dosO4pSAbJF8zWCzCoTWP7nNsjcvSUBQmniFxDg5daw= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= -github.com/cosmos/cosmos-sdk v0.46.12-0.20230403084236-f89d955e03e2 h1:sq8t/py6tjO+dCpQZj9wpCGOYFfDsvVjgjp3mRVBvYI= -github.com/cosmos/cosmos-sdk v0.46.12-0.20230403084236-f89d955e03e2/go.mod h1:bG4AkW9bqc8ycrryyKGQEl3YV9BY2wr6HggGq8kvcgM= github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1/go.mod h1:JUMM2MxF9wuwzRWZJjb8BjXsn1BmPmdBd3a75pIct4I= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= @@ -1015,8 +1013,8 @@ github.com/cosmos/iavl v0.19.0/go.mod h1:l5h9pAB3m5fihB3pXVgwYqdY8aBsMagqz7T0MUj github.com/cosmos/iavl v0.19.5 h1:rGA3hOrgNxgRM5wYcSCxgQBap7fW82WZgY78V9po/iY= github.com/cosmos/iavl v0.19.5/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= github.com/cosmos/ibc-go/v5 v5.0.0-beta1/go.mod h1:9mmcbzuidgX7nhafIKng/XhXAHDEnRqDjGy/60W1cvg= -github.com/cosmos/ibc-go/v5 v5.2.0 h1:LxwttRQqdUJpQ3/Gc3XPg5lkRo3pcbzx65dxFIY6ONE= -github.com/cosmos/ibc-go/v5 v5.2.0/go.mod h1:MhDUMDVSboK5JW2pEWHNcw0wJHaHqKV/vwwP7awGhzI= +github.com/cosmos/ibc-go/v5 v5.2.1 h1:i8Kl9KZfPJVYuihjbGPnjTQWecXQfRLz+QrjJGhzY9o= +github.com/cosmos/ibc-go/v5 v5.2.1/go.mod h1:eH18ghfqGGT9gDCTMDLWg1zPLXplSnPxXRNWPx98xhU= github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY= github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= @@ -1034,6 +1032,8 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ github.com/cristalhq/acmd v0.8.1/go.mod h1:LG5oa43pE/BbxtfMoImHCQN++0Su7dzipdgBjMCBVDQ= github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6 h1:d4h4Ki1UE/LF6CKwYEm3OZ+HIBCrzSmOokG1vce0O98= github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6/go.mod h1:hF5aclS++7WrW8USOA3zPeKI0CuzwUD2TPYug25ANlQ= +github.com/crypto-org-chain/cosmos-sdk v0.46.3-0.20230530021201-0a93ffb1f9d4 h1:sccBXX4kTWlB2ppRy2foFZqJ+hL1OdvBwcdiXkyuiCw= +github.com/crypto-org-chain/cosmos-sdk v0.46.3-0.20230530021201-0a93ffb1f9d4/go.mod h1:bG4AkW9bqc8ycrryyKGQEl3YV9BY2wr6HggGq8kvcgM= github.com/crypto-org-chain/ethermint v0.20.10-cronos h1:TOQgelSAFKOuda4oWeU9CX18V59WDJxhil0taDKQEiA= github.com/crypto-org-chain/ethermint v0.20.10-cronos/go.mod h1:IOoPb0Pev7xanCu3IVp4HU5NoEEt3kI7vRD4ED9yOsQ= github.com/crypto-org-chain/go-ethereum v1.10.19-deepcopy-jumptable h1:VQLW0R8t9DcC/HvQZO1i0mIWjJfAezhI8lLUCholP0M= diff --git a/gomod2nix.toml b/gomod2nix.toml index c5d4c8e674..cfee237487 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -131,9 +131,9 @@ schema = 3 version = "v1.0.0-beta.1" hash = "sha256-oATkuj+fM5eBn+ywO+w/tL0AFSIEkx0J3Yz+VhVe0QA=" [mod."github.com/cosmos/cosmos-sdk"] - version = "v0.46.12-0.20230403084236-f89d955e03e2" - hash = "sha256-YbZnz23CrvOdkDc+oADvE5PzBd4BpVIR/y4a4qx3LmE=" - replaced = "github.com/cosmos/cosmos-sdk" + version = "v0.46.3-0.20230530021201-0a93ffb1f9d4" + hash = "sha256-8/fRL+irUZ8mNQX5oNXdLp1OCeDkPrux9j6JiHJsew0=" + replaced = "github.com/crypto-org-chain/cosmos-sdk" [mod."github.com/cosmos/go-bip39"] version = "v1.0.0" hash = "sha256-Qm2aC2vaS8tjtMUbHmlBSagOSqbduEEDwc51qvQaBmA=" @@ -141,8 +141,8 @@ schema = 3 version = "v0.19.5" hash = "sha256-8PerCyxQrBCtr2zkhgriqauhCSoIe580dsYpZ44o+cE=" [mod."github.com/cosmos/ibc-go/v5"] - version = "v5.2.0" - hash = "sha256-Gfqhdz9ZKEgb7LCkHiXCwYZYUYluQ+vMew/GkssfVj8=" + version = "v5.2.1" + hash = "sha256-zBw4oJQxhdviybdaL9n8PTFRTUpIIUbCGitVj6FD1/k=" [mod."github.com/cosmos/ledger-cosmos-go"] version = "v0.12.2" hash = "sha256-fLkveUWxn0nZzvgsY0KTU/T1TUUQ8Ap6XTYSnJs6XXo="