Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
0g-wh committed Sep 25, 2024
1 parent 0c02c27 commit de22587
Show file tree
Hide file tree
Showing 51 changed files with 85 additions and 406 deletions.
2 changes: 1 addition & 1 deletion .mockery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ outpkg: "mocks"
filename: "Mock{{.InterfaceName}}.go"

packages:
github.com/kava-labs/kava/x/precisebank/types:
github.com/0glabs/0g-chain/x/precisebank/types:
# package-specific config
config:
interfaces:
Expand Down
1 change: 0 additions & 1 deletion app/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine"
ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
"github.com/ethereum/go-ethereum/precompile/modules"
evmtypes "github.com/evmos/ethermint/x/evm/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
8 changes: 4 additions & 4 deletions app/upgrades_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"time"

sdkmath "cosmossdk.io/math"
"github.com/0glabs/0g-chain/app"
evmutiltypes "github.com/0glabs/0g-chain/x/evmutil/types"
precisebankkeeper "github.com/0glabs/0g-chain/x/precisebank/keeper"
precisebanktypes "github.com/0glabs/0g-chain/x/precisebank/types"
tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/kava-labs/kava/app"
evmutiltypes "github.com/kava-labs/kava/x/evmutil/types"
precisebankkeeper "github.com/kava-labs/kava/x/precisebank/keeper"
precisebanktypes "github.com/kava-labs/kava/x/precisebank/types"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion client/grpc/query/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"net/url"

"github.com/0glabs/0g-chain/app"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/kava-labs/kava/app"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure"
Expand Down
2 changes: 1 addition & 1 deletion client/grpc/query/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
committeetypes "github.com/0glabs/0g-chain/x/committee/types"
evmutiltypes "github.com/0glabs/0g-chain/x/evmutil/types"
issuancetypes "github.com/0glabs/0g-chain/x/issuance/types"
precisebanktypes "github.com/0glabs/0g-chain/x/precisebank/types"
pricefeedtypes "github.com/0glabs/0g-chain/x/pricefeed/types"
precisebanktypes "github.com/kava-labs/kava/x/precisebank/types"
)

// QueryClient is a wrapper with all Cosmos and Kava grpc query clients
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ replace (
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
// Tracking kava-labs/go-ethereum kava/release/v1.10 branch
// TODO: Tag before release
github.com/ethereum/go-ethereum => github.com/Kava-Labs/go-ethereum v1.10.27-0.20240513233504-6e038346780b
github.com/ethereum/go-ethereum => github.com/evmos/go-ethereum v1.10.26-evmos-rc2
// Use ethermint fork that respects min-gas-price with NoBaseFee true and london enabled, and includes eip712 support
github.com/evmos/ethermint => github.com/0glabs/ethermint v0.21.0-0g.v3.1.0
// See https://github.com/cosmos/cosmos-sdk/pull/10401, https://github.com/cosmos/cosmos-sdk/commit/0592ba6158cd0bf49d894be1cef4faeec59e8320
Expand Down
27 changes: 0 additions & 27 deletions precompile/README.md

This file was deleted.

23 changes: 0 additions & 23 deletions precompile/contracts/noop/contract.go

This file was deleted.

18 changes: 0 additions & 18 deletions precompile/contracts/noop/contract_test.go

This file was deleted.

46 changes: 0 additions & 46 deletions precompile/registry/registry.go

This file was deleted.

33 changes: 0 additions & 33 deletions precompile/registry/registry_test.go

This file was deleted.

2 changes: 1 addition & 1 deletion proto/kava/precisebank/v1/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package kava.precisebank.v1;
import "cosmos_proto/cosmos.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/kava-labs/kava/x/precisebank/types";
option go_package = "github.com/0glabs/0g-chain/x/precisebank/types";

// GenesisState defines the precisebank module's genesis state.
message GenesisState {
Expand Down
2 changes: 1 addition & 1 deletion proto/kava/precisebank/v1/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";
import "google/api/annotations.proto";

option go_package = "github.com/kava-labs/kava/x/precisebank/types";
option go_package = "github.com/0glabs/0g-chain/x/precisebank/types";
option (gogoproto.goproto_getters_all) = false;

// Query defines the gRPC querier service for precisebank module
Expand Down
14 changes: 7 additions & 7 deletions tests/e2e-ibc/erc20_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ import (
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/testreporter"

"github.com/kava-labs/kava/app"
"github.com/kava-labs/kava/client/erc20"
"github.com/kava-labs/kava/tests/e2e/runner"
"github.com/kava-labs/kava/tests/e2e/testutil"
kavainterchain "github.com/kava-labs/kava/tests/interchain"
"github.com/kava-labs/kava/tests/util"
evmutiltypes "github.com/kava-labs/kava/x/evmutil/types"
"github.com/0glabs/0g-chain/app"
"github.com/0glabs/0g-chain/client/erc20"
"github.com/0glabs/0g-chain/tests/e2e/runner"
"github.com/0glabs/0g-chain/tests/e2e/testutil"
kavainterchain "github.com/0glabs/0g-chain/tests/interchain"
"github.com/0glabs/0g-chain/tests/util"
evmutiltypes "github.com/0glabs/0g-chain/x/evmutil/types"
)

// This test does the following:
Expand Down
Loading

0 comments on commit de22587

Please sign in to comment.