Skip to content

Commit 95515a4

Browse files
author
valdok
committed
Merge branch 'master' into testnet
2 parents 77bc2ef + aedf7c4 commit 95515a4

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,4 @@ x/compute/internal/keeper/testdata/test-contract/target
4545
x/compute/internal/keeper/testdata/v1-sanity-contract/target
4646
build
4747
check-hw/target
48+
cmd/secretd/__debug*

.vscode/launch.json

+9-8
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,15 @@
3737
"program": "${workspaceFolder}/cmd/secretd",
3838
"cwd": "${workspaceFolder}",
3939
"args": [
40-
"q",
41-
"compute",
42-
"tx",
43-
"9FAF715EA6671A17521FBC4D52AD391B72B6AADD102481B071DD80F34C50E79F",
44-
"--node",
45-
"http://localhost:26657",
46-
"--chain-id",
47-
"secretdev-1"
40+
"rosetta",
41+
"--blockchain",
42+
"secret",
43+
"--network",
44+
"secret-4",
45+
"--tendermint",
46+
"89.149.206.162:26657",
47+
"--grpc",
48+
"89.149.206.162:9090"
4849
]
4950
}
5051
]

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.21
44

55
replace (
66
github.com/cometbft/cometbft => github.com/scrtlabs/tendermint v1.9.0-scrt.0.20230802144651-d62916253d52
7-
github.com/cosmos/cosmos-sdk => github.com/scrtlabs/cosmos-sdk v0.45.13-0.20230802150248-ea64f27dc58d
7+
github.com/cosmos/cosmos-sdk => github.com/scrtlabs/cosmos-sdk v0.45.13-0.20240123105116-fa873fadfa55
88
// PFM: v4.1.1 + https://github.com/cosmos/ibc-apps/commit/455757bb5771c29cf2f83b59e37f6513e07c92be.patch
99
github.com/cosmos/ibc-apps/v4 => github.com/scrtlabs/ibc-apps/v4 v4.1.2-0.20240312165106-908dc3766519
1010
// Fix OSX Ledger Connection Issues - Premerged https://github.com/cosmos/ledger-cosmos-go/pull/36/files
@@ -20,7 +20,7 @@ require (
2020
github.com/cosmos/cosmos-sdk v0.45.16
2121
github.com/cosmos/go-bip39 v1.0.0
2222
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4 v4.1.1
23-
github.com/cosmos/ibc-go/v4 v4.5.1
23+
github.com/cosmos/ibc-go/v4 v4.6.0
2424
github.com/gogo/protobuf v1.3.3
2525
github.com/golang/protobuf v1.5.3
2626
github.com/google/gofuzz v1.2.0

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ github.com/cosmos/iavl v0.19.6 h1:XY78yEeNPrEYyNCKlqr9chrwoeSDJ0bV2VjocTk//OU=
243243
github.com/cosmos/iavl v0.19.6/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
244244
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4 v4.1.1 h1:TeiMKG56Kg+lqw/+08dfusInebjVagr9v75sP2GJo6w=
245245
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4 v4.1.1/go.mod h1:mFk2qfXAm7ndXQQuXUGm9tlC2OM9jxPQb5PRKEHNU5I=
246-
github.com/cosmos/ibc-go/v4 v4.5.1 h1:+P73X7aIikGAXBUJ9vP9rEbvdSuekt3KGXmAWCSYets=
247-
github.com/cosmos/ibc-go/v4 v4.5.1/go.mod h1:2EOi40Bx/j6rJrtP1ui8k8yUAMpGybmL1EjakYqYv5U=
246+
github.com/cosmos/ibc-go/v4 v4.6.0 h1:G7kiD4Zf8Wrxc8BXWIKuFnzI0W4wpvRPrl5HwdfTIsA=
247+
github.com/cosmos/ibc-go/v4 v4.6.0/go.mod h1:ksiZHUypws0NVP50E3ea0ivVFO/bfS8q8yLg8yZ2ATQ=
248248
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
249249
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
250250
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -935,8 +935,8 @@ github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71e
935935
github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
936936
github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
937937
github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
938-
github.com/scrtlabs/cosmos-sdk v0.45.13-0.20230802150248-ea64f27dc58d h1:J52TETA52GtOOCBYPfmZoOOSM7Nr/GjhsH6RvdaHKMU=
939-
github.com/scrtlabs/cosmos-sdk v0.45.13-0.20230802150248-ea64f27dc58d/go.mod h1:kOvNW8eRcR6zcO9yEfDa+iexTXdb+/QxHL1OqSEqfAo=
938+
github.com/scrtlabs/cosmos-sdk v0.45.13-0.20240123105116-fa873fadfa55 h1:DEIQb8TEZOtTVFf2gmj43T96OZKFMEqLvMVWwp6Dz5Q=
939+
github.com/scrtlabs/cosmos-sdk v0.45.13-0.20240123105116-fa873fadfa55/go.mod h1:kOvNW8eRcR6zcO9yEfDa+iexTXdb+/QxHL1OqSEqfAo=
940940
github.com/scrtlabs/tendermint v1.9.0-scrt.0.20230802144651-d62916253d52 h1:25rvoh2dQgzOOGPj/t1tPKApeeRrcUZtQXZ6wu6mE54=
941941
github.com/scrtlabs/tendermint v1.9.0-scrt.0.20230802144651-d62916253d52/go.mod h1:H9SALxhCLtq/RwZLDUo/A7q7ri4GSDeZzJDx/mqA23E=
942942
github.com/scrtlabs/tm-secret-enclave v1.11.1 h1:UFPMS8XGrgx0SVTcHF0JmM/7nw17sQRMJ3PCg6rlGQA=

0 commit comments

Comments
 (0)