Skip to content

Commit ed1728e

Browse files
beer-1Vritra4
andauthored
chores: bump deps and update swagger (#92)
* bump deps and update swagger * fix lint * bump kvindexer and submodules * update readme --------- Co-authored-by: Geoff Lee <[email protected]>
1 parent d01ae95 commit ed1728e

21 files changed

+1109
-240
lines changed

.github/workflows/build-darwin-amd64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@v4
1717
with:
18-
go-version: "1.22"
18+
go-version: "1.23"
1919

2020
- name: Set environment variables
2121
run: |

.github/workflows/build-darwin-arm64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Set up Go
1515
uses: actions/setup-go@v4
1616
with:
17-
go-version: "1.22"
17+
go-version: "1.23"
1818
- name: Set environment variables
1919
run: |
2020
MINIWASM_NETWORK_NAME="miniwasm-1"

.github/workflows/build-linux-amd64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Set up Go
1313
uses: actions/setup-go@v4
1414
with:
15-
go-version: "1.22"
15+
go-version: "1.23"
1616

1717
- name: Set environment variables
1818
run: |

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828
- uses: actions/setup-go@v3
2929
with:
30-
go-version: 1.22
30+
go-version: 1.23
3131
- name: Install openssl
3232
run: sudo apt-get install libssl-dev
3333
- uses: actions/checkout@v3

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22-alpine3.19 AS go-builder
1+
FROM golang:1.23-alpine AS go-builder
22
#ARG arch=x86_64
33

44
# See https://github.com/CosmWasm/wasmvm/releases

Dockerfile.arm64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM arm64v8/golang:1.22-bullseye AS go-builder
1+
FROM arm64v8/golang:1.23-bullseye AS go-builder
22

33
# Install minimum necessary dependencies, build Cosmos SDK, remove packages
44
RUN apt update

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ MiniWasm is an optimistic rollup consumer chain powered by WasmVM, designed to s
44

55
## Prerequisites
66

7-
- Go v1.22.7+
7+
- Go v1.23.3+
88

99
## Getting Started
1010

app/blocksdk.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,16 +130,20 @@ func setupBlockSDK(
130130
app.BaseApp.CheckTx,
131131
)
132132
checkTxHandler := blockchecktx.NewMempoolParityCheckTx(
133-
app.Logger(), mempool,
134-
app.txConfig.TxDecoder(), mevCheckTx.CheckTx(),
133+
app.Logger(),
134+
mempool,
135+
app.txConfig.TxDecoder(),
136+
mevCheckTx.CheckTx(),
137+
app.BaseApp,
135138
)
136139
checkTx := checkTxHandler.CheckTx()
137140

138-
proposalHandler := blockabci.NewProposalHandler(
141+
proposalHandler := blockabci.New(
139142
app.Logger(),
140143
app.txConfig.TxDecoder(),
141144
app.txConfig.TxEncoder(),
142145
mempool,
146+
true,
143147
)
144148

145149
prepareProposalHandler := proposalHandler.PrepareProposalHandler()

app/ibc-hooks/ack_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func Test_OnAckPacket_ICS721(t *testing.T) {
132132
_, _, addr := keyPubAddr()
133133
_, _, addr2 := keyPubAddr()
134134

135-
data := nfttransfertypes.NonFungibleTokenPacketDataWasm{
135+
data := nfttransfertypes.NonFungibleTokenPacketData{
136136
ClassId: "classId",
137137
ClassUri: "classUri",
138138
ClassData: "classData",
@@ -184,7 +184,7 @@ func Test_OnAckPacket_memo_ICS721(t *testing.T) {
184184
contractAddr, err := sdk.AccAddressFromBech32(contractAddrBech32)
185185
require.NoError(t, err)
186186

187-
data := nfttransfertypes.NonFungibleTokenPacketDataWasm{
187+
data := nfttransfertypes.NonFungibleTokenPacketData{
188188
ClassId: "classId",
189189
ClassUri: "classUri",
190190
ClassData: "classData",

app/ibc-hooks/receive_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func Test_OnReceivePacket_ICS721(t *testing.T) {
129129
_, _, addr := keyPubAddr()
130130
_, _, addr2 := keyPubAddr()
131131

132-
data := nfttransfertypes.NonFungibleTokenPacketDataWasm{
132+
data := nfttransfertypes.NonFungibleTokenPacketData{
133133
ClassId: "classId",
134134
ClassUri: "classUri",
135135
ClassData: "classData",
@@ -176,7 +176,7 @@ func Test_onReceivePacket_memo_ICS721(t *testing.T) {
176176
require.NoError(t, err)
177177

178178
contractAddrBech32 := instantiateRes.Address
179-
data := nfttransfertypes.NonFungibleTokenPacketDataWasm{
179+
data := nfttransfertypes.NonFungibleTokenPacketData{
180180
ClassId: "classId",
181181
ClassUri: "classUri",
182182
ClassData: "classData",

app/ibc-hooks/timeout_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func Test_OnTimeoutPacket_ICS721(t *testing.T) {
113113
_, _, addr := keyPubAddr()
114114
_, _, addr2 := keyPubAddr()
115115

116-
data := nfttransfertypes.NonFungibleTokenPacketDataWasm{
116+
data := nfttransfertypes.NonFungibleTokenPacketData{
117117
ClassId: "classId",
118118
ClassUri: "classUri",
119119
ClassData: "classData",
@@ -162,7 +162,7 @@ func Test_OnTimeoutPacket_memo_ICS721(t *testing.T) {
162162
contractAddr, err := sdk.AccAddressFromBech32(contractAddrBech32)
163163
require.NoError(t, err)
164164

165-
data := nfttransfertypes.NonFungibleTokenPacketDataWasm{
165+
data := nfttransfertypes.NonFungibleTokenPacketData{
166166
ClassId: "classId",
167167
ClassUri: "classUri",
168168
ClassData: "classData",

app/ibc-hooks/util.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,12 @@ func isIcs20Packet(packetData []byte) (isIcs20 bool, ics20data transfertypes.Fun
3939
return true, data
4040
}
4141

42-
const wasmPortPrefix = "wasm."
43-
4442
func isIcs721Packet(packetData []byte) (isIcs721 bool, ics721data nfttransfertypes.NonFungibleTokenPacketData) {
4543
// Use wasm port prefix to ack like normal wasm chain.
4644
//
4745
// initia l1 is handling encoding and decoding depends on port id,
4846
// so miniwasm should ack like normal wasm chain.
49-
if data, err := nfttransfertypes.DecodePacketData(packetData, wasmPortPrefix); err != nil {
47+
if data, err := nfttransfertypes.DecodePacketData(packetData); err != nil {
5048
return false, data
5149
} else {
5250
return true, data

app/ibc-hooks/util_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func Test_isIcs20Packet(t *testing.T) {
3535
func Test_isIcs721Packet(t *testing.T) {
3636
nftTransferMsg := nfttransfertypes.NewNonFungibleTokenPacketData("class_id", "uri", "data", []string{"1", "2", "3"}, []string{"uri1", "uri2", "uri3"}, []string{"data1", "data2", "data3"}, "sender", "receiver", "memo")
3737

38-
ok, _nftTransferMsg := isIcs721Packet(nftTransferMsg.GetBytes(wasmPortPrefix))
38+
ok, _nftTransferMsg := isIcs721Packet(nftTransferMsg.GetBytes())
3939
require.True(t, ok)
4040
require.Equal(t, nftTransferMsg, _nftTransferMsg)
4141

app/keepers/keepers.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ import (
9696
tokenfactorytypes "github.com/initia-labs/miniwasm/x/tokenfactory/types"
9797

9898
// noble forwarding keeper
99-
forwarding "github.com/noble-assets/forwarding/v2/x/forwarding"
100-
forwardingkeeper "github.com/noble-assets/forwarding/v2/x/forwarding/keeper"
101-
forwardingtypes "github.com/noble-assets/forwarding/v2/x/forwarding/types"
99+
forwarding "github.com/noble-assets/forwarding/v2"
100+
forwardingkeeper "github.com/noble-assets/forwarding/v2/keeper"
101+
forwardingtypes "github.com/noble-assets/forwarding/v2/types"
102102
// kvindexer
103103
)
104104

@@ -317,7 +317,7 @@ func NewAppKeeper(
317317
authorityAddr,
318318
)
319319

320-
appKeepers.IBCKeeper.ClientKeeper.WithPostUpdateHandler(
320+
appKeepers.IBCKeeper.ClientKeeper.SetPostUpdateHandler(
321321
appKeepers.OPChildKeeper.UpdateHostValidatorSet,
322322
)
323323

app/keepers/keys.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343
tokenfactorytypes "github.com/initia-labs/miniwasm/x/tokenfactory/types"
4444

4545
// noble forwarding keeper
46-
forwardingtypes "github.com/noble-assets/forwarding/v2/x/forwarding/types"
46+
forwardingtypes "github.com/noble-assets/forwarding/v2/types"
4747
)
4848

4949
func (appKeepers *AppKeepers) GenerateKeys() {

app/modules.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ import (
6565
tokenfactorytypes "github.com/initia-labs/miniwasm/x/tokenfactory/types"
6666

6767
// noble forwarding keeper
68-
forwarding "github.com/noble-assets/forwarding/v2/x/forwarding"
69-
forwardingtypes "github.com/noble-assets/forwarding/v2/x/forwarding/types"
68+
forwarding "github.com/noble-assets/forwarding/v2"
69+
forwardingtypes "github.com/noble-assets/forwarding/v2/types"
7070
)
7171

7272
// module account permissions

client/docs/statik/statik.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)