Skip to content

Commit

Permalink
chore: upgrade in progress (remove burrow dependency)
Browse files Browse the repository at this point in the history
  • Loading branch information
hacheigriega committed Jan 22, 2024
1 parent 7c57033 commit 8556dc0
Show file tree
Hide file tree
Showing 9 changed files with 617 additions and 143 deletions.
6 changes: 4 additions & 2 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -684,9 +684,11 @@ func NewApp(
// there is nothing left over in the validator fee pool, so as to keep the
// CanWithdrawInvariant invariant.
// NOTE: staking module is required if HistoricalEntries param > 0
app.mm.SetOrderBeginBlockers(
// upgrades should be run first
app.mm.SetOrderPreBlockers(
upgradetypes.ModuleName,
)

app.mm.SetOrderBeginBlockers(
capabilitytypes.ModuleName, // capability module's beginblocker must come before any modules using capabilities (e.g. IBC)
minttypes.ModuleName,
distrtypes.ModuleName,
Expand Down
3 changes: 2 additions & 1 deletion e2e/e2e_gov_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ import (
"strconv"
"time"

"github.com/ethereum/go-ethereum/crypto"

wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
"github.com/hyperledger/burrow/crypto"

"github.com/sedaprotocol/seda-chain/x/wasm-storage/types"
)
Expand Down
2 changes: 1 addition & 1 deletion e2e/e2e_wasm_storage_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"path/filepath"
"time"

"github.com/hyperledger/burrow/crypto"
"github.com/ethereum/go-ethereum/crypto"
"github.com/sedaprotocol/seda-chain/x/wasm-storage/types"
)

Expand Down
7 changes: 3 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ require (
github.com/cosmos/gogoproto v1.4.11
github.com/cosmos/ibc-go/modules/capability v1.0.0
github.com/cosmos/ibc-go/v8 v8.0.0
github.com/ethereum/go-ethereum v1.13.5
github.com/golang/protobuf v1.5.3
github.com/gorilla/mux v1.8.1
github.com/grpc-ecosystem/grpc-gateway v1.16.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2
github.com/hyperledger/burrow v0.34.4
github.com/ory/dockertest/v3 v3.10.0
github.com/pkg/errors v0.9.1
github.com/sedaprotocol/vrf-go v0.0.0-20231211075603-e5a17bb0b87c
Expand Down Expand Up @@ -60,6 +60,7 @@ require (
github.com/DataDog/zstd v1.5.5 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/aws/aws-sdk-go v1.44.224 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
Expand Down Expand Up @@ -101,7 +102,6 @@ require (
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
github.com/emicklei/dot v1.6.0 // indirect
github.com/ethereum/go-ethereum v1.13.5 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
Expand Down Expand Up @@ -142,6 +142,7 @@ require (
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
github.com/holiman/uint256 v1.2.3 // indirect
github.com/huandu/skiplist v1.2.0 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
Expand Down Expand Up @@ -191,9 +192,7 @@ require (
github.com/subosito/gotenv v1.6.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
github.com/tendermint/go-amino v0.16.0 // indirect
github.com/tendermint/tendermint v0.34.3 // indirect
github.com/tidwall/btree v1.7.0 // indirect
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
Expand Down
134 changes: 2 additions & 132 deletions go.sum

Large diffs are not rendered by default.

602 changes: 602 additions & 0 deletions go.work.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion x/wasm-storage/keeper/keeper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/hex"
"os"

"github.com/hyperledger/burrow/crypto"
"github.com/ethereum/go-ethereum/crypto"

"github.com/CosmWasm/wasmd/x/wasm/ioutils"

Expand Down
2 changes: 1 addition & 1 deletion x/wasm-storage/keeper/msg_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"os"

"github.com/hyperledger/burrow/crypto"
"github.com/ethereum/go-ethereum/crypto"

"github.com/CosmWasm/wasmd/x/wasm/ioutils"

Expand Down
2 changes: 1 addition & 1 deletion x/wasm-storage/types/wasm.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"
"time"

"github.com/hyperledger/burrow/crypto"
"github.com/ethereum/go-ethereum/crypto"
)

const (
Expand Down

0 comments on commit 8556dc0

Please sign in to comment.