Skip to content

Commit 14b941d

Browse files
authored
feat(uniond): upgrade cosmos sdk to v0.50.2 (#1072)
- Upgraded the ref of our cosmos-sdk fork - Re-vendored - Replaced deprecated `vendorSha256` with recommended `vendorHash` throughout the repository <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Refactor** - Replaced `vendorSha256` with `vendorHash` in multiple files for improved hash handling and build configuration. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
2 parents 419061a + f3f39b7 commit 14b941d

File tree

25 files changed

+1875
-34
lines changed

25 files changed

+1875
-34
lines changed

faucet/faucet.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
let
44
faucet = pkgs.buildGoModule {
55
name = "faucet";
6-
vendorSha256 = "sha256-LDu9GSgMsCHTk5K7hsEhLg36SatUpgQZrOdEvuPSM84=";
6+
vendorHash = "sha256-LDu9GSgMsCHTk5K7hsEhLg36SatUpgQZrOdEvuPSM84=";
77
meta.mainProgram = "cosmos-faucet";
88
version = "2.0.0";
99
src = pkgs.fetchFromGitHub {

galoisd/galoisd.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
galoisd = goPkgs.buildGoModule ({
66
name = "galoisd";
77
src = ./.;
8-
vendorSha256 = null;
8+
vendorHash = null;
99
doCheck = false;
1010
meta = {
1111
mainProgram = "galoisd";

uniond/go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ require (
5050
filippo.io/edwards25519 v1.0.0 // indirect
5151
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
5252
github.com/99designs/keyring v1.2.2 // indirect
53+
github.com/DataDog/datadog-go v3.2.0+incompatible // indirect
5354
github.com/DataDog/zstd v1.5.5 // indirect
5455
github.com/aws/aws-sdk-go v1.44.224 // indirect
5556
github.com/beorn7/perks v1.0.1 // indirect
@@ -223,7 +224,7 @@ replace (
223224
github.com/consensys/gnark => github.com/consensys/gnark v0.9.1-0.20231013131835-4ebcccd9c0a8
224225
// Fork of gnark crypto until https://github.com/ConsenSys/gnark-crypto/pull/314 is merged
225226
github.com/consensys/gnark-crypto => github.com/unionlabs/gnark-crypto v0.0.0-20231016072529-15c0507b6578
226-
github.com/cosmos/cosmos-sdk => github.com/unionlabs/cosmos-sdk v0.0.0-20231225095328-c14fbca9a01d
227+
github.com/cosmos/cosmos-sdk => github.com/unionlabs/cosmos-sdk v0.0.0-20231226054635-49629fac4b8d
227228
github.com/cosmos/ibc-go/modules/light-clients/08-wasm => github.com/unionlabs/ibc-go/modules/light-clients/08-wasm v0.0.0-20231219091832-0947f2e3d1aa
228229

229230
github.com/cosmos/ibc-go/v8 => github.com/unionlabs/ibc-go/v8 v8.0.0-20231219091832-0947f2e3d1aa

uniond/go.sum

+3-2
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ github.com/CosmWasm/wasmd v0.50.0 h1:NVaGqCSTRfb9UTDHJwT6nQIWcb6VjlQl88iI+u1+qjE
234234
github.com/CosmWasm/wasmd v0.50.0/go.mod h1:UjmShW4l9YxaMytwJZ7IB7MWzHiynSZP3DdWrG0FRtk=
235235
github.com/CosmWasm/wasmvm v1.5.0 h1:3hKeT9SfwfLhxTGKH3vXaKFzBz1yuvP8SlfwfQXbQfw=
236236
github.com/CosmWasm/wasmvm v1.5.0/go.mod h1:fXB+m2gyh4v9839zlIXdMZGeLAxqUdYdFQqYsTha2hc=
237+
github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4=
237238
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
238239
github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ=
239240
github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
@@ -1081,8 +1082,8 @@ github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
10811082
github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
10821083
github.com/unionlabs/cometbls v0.0.0-20231225001748-d638e57b7566 h1:OWKrbO4k1RdsNo4I9lva2QAGrgaw5bAcxjQoUSpiYEY=
10831084
github.com/unionlabs/cometbls v0.0.0-20231225001748-d638e57b7566/go.mod h1:3H1gcLEVOQZbPwdH8gyv4UzwHtEawNgcnytglkCQVOQ=
1084-
github.com/unionlabs/cosmos-sdk v0.0.0-20231225095328-c14fbca9a01d h1:34wxccyIPXNu8pFfMB81xiMB7/lE7dT5eiXFJgOJg9o=
1085-
github.com/unionlabs/cosmos-sdk v0.0.0-20231225095328-c14fbca9a01d/go.mod h1:swjtSL97Uhk3ZDjJyvOuiJKXk8MO77E/Ci+HAIX9UTM=
1085+
github.com/unionlabs/cosmos-sdk v0.0.0-20231226054635-49629fac4b8d h1:DhvNZ1QHbbf0FilDJYoyUN5u3WjqhjydbBWu194GJl8=
1086+
github.com/unionlabs/cosmos-sdk v0.0.0-20231226054635-49629fac4b8d/go.mod h1:7APxtjR0pTYrLeTG/iMp77at8y8BoUttNGjMkxQUAVo=
10861087
github.com/unionlabs/gnark-crypto v0.0.0-20231016072529-15c0507b6578 h1:Owzup0XvshGNHgS1s0xUI/mZM+fPvTT7dLg7P0cT2vQ=
10871088
github.com/unionlabs/gnark-crypto v0.0.0-20231016072529-15c0507b6578/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY=
10881089
github.com/unionlabs/ibc-go/modules/light-clients/08-wasm v0.0.0-20231219091832-0947f2e3d1aa h1:pzXp42whoLAzvNkdJHPnWPzWAN2iDtqAFoN/BksxmAE=

uniond/proto.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
sha256 = "sha256-jJWqkMEBAJq50KaXccVpmgx/hwTdKgTtNkz8/xYO+Dc=";
1919
};
2020

21-
vendorSha256 = "sha256-jVOb2uHjPley+K41pV+iMPNx67jtb75Rb/ENhw+ZMoM=";
21+
vendorHash = "sha256-jVOb2uHjPley+K41pV+iMPNx67jtb75Rb/ENhw+ZMoM=";
2222
};
2323

2424
cosmos-proto = pkgs.buildGoModule {
@@ -32,7 +32,7 @@
3232
};
3333
doCheck = false;
3434

35-
vendorSha256 = "sha256-7kDz0RAon2L/3NTHIxya8nWMyN28G9rAfqUu+lbkea4=";
35+
vendorHash = "sha256-7kDz0RAon2L/3NTHIxya8nWMyN28G9rAfqUu+lbkea4=";
3636
};
3737

3838
gogoproto = pkgs.buildGoModule {
@@ -47,7 +47,7 @@
4747
nativeBuildInputs = with pkgs; [ protobuf ];
4848
doCheck = false;
4949

50-
vendorSha256 = "sha256-nfeqVsPMQz7EL+qWxFzRukCE3YqXErhS9urRaJo44Fg=";
50+
vendorHash = "sha256-nfeqVsPMQz7EL+qWxFzRukCE3YqXErhS9urRaJo44Fg=";
5151
};
5252
generate-uniond-proto = pkgs.stdenv.mkDerivation {
5353
name = "generate-uniond-proto";

uniond/uniond.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
(nix-filter.matchExt "md")
6262
];
6363
};
64-
vendorSha256 = null;
64+
vendorHash = null;
6565
doCheck = true;
6666
meta.mainProgram = "uniond";
6767
} // (
@@ -116,7 +116,7 @@
116116
rev = "a1ea6c775ac230bb1a1428bb96e4306044aa944b";
117117
sha256 = "sha256-7AdE5qps4OMjaubt9Af6ATaqrV3n73ZuI7zTz7Kgm6w=";
118118
};
119-
vendorSha256 = null;
119+
vendorHash = null;
120120
};
121121

122122
# must be run from a directory with vendor/

uniond/vendor/github.com/DataDog/datadog-go/LICENSE.txt

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

uniond/vendor/github.com/DataDog/datadog-go/statsd/README.md

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

uniond/vendor/github.com/DataDog/datadog-go/statsd/buffer.go

+130
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

uniond/vendor/github.com/DataDog/datadog-go/statsd/buffer_pool.go

+40
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

uniond/vendor/github.com/DataDog/datadog-go/statsd/event.go

+91
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)