diff --git a/go.mod b/go.mod index af03846af..780457fa9 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( github.com/cosmos/cosmos-sdk v0.25.0 github.com/deathowl/go-metrics-prometheus v0.0.0-20200518174047-74482eab5bfb github.com/eapache/go-resiliency v1.1.0 + github.com/ethereum/go-ethereum v1.11.3 github.com/go-kit/kit v0.10.0 github.com/google/btree v1.0.0 github.com/gorilla/mux v1.8.0 @@ -48,7 +49,6 @@ require ( github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect github.com/eapache/queue v1.1.0 // indirect github.com/etcd-io/bbolt v1.3.3 // indirect - github.com/ethereum/go-ethereum v1.11.3 // indirect github.com/ferranbt/fastssz v0.0.0-20210526181520-7df50c8568f8 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect @@ -165,7 +165,8 @@ require ( replace ( github.com/Shopify/sarama v1.26.1 => github.com/Shopify/sarama v1.21.0 - github.com/cosmos/cosmos-sdk => github.com/j75689/bnc-cosmos-sdk v0.0.0-20231116015058-f4c4b6cf4304 //github.com/bnb-chain/bnc-cosmos-sdk v0.26.6 + // TODO: bump to official release + github.com/cosmos/cosmos-sdk => github.com/j75689/bnc-cosmos-sdk v0.0.0-20231129030639-0bac8422dcb4 github.com/grpc-ecosystem/grpc-gateway/v2 => github.com/prysmaticlabs/grpc-gateway/v2 v2.3.1-0.20210702154020-550e1cd83ec1 github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/tendermint/go-amino => github.com/bnb-chain/bnc-go-amino v0.14.1-binance.2 diff --git a/go.sum b/go.sum index 6328317e3..c76c3abd1 100644 --- a/go.sum +++ b/go.sum @@ -787,8 +787,8 @@ github.com/iris-contrib/jade v1.1.4/go.mod h1:EDqR+ur9piDl6DUgs6qRrlfzmlx/D5Uybo github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g= github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= github.com/iris-contrib/schema v0.0.6/go.mod h1:iYszG0IOsuIsfzjymw1kMzTL8YQcCWlm65f3wX8J5iA= -github.com/j75689/bnc-cosmos-sdk v0.0.0-20231116015058-f4c4b6cf4304 h1:pRwSJU1SnmKNmpK8yIdTEoeny2MbKoQPvmvoY/BUaA8= -github.com/j75689/bnc-cosmos-sdk v0.0.0-20231116015058-f4c4b6cf4304/go.mod h1:OjdXpDHofs6gcPLM9oGD+mm8DPc6Lsevz0Kia53zt3Q= +github.com/j75689/bnc-cosmos-sdk v0.0.0-20231129030639-0bac8422dcb4 h1:uGe9w4AzTkpmuTORXrKf35I0zpn2OfFByvxb5uOq1jk= +github.com/j75689/bnc-cosmos-sdk v0.0.0-20231129030639-0bac8422dcb4/go.mod h1:OjdXpDHofs6gcPLM9oGD+mm8DPc6Lsevz0Kia53zt3Q= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA= diff --git a/plugins/tokens/freeze/handler.go b/plugins/tokens/freeze/handler.go index 1a1b21015..b6cabb117 100644 --- a/plugins/tokens/freeze/handler.go +++ b/plugins/tokens/freeze/handler.go @@ -19,7 +19,7 @@ func NewHandler(tokenMapper store.Mapper, accKeeper auth.AccountKeeper, keeper b return func(ctx sdk.Context, msg sdk.Msg) sdk.Result { switch msg := msg.(type) { case FreezeMsg: - if sdk.IsUpgrade(sdk.BCFusionFirstHardFork) { + if sdk.IsUpgrade(sdk.FirstSunsetFork) { return sdk.ErrMsgNotSupported("").Result() } return handleFreezeToken(ctx, tokenMapper, accKeeper, keeper, msg) diff --git a/plugins/tokens/issue/handler.go b/plugins/tokens/issue/handler.go index 9ec8de05c..82ef70444 100644 --- a/plugins/tokens/issue/handler.go +++ b/plugins/tokens/issue/handler.go @@ -21,7 +21,7 @@ import ( // NewHandler creates a new token issue message handler func NewHandler(tokenMapper store.Mapper, keeper bank.Keeper) sdk.Handler { return func(ctx sdk.Context, msg sdk.Msg) sdk.Result { - if sdk.IsUpgrade(sdk.BCFusionFirstHardFork) { + if sdk.IsUpgrade(sdk.FirstSunsetFork) { return sdk.ErrMsgNotSupported("").Result() } switch msg := msg.(type) { diff --git a/plugins/tokens/plugin.go b/plugins/tokens/plugin.go index a34dd41ee..53ddd44a7 100644 --- a/plugins/tokens/plugin.go +++ b/plugins/tokens/plugin.go @@ -56,7 +56,7 @@ const ( ) func EndBlocker(ctx sdk.Context, timelockKeeper timelock.Keeper, swapKeeper swap.Keeper) { - if !sdk.IsUpgrade(sdk.BCFusionSecondHardFork) { + if !sdk.IsUpgrade(sdk.SecondSunsetFork) { return } logger := bnclog.With("module", "tokens") diff --git a/plugins/tokens/swap/handler.go b/plugins/tokens/swap/handler.go index 0cc912f70..a07347e5b 100644 --- a/plugins/tokens/swap/handler.go +++ b/plugins/tokens/swap/handler.go @@ -12,12 +12,12 @@ func NewHandler(kp Keeper) sdk.Handler { return func(ctx sdk.Context, msg sdk.Msg) sdk.Result { switch msg := msg.(type) { case HTLTMsg: - if sdk.IsUpgrade(sdk.BCFusionFirstHardFork) { + if sdk.IsUpgrade(sdk.FirstSunsetFork) { return sdk.ErrMsgNotSupported("").Result() } return handleHashTimerLockedTransfer(ctx, kp, msg) case DepositHTLTMsg: - if sdk.IsUpgrade(sdk.BCFusionFirstHardFork) { + if sdk.IsUpgrade(sdk.FirstSunsetFork) { return sdk.ErrMsgNotSupported("").Result() } return handleDepositHashTimerLockedTransfer(ctx, kp, msg) diff --git a/plugins/tokens/timelock/handler.go b/plugins/tokens/timelock/handler.go index f8204b5e0..f69741954 100644 --- a/plugins/tokens/timelock/handler.go +++ b/plugins/tokens/timelock/handler.go @@ -11,14 +11,14 @@ func NewHandler(keeper Keeper) sdk.Handler { return func(ctx sdk.Context, msg sdk.Msg) sdk.Result { switch msg := msg.(type) { case TimeLockMsg: - if sdk.IsUpgrade(sdk.BCFusionFirstHardFork) { + if sdk.IsUpgrade(sdk.FirstSunsetFork) { return sdk.ErrMsgNotSupported("").Result() } return handleTimeLock(ctx, keeper, msg) case TimeUnlockMsg: return handleTimeUnlock(ctx, keeper, msg) case TimeRelockMsg: - if sdk.IsUpgrade(sdk.BCFusionFirstHardFork) { + if sdk.IsUpgrade(sdk.FirstSunsetFork) { return sdk.ErrMsgNotSupported("").Result() } return handleTimeRelock(ctx, keeper, msg)