Skip to content

Commit

Permalink
refactor: replace wasmd build
Browse files Browse the repository at this point in the history
  • Loading branch information
@scorpioborn
scorpioborn committed May 6, 2024
1 parent a78d48f commit 5b16f7d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
8 changes: 4 additions & 4 deletions app/keepers/keepers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,8 @@ func NewAppKeeper(
)
appKeepers.IBCHooksKeeper = &hooksKeeper

junoPrefix := sdk.GetConfig().GetBech32AccountAddrPrefix()
wasmHooks := ibc_hooks.NewWasmHooks(appKeepers.IBCHooksKeeper, &appKeepers.WasmKeeper, junoPrefix) // The contract keeper needs to be set later
sgePrefix := sdk.GetConfig().GetBech32AccountAddrPrefix()
wasmHooks := ibc_hooks.NewWasmHooks(appKeepers.IBCHooksKeeper, &appKeepers.WasmKeeper, sgePrefix) // The contract keeper needs to be set later
appKeepers.Ics20WasmHooks = &wasmHooks
appKeepers.HooksICS4Wrapper = ibc_hooks.NewICS4Middleware(
appKeepers.IBCKeeper.ChannelKeeper,
Expand Down Expand Up @@ -475,12 +475,12 @@ func NewAppKeeper(

mainWasmer, err := wasmvm.NewVM(path.Join(dataDir, "wasm"), wasmCapabilities, 32, wasmConfig.ContractDebugMode, wasmConfig.MemoryCacheSize)
if err != nil {
panic(fmt.Sprintf("failed to create juno wasm vm: %s", err))
panic(fmt.Sprintf("failed to create sge wasm vm: %s", err))
}

lcWasmer, err := wasmvm.NewVM(filepath.Join(dataDir, "light-client-wasm"), wasmCapabilities, 32, wasmConfig.ContractDebugMode, wasmConfig.MemoryCacheSize)
if err != nil {
panic(fmt.Sprintf("failed to create juno wasm vm for 08-wasm: %s", err))
panic(fmt.Sprintf("failed to create sge wasm vm for 08-wasm: %s", err))
}

appKeepers.WasmKeeper = wasmkeeper.NewKeeper(
Expand Down
1 change: 0 additions & 1 deletion cmd/sged/cmd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ func initAppConfig() (string, interface{}) {
// Optionally allow the chain developer to overwrite the SDK's default
// server config.
srvCfg := serverconfig.DefaultConfig()
// srvCfg.MinGasPrices = "0ujuno,0ujunox" // GlobalFee handles

customAppConfig := CustomAppConfig{
Config: *srvCfg,
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/cosmos/cosmos-sdk v0.47.8
github.com/cosmos/gogoproto v1.4.10
github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240502201956-e9b46e4bf0ad
github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-ibc-go-v7.3-wasmvm-v1.5
github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-0.20231213092633-b306e7a706e1
github.com/cosmos/ibc-go/v7 v7.4.0
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/golang-jwt/jwt/v4 v4.5.0
Expand Down Expand Up @@ -349,7 +349,7 @@ replace (
// cosmos keyring
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0

github.com/CosmWasm/wasmd => github.com/sge-network/wasmd v0.0.0-20240503124041-93276618b032
github.com/CosmWasm/wasmd => github.com/sge-network/wasmd v0.0.0-20240506113624-5ccb26abde7a

github.com/cosmos/cosmos-sdk => github.com/sge-network/cosmos-sdk v0.47.9-0.20240409081440-054c8c413d45

Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,8 @@ github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg=
github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A=
github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240502201956-e9b46e4bf0ad h1:ozJyL/gd3hXYQodS7EESUQgu+1CeJ9nvb9sfHufmsjI=
github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240502201956-e9b46e4bf0ad/go.mod h1:JwHFbo1oX/ht4fPpnPvmhZr+dCkYK1Vihw+vZE9umR4=
github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-ibc-go-v7.3-wasmvm-v1.5 h1:sMoHjep+KInjMrppNCEutMVm1p8nI9WhKCuMQ+EcUHw=
github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-ibc-go-v7.3-wasmvm-v1.5/go.mod h1:VR2Hg2i/X1bafbmmNsV2Khwsg0PzNeuWoVKmSN5dAwo=
github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-0.20231213092633-b306e7a706e1 h1:fCtG9qasnNzhgxGR1jM9eBufZ5WQVpy0KdaOpKRfg8Y=
github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-0.20231213092633-b306e7a706e1/go.mod h1:h114vYKBtI5zKBeSyr8y5JZ8ZtpQJInO4TYww2IQr6o=
github.com/cosmos/ibc-go/v7 v7.4.0 h1:8FqYMptvksgMvlbN4UW9jFxTXzsPyfAzEZurujXac8M=
github.com/cosmos/ibc-go/v7 v7.4.0/go.mod h1:L/KaEhzV5TGUCTfGysVgMBQtl5Dm7hHitfpk+GIeoAo=
github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM=
Expand Down Expand Up @@ -1370,8 +1370,8 @@ github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfP
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/sge-network/cosmos-sdk v0.47.9-0.20240409081440-054c8c413d45 h1:gdXKc/Y7QTsuDsoC/S3R/LdXAxazOFzjxNoiJmpFaYE=
github.com/sge-network/cosmos-sdk v0.47.9-0.20240409081440-054c8c413d45/go.mod h1:WjqTUUHJnaRjkgJbP2aQ1F+9pxDpLsOBpfuP2S0W+Ck=
github.com/sge-network/wasmd v0.0.0-20240503124041-93276618b032 h1:h36Vah9OlpBhVFxAEwo9cSRLhX1vhN5f4Q4Hue2BKXw=
github.com/sge-network/wasmd v0.0.0-20240503124041-93276618b032/go.mod h1:uQOWQUhJrZpsroGkmunpIJfj4tY9NIZWDVw1f42hjtI=
github.com/sge-network/wasmd v0.0.0-20240506113624-5ccb26abde7a h1:cg3upuH1sZBjFKY2p7qgE9LTtGt2ccH8vucTGMWquSo=
github.com/sge-network/wasmd v0.0.0-20240506113624-5ccb26abde7a/go.mod h1:uQOWQUhJrZpsroGkmunpIJfj4tY9NIZWDVw1f42hjtI=
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU=
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs=
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
Expand Down

0 comments on commit 5b16f7d

Please sign in to comment.