From 1456a9f51aa524305d5f969e543e4daf2e6f72e0 Mon Sep 17 00:00:00 2001 From: slandymani Date: Fri, 19 Jul 2024 20:33:25 +0300 Subject: [PATCH 1/2] change path to odin-protocol --- .circleci/config.yml | 2 +- .github/dependabot.yml | 4 ++-- .golangci.yml | 2 +- Dockerfile | 8 ++++---- Makefile | 6 +++--- app/ante.go | 4 ++-- app/app.go | 6 +++--- app/app_test.go | 2 +- app/encoding.go | 4 ++-- app/sim_test.go | 2 +- app/test_helpers.go | 2 +- app/test_support.go | 2 +- app/upgrades.go | 10 +++++----- app/upgrades/noop/upgrades.go | 2 +- app/upgrades/v050/upgrades.go | 2 +- app/wasm.go | 4 ++-- benchmarks/app_test.go | 6 +++--- benchmarks/bench_test.go | 2 +- cmd/wasmd/commands.go | 10 +++++----- cmd/wasmd/main.go | 2 +- cmd/wasmd/root.go | 8 ++++---- cmd/wasmd/testnet.go | 2 +- go.mod | 4 ++-- go.sum | 6 ++++-- tests/e2e/gov_test.go | 8 ++++---- tests/e2e/grants_test.go | 8 ++++---- tests/e2e/group_test.go | 6 +++--- tests/e2e/ibc_fees_test.go | 6 +++--- tests/e2e/ica_test.go | 4 ++-- tests/e2e/reflect_helper.go | 8 ++++---- tests/system/upgrade_test.go | 2 +- x/wasm/alias.go | 8 ++++---- x/wasm/client/cli/gov_tx.go | 10 +++++----- x/wasm/client/cli/gov_tx_test.go | 6 +++--- x/wasm/client/cli/new_tx.go | 2 +- x/wasm/client/cli/query.go | 4 ++-- x/wasm/client/cli/tx.go | 10 +++++----- x/wasm/client/cli/tx_test.go | 6 +++--- x/wasm/common_test.go | 2 +- x/wasm/genesis_test.go | 4 ++-- x/wasm/ibc.go | 6 +++--- x/wasm/ibc_integration_test.go | 14 +++++++------- x/wasm/ibc_reflect_test.go | 6 +++--- x/wasm/ibc_test.go | 6 +++--- x/wasm/ibctesting/chain.go | 4 ++-- x/wasm/ibctesting/coordinator.go | 2 +- x/wasm/ibctesting/wasm.go | 2 +- x/wasm/keeper/addresses.go | 2 +- x/wasm/keeper/ante.go | 2 +- x/wasm/keeper/ante_test.go | 6 +++--- x/wasm/keeper/api.go | 6 +++--- x/wasm/keeper/authz_policy.go | 2 +- x/wasm/keeper/authz_policy_test.go | 2 +- x/wasm/keeper/bench_test.go | 2 +- x/wasm/keeper/contract_keeper.go | 2 +- x/wasm/keeper/contract_keeper_test.go | 4 ++-- x/wasm/keeper/events.go | 4 ++-- x/wasm/keeper/events_test.go | 4 ++-- x/wasm/keeper/genesis.go | 2 +- x/wasm/keeper/genesis_test.go | 4 ++-- x/wasm/keeper/handler_plugin.go | 4 ++-- x/wasm/keeper/handler_plugin_encoders.go | 4 ++-- x/wasm/keeper/handler_plugin_encoders_test.go | 6 +++--- x/wasm/keeper/handler_plugin_test.go | 8 ++++---- x/wasm/keeper/ibc.go | 2 +- x/wasm/keeper/keeper.go | 8 ++++---- x/wasm/keeper/keeper_cgo.go | 4 ++-- x/wasm/keeper/keeper_no_cgo.go | 2 +- x/wasm/keeper/keeper_test.go | 12 ++++++------ x/wasm/keeper/metrics.go | 2 +- x/wasm/keeper/migrations.go | 8 ++++---- x/wasm/keeper/migrations_integration_test.go | 10 +++++----- x/wasm/keeper/msg_dispatcher.go | 6 +++--- x/wasm/keeper/msg_dispatcher_test.go | 4 ++-- x/wasm/keeper/msg_server.go | 2 +- x/wasm/keeper/msg_server_integration_test.go | 10 +++++----- x/wasm/keeper/msg_server_test.go | 2 +- x/wasm/keeper/options.go | 2 +- x/wasm/keeper/options_test.go | 6 +++--- x/wasm/keeper/proposal_handler_legacy.go | 2 +- x/wasm/keeper/proposal_integration_test.go | 6 +++--- x/wasm/keeper/querier.go | 2 +- x/wasm/keeper/querier_test.go | 8 ++++---- x/wasm/keeper/query_plugin_integration_test.go | 6 +++--- x/wasm/keeper/query_plugins.go | 6 +++--- x/wasm/keeper/query_plugins_test.go | 10 +++++----- x/wasm/keeper/recurse_test.go | 4 ++-- x/wasm/keeper/reflect_test.go | 6 +++--- x/wasm/keeper/relay.go | 4 ++-- x/wasm/keeper/relay_test.go | 8 ++++---- x/wasm/keeper/snapshotter.go | 4 ++-- x/wasm/keeper/snapshotter_integration_test.go | 10 +++++----- x/wasm/keeper/staking_test.go | 6 +++--- x/wasm/keeper/submsg_test.go | 10 +++++----- x/wasm/keeper/test_common.go | 8 ++++---- x/wasm/keeper/test_fuzz.go | 2 +- x/wasm/keeper/testdata/contracts.go | 2 +- x/wasm/keeper/wasmtesting/gas_register.go | 2 +- x/wasm/keeper/wasmtesting/messenger.go | 2 +- x/wasm/keeper/wasmtesting/mock_engine.go | 6 +++--- x/wasm/keeper/wasmtesting/mock_keepers.go | 2 +- x/wasm/keeper/wasmtesting/msg_dispatcher.go | 2 +- x/wasm/keeper/wasmtesting/query_handler.go | 2 +- x/wasm/migrations/v1/store.go | 2 +- x/wasm/migrations/v1/store_test.go | 4 ++-- x/wasm/migrations/v2/params_legacy.go | 2 +- x/wasm/migrations/v2/store.go | 4 ++-- x/wasm/migrations/v2/store_test.go | 6 +++--- x/wasm/migrations/v3/store.go | 2 +- x/wasm/migrations/v3/store_test.go | 10 +++++----- x/wasm/module.go | 16 ++++++++-------- x/wasm/module_test.go | 12 ++++++------ x/wasm/relay_pingpong_test.go | 14 +++++++------- x/wasm/relay_test.go | 14 +++++++------- x/wasm/simulation/genesis.go | 2 +- x/wasm/simulation/operations.go | 10 +++++----- x/wasm/simulation/proposals.go | 6 +++--- x/wasm/types/authz.go | 4 ++-- x/wasm/types/authz_test.go | 2 +- x/wasm/types/errors.go | 2 +- x/wasm/types/errors_test.go | 2 +- x/wasm/types/exported_keepers.go | 2 +- x/wasm/types/gas_register.go | 14 +++++++------- x/wasm/types/gas_register_test.go | 2 +- x/wasm/types/test_fixtures.go | 2 +- x/wasm/types/types.go | 2 +- x/wasm/types/types_test.go | 2 +- x/wasm/types/wasmer_engine.go | 4 ++-- 128 files changed, 322 insertions(+), 320 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fbe4754bf7..e1f539b82e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -189,7 +189,7 @@ jobs: command: | IN_DOCKER=$(docker run --rm "cosmwasm/wasmd:${CIRCLE_SHA1}" /usr/bin/wasmd query wasm libwasmvm-version) echo "Runtime libwasmvm-version in docker: $IN_DOCKER" - IN_GOMOD=$(go list -m github.com/CosmWasm/wasmvm/v2 | cut -d" " -f2 | cut -d"v" -f2) + IN_GOMOD=$(go list -m github.com/ODIN-PROTOCOL/wasmvm/v2 | cut -d" " -f2 | cut -d"v" -f2) echo "wasmvm version in go.mod: $IN_GOMOD" if [[ "$IN_DOCKER" != "$IN_GOMOD" ]]; then echo "Mismatch of wasmvm versions detected" diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 376c012334..ae9de5e0bc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,5 +1,5 @@ version: 2 -updates: +updates: - package-ecosystem: github-actions directory: "/" schedule: @@ -11,7 +11,7 @@ updates: interval: daily open-pull-requests-limit: 10 ignore: - - dependency-name: github.com/CosmWasm/wasmvm + - dependency-name: github.com/ODIN-PROTOCOL/wasmvm versions: - 0.14.0-beta2 - 0.14.0-beta3 diff --git a/.golangci.yml b/.golangci.yml index d155f54e54..ab84c664e7 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -81,7 +81,7 @@ linters-settings: - default # Default section: contains all imports that could not be matched to another section type. - prefix(cosmossdk.io) - prefix(github.com/cosmos/cosmos-sdk) - - prefix(github.com/CosmWasm/wasmd) + - prefix(github.com/ODIN-PROTOCOL/wasmd) revive: rules: - name: redefines-builtin-id diff --git a/Dockerfile b/Dockerfile index 5286e109ee..d9da45b188 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,10 +17,10 @@ RUN apk add git WORKDIR /code COPY . /code/ # See https://github.com/CosmWasm/wasmvm/releases -ADD https://github.com/CosmWasm/wasmvm/releases/download/v2.0.0/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a -ADD https://github.com/CosmWasm/wasmvm/releases/download/v2.0.0/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a -RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 3b478b3e51d31e53ce9324a8895d2cd7278af5179b9a02ea55d8627958e42afa -RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep ca08bb7b73b49b483611d9755bb8455620bb8c0faf3014400908ed49bf3b19a5 +ADD https://github.com/ODIN-PROTOCOL/wasmvm/releases/download/v2.0.14/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a +ADD https://github.com/ODIN-PROTOCOL/wasmvm/releases/download/v2.0.14/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a +#RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 3b478b3e51d31e53ce9324a8895d2cd7278af5179b9a02ea55d8627958e42afa +#RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep ca08bb7b73b49b483611d9755bb8455620bb8c0faf3014400908ed49bf3b19a5 # force it to use static lib (from above) not standard libgo_cosmwasm.so file RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build diff --git a/Makefile b/Makefile index 90814a3c65..cd2f32484f 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ SIMAPP = ./app DOCKER := $(shell which docker) BUF_IMAGE=bufbuild/buf@sha256:3cb1f8a4b48bd5ad8f09168f10f607ddc318af202f5c057d52a45216793d85e5 #v1.4.0 DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(BUF_IMAGE) -HTTPS_GIT := https://github.com/CosmWasm/wasmd.git +HTTPS_GIT := https://github.com/ODIN-PROTOCOL/wasmd.git export GO111MODULE = on @@ -59,7 +59,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=wasm \ -X github.com/cosmos/cosmos-sdk/version.AppName=wasmd \ -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \ -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \ - -X github.com/CosmWasm/wasmd/app.Bech32Prefix=wasm \ + -X github.com/ODIN-PROTOCOL/wasmd/app.Bech32Prefix=wasm \ -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" ifeq ($(WITH_CLEVELDB),yes) @@ -163,7 +163,7 @@ lint: format-tools format: format-tools find . -name '*.go' -type f -not -path "./vendor*" -not -path "./tests/system/vendor*" -not -path "*.git*" -not -path "./client/lcd/statik/statik.go" | xargs gofumpt -w find . -name '*.go' -type f -not -path "./vendor*" -not -path "./tests/system/vendor*" -not -path "*.git*" -not -path "./client/lcd/statik/statik.go" | xargs misspell -w - find . -name '*.go' -type f -not -path "./vendor*" -not -path "./tests/system/vendor*" -not -path "*.git*" -not -path "./client/lcd/statik/statik.go" | xargs gci write --skip-generated -s standard -s default -s "prefix(cosmossdk.io)" -s "prefix(github.com/cosmos/cosmos-sdk)" -s "prefix(github.com/CosmWasm/wasmd)" --custom-order + find . -name '*.go' -type f -not -path "./vendor*" -not -path "./tests/system/vendor*" -not -path "*.git*" -not -path "./client/lcd/statik/statik.go" | xargs gci write --skip-generated -s standard -s default -s "prefix(cosmossdk.io)" -s "prefix(github.com/cosmos/cosmos-sdk)" -s "prefix(github.com/ODIN-PROTOCOL/wasmd)" --custom-order ############################################################################### diff --git a/app/ante.go b/app/ante.go index 7a8f17e511..a20fdfaea1 100644 --- a/app/ante.go +++ b/app/ante.go @@ -13,8 +13,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/ante" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + wasmTypes "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC diff --git a/app/app.go b/app/app.go index d0c75a55c1..a8e97f6a65 100644 --- a/app/app.go +++ b/app/app.go @@ -130,9 +130,9 @@ import ( stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/CosmWasm/wasmd/x/wasm" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + wasmtypes "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) const appName = "WasmApp" diff --git a/app/app_test.go b/app/app_test.go index c363a847f8..9f82cb733e 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -14,7 +14,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" ) var emptyWasmOpts []wasmkeeper.Option diff --git a/app/encoding.go b/app/encoding.go index 3bf0c656c0..77b4171c4a 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -9,8 +9,8 @@ import ( simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" - "github.com/CosmWasm/wasmd/app/params" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/app/params" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" ) // MakeEncodingConfig creates a new EncodingConfig with all modules registered. For testing only diff --git a/app/sim_test.go b/app/sim_test.go index c4e1cebdc0..7b15214d03 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -32,7 +32,7 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + wasmtypes "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // SimAppChainID hardcoded chainID for simulation diff --git a/app/test_helpers.go b/app/test_helpers.go index 5a6972e726..8deb57d905 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -42,7 +42,7 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" ) // SetupOptions defines arguments that are passed into `WasmApp` constructor. diff --git a/app/test_support.go b/app/test_support.go index 33bbffadc2..ab8066b4fd 100644 --- a/app/test_support.go +++ b/app/test_support.go @@ -9,7 +9,7 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" ) func (app *WasmApp) GetIBCKeeper() *ibckeeper.Keeper { diff --git a/app/upgrades.go b/app/upgrades.go index 2ffaa17b70..90814e07b5 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -18,11 +18,11 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/CosmWasm/wasmd/app/upgrades" - "github.com/CosmWasm/wasmd/app/upgrades/noop" - v050 "github.com/CosmWasm/wasmd/app/upgrades/v050" - v2 "github.com/CosmWasm/wasmd/x/wasm/migrations/v2" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/app/upgrades" + "github.com/ODIN-PROTOCOL/wasmd/app/upgrades/noop" + v050 "github.com/ODIN-PROTOCOL/wasmd/app/upgrades/v050" + v2 "github.com/ODIN-PROTOCOL/wasmd/x/wasm/migrations/v2" + wasmtypes "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // Upgrades list of chain upgrades diff --git a/app/upgrades/noop/upgrades.go b/app/upgrades/noop/upgrades.go index e1ac64da01..7c8d42f1bb 100644 --- a/app/upgrades/noop/upgrades.go +++ b/app/upgrades/noop/upgrades.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" - "github.com/CosmWasm/wasmd/app/upgrades" + "github.com/ODIN-PROTOCOL/wasmd/app/upgrades" ) // NewUpgrade constructor diff --git a/app/upgrades/v050/upgrades.go b/app/upgrades/v050/upgrades.go index 091cfe9be8..f243092a16 100644 --- a/app/upgrades/v050/upgrades.go +++ b/app/upgrades/v050/upgrades.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" - "github.com/CosmWasm/wasmd/app/upgrades" + "github.com/ODIN-PROTOCOL/wasmd/app/upgrades" ) // UpgradeName defines the on-chain upgrade name diff --git a/app/wasm.go b/app/wasm.go index 97b0544b06..52814a1bc7 100644 --- a/app/wasm.go +++ b/app/wasm.go @@ -1,10 +1,10 @@ package app import ( - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" ) -// Deprecated: Use BuiltInCapabilities from github.com/CosmWasm/wasmd/x/wasm/keeper +// Deprecated: Use BuiltInCapabilities from github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper func AllCapabilities() []string { return wasmkeeper.BuiltInCapabilities() } diff --git a/benchmarks/app_test.go b/benchmarks/app_test.go index a5bb6ac557..274bfe71d6 100644 --- a/benchmarks/app_test.go +++ b/benchmarks/app_test.go @@ -28,9 +28,9 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/CosmWasm/wasmd/app" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/app" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + wasmtypes "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func setup(db dbm.DB, withGenesis bool, invCheckPeriod uint, opts ...wasmkeeper.Option) (*app.WasmApp, app.GenesisState) { //nolint:unparam diff --git a/benchmarks/bench_test.go b/benchmarks/bench_test.go index 49aec11da7..1891473bd7 100644 --- a/benchmarks/bench_test.go +++ b/benchmarks/bench_test.go @@ -14,7 +14,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + wasmtypes "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func BenchmarkTxSending(b *testing.B) { diff --git a/cmd/wasmd/commands.go b/cmd/wasmd/commands.go index ba97b85db1..62c3a18371 100644 --- a/cmd/wasmd/commands.go +++ b/cmd/wasmd/commands.go @@ -34,11 +34,11 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - "github.com/CosmWasm/wasmd/app" - "github.com/CosmWasm/wasmd/x/wasm" - wasmcli "github.com/CosmWasm/wasmd/x/wasm/client/cli" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/app" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm" + wasmcli "github.com/ODIN-PROTOCOL/wasmd/x/wasm/client/cli" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + wasmtypes "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // initCometBFTConfig helps to override default CometBFT Config values. diff --git a/cmd/wasmd/main.go b/cmd/wasmd/main.go index af4366beda..ef7f9cda97 100644 --- a/cmd/wasmd/main.go +++ b/cmd/wasmd/main.go @@ -7,7 +7,7 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/CosmWasm/wasmd/app" + "github.com/ODIN-PROTOCOL/wasmd/app" ) func main() { diff --git a/cmd/wasmd/root.go b/cmd/wasmd/root.go index 6f6022336b..d9ce7bd685 100644 --- a/cmd/wasmd/root.go +++ b/cmd/wasmd/root.go @@ -20,10 +20,10 @@ import ( txmodule "github.com/cosmos/cosmos-sdk/x/auth/tx/config" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/CosmWasm/wasmd/app" - "github.com/CosmWasm/wasmd/app/params" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/app" + "github.com/ODIN-PROTOCOL/wasmd/app/params" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + wasmtypes "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // NewRootCmd creates a new root command for wasmd. It is called once in the diff --git a/cmd/wasmd/testnet.go b/cmd/wasmd/testnet.go index 60b9cc1b4f..a8a0b8b537 100644 --- a/cmd/wasmd/testnet.go +++ b/cmd/wasmd/testnet.go @@ -39,7 +39,7 @@ import ( genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/CosmWasm/wasmd/app" + "github.com/ODIN-PROTOCOL/wasmd/app" ) var ( diff --git a/go.mod b/go.mod index 806da9d5ba..27fce2db88 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ -module github.com/CosmWasm/wasmd +module github.com/ODIN-PROTOCOL/wasmd go 1.21 require ( - github.com/CosmWasm/wasmvm/v2 v2.0.0 + github.com/ODIN-PROTOCOL/wasmvm/v2 v2.0.14 github.com/cosmos/cosmos-proto v1.0.0-beta.5 github.com/cosmos/cosmos-sdk v0.50.6 github.com/cosmos/gogogateway v1.2.0 // indirect diff --git a/go.sum b/go.sum index b43e5cf8f2..15b53bb38e 100644 --- a/go.sum +++ b/go.sum @@ -225,8 +225,6 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/CosmWasm/wasmvm/v2 v2.0.0 h1:IqNCI2G0mvs7K6ej17/I28805rVqnu+Y1cWDqIdwb08= -github.com/CosmWasm/wasmvm/v2 v2.0.0/go.mod h1:su9lg5qLr7adV95eOfzjZWkGiky8WNaNIHDr7Fpu7Ck= github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= @@ -236,6 +234,8 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= +github.com/ODIN-PROTOCOL/wasmvm/v2 v2.0.14 h1:icJ2ZHS5Rtdk2JJDiyiCprzgLMWRW3hJVMfG+0yR+2U= +github.com/ODIN-PROTOCOL/wasmvm/v2 v2.0.14/go.mod h1:byVmvc+Sk1gIpmn1exL8EdAiXebWZCsLe5HtvI0PVpk= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -284,6 +284,8 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOF github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/bufbuild/protocompile v0.6.0 h1:Uu7WiSQ6Yj9DbkdnOe7U4mNKp58y9WDMKDn28/ZlunY= github.com/bufbuild/protocompile v0.6.0/go.mod h1:YNP35qEYoYGme7QMtz5SBCoN4kL4g12jTtjuzRNdjpE= +github.com/bytecodealliance/wasmtime-go/v20 v20.0.0 h1:xO8EMdztxRALMRoru7WCIlr10co225tFFUoJ/Ygzdv4= +github.com/bytecodealliance/wasmtime-go/v20 v20.0.0/go.mod h1:Va362hmt7aqwyb2Vu73yHbmx6NkSvGmvHOzJa2xMECQ= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= diff --git a/tests/e2e/gov_test.go b/tests/e2e/gov_test.go index a0abd64edf..25c3da5e50 100644 --- a/tests/e2e/gov_test.go +++ b/tests/e2e/gov_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -15,9 +15,9 @@ import ( distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/CosmWasm/wasmd/app" - "github.com/CosmWasm/wasmd/tests/e2e" - "github.com/CosmWasm/wasmd/x/wasm/ibctesting" + "github.com/ODIN-PROTOCOL/wasmd/app" + "github.com/ODIN-PROTOCOL/wasmd/tests/e2e" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ibctesting" ) func TestGovVoteByContract(t *testing.T) { diff --git a/tests/e2e/grants_test.go b/tests/e2e/grants_test.go index 203e23f0d3..4af916f642 100644 --- a/tests/e2e/grants_test.go +++ b/tests/e2e/grants_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -19,9 +19,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/authz" - "github.com/CosmWasm/wasmd/tests/e2e" - "github.com/CosmWasm/wasmd/x/wasm/ibctesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/tests/e2e" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ibctesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestGrants(t *testing.T) { diff --git a/tests/e2e/group_test.go b/tests/e2e/group_test.go index 49ab9638bb..0ec2ac529d 100644 --- a/tests/e2e/group_test.go +++ b/tests/e2e/group_test.go @@ -15,9 +15,9 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/group" - "github.com/CosmWasm/wasmd/tests/e2e" - "github.com/CosmWasm/wasmd/x/wasm/ibctesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/tests/e2e" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ibctesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestGroupWithContract(t *testing.T) { diff --git a/tests/e2e/ibc_fees_test.go b/tests/e2e/ibc_fees_test.go index 5c29bec5ca..48292f46ae 100644 --- a/tests/e2e/ibc_fees_test.go +++ b/tests/e2e/ibc_fees_test.go @@ -20,9 +20,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" - "github.com/CosmWasm/wasmd/app" - wasmibctesting "github.com/CosmWasm/wasmd/x/wasm/ibctesting" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/app" + wasmibctesting "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ibctesting" + wasmtypes "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestIBCFeesTransfer(t *testing.T) { diff --git a/tests/e2e/ica_test.go b/tests/e2e/ica_test.go index 489da9a4ed..c7ddb31eb1 100644 --- a/tests/e2e/ica_test.go +++ b/tests/e2e/ica_test.go @@ -22,8 +22,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/address" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/CosmWasm/wasmd/app" - wasmibctesting "github.com/CosmWasm/wasmd/x/wasm/ibctesting" + "github.com/ODIN-PROTOCOL/wasmd/app" + wasmibctesting "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ibctesting" ) func TestICA(t *testing.T) { diff --git a/tests/e2e/reflect_helper.go b/tests/e2e/reflect_helper.go index f857c8dad0..f8b0b6f220 100644 --- a/tests/e2e/reflect_helper.go +++ b/tests/e2e/reflect_helper.go @@ -6,16 +6,16 @@ import ( "fmt" "testing" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/ibctesting" - "github.com/CosmWasm/wasmd/x/wasm/keeper/testdata" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ibctesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/testdata" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // InstantiateStargateReflectContract stores and instantiates the reflect contract shipped with CosmWasm 1.5.3. diff --git a/tests/system/upgrade_test.go b/tests/system/upgrade_test.go index 9196862756..5a8b95e7f4 100644 --- a/tests/system/upgrade_test.go +++ b/tests/system/upgrade_test.go @@ -117,7 +117,7 @@ func FetchExecutable(t *testing.T, version string) string { t.Logf("+++ version not in cache, downloading from github") // then download from GH releases: only works with Linux currently as we are not publishing OSX binaries - const releaseUrl = "https://github.com/CosmWasm/wasmd/releases/download/%s/wasmd-%s-linux-amd64.tar.gz" + const releaseUrl = "https://github.com/ODIN-PROTOCOL/wasmd/releases/download/%s/wasmd-%s-linux-amd64.tar.gz" destDir := t.TempDir() rsp, err := http.Get(fmt.Sprintf(releaseUrl, version, version)) require.NoError(t, err) diff --git a/x/wasm/alias.go b/x/wasm/alias.go index f53463b993..e66828d2d7 100644 --- a/x/wasm/alias.go +++ b/x/wasm/alias.go @@ -1,12 +1,12 @@ // autogenerated code using github.com/rigelrozanski/multitool // aliases generated for the following subdirectories: -// ALIASGEN: github.com/Cosmwasm/wasmd/x/wasm/types -// ALIASGEN: github.com/CosmWasm/wasmd/x/wasm/keeper +// ALIASGEN: github.com/ODIN-PROTOCOL/wasmd/x/wasm/types +// ALIASGEN: github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper package wasm import ( - "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) const ( diff --git a/x/wasm/client/cli/gov_tx.go b/x/wasm/client/cli/gov_tx.go index 9b95ae949d..feb6508026 100644 --- a/x/wasm/client/cli/gov_tx.go +++ b/x/wasm/client/cli/gov_tx.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" "github.com/distribution/reference" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -22,8 +22,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/client/cli" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/CosmWasm/wasmd/x/wasm/ioutils" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ioutils" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // DefaultGovAuthority is set to the gov module address. @@ -129,7 +129,7 @@ func parseVerificationFlags(gzippedWasm []byte, flags *flag.FlagSet) (string, st } // wasm is gzipped in parseStoreCodeArgs // checksum generation will be decoupled here - // reference https://github.com/CosmWasm/wasmvm/issues/359 + // reference https://github.com/ODIN-PROTOCOL/wasmvm/issues/359 raw, err := ioutils.Uncompress(gzippedWasm, int64(types.MaxWasmSize)) if err != nil { return "", "", nil, fmt.Errorf("invalid zip: %w", err) @@ -747,7 +747,7 @@ func ProposalUpdateInstantiateConfigCmd() *cobra.Command { Long: strings.TrimSpace( fmt.Sprintf(`Submit an update instantiate config proposal for multiple code ids. -Example: +Example: $ %s tx gov submit-proposal update-instantiate-config 1:nobody 2:everybody 3:%s1l2rsakp388kuv9k8qzq6lrm9taddae7fpx59wm,%s1vx8knpllrj7n963p9ttd80w47kpacrhuts497x `, version.AppName, bech32Prefix, bech32Prefix)), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/x/wasm/client/cli/gov_tx_test.go b/x/wasm/client/cli/gov_tx_test.go index d6dea668ef..49665639b3 100644 --- a/x/wasm/client/cli/gov_tx_test.go +++ b/x/wasm/client/cli/gov_tx_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/CosmWasm/wasmd/x/wasm/keeper/testdata" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/testdata" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestParseAccessConfigUpdates(t *testing.T) { @@ -100,7 +100,7 @@ func TestParseAccessConfigUpdates(t *testing.T) { } func TestParseCodeInfoFlags(t *testing.T) { - correctSource := "https://github.com/CosmWasm/wasmd/blob/main/x/wasm/keeper/testdata/hackatom.wasm" + correctSource := "https://github.com/ODIN-PROTOCOL/wasmd/blob/main/x/wasm/keeper/testdata/hackatom.wasm" correctBuilderRef := "cosmwasm/workspace-optimizer:0.12.9" wasmBin, err := os.ReadFile("../../keeper/testdata/hackatom.wasm.gzip") diff --git a/x/wasm/client/cli/new_tx.go b/x/wasm/client/cli/new_tx.go index 5d54602aa3..57ec06d798 100644 --- a/x/wasm/client/cli/new_tx.go +++ b/x/wasm/client/cli/new_tx.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // MigrateContractCmd will migrate a contract to a new code version diff --git a/x/wasm/client/cli/query.go b/x/wasm/client/cli/query.go index 89f6790327..78be17ae69 100644 --- a/x/wasm/client/cli/query.go +++ b/x/wasm/client/cli/query.go @@ -10,7 +10,7 @@ import ( "os" "strconv" - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" "github.com/spf13/cobra" flag "github.com/spf13/pflag" @@ -18,7 +18,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/wasm/client/cli/tx.go b/x/wasm/client/cli/tx.go index f5499af965..4ffd5deb01 100644 --- a/x/wasm/client/cli/tx.go +++ b/x/wasm/client/cli/tx.go @@ -20,8 +20,8 @@ import ( "github.com/cosmos/cosmos-sdk/version" "github.com/cosmos/cosmos-sdk/x/authz" - "github.com/CosmWasm/wasmd/x/wasm/ioutils" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ioutils" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) const ( @@ -203,7 +203,7 @@ func InstantiateContractCmd() *cobra.Command { Each contract instance has a unique address assigned. Example: $ %s tx wasm instantiate 1 '{"foo":"bar"}' --admin="$(%s keys show mykey -a)" \ - --from mykey --amount="100ustake" --label "local0.1.0" + --from mykey --amount="100ustake" --label "local0.1.0" `, version.AppName, version.AppName), Aliases: []string{"start", "init", "inst", "i"}, Args: cobra.ExactArgs(2), @@ -237,13 +237,13 @@ func InstantiateContract2Cmd() *cobra.Command { "--fix-msg [bool,optional]", Short: "Instantiate a wasm contract with predictable address", Long: fmt.Sprintf(`Creates a new instance of an uploaded wasm code with the given 'constructor' message. -Each contract instance has a unique address assigned. They are assigned automatically but in order to have predictable addresses +Each contract instance has a unique address assigned. They are assigned automatically but in order to have predictable addresses for special use cases, the given 'salt' argument and '--fix-msg' parameters can be used to generate a custom address. Predictable address example (also see '%s query wasm build-address -h'): $ %s tx wasm instantiate2 1 '{"foo":"bar"}' $(echo -n "testing" | xxd -ps) --admin="$(%s keys show mykey -a)" \ --from mykey --amount="100ustake" --label "local0.1.0" \ - --fix-msg + --fix-msg `, version.AppName, version.AppName, version.AppName), Aliases: []string{"start", "init", "inst", "i"}, Args: cobra.ExactArgs(3), diff --git a/x/wasm/client/cli/tx_test.go b/x/wasm/client/cli/tx_test.go index 72e3967ab6..42c54c4604 100644 --- a/x/wasm/client/cli/tx_test.go +++ b/x/wasm/client/cli/tx_test.go @@ -9,9 +9,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/ioutils" - "github.com/CosmWasm/wasmd/x/wasm/keeper/testdata" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ioutils" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/testdata" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestParseVerificationFlags(t *testing.T) { diff --git a/x/wasm/common_test.go b/x/wasm/common_test.go index aa507ee429..47e30a7724 100644 --- a/x/wasm/common_test.go +++ b/x/wasm/common_test.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) const firstCodeID = 1 diff --git a/x/wasm/genesis_test.go b/x/wasm/genesis_test.go index 73503c8c95..b40d17fc92 100644 --- a/x/wasm/genesis_test.go +++ b/x/wasm/genesis_test.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestInitGenesis(t *testing.T) { diff --git a/x/wasm/ibc.go b/x/wasm/ibc.go index 45adcf4d19..f1e5831d0a 100644 --- a/x/wasm/ibc.go +++ b/x/wasm/ibc.go @@ -3,7 +3,7 @@ package wasm import ( "math" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types" @@ -14,8 +14,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) var _ porttypes.IBCModule = IBCHandler{} diff --git a/x/wasm/ibc_integration_test.go b/x/wasm/ibc_integration_test.go index d268a8c720..d9e768beea 100644 --- a/x/wasm/ibc_integration_test.go +++ b/x/wasm/ibc_integration_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" ibctesting "github.com/cosmos/ibc-go/v8/testing" @@ -14,11 +14,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/app" - wasmibctesting "github.com/CosmWasm/wasmd/x/wasm/ibctesting" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/app" + wasmibctesting "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ibctesting" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestOnChanOpenInitVersion(t *testing.T) { diff --git a/x/wasm/ibc_reflect_test.go b/x/wasm/ibc_reflect_test.go index c73155da9e..5c78e653cc 100644 --- a/x/wasm/ibc_reflect_test.go +++ b/x/wasm/ibc_reflect_test.go @@ -3,14 +3,14 @@ package wasm_test import ( "testing" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" ibctesting "github.com/cosmos/ibc-go/v8/testing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - wasmibctesting "github.com/CosmWasm/wasmd/x/wasm/ibctesting" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmibctesting "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ibctesting" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" ) func TestIBCReflectContract(t *testing.T) { diff --git a/x/wasm/ibc_test.go b/x/wasm/ibc_test.go index 032c25f6e0..4377ba186d 100644 --- a/x/wasm/ibc_test.go +++ b/x/wasm/ibc_test.go @@ -3,7 +3,7 @@ package wasm import ( "testing" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/rand" clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck @@ -15,8 +15,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" - "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestOnRecvPacket(t *testing.T) { diff --git a/x/wasm/ibctesting/chain.go b/x/wasm/ibctesting/chain.go index b1425cc7e3..ad4d04a78a 100644 --- a/x/wasm/ibctesting/chain.go +++ b/x/wasm/ibctesting/chain.go @@ -45,8 +45,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking/testutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/CosmWasm/wasmd/app" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/app" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" ) var MaxAccounts = 10 diff --git a/x/wasm/ibctesting/coordinator.go b/x/wasm/ibctesting/coordinator.go index de91edfcd1..572938d125 100644 --- a/x/wasm/ibctesting/coordinator.go +++ b/x/wasm/ibctesting/coordinator.go @@ -10,7 +10,7 @@ import ( ibctesting "github.com/cosmos/ibc-go/v8/testing" "github.com/stretchr/testify/require" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" ) var ( diff --git a/x/wasm/ibctesting/wasm.go b/x/wasm/ibctesting/wasm.go index 48343926da..bc6140db0c 100644 --- a/x/wasm/ibctesting/wasm.go +++ b/x/wasm/ibctesting/wasm.go @@ -17,7 +17,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) var wasmIdent = []byte("\x00\x61\x73\x6D") diff --git a/x/wasm/keeper/addresses.go b/x/wasm/keeper/addresses.go index 4f7093631d..7fa310218f 100644 --- a/x/wasm/keeper/addresses.go +++ b/x/wasm/keeper/addresses.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // AddressGenerator abstract address generator to be used for a single contract address diff --git a/x/wasm/keeper/ante.go b/x/wasm/keeper/ante.go index 96bf474caf..aed7f26d2b 100644 --- a/x/wasm/keeper/ante.go +++ b/x/wasm/keeper/ante.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // CountTXDecorator ante handler to count the tx position in a block. diff --git a/x/wasm/keeper/ante_test.go b/x/wasm/keeper/ante_test.go index 5334964615..758d09f80b 100644 --- a/x/wasm/keeper/ante_test.go +++ b/x/wasm/keeper/ante_test.go @@ -17,9 +17,9 @@ import ( "github.com/cosmos/cosmos-sdk/runtime" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestCountTxDecorator(t *testing.T) { diff --git a/x/wasm/keeper/api.go b/x/wasm/keeper/api.go index c25a63860c..d395eb5586 100644 --- a/x/wasm/keeper/api.go +++ b/x/wasm/keeper/api.go @@ -3,12 +3,12 @@ package keeper import ( "errors" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) const ( diff --git a/x/wasm/keeper/authz_policy.go b/x/wasm/keeper/authz_policy.go index 74c029e969..14cd993cd7 100644 --- a/x/wasm/keeper/authz_policy.go +++ b/x/wasm/keeper/authz_policy.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) var _ types.AuthorizationPolicy = DefaultAuthorizationPolicy{} diff --git a/x/wasm/keeper/authz_policy_test.go b/x/wasm/keeper/authz_policy_test.go index 4d918e512a..6ae6736fd7 100644 --- a/x/wasm/keeper/authz_policy_test.go +++ b/x/wasm/keeper/authz_policy_test.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestDefaultAuthzPolicyCanCreateCode(t *testing.T) { diff --git a/x/wasm/keeper/bench_test.go b/x/wasm/keeper/bench_test.go index 19bb7de44d..0b3762c4b2 100644 --- a/x/wasm/keeper/bench_test.go +++ b/x/wasm/keeper/bench_test.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // BenchmarkVerification benchmarks secp256k1 verification which is 1000 gas based on cpu time. diff --git a/x/wasm/keeper/contract_keeper.go b/x/wasm/keeper/contract_keeper.go index 3faf459bdf..91bd33cde2 100644 --- a/x/wasm/keeper/contract_keeper.go +++ b/x/wasm/keeper/contract_keeper.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) var _ types.ContractOpsKeeper = PermissionedKeeper{} diff --git a/x/wasm/keeper/contract_keeper_test.go b/x/wasm/keeper/contract_keeper_test.go index e917367d20..53daa077ed 100644 --- a/x/wasm/keeper/contract_keeper_test.go +++ b/x/wasm/keeper/contract_keeper_test.go @@ -14,8 +14,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestInstantiate2(t *testing.T) { diff --git a/x/wasm/keeper/events.go b/x/wasm/keeper/events.go index 5cfb075b2e..c91307c31a 100644 --- a/x/wasm/keeper/events.go +++ b/x/wasm/keeper/events.go @@ -4,13 +4,13 @@ import ( "fmt" "strings" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // newWasmModuleEvent creates with wasm module event for interacting with the given contract. Adds custom attributes diff --git a/x/wasm/keeper/events_test.go b/x/wasm/keeper/events_test.go index 6516703ec5..9ab035599b 100644 --- a/x/wasm/keeper/events_test.go +++ b/x/wasm/keeper/events_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/stretchr/testify/assert" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestHasWasmModuleEvent(t *testing.T) { diff --git a/x/wasm/keeper/genesis.go b/x/wasm/keeper/genesis.go index bfee46927e..2e6f742662 100644 --- a/x/wasm/keeper/genesis.go +++ b/x/wasm/keeper/genesis.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // ValidatorSetSource is a subset of the staking keeper diff --git a/x/wasm/keeper/genesis_test.go b/x/wasm/keeper/genesis_test.go index f16b151a4b..3cc9ae9726 100644 --- a/x/wasm/keeper/genesis_test.go +++ b/x/wasm/keeper/genesis_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" abci "github.com/cometbft/cometbft/abci/types" cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" @@ -32,7 +32,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestGenesisExportImport(t *testing.T) { diff --git a/x/wasm/keeper/handler_plugin.go b/x/wasm/keeper/handler_plugin.go index 50bd1a1b67..6f0513709c 100644 --- a/x/wasm/keeper/handler_plugin.go +++ b/x/wasm/keeper/handler_plugin.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" host "github.com/cosmos/ibc-go/v8/modules/core/24-host" @@ -16,7 +16,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // msgEncoder is an extension point to customize encodings diff --git a/x/wasm/keeper/handler_plugin_encoders.go b/x/wasm/keeper/handler_plugin_encoders.go index 5ae2313e9b..97339f4d71 100644 --- a/x/wasm/keeper/handler_plugin_encoders.go +++ b/x/wasm/keeper/handler_plugin_encoders.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" @@ -20,7 +20,7 @@ import ( v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) type ( diff --git a/x/wasm/keeper/handler_plugin_encoders_test.go b/x/wasm/keeper/handler_plugin_encoders_test.go index f5536a3355..9a872ebe6d 100644 --- a/x/wasm/keeper/handler_plugin_encoders_test.go +++ b/x/wasm/keeper/handler_plugin_encoders_test.go @@ -3,7 +3,7 @@ package keeper import ( "testing" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/cosmos/gogoproto/proto" ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck @@ -20,8 +20,8 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestEncoding(t *testing.T) { diff --git a/x/wasm/keeper/handler_plugin_test.go b/x/wasm/keeper/handler_plugin_test.go index 01d23ccd39..aa8519c636 100644 --- a/x/wasm/keeper/handler_plugin_test.go +++ b/x/wasm/keeper/handler_plugin_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" @@ -22,8 +22,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestMessageHandlerChainDispatch(t *testing.T) { diff --git a/x/wasm/keeper/ibc.go b/x/wasm/keeper/ibc.go index b0e1d05e1f..05ff228b1e 100644 --- a/x/wasm/keeper/ibc.go +++ b/x/wasm/keeper/ibc.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // bindIbcPort will reserve the port. diff --git a/x/wasm/keeper/keeper.go b/x/wasm/keeper/keeper.go index 2b1ac57688..de01a9addd 100644 --- a/x/wasm/keeper/keeper.go +++ b/x/wasm/keeper/keeper.go @@ -12,8 +12,8 @@ import ( "strings" "time" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "cosmossdk.io/collections" corestoretypes "cosmossdk.io/core/store" @@ -30,8 +30,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" vestingexported "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported" - "github.com/CosmWasm/wasmd/x/wasm/ioutils" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ioutils" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // contractMemoryLimit is the memory limit of each contract execution (in MiB) diff --git a/x/wasm/keeper/keeper_cgo.go b/x/wasm/keeper/keeper_cgo.go index 020fef834d..5a6da99a84 100644 --- a/x/wasm/keeper/keeper_cgo.go +++ b/x/wasm/keeper/keeper_cgo.go @@ -5,14 +5,14 @@ package keeper import ( "path/filepath" - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" "cosmossdk.io/collections" corestoretypes "cosmossdk.io/core/store" "github.com/cosmos/cosmos-sdk/codec" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // NewKeeper creates a new contract Keeper instance diff --git a/x/wasm/keeper/keeper_no_cgo.go b/x/wasm/keeper/keeper_no_cgo.go index 261b2bad2a..0ae38429e4 100644 --- a/x/wasm/keeper/keeper_no_cgo.go +++ b/x/wasm/keeper/keeper_no_cgo.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // NewKeeper creates a new contract Keeper instance diff --git a/x/wasm/keeper/keeper_test.go b/x/wasm/keeper/keeper_test.go index 8a5f32119a..d29cf6b7f7 100644 --- a/x/wasm/keeper/keeper_test.go +++ b/x/wasm/keeper/keeper_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/rand" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" @@ -35,9 +35,9 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - "github.com/CosmWasm/wasmd/x/wasm/keeper/testdata" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/testdata" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) //go:embed testdata/hackatom.wasm @@ -824,7 +824,7 @@ func TestInstantiateWithContractFactoryChildQueriesParent(t *testing.T) { // and the child contracts queries the senders ContractInfo on instantiation // then the factory contract's ContractInfo should be returned to the child contract // - // see also: https://github.com/CosmWasm/wasmd/issues/896 + // see also: https://github.com/ODIN-PROTOCOL/wasmd/issues/896 ctx, keepers := CreateTestInput(t, false, AvailableCapabilities) keeper := keepers.WasmKeeper diff --git a/x/wasm/keeper/metrics.go b/x/wasm/keeper/metrics.go index 37d7cd4300..3216b46b2f 100644 --- a/x/wasm/keeper/metrics.go +++ b/x/wasm/keeper/metrics.go @@ -1,7 +1,7 @@ package keeper import ( - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/prometheus/client_golang/prometheus" ) diff --git a/x/wasm/keeper/migrations.go b/x/wasm/keeper/migrations.go index 5188c5bb2a..2b99f7ef39 100644 --- a/x/wasm/keeper/migrations.go +++ b/x/wasm/keeper/migrations.go @@ -3,10 +3,10 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/exported" - v1 "github.com/CosmWasm/wasmd/x/wasm/migrations/v1" - v2 "github.com/CosmWasm/wasmd/x/wasm/migrations/v2" - v3 "github.com/CosmWasm/wasmd/x/wasm/migrations/v3" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/exported" + v1 "github.com/ODIN-PROTOCOL/wasmd/x/wasm/migrations/v1" + v2 "github.com/ODIN-PROTOCOL/wasmd/x/wasm/migrations/v2" + v3 "github.com/ODIN-PROTOCOL/wasmd/x/wasm/migrations/v3" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/wasm/keeper/migrations_integration_test.go b/x/wasm/keeper/migrations_integration_test.go index 0962a79977..9da7f0882c 100644 --- a/x/wasm/keeper/migrations_integration_test.go +++ b/x/wasm/keeper/migrations_integration_test.go @@ -13,9 +13,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/address" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/CosmWasm/wasmd/app" - v2 "github.com/CosmWasm/wasmd/x/wasm/migrations/v2" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/app" + v2 "github.com/ODIN-PROTOCOL/wasmd/x/wasm/migrations/v2" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestModuleMigrations(t *testing.T) { @@ -40,7 +40,7 @@ func TestModuleMigrations(t *testing.T) { } // upgrade code shipped with v0.40 - // https://github.com/CosmWasm/wasmd/blob/v0.40.0/app/upgrades.go#L66 + // https://github.com/ODIN-PROTOCOL/wasmd/blob/v0.40.0/app/upgrades.go#L66 sp, _ := wasmApp.ParamsKeeper.GetSubspace(types.ModuleName) keyTable := v2.ParamKeyTable() if !sp.HasKeyTable() { @@ -63,7 +63,7 @@ func TestModuleMigrations(t *testing.T) { } // upgrade code shipped with v0.40 - // https://github.com/CosmWasm/wasmd/blob/v0.40.0/app/upgrades.go#L66 + // https://github.com/ODIN-PROTOCOL/wasmd/blob/v0.40.0/app/upgrades.go#L66 sp, _ := wasmApp.ParamsKeeper.GetSubspace(types.ModuleName) keyTable := v2.ParamKeyTable() if !sp.HasKeyTable() { diff --git a/x/wasm/keeper/msg_dispatcher.go b/x/wasm/keeper/msg_dispatcher.go index 2577047beb..716ac09696 100644 --- a/x/wasm/keeper/msg_dispatcher.go +++ b/x/wasm/keeper/msg_dispatcher.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" abci "github.com/cometbft/cometbft/abci/types" errorsmod "cosmossdk.io/errors" @@ -15,8 +15,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) var ( diff --git a/x/wasm/keeper/msg_dispatcher_test.go b/x/wasm/keeper/msg_dispatcher_test.go index a17a73281d..99efd73fe1 100644 --- a/x/wasm/keeper/msg_dispatcher_test.go +++ b/x/wasm/keeper/msg_dispatcher_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" abci "github.com/cometbft/cometbft/abci/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -17,7 +17,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" ) func TestDispatchSubmessages(t *testing.T) { diff --git a/x/wasm/keeper/msg_server.go b/x/wasm/keeper/msg_server.go index 691ffa445c..aa8072aef2 100644 --- a/x/wasm/keeper/msg_server.go +++ b/x/wasm/keeper/msg_server.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/wasm/keeper/msg_server_integration_test.go b/x/wasm/keeper/msg_server_integration_test.go index fad2b112b6..c72ec36d0a 100644 --- a/x/wasm/keeper/msg_server_integration_test.go +++ b/x/wasm/keeper/msg_server_integration_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -15,9 +15,9 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/app" - "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/app" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) //go:embed testdata/reflect_1_5.wasm diff --git a/x/wasm/keeper/msg_server_test.go b/x/wasm/keeper/msg_server_test.go index ff34162ccf..b07bb90cac 100644 --- a/x/wasm/keeper/msg_server_test.go +++ b/x/wasm/keeper/msg_server_test.go @@ -13,7 +13,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestSelectAuthorizationPolicy(t *testing.T) { diff --git a/x/wasm/keeper/options.go b/x/wasm/keeper/options.go index 234197be8d..9c1fdd356e 100644 --- a/x/wasm/keeper/options.go +++ b/x/wasm/keeper/options.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) type optsFn func(*Keeper) diff --git a/x/wasm/keeper/options_test.go b/x/wasm/keeper/options_test.go index 1ac311c14c..4e0c5a5a63 100644 --- a/x/wasm/keeper/options_test.go +++ b/x/wasm/keeper/options_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -18,8 +18,8 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestConstructorOptions(t *testing.T) { diff --git a/x/wasm/keeper/proposal_handler_legacy.go b/x/wasm/keeper/proposal_handler_legacy.go index d066e4b6e0..cede915e5f 100644 --- a/x/wasm/keeper/proposal_handler_legacy.go +++ b/x/wasm/keeper/proposal_handler_legacy.go @@ -11,7 +11,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // NewLegacyWasmProposalHandler creates a new governance Handler for wasm proposals diff --git a/x/wasm/keeper/proposal_integration_test.go b/x/wasm/keeper/proposal_integration_test.go index c228424180..ebe5dfcff5 100644 --- a/x/wasm/keeper/proposal_integration_test.go +++ b/x/wasm/keeper/proposal_integration_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -18,8 +18,8 @@ import ( v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/CosmWasm/wasmd/x/wasm/keeper/testdata" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/testdata" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestLoadStoredGovV1Beta1LegacyTypes(t *testing.T) { diff --git a/x/wasm/keeper/querier.go b/x/wasm/keeper/querier.go index f6eb47fcb2..f0c35ae210 100644 --- a/x/wasm/keeper/querier.go +++ b/x/wasm/keeper/querier.go @@ -21,7 +21,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) var _ types.QueryServer = &GrpcQuerier{} diff --git a/x/wasm/keeper/querier_test.go b/x/wasm/keeper/querier_test.go index afd4ad3cc5..f65ce63efc 100644 --- a/x/wasm/keeper/querier_test.go +++ b/x/wasm/keeper/querier_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" @@ -25,8 +25,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestQueryAllContractState(t *testing.T) { diff --git a/x/wasm/keeper/query_plugin_integration_test.go b/x/wasm/keeper/query_plugin_integration_test.go index f9d126e20e..07d5224858 100644 --- a/x/wasm/keeper/query_plugin_integration_test.go +++ b/x/wasm/keeper/query_plugin_integration_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/cosmos/gogoproto/proto" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" "github.com/stretchr/testify/assert" @@ -22,8 +22,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/CosmWasm/wasmd/x/wasm/keeper/testdata" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/testdata" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestMaskReflectCustomQuery(t *testing.T) { diff --git a/x/wasm/keeper/query_plugins.go b/x/wasm/keeper/query_plugins.go index 2bb2246968..0689902348 100644 --- a/x/wasm/keeper/query_plugins.go +++ b/x/wasm/keeper/query_plugins.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/gogoproto/proto" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" @@ -23,7 +23,7 @@ import ( distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) type QueryHandler struct { @@ -575,7 +575,7 @@ func sdkToFullDelegation(ctx sdk.Context, keeper types.StakingKeeper, distKeeper delegationCoins := ConvertSdkCoinToWasmCoin(amount) // FIXME: this is very rough but better than nothing... - // https://github.com/CosmWasm/wasmd/issues/282 + // https://github.com/ODIN-PROTOCOL/wasmd/issues/282 // if this (val, delegate) pair is receiving a redelegation, it cannot redelegate more // otherwise, it can redelegate the full amount // (there are cases of partial funds redelegated, but this is a start) diff --git a/x/wasm/keeper/query_plugins_test.go b/x/wasm/keeper/query_plugins_test.go index 1fea83a25f..3f65efaf05 100644 --- a/x/wasm/keeper/query_plugins_test.go +++ b/x/wasm/keeper/query_plugins_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/gogoproto/proto" @@ -32,10 +32,10 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/CosmWasm/wasmd/app" - "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/app" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestIBCQuerier(t *testing.T) { diff --git a/x/wasm/keeper/recurse_test.go b/x/wasm/keeper/recurse_test.go index a0a2bae54a..5936b887e8 100644 --- a/x/wasm/keeper/recurse_test.go +++ b/x/wasm/keeper/recurse_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -13,7 +13,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) type Recurse struct { diff --git a/x/wasm/keeper/reflect_test.go b/x/wasm/keeper/reflect_test.go index d6a14ae361..054af7f486 100644 --- a/x/wasm/keeper/reflect_test.go +++ b/x/wasm/keeper/reflect_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -19,8 +19,8 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/CosmWasm/wasmd/x/wasm/keeper/testdata" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/testdata" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) var ( diff --git a/x/wasm/keeper/relay.go b/x/wasm/keeper/relay.go index 388136d608..f2246706c4 100644 --- a/x/wasm/keeper/relay.go +++ b/x/wasm/keeper/relay.go @@ -3,7 +3,7 @@ package keeper import ( "time" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) var _ types.IBCContractKeeper = (*Keeper)(nil) diff --git a/x/wasm/keeper/relay_test.go b/x/wasm/keeper/relay_test.go index 8fbd83be3a..d67fe1987e 100644 --- a/x/wasm/keeper/relay_test.go +++ b/x/wasm/keeper/relay_test.go @@ -6,8 +6,8 @@ import ( "math" "testing" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -15,8 +15,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestOnOpenChannel(t *testing.T) { diff --git a/x/wasm/keeper/snapshotter.go b/x/wasm/keeper/snapshotter.go index ab813cc0ec..1c2f4c6490 100644 --- a/x/wasm/keeper/snapshotter.go +++ b/x/wasm/keeper/snapshotter.go @@ -14,8 +14,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/ioutils" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ioutils" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) var _ snapshot.ExtensionSnapshotter = &WasmSnapshotter{} diff --git a/x/wasm/keeper/snapshotter_integration_test.go b/x/wasm/keeper/snapshotter_integration_test.go index ed9af49f99..2a064a6d8b 100644 --- a/x/wasm/keeper/snapshotter_integration_test.go +++ b/x/wasm/keeper/snapshotter_integration_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" tmtypes "github.com/cometbft/cometbft/types" "github.com/stretchr/testify/assert" @@ -20,9 +20,9 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/CosmWasm/wasmd/app" - "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/app" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestSnapshotter(t *testing.T) { diff --git a/x/wasm/keeper/staking_test.go b/x/wasm/keeper/staking_test.go index 292094a52e..24be2f1d4d 100644 --- a/x/wasm/keeper/staking_test.go +++ b/x/wasm/keeper/staking_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -20,8 +20,8 @@ import ( stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/CosmWasm/wasmd/x/wasm/keeper/testdata" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/testdata" + wasmtypes "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) type StakingInitMsg struct { diff --git a/x/wasm/keeper/submsg_test.go b/x/wasm/keeper/submsg_test.go index 971f0d9648..297b90146e 100644 --- a/x/wasm/keeper/submsg_test.go +++ b/x/wasm/keeper/submsg_test.go @@ -7,8 +7,8 @@ import ( "strconv" "testing" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -18,9 +18,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/CosmWasm/wasmd/x/wasm/keeper/testdata" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/testdata" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // test handing of submessages, very closely related to the reflect_test diff --git a/x/wasm/keeper/test_common.go b/x/wasm/keeper/test_common.go index dbf52df037..fac2df2177 100644 --- a/x/wasm/keeper/test_common.go +++ b/x/wasm/keeper/test_common.go @@ -76,10 +76,10 @@ import ( stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - wasmappparams "github.com/CosmWasm/wasmd/app/params" - "github.com/CosmWasm/wasmd/x/wasm/keeper/testdata" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + wasmappparams "github.com/ODIN-PROTOCOL/wasmd/app/params" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/testdata" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) var moduleBasics = module.NewBasicManager( diff --git a/x/wasm/keeper/test_fuzz.go b/x/wasm/keeper/test_fuzz.go index 7bd3e9bbd5..ee09d2db04 100644 --- a/x/wasm/keeper/test_fuzz.go +++ b/x/wasm/keeper/test_fuzz.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) var ModelFuzzers = []interface{}{FuzzAddr, FuzzAddrString, FuzzAbsoluteTxPosition, FuzzContractInfo, FuzzStateModel, FuzzAccessType, FuzzAccessConfig, FuzzContractCodeHistory} diff --git a/x/wasm/keeper/testdata/contracts.go b/x/wasm/keeper/testdata/contracts.go index eb63bdeef6..ad0f9063f2 100644 --- a/x/wasm/keeper/testdata/contracts.go +++ b/x/wasm/keeper/testdata/contracts.go @@ -3,7 +3,7 @@ package testdata import ( _ "embed" - typwasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + typwasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/wasm/keeper/wasmtesting/gas_register.go b/x/wasm/keeper/wasmtesting/gas_register.go index a16de3b32d..706a00f2ab 100644 --- a/x/wasm/keeper/wasmtesting/gas_register.go +++ b/x/wasm/keeper/wasmtesting/gas_register.go @@ -1,7 +1,7 @@ package wasmtesting import ( - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" storetypes "cosmossdk.io/store/types" ) diff --git a/x/wasm/keeper/wasmtesting/messenger.go b/x/wasm/keeper/wasmtesting/messenger.go index 6c133406a5..dfb7a0114c 100644 --- a/x/wasm/keeper/wasmtesting/messenger.go +++ b/x/wasm/keeper/wasmtesting/messenger.go @@ -3,7 +3,7 @@ package wasmtesting import ( "errors" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/wasm/keeper/wasmtesting/mock_engine.go b/x/wasm/keeper/wasmtesting/mock_engine.go index 9ef1c583a2..5906abb97b 100644 --- a/x/wasm/keeper/wasmtesting/mock_engine.go +++ b/x/wasm/keeper/wasmtesting/mock_engine.go @@ -3,13 +3,13 @@ package wasmtesting import ( "bytes" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/cometbft/cometbft/libs/rand" errorsmod "cosmossdk.io/errors" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) const ( diff --git a/x/wasm/keeper/wasmtesting/mock_keepers.go b/x/wasm/keeper/wasmtesting/mock_keepers.go index 2c327785ee..7a8e511c14 100644 --- a/x/wasm/keeper/wasmtesting/mock_keepers.go +++ b/x/wasm/keeper/wasmtesting/mock_keepers.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) type MockChannelKeeper struct { diff --git a/x/wasm/keeper/wasmtesting/msg_dispatcher.go b/x/wasm/keeper/wasmtesting/msg_dispatcher.go index 2229fedab5..85fc1f0da7 100644 --- a/x/wasm/keeper/wasmtesting/msg_dispatcher.go +++ b/x/wasm/keeper/wasmtesting/msg_dispatcher.go @@ -1,7 +1,7 @@ package wasmtesting import ( - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/wasm/keeper/wasmtesting/query_handler.go b/x/wasm/keeper/wasmtesting/query_handler.go index 5f4a4501bb..5f8f1dce76 100644 --- a/x/wasm/keeper/wasmtesting/query_handler.go +++ b/x/wasm/keeper/wasmtesting/query_handler.go @@ -1,7 +1,7 @@ package wasmtesting import ( - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/wasm/migrations/v1/store.go b/x/wasm/migrations/v1/store.go index ab245b0e2a..6a4e91394d 100644 --- a/x/wasm/migrations/v1/store.go +++ b/x/wasm/migrations/v1/store.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // AddToSecondIndexFn creates a secondary index entry for the creator fo the contract diff --git a/x/wasm/migrations/v1/store_test.go b/x/wasm/migrations/v1/store_test.go index d85ff8f1f3..dd9b6a4b7e 100644 --- a/x/wasm/migrations/v1/store_test.go +++ b/x/wasm/migrations/v1/store_test.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" - "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestMigrate1To2(t *testing.T) { diff --git a/x/wasm/migrations/v2/params_legacy.go b/x/wasm/migrations/v2/params_legacy.go index d4fad0bdef..fa97546243 100644 --- a/x/wasm/migrations/v2/params_legacy.go +++ b/x/wasm/migrations/v2/params_legacy.go @@ -16,7 +16,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) var ( diff --git a/x/wasm/migrations/v2/store.go b/x/wasm/migrations/v2/store.go index 481ef6865c..7a8f29ab7f 100644 --- a/x/wasm/migrations/v2/store.go +++ b/x/wasm/migrations/v2/store.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/exported" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/exported" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // MigrateStore migrates the x/wasm module state from the consensus version 2 to diff --git a/x/wasm/migrations/v2/store_test.go b/x/wasm/migrations/v2/store_test.go index f087e6f42f..1796b36ae4 100644 --- a/x/wasm/migrations/v2/store_test.go +++ b/x/wasm/migrations/v2/store_test.go @@ -17,9 +17,9 @@ import ( paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/CosmWasm/wasmd/x/wasm" - v2 "github.com/CosmWasm/wasmd/x/wasm/migrations/v2" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm" + v2 "github.com/ODIN-PROTOCOL/wasmd/x/wasm/migrations/v2" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestMigrate(t *testing.T) { diff --git a/x/wasm/migrations/v3/store.go b/x/wasm/migrations/v3/store.go index a4408ea61e..25a0602ca7 100644 --- a/x/wasm/migrations/v3/store.go +++ b/x/wasm/migrations/v3/store.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/runtime" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // StoreCodeInfoFn stores code info diff --git a/x/wasm/migrations/v3/store_test.go b/x/wasm/migrations/v3/store_test.go index b754599d76..dae59881b9 100644 --- a/x/wasm/migrations/v3/store_test.go +++ b/x/wasm/migrations/v3/store_test.go @@ -11,11 +11,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/address" moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" - "github.com/CosmWasm/wasmd/x/wasm" - "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - v3 "github.com/CosmWasm/wasmd/x/wasm/migrations/v3" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + v3 "github.com/ODIN-PROTOCOL/wasmd/x/wasm/migrations/v3" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestMigrate3To4(t *testing.T) { diff --git a/x/wasm/module.go b/x/wasm/module.go index 4fdf8f9dd4..efcfb5b244 100644 --- a/x/wasm/module.go +++ b/x/wasm/module.go @@ -7,7 +7,7 @@ import ( "runtime/debug" "strings" - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" abci "github.com/cometbft/cometbft/abci/types" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cast" @@ -25,11 +25,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/CosmWasm/wasmd/x/wasm/client/cli" - "github.com/CosmWasm/wasmd/x/wasm/exported" - "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/simulation" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/client/cli" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/exported" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/simulation" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) var ( @@ -280,7 +280,7 @@ func getExpectedLibwasmVersion() string { panic("can't read build info") } for _, d := range buildInfo.Deps { - if d.Path != "github.com/CosmWasm/wasmvm/v2" { + if d.Path != "github.com/ODIN-PROTOCOL/wasmvm/v2" { continue } if d.Replace != nil { @@ -292,7 +292,7 @@ func getExpectedLibwasmVersion() string { } // CheckLibwasmVersion ensures that the libwasmvm version loaded at runtime matches the version -// of the github.com/CosmWasm/wasmvm dependency in go.mod. This us useful when dealing with +// of the github.com/ODIN-PROTOCOL/wasmvm dependency in go.mod. This us useful when dealing with // shared libraries that are copied or moved from their default location, e.g. when building the node // on one machine and deploying it to other machines. // diff --git a/x/wasm/module_test.go b/x/wasm/module_test.go index d75838a2a5..c63390490c 100644 --- a/x/wasm/module_test.go +++ b/x/wasm/module_test.go @@ -23,12 +23,12 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/CosmWasm/wasmd/app/params" - "github.com/CosmWasm/wasmd/x/wasm/exported" - "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/keeper/testdata" - v2 "github.com/CosmWasm/wasmd/x/wasm/migrations/v2" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/app/params" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/exported" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/testdata" + v2 "github.com/ODIN-PROTOCOL/wasmd/x/wasm/migrations/v2" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) type mockSubspace struct { diff --git a/x/wasm/relay_pingpong_test.go b/x/wasm/relay_pingpong_test.go index d06a460714..c4368b5542 100644 --- a/x/wasm/relay_pingpong_test.go +++ b/x/wasm/relay_pingpong_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" @@ -16,11 +16,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - app2 "github.com/CosmWasm/wasmd/app" - wasmibctesting "github.com/CosmWasm/wasmd/x/wasm/ibctesting" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + app2 "github.com/ODIN-PROTOCOL/wasmd/app" + wasmibctesting "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ibctesting" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + wasmtypes "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) const ( diff --git a/x/wasm/relay_test.go b/x/wasm/relay_test.go index bfb906db6b..070e311b1b 100644 --- a/x/wasm/relay_test.go +++ b/x/wasm/relay_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" @@ -20,11 +20,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmWasm/wasmd/app" - wasmibctesting "github.com/CosmWasm/wasmd/x/wasm/ibctesting" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/app" + wasmibctesting "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ibctesting" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/wasmtesting" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) func TestFromIBCTransferToContract(t *testing.T) { diff --git a/x/wasm/simulation/genesis.go b/x/wasm/simulation/genesis.go index 94db6be27f..d7cc0660be 100644 --- a/x/wasm/simulation/genesis.go +++ b/x/wasm/simulation/genesis.go @@ -3,7 +3,7 @@ package simulation import ( "github.com/cosmos/cosmos-sdk/types/module" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // RandomizeGenState generates a random GenesisState for wasm diff --git a/x/wasm/simulation/operations.go b/x/wasm/simulation/operations.go index c284a33342..3482566493 100644 --- a/x/wasm/simulation/operations.go +++ b/x/wasm/simulation/operations.go @@ -6,7 +6,7 @@ import ( "math/rand" "os" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" errorsmod "cosmossdk.io/errors" @@ -18,10 +18,10 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/tx" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/CosmWasm/wasmd/app/params" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - "github.com/CosmWasm/wasmd/x/wasm/keeper/testdata" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/app/params" + wasmkeeper "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/testdata" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) // Simulation operation weights constants diff --git a/x/wasm/simulation/proposals.go b/x/wasm/simulation/proposals.go index aeda227b23..64701c98bd 100644 --- a/x/wasm/simulation/proposals.go +++ b/x/wasm/simulation/proposals.go @@ -7,9 +7,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/CosmWasm/wasmd/app/params" - "github.com/CosmWasm/wasmd/x/wasm/keeper/testdata" - "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/ODIN-PROTOCOL/wasmd/app/params" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/keeper/testdata" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/types" ) const ( diff --git a/x/wasm/types/authz.go b/x/wasm/types/authz.go index 0e8279703f..db87f63512 100644 --- a/x/wasm/types/authz.go +++ b/x/wasm/types/authz.go @@ -5,7 +5,7 @@ import ( "context" "strings" - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" "github.com/cosmos/gogoproto/proto" errorsmod "cosmossdk.io/errors" @@ -15,7 +15,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" authztypes "github.com/cosmos/cosmos-sdk/x/authz" - "github.com/CosmWasm/wasmd/x/wasm/ioutils" + "github.com/ODIN-PROTOCOL/wasmd/x/wasm/ioutils" ) const ( diff --git a/x/wasm/types/authz_test.go b/x/wasm/types/authz_test.go index f846691988..064699b174 100644 --- a/x/wasm/types/authz_test.go +++ b/x/wasm/types/authz_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/x/wasm/types/errors.go b/x/wasm/types/errors.go index 00ea45dc68..bcb3c3fd8b 100644 --- a/x/wasm/types/errors.go +++ b/x/wasm/types/errors.go @@ -1,7 +1,7 @@ package types import ( - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" errorsmod "cosmossdk.io/errors" ) diff --git a/x/wasm/types/errors_test.go b/x/wasm/types/errors_test.go index 45d98c9299..b054928c73 100644 --- a/x/wasm/types/errors_test.go +++ b/x/wasm/types/errors_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/x/wasm/types/exported_keepers.go b/x/wasm/types/exported_keepers.go index 918ad214e3..918c04729c 100644 --- a/x/wasm/types/exported_keepers.go +++ b/x/wasm/types/exported_keepers.go @@ -3,7 +3,7 @@ package types import ( "context" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" diff --git a/x/wasm/types/gas_register.go b/x/wasm/types/gas_register.go index ca6e11c235..70601ee673 100644 --- a/x/wasm/types/gas_register.go +++ b/x/wasm/types/gas_register.go @@ -1,7 +1,7 @@ package types import ( - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" @@ -24,17 +24,17 @@ const ( // In the 2.0 upgrade, this was reduced by a factor of 1000 (https://github.com/CosmWasm/cosmwasm/pull/1884). // // The multiplier deserves more reproducible benchmarking and a strategy that allows easy adjustments. - // This is tracked in https://github.com/CosmWasm/wasmd/issues/566 and https://github.com/CosmWasm/wasmd/issues/631. + // This is tracked in https://github.com/ODIN-PROTOCOL/wasmd/issues/566 and https://github.com/ODIN-PROTOCOL/wasmd/issues/631. // Gas adjustments are consensus breaking but may happen in any release marked as consensus breaking. // Do not make assumptions on how much gas an operation will consume in places that are hard to adjust, // such as hardcoding them in contracts. // // Please note that all gas prices returned to wasmvm should have this multiplied. - // Benchmarks and numbers were discussed in: https://github.com/CosmWasm/wasmd/pull/634#issuecomment-938055852 + // Benchmarks and numbers were discussed in: https://github.com/ODIN-PROTOCOL/wasmd/pull/634#issuecomment-938055852 DefaultGasMultiplier uint64 = 140_000 // DefaultInstanceCost is how much SDK gas we charge each time we load a WASM instance. // Creating a new instance is costly, and this helps put a recursion limit to contracts calling contracts. - // Benchmarks and numbers were discussed in: https://github.com/CosmWasm/wasmd/pull/634#issuecomment-938056803 + // Benchmarks and numbers were discussed in: https://github.com/ODIN-PROTOCOL/wasmd/pull/634#issuecomment-938056803 DefaultInstanceCost uint64 = 60_000 // DefaultInstanceCostDiscount is charged instead of DefaultInstanceCost for cases where // we assume the contract is loaded from an in-memory cache. @@ -42,7 +42,7 @@ const ( // Now we use something small that roughly reflects the 45µs startup time (30x cheaper than DefaultInstanceCost). DefaultInstanceCostDiscount uint64 = 2_000 // DefaultCompileCost is how much SDK gas is charged *per byte* for compiling WASM code. - // Benchmarks and numbers were discussed in: https://github.com/CosmWasm/wasmd/pull/634#issuecomment-938056803 + // Benchmarks and numbers were discussed in: https://github.com/ODIN-PROTOCOL/wasmd/pull/634#issuecomment-938056803 DefaultCompileCost uint64 = 3 // DefaultEventAttributeDataCost is how much SDK gas is charged *per byte* for attribute data in events. // This is used with len(key) + len(value) @@ -62,7 +62,7 @@ const ( ) // default: 0.15 gas. -// see https://github.com/CosmWasm/wasmd/pull/898#discussion_r937727200 +// see https://github.com/ODIN-PROTOCOL/wasmd/pull/898#discussion_r937727200 var defaultPerByteUncompressCost = wasmvmtypes.UFraction{ Numerator: 15, Denominator: 100, @@ -103,7 +103,7 @@ type WasmGasRegisterConfig struct { // InstanceCostDiscount is a discounted version of InstanceCost. It is charged whenever // we can reasonably assume that a contract is in one of the in-memory caches. E.g. // when the contract is pinned or we send a reply to a contract that was executed before. - // See also https://github.com/CosmWasm/wasmd/issues/1798 for more thinking around + // See also https://github.com/ODIN-PROTOCOL/wasmd/issues/1798 for more thinking around // discount cases. InstanceCostDiscount storetypes.Gas // CompileCosts costs to persist and "compile" a new wasm contract diff --git a/x/wasm/types/gas_register_test.go b/x/wasm/types/gas_register_test.go index 45e9719cbf..c08c7b2417 100644 --- a/x/wasm/types/gas_register_test.go +++ b/x/wasm/types/gas_register_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/stretchr/testify/assert" storetypes "cosmossdk.io/store/types" diff --git a/x/wasm/types/test_fixtures.go b/x/wasm/types/test_fixtures.go index e1d03c59c7..9a5907ef75 100644 --- a/x/wasm/types/test_fixtures.go +++ b/x/wasm/types/test_fixtures.go @@ -4,7 +4,7 @@ import ( _ "embed" "math/rand" - wasmvm "github.com/CosmWasm/wasmvm/v2" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" sdkmath "cosmossdk.io/math" diff --git a/x/wasm/types/types.go b/x/wasm/types/types.go index 4b2a83e0d9..31bd0d6517 100644 --- a/x/wasm/types/types.go +++ b/x/wasm/types/types.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/cosmos/gogoproto/proto" errorsmod "cosmossdk.io/errors" diff --git a/x/wasm/types/types_test.go b/x/wasm/types/types_test.go index d00cf5ca3a..3cef80807a 100644 --- a/x/wasm/types/types_test.go +++ b/x/wasm/types/types_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" "github.com/cometbft/cometbft/libs/rand" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/x/wasm/types/wasmer_engine.go b/x/wasm/types/wasmer_engine.go index f3829e9146..b69ae48a09 100644 --- a/x/wasm/types/wasmer_engine.go +++ b/x/wasm/types/wasmer_engine.go @@ -1,8 +1,8 @@ package types import ( - wasmvm "github.com/CosmWasm/wasmvm/v2" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvm "github.com/ODIN-PROTOCOL/wasmvm/v2" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" storetypes "cosmossdk.io/store/types" ) From df725cbf325bb99ae68a819a30ff0c50283947db Mon Sep 17 00:00:00 2001 From: slandymani Date: Fri, 22 Nov 2024 18:32:27 +0200 Subject: [PATCH 2/2] fix paths --- cmd/wasmd/root.go | 2 -- go.mod | 1 - go.sum | 2 -- tests/e2e/ibc_callbacks_test.go | 2 +- x/wasm/keeper/keeper_test.go | 2 +- x/wasm/keeper/wasmtesting/mock_keepers.go | 2 +- 6 files changed, 3 insertions(+), 8 deletions(-) diff --git a/cmd/wasmd/root.go b/cmd/wasmd/root.go index d9ce7bd685..11f8065f23 100644 --- a/cmd/wasmd/root.go +++ b/cmd/wasmd/root.go @@ -10,7 +10,6 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/config" - "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/cosmos/cosmos-sdk/server" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" @@ -111,7 +110,6 @@ func NewRootCmd() *cobra.Command { // add keyring to autocli opts autoCliOpts := tempApp.AutoCliOpts() initClientCtx, _ = config.ReadFromClientConfig(initClientCtx) - autoCliOpts.Keyring, _ = keyring.NewAutoCLIKeyring(initClientCtx.Keyring) autoCliOpts.ClientCtx = initClientCtx if err := autoCliOpts.EnhanceRootCommand(rootCmd); err != nil { diff --git a/go.mod b/go.mod index a25db3749b..82a86c9b79 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,6 @@ require ( cosmossdk.io/x/nft v0.1.1 cosmossdk.io/x/tx v0.13.5 cosmossdk.io/x/upgrade v0.1.4 - github.com/CosmWasm/wasmvm/v2 v2.1.3 github.com/cometbft/cometbft v0.38.12 github.com/cosmos/cosmos-db v1.0.2 github.com/cosmos/ibc-go/modules/apps/callbacks v0.2.1-0.20231113120333-342c00b0f8bd diff --git a/go.sum b/go.sum index ca215fac84..d6c501c2dd 100644 --- a/go.sum +++ b/go.sum @@ -227,8 +227,6 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/CosmWasm/wasmvm/v2 v2.1.3 h1:CSJTauZqkHyb9yic6JVYCjiGUgxI2MJV2QzfSu8m49c= -github.com/CosmWasm/wasmvm/v2 v2.1.3/go.mod h1:bMhLQL4Yp9CzJi9A83aR7VO9wockOsSlZbT4ztOl6bg= github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= diff --git a/tests/e2e/ibc_callbacks_test.go b/tests/e2e/ibc_callbacks_test.go index 10612530b7..5c2abd411e 100644 --- a/tests/e2e/ibc_callbacks_test.go +++ b/tests/e2e/ibc_callbacks_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" ibcfee "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/types" ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" diff --git a/x/wasm/keeper/keeper_test.go b/x/wasm/keeper/keeper_test.go index 68e3c306ee..cae7612e1f 100644 --- a/x/wasm/keeper/keeper_test.go +++ b/x/wasm/keeper/keeper_test.go @@ -422,7 +422,7 @@ func TestInstantiate(t *testing.T) { gasAfter := ctx.GasMeter().GasConsumed() if types.EnableGasVerification { - require.Equal(t, uint64(0x1bc8f), gasAfter-gasBefore) + require.Equal(t, uint64(0x1bca5), gasAfter-gasBefore) } // ensure it is stored properly diff --git a/x/wasm/keeper/wasmtesting/mock_keepers.go b/x/wasm/keeper/wasmtesting/mock_keepers.go index ae65881aad..3bb2207a95 100644 --- a/x/wasm/keeper/wasmtesting/mock_keepers.go +++ b/x/wasm/keeper/wasmtesting/mock_keepers.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" + wasmvmtypes "github.com/ODIN-PROTOCOL/wasmvm/v2/types" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"