Skip to content

Commit 83500fb

Browse files
dimiandredimiandre
committed
Merge branch 'main' into release/v28
2 parents 75bb6c6 + 4276738 commit 83500fb

File tree

6 files changed

+83
-16
lines changed

6 files changed

+83
-16
lines changed

‎.github/workflows/release-dispatch.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Dispatch Release to juno-std
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
env:
8+
JUNO_REPO: "https://github.com/CosmosContracts/juno.git"
9+
JUNO_DIR: "../dependencies/juno/"
10+
COSMOS_SDK_REPO: "https://github.com/cosmos/cosmos-sdk.git"
11+
COSMOS_SDK_REV: "v0.50.11"
12+
COSMOS_SDK_DIR: "../dependencies/cosmos-sdk/"
13+
WASMD_REPO: "https://github.com/CosmWasm/wasmd.git"
14+
WASMD_REV: "v0.54.0"
15+
WASMD_DIR: "../dependencies/wasmd/"
16+
COMETBFT_REPO: "https://github.com/cometbft/cometbft.git"
17+
COMETBFT_REV: "v0.38.17"
18+
COMETBFT_DIR: "../dependencies/cometbft/"
19+
IBC_GO_REPO: "https://github.com/cosmos/ibc-go.git"
20+
IBC_GO_REV: "v8.5.3"
21+
IBC_GO_DIR: "../dependencies/ibc-go/"
22+
ICS23_REPO: "https://github.com/cosmos/ics23.git"
23+
ICS23_REV: "go/v0.11.0"
24+
ICS23_DIR: "../dependencies/ics23/"
25+
26+
jobs:
27+
dispatch:
28+
runs-on: ubuntu-latest
29+
steps:
30+
- name: Build repo_config JSON
31+
id: build_repo_config
32+
env:
33+
GITHUB_EVENT_RELEASE_TAG: ${{ github.event.release.tag_name }}
34+
run: |
35+
printf '[\n {"name": "juno", "repo": "%s", "rev": "%s", "dir": "%s", "exclude_mods": [], "is_main": true},\n {"name": "cosmos-sdk", "repo": "%s", "rev": "%s", "dir": "%s", "exclude_mods": ["reflection", "autocli"], "is_main": false},\n {"name": "wasmd", "repo": "%s", "rev": "%s", "dir": "%s", "exclude_mods": [], "is_main": false},\n {"name": "cometbft", "repo": "%s", "rev": "%s", "dir": "%s", "exclude_mods": [], "is_main": false},\n {"name": "ibc-go", "repo": "%s", "rev": "%s", "dir": "%s", "exclude_mods": [], "is_main": false},\n {"name": "ics23", "repo": "%s", "rev": "%s", "dir": "%s", "exclude_mods": [], "is_main": false}\n]\n' \
36+
"$JUNO_REPO" "$GITHUB_EVENT_RELEASE_TAG" "$JUNO_DIR" \
37+
"$COSMOS_SDK_REPO" "$COSMOS_SDK_REV" "$COSMOS_SDK_DIR" \
38+
"$WASMD_REPO" "$WASMD_REV" "$WASMD_DIR" \
39+
"$COMETBFT_REPO" "$COMETBFT_REV" "$COMETBFT_DIR" \
40+
"$IBC_GO_REPO" "$IBC_GO_REV" "$IBC_GO_DIR" \
41+
"$ICS23_REPO" "$ICS23_REV" "$ICS23_DIR" > repo_config.json
42+
cat repo_config.json
43+
echo "json=$(cat repo_config.json)" >> $GITHUB_OUTPUT
44+
shell: bash
45+
46+
- name: Dispatch release event with repo_config
47+
uses: peter-evans/repository-dispatch@v3
48+
with:
49+
token: ${{ secrets.DISPATCH_TOKEN }}
50+
repository: CosmosContracts/juno-std
51+
event-type: juno-release
52+
client-payload: |
53+
{
54+
"is_draft": "${{ github.event.release.draft }}",
55+
"is_prerelease": "${{ github.event.release.prerelease }}",
56+
"release_tag": "${{ github.event.release.tag_name }}",
57+
"repo_config": "${{ steps.build_repo_config.outputs.json }}"
58+
}

‎app/keepers/keepers.go‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package keepers
22

33
import (
4+
"fmt"
45
"math"
5-
"path/filepath"
6+
"path"
67

78
"github.com/CosmWasm/wasmd/x/wasm"
89
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
910
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
11+
wasmvm "github.com/CosmWasm/wasmvm/v2"
1012
"github.com/prometheus/client_golang/prometheus"
1113
"github.com/spf13/cast"
1214

@@ -218,7 +220,8 @@ func NewAppKeepers(
218220
bech32Prefix := sdk.GetConfig().GetBech32AccountAddrPrefix()
219221
ac := authcodec.NewBech32Codec(bech32Prefix)
220222
invCheckPeriod := cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod))
221-
dataDir := filepath.Join(homePath, "data")
223+
dataDir := path.Join(homePath, "data")
224+
wasmDir := path.Join(dataDir, "wasm")
222225

223226
// set the BaseApp's parameter store
224227
appKeepers.ConsensusParamsKeeper = consensusparamkeeper.NewKeeper(
@@ -534,6 +537,12 @@ func NewAppKeepers(
534537
}
535538
wasmOpts = append(wasmOpts, wasmkeeper.WithGasRegister(NewJunoWasmGasRegister()))
536539

540+
wasmer, err := wasmvm.NewVM(wasmDir, wasmCapabilities, 32, wasmConfig.ContractDebugMode, wasmConfig.MemoryCacheSize)
541+
if err != nil {
542+
panic(fmt.Sprintf("failed to create juno wasmvm: %s", err))
543+
}
544+
wasmOpts = append(wasmOpts, wasmkeeper.WithWasmEngine(wasmer))
545+
537546
appKeepers.WasmKeeper = wasmkeeper.NewKeeper(
538547
appCodec,
539548
runtime.NewKVStoreService(appKeepers.keys[wasmtypes.StoreKey]),

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ require (
2525
github.com/cosmos/cosmos-db v1.1.1
2626
github.com/cosmos/cosmos-sdk v0.50.11
2727
github.com/cosmos/gogoproto v1.7.0
28-
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.1.1
28+
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.2.0
2929
github.com/cosmos/ibc-apps/modules/async-icq/v8 v8.0.1-0.20240124225747-f055ce5b405c
30-
github.com/cosmos/ibc-apps/modules/ibc-hooks/v8 v8.0.0-20250211213414-515bdcaf73ac
30+
github.com/cosmos/ibc-apps/modules/ibc-hooks/v8 v8.0.0
3131
github.com/cosmos/ibc-go/modules/capability v1.0.1
32-
github.com/cosmos/ibc-go/v8 v8.5.3
32+
github.com/cosmos/ibc-go/v8 v8.7.0
3333
github.com/golang/protobuf v1.5.4
3434
github.com/grpc-ecosystem/grpc-gateway v1.16.0
3535
github.com/prometheus/client_golang v1.20.5

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -378,16 +378,16 @@ github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fr
378378
github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0=
379379
github.com/cosmos/iavl v1.2.4 h1:IHUrG8dkyueKEY72y92jajrizbkZKPZbMmG14QzsEkw=
380380
github.com/cosmos/iavl v1.2.4/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw=
381-
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.1.1 h1:+EGYrTsQ2hu8pBwCWAgqc0g/zSklvBFehda9URLfvOU=
382-
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.1.1/go.mod h1:8sbOclBgOCgBPesufd3ZlLRHvJ3dOeN9+dXhn3KbKOc=
381+
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.2.0 h1:rM+S14DFiqmu6Rc3PuhvWqwywPsnt/CbIslSnBftPFs=
382+
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.2.0/go.mod h1:O5H9Ic3Pe6cmJn1eqlj5N48sLb8WQ1VWmDP4/11g/4E=
383383
github.com/cosmos/ibc-apps/modules/async-icq/v8 v8.0.1-0.20240124225747-f055ce5b405c h1:44QAwcoTqB1jT6p7IogVKZwdKVZykX2fg+iU0Q/LTZ0=
384384
github.com/cosmos/ibc-apps/modules/async-icq/v8 v8.0.1-0.20240124225747-f055ce5b405c/go.mod h1:D3Q380FpWRFtmUQWLosPxachi6w24Og2t5u/Tww5wtY=
385-
github.com/cosmos/ibc-apps/modules/ibc-hooks/v8 v8.0.0-20250211213414-515bdcaf73ac h1:iudNpWmHGPglQ5vbeLzStgGdjgHDoKqiaqhJ9k4RDkg=
386-
github.com/cosmos/ibc-apps/modules/ibc-hooks/v8 v8.0.0-20250211213414-515bdcaf73ac/go.mod h1:9+Z14xz3Y+5uEn5i1CvLcDN1aTthEhYUdI7pphySkY8=
385+
github.com/cosmos/ibc-apps/modules/ibc-hooks/v8 v8.0.0 h1:RBUq0cC9HJ9iIhifdWbV+kjDExzfhmAB7ktOAU1RWPU=
386+
github.com/cosmos/ibc-apps/modules/ibc-hooks/v8 v8.0.0/go.mod h1:6szYOdzw0cUzFj8ZW+qfss0b4mMN1/HWxPATKZKbCfI=
387387
github.com/cosmos/ibc-go/modules/capability v1.0.1 h1:ibwhrpJ3SftEEZRxCRkH0fQZ9svjthrX2+oXdZvzgGI=
388388
github.com/cosmos/ibc-go/modules/capability v1.0.1/go.mod h1:rquyOV262nGJplkumH+/LeYs04P3eV8oB7ZM4Ygqk4E=
389-
github.com/cosmos/ibc-go/v8 v8.5.3 h1:VF1Vq3/zZB40eeFvx4wI4WmlJGGF74o+/MxcPxQ2mWY=
390-
github.com/cosmos/ibc-go/v8 v8.5.3/go.mod h1:P5hkAvq0Qbg0h18uLxDVA9q1kOJ0l36htMsskiNwXbo=
389+
github.com/cosmos/ibc-go/v8 v8.7.0 h1:HqhVOkO8bDpClXE81DFQgFjroQcTvtpm0tCS7SQVKVY=
390+
github.com/cosmos/ibc-go/v8 v8.7.0/go.mod h1:G2z+Q6ZQSMcyHI2+BVcJdvfOupb09M2h/tgpXOEdY6k=
391391
github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU=
392392
github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0=
393393
github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo=

‎interchaintest/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ replace (
66
github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d
77
github.com/ChainSafe/go-schnorrkel/1 => github.com/ChainSafe/go-schnorrkel v1.0.0
88
// For this nested module, you always want to replace the parent reference with the current worktree.
9-
github.com/CosmosContracts/juno/v28 v28.0.0 => ../
9+
github.com/CosmosContracts/juno/v28 v28.0.1 => ../
1010
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
1111
)
1212

1313
require (
1414
cosmossdk.io/math v1.5.0
1515
cosmossdk.io/x/upgrade v0.1.4
1616
github.com/CosmWasm/wasmd v0.54.0
17-
github.com/CosmosContracts/juno/v28 v28.0.0
17+
github.com/CosmosContracts/juno/v28 v28.0.1
1818
github.com/cosmos/cosmos-sdk v0.50.11
19-
github.com/cosmos/ibc-go/v8 v8.5.3
19+
github.com/cosmos/ibc-go/v8 v8.7.0
2020
github.com/docker/docker v24.0.9+incompatible
2121
github.com/strangelove-ventures/interchaintest/v8 v8.8.1
2222
github.com/stretchr/testify v1.10.0

‎interchaintest/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,8 +408,8 @@ github.com/cosmos/iavl v1.2.4 h1:IHUrG8dkyueKEY72y92jajrizbkZKPZbMmG14QzsEkw=
408408
github.com/cosmos/iavl v1.2.4/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw=
409409
github.com/cosmos/ibc-go/modules/capability v1.0.1 h1:ibwhrpJ3SftEEZRxCRkH0fQZ9svjthrX2+oXdZvzgGI=
410410
github.com/cosmos/ibc-go/modules/capability v1.0.1/go.mod h1:rquyOV262nGJplkumH+/LeYs04P3eV8oB7ZM4Ygqk4E=
411-
github.com/cosmos/ibc-go/v8 v8.5.3 h1:VF1Vq3/zZB40eeFvx4wI4WmlJGGF74o+/MxcPxQ2mWY=
412-
github.com/cosmos/ibc-go/v8 v8.5.3/go.mod h1:P5hkAvq0Qbg0h18uLxDVA9q1kOJ0l36htMsskiNwXbo=
411+
github.com/cosmos/ibc-go/v8 v8.7.0 h1:HqhVOkO8bDpClXE81DFQgFjroQcTvtpm0tCS7SQVKVY=
412+
github.com/cosmos/ibc-go/v8 v8.7.0/go.mod h1:G2z+Q6ZQSMcyHI2+BVcJdvfOupb09M2h/tgpXOEdY6k=
413413
github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU=
414414
github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0=
415415
github.com/cosmos/interchain-security/v5 v5.1.1 h1:xmRRMeE4xoc+JAZUh0XzXFYWaGBtzFFj5SETuOgnEnY=

0 commit comments

Comments
 (0)