Skip to content

Commit a84d9df

Browse files
beer-1beer-1
authored
chores: bump deps (#156)
* update deps * update swagger docs * add forwarding pubkey to sigverify
1 parent 07e80e0 commit a84d9df

23 files changed

+1080
-355
lines changed

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

+1-1
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

+1-1
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="minievm-1"

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

+1-1
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

+1-1
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

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ update-swagger-docs: statik
144144
### Protobuf ###
145145
###############################################################################
146146

147-
protoVer=0.15.3
147+
protoVer=0.14.0
148148
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
149149
protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
150150

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ MiniEVM is an optimistic rollup consumer chain powered by EVM, designed to simpl
66

77
## Prerequisites
88

9-
- Go v1.22.7+
9+
- Go v1.23.3+
1010
- (optional) [solc-select](https://github.com/crytic/solc-select) v1.0.4+ (used in contractsgen.sh)
1111

1212
## Getting Started

‎app/ante/sigverify.go

+5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import (
2323

2424
"github.com/initia-labs/initia/crypto/ethsecp256k1"
2525
evmkeeper "github.com/initia-labs/minievm/x/evm/keeper"
26+
27+
forwardingtypes "github.com/noble-assets/forwarding/v2/types"
2628
)
2729

2830
// SigVerificationDecorator verifies all signatures for a tx and return an error if any are invalid. Note,
@@ -176,6 +178,9 @@ func DefaultSigVerificationGasConsumer(
176178
}
177179
return nil
178180

181+
case *forwardingtypes.ForwardingPubKey:
182+
return nil
183+
179184
default:
180185
return errorsmod.Wrapf(sdkerrors.ErrInvalidPubKey, "unrecognized public key type: %T", pubkey)
181186
}

‎app/blocksdk.go

+7-3
Original file line numberDiff line numberDiff line change
@@ -132,16 +132,20 @@ func setupBlockSDK(
132132
app.BaseApp.CheckTx,
133133
)
134134
checkTxHandler := blockchecktx.NewMempoolParityCheckTx(
135-
app.Logger(), mempool,
136-
app.txConfig.TxDecoder(), mevCheckTx.CheckTx(),
135+
app.Logger(),
136+
mempool,
137+
app.txConfig.TxDecoder(),
138+
mevCheckTx.CheckTx(),
139+
app.BaseApp,
137140
)
138141
checkTx := checkTxHandler.CheckTx()
139142

140-
proposalHandler := blockabci.NewProposalHandler(
143+
proposalHandler := blockabci.New(
141144
app.Logger(),
142145
app.txConfig.TxDecoder(),
143146
app.txConfig.TxEncoder(),
144147
mempool,
148+
true,
145149
)
146150

147151
prepareProposalHandler := proposalHandler.PrepareProposalHandler()

‎app/ibc-hooks/hooks.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (h EVMHooks) OnRecvPacketOverride(im ibchooks.IBCMiddleware, ctx sdk.Contex
4646
return h.onRecvIcs20Packet(ctx, im, packet, relayer, ics20Data)
4747
}
4848

49-
if isIcs721, ics721Data := isIcs721Packet(packet.GetData(), packet.GetSourcePort()); isIcs721 {
49+
if isIcs721, ics721Data := isIcs721Packet(packet.GetData()); isIcs721 {
5050
return h.onRecvIcs721Packet(ctx, im, packet, relayer, ics721Data)
5151
}
5252

@@ -58,7 +58,7 @@ func (h EVMHooks) OnAcknowledgementPacketOverride(im ibchooks.IBCMiddleware, ctx
5858
return h.onAckIcs20Packet(ctx, im, packet, acknowledgement, relayer, ics20Data)
5959
}
6060

61-
if isIcs721, ics721Data := isIcs721Packet(packet.GetData(), packet.GetDestPort()); isIcs721 {
61+
if isIcs721, ics721Data := isIcs721Packet(packet.GetData()); isIcs721 {
6262
return h.onAckIcs721Packet(ctx, im, packet, acknowledgement, relayer, ics721Data)
6363
}
6464

@@ -70,7 +70,7 @@ func (h EVMHooks) OnTimeoutPacketOverride(im ibchooks.IBCMiddleware, ctx sdk.Con
7070
return h.onTimeoutIcs20Packet(ctx, im, packet, relayer, ics20Data)
7171
}
7272

73-
if isIcs721, ics721Data := isIcs721Packet(packet.GetData(), packet.GetDestPort()); isIcs721 {
73+
if isIcs721, ics721Data := isIcs721Packet(packet.GetData()); isIcs721 {
7474
return h.onTimeoutIcs721Packet(ctx, im, packet, relayer, ics721Data)
7575
}
7676

‎app/ibc-hooks/receive.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func (h EVMHooks) onRecvIcs721Packet(
139139
//
140140
// If that succeeds, we make the contract call
141141
data.Receiver = intermediateSender
142-
packet.Data = data.GetBytes(packet.SourcePort)
142+
packet.Data = data.GetBytes()
143143

144144
ack := im.App.OnRecvPacket(ctx, packet, relayer)
145145
if !ack.Success() {

‎app/ibc-hooks/receive_test.go

-94
Original file line numberDiff line numberDiff line change
@@ -238,97 +238,3 @@ func Test_onReceivePacket_memo_ICS721(t *testing.T) {
238238
require.NoError(t, err)
239239
require.Equal(t, contractAddr.Bytes(), common.HexToAddress(hexutil.Encode(queryRes)).Bytes())
240240
}
241-
242-
func Test_onReceivePacket_memo_ICS721_Wasm(t *testing.T) {
243-
ctx, input := createDefaultTestInput(t)
244-
_, _, addr := keyPubAddr()
245-
246-
evmAddr := common.BytesToAddress(addr.Bytes())
247-
248-
codeBz, err := hexutil.Decode(counter.CounterBin)
249-
require.NoError(t, err)
250-
251-
_, contractAddr, _, err := input.EVMKeeper.EVMCreate(ctx, evmAddr, codeBz, nil, nil)
252-
require.NoError(t, err)
253-
254-
abi, err := counter.CounterMetaData.GetAbi()
255-
require.NoError(t, err)
256-
257-
inputBz, err := abi.Pack("increase")
258-
require.NoError(t, err)
259-
260-
data := nfttransfertypes.NonFungibleTokenPacketDataWasm{
261-
ClassId: "classId",
262-
ClassUri: "classUri",
263-
ClassData: "classData",
264-
TokenIds: []string{"tokenId"},
265-
TokenUris: []string{"tokenUri"},
266-
TokenData: []string{"tokenData"},
267-
Sender: addr.String(),
268-
Receiver: contractAddr.Hex(),
269-
Memo: fmt.Sprintf(`{
270-
"evm": {
271-
"message": {
272-
"contract_addr": "%s",
273-
"input": "%s"
274-
}
275-
}
276-
}`, contractAddr.Hex(), hexutil.Encode(inputBz)),
277-
}
278-
279-
dataBz, err := json.Marshal(&data)
280-
require.NoError(t, err)
281-
282-
pk := channeltypes.Packet{
283-
SourcePort: "wasm.contract_address",
284-
Data: dataBz,
285-
DestinationPort: "nfttransfer-1",
286-
DestinationChannel: "channel-1",
287-
}
288-
289-
// mint for approval test
290-
localClassId := evm_hooks.LocalClassId(pk, data.ClassId)
291-
intermediateSender := sdk.MustAccAddressFromBech32(evm_hooks.DeriveIntermediateSender(pk.DestinationChannel, data.Sender))
292-
err = input.EVMKeeper.ERC721Keeper().CreateOrUpdateClass(ctx, localClassId, data.ClassUri, data.ClassData)
293-
require.NoError(t, err)
294-
err = input.EVMKeeper.ERC721Keeper().Mints(
295-
ctx,
296-
intermediateSender,
297-
localClassId,
298-
[]string{"tokenId"},
299-
[]string{"tokenUri"},
300-
[]string{"tokenData"},
301-
)
302-
require.NoError(t, err)
303-
304-
// failed to due to acl
305-
ack := input.IBCHooksMiddleware.OnRecvPacket(ctx, pk, addr)
306-
require.False(t, ack.Success())
307-
308-
// set acl
309-
require.NoError(t, input.IBCHooksKeeper.SetAllowed(ctx, contractAddr[:], true))
310-
311-
// success
312-
ack = input.IBCHooksMiddleware.OnRecvPacket(ctx, pk, addr)
313-
require.True(t, ack.Success())
314-
315-
queryInputBz, err := abi.Pack("count")
316-
require.NoError(t, err)
317-
318-
// check the contract state
319-
queryRes, logs, err := input.EVMKeeper.EVMCall(ctx, evmAddr, contractAddr, queryInputBz, nil, nil)
320-
require.NoError(t, err)
321-
require.Equal(t, uint256.NewInt(1).Bytes32(), [32]byte(queryRes))
322-
require.Empty(t, logs)
323-
324-
// check allowance
325-
tokenId, ok := evmtypes.TokenIdToBigInt(localClassId, data.TokenIds[0])
326-
require.True(t, ok)
327-
erc721Addr, err := input.EVMKeeper.GetContractAddrByClassId(ctx, localClassId)
328-
require.NoError(t, err)
329-
queryInputBz, err = input.EVMKeeper.ERC721Keeper().GetERC721ABI().Pack("getApproved", tokenId)
330-
require.NoError(t, err)
331-
queryRes, err = input.EVMKeeper.EVMStaticCall(ctx, evmtypes.StdAddress, erc721Addr, queryInputBz, nil)
332-
require.NoError(t, err)
333-
require.Equal(t, contractAddr.Bytes(), common.HexToAddress(hexutil.Encode(queryRes)).Bytes())
334-
}

‎app/ibc-hooks/util.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ func isIcs20Packet(packetData []byte) (isIcs20 bool, ics20data transfertypes.Fun
4242
return true, data
4343
}
4444

45-
func isIcs721Packet(packetData []byte, counterPartyPort string) (isIcs721 bool, ics721data nfttransfertypes.NonFungibleTokenPacketData) {
46-
if data, err := nfttransfertypes.DecodePacketData(packetData, counterPartyPort); err != nil {
45+
func isIcs721Packet(packetData []byte) (isIcs721 bool, ics721data nfttransfertypes.NonFungibleTokenPacketData) {
46+
if data, err := nfttransfertypes.DecodePacketData(packetData); err != nil {
4747
return false, data
4848
} else {
4949
return true, data

‎app/keepers/keepers.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ import (
8888
evmtypes "github.com/initia-labs/minievm/x/evm/types"
8989

9090
// noble forwarding keeper
91-
forwarding "github.com/noble-assets/forwarding/v2/x/forwarding"
92-
forwardingkeeper "github.com/noble-assets/forwarding/v2/x/forwarding/keeper"
93-
forwardingtypes "github.com/noble-assets/forwarding/v2/x/forwarding/types"
91+
forwarding "github.com/noble-assets/forwarding/v2"
92+
forwardingkeeper "github.com/noble-assets/forwarding/v2/keeper"
93+
forwardingtypes "github.com/noble-assets/forwarding/v2/types"
9494
)
9595

9696
type AppKeepers struct {
@@ -309,7 +309,7 @@ func NewAppKeeper(
309309
)
310310

311311
// Set IBC post handler to receive validator set updates
312-
appKeepers.IBCKeeper.ClientKeeper.WithPostUpdateHandler(
312+
appKeepers.IBCKeeper.ClientKeeper.SetPostUpdateHandler(
313313
appKeepers.OPChildKeeper.UpdateHostValidatorSet,
314314
)
315315

‎app/keepers/keys.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
oracletypes "github.com/skip-mev/connect/v2/x/oracle/types"
3737

3838
// noble forwarding keeper
39-
forwardingtypes "github.com/noble-assets/forwarding/v2/x/forwarding/types"
39+
forwardingtypes "github.com/noble-assets/forwarding/v2/types"
4040

4141
// local imports
4242
evmtypes "github.com/initia-labs/minievm/x/evm/types"

‎app/modules.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ import (
6363
evmtypes "github.com/initia-labs/minievm/x/evm/types"
6464

6565
// noble forwarding keeper
66-
forwarding "github.com/noble-assets/forwarding/v2/x/forwarding"
67-
forwardingtypes "github.com/noble-assets/forwarding/v2/x/forwarding/types"
66+
forwarding "github.com/noble-assets/forwarding/v2"
67+
forwardingtypes "github.com/noble-assets/forwarding/v2/types"
6868
)
6969

7070
// module account permissions

‎app/upgrade.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
opchildtypes "github.com/initia-labs/OPinit/x/opchild/types"
2323
)
2424

25-
const upgradeName = "0.6.10"
25+
const upgradeName = "0.7.0"
2626

2727
// RegisterUpgradeHandlers returns upgrade handlers
2828
func (app *MinitiaApp) RegisterUpgradeHandlers(cfg module.Configurator) {

‎client/docs/statik/statik.go

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

0 commit comments

Comments
 (0)