Merge branch 'facu/gbupgrade-drain' of https://github.com/umee-networ…

…k/umee into facu/gbupgrade-drain

.github/workflows/lint.yml

@@ -40,7 +40,7 @@ jobs:
  with:
  fetch-depth: 0
  # lint only changed files
- - uses: tj-actions/changed-files@v36
+ - uses: tj-actions/changed-files@v37
  id: changed-files
  with:
  files: "**/*.md"

CHANGELOG.md

@@ -48,7 +48,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Features
 
-- [2192](https://github.com/umee-network/umee/pull/2102) Add `MsgFastLiquidate` to `x/leverage`
+- [2114](https://github.com/umee-network/umee/pull/2114) Add borrow factor to `x/leverage`
+- [2102](https://github.com/umee-network/umee/pull/2102) and [2106](https://github.com/umee-network/umee/pull/2106) Add `MsgLeveragedLiquidate` to `x/leverage`
 - [2085](https://github.com/umee-network/umee/pull/2085) Add `inspect` query to leverage module, which msut be enabled on a node by running with `-l` liquidator query flag.
 - [1952](https://github.com/umee-network/umee/pull/1952) Add `x/incentive` module.
 - [2015](https://github.com/umee-network/umee/pull/2015), [2050](https://github.com/umee-network/umee/pull/2050) Add `x/ugov` module.

app/wasm/query/handle_leverage.go

@@ -86,6 +86,6 @@ func (q UmeeQuery) HandleMaxBorrow(
  ctx context.Context,
  qs lvtypes.QueryServer,
 ) (proto.Message, error) {
- req := &lvtypes.QueryMaxBorrow{Address: q.MaxBorrow.Address, Denom: q.MaxBorrow.Address}
+ req := &lvtypes.QueryMaxBorrow{Address: q.MaxBorrow.Address, Denom: q.MaxBorrow.Denom}
  return qs.MaxBorrow(ctx, req)
 }

client/client.go

@@ -18,14 +18,15 @@ type Client struct {
 // Accounts are generated using the list of mnemonics. Each string must be a sequence of words,
 // eg: `["w11 w12 w13", "w21 w22 w23"]`. Keyring names for created accounts will be: val1, val2....
 func NewClient(
+ chainDataDir,
  chainID,
  tmrpcEndpoint,
  grpcEndpoint string,
  mnemonics map[string]string,
  gasAdjustment float64,
  encCfg sdkparams.EncodingConfig,
 ) (Client, error) {
- c, err := sdkclient.NewClient(chainID, tmrpcEndpoint, grpcEndpoint, mnemonics, gasAdjustment, encCfg)
+ c, err := sdkclient.NewClient(chainDataDir, chainID, tmrpcEndpoint, grpcEndpoint, mnemonics, gasAdjustment, encCfg)
  if err != nil {
  return Client{}, err
  }

contrib/images/umee.e2e.dockerfile

@@ -21,7 +21,7 @@ RUN if [ "$EXPERIMENTAL" = "true" ] ; then echo "Installing experimental build";
 RUN BUILD_TAGS=badgerdb make install
 
 ## Prepare the final clear binary
-FROM ubuntu:rolling
+FROM ubuntu:23.04
 EXPOSE 26656 26657 1317 9090 7171
 ENTRYPOINT ["umeed", "start"]
 

contrib/images/umeed.dockerfile

@@ -14,15 +14,14 @@ RUN LEDGER_ENABLED=false BUILD_TAGS=badgerdb make install
 
 # Stage-2: copy binary and required artifacts to a fresh image
 # we need to use debian compatible system.
-FROM ubuntu:rolling
+FROM ubuntu:23.04
 EXPOSE 26656 26657 1317 9090
-CMD ["umeed"]
 # Run umeed by default, omit entrypoint to ease using container with CLI
+CMD ["umeed"]
 STOPSIGNAL SIGTERM
 
 RUN apt-get update && apt-get install ca-certificates -y \
- && addgroup --gid 1000 umee \
- && useradd -u 1000 -g umee -m umee
+ && groupadd umee && useradd -g umee -m umee
 
 COPY --from=builder /go/bin/umeed /usr/local/bin/
 COPY --from=builder /go/pkg/mod/github.com/\!cosm\!wasm/wasmvm\@v*/internal/api/libwasmvm.*.so /usr/lib/

go.mod

@@ -33,7 +33,7 @@ require (
  github.com/tendermint/tm-db v0.6.7
  google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
  google.golang.org/grpc v1.56.1
- google.golang.org/protobuf v1.30.0
+ google.golang.org/protobuf v1.31.0
  gopkg.in/yaml.v3 v3.0.1
  gotest.tools/v3 v3.4.0
  mvdan.cc/gofumpt v0.5.0

go.sum

@@ -2254,8 +2254,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

proto/umee/leverage/v1/tx.proto

@@ -48,14 +48,15 @@ service Msg {
  // of the target's collateral.
  rpc Liquidate(MsgLiquidate) returns (MsgLiquidateResponse);
 
- // FastLiquidate allows a user to repay a different user's borrowed coins in exchange for some
- // of the target's collateral. For flash liquidations, the tokens to repay are borrowed instead of
+ // LeveragedLiquidate allows a user to repay a different user's borrowed coins in exchange for some
+ // of the target's collateral. For leveraged liquidations, the tokens to repay are borrowed instead of
  // being taken from the liquidator's wallet, and the reward is immediately collateralized. Borrow
  // limit checks for the liquidator are deferred until after the reward is collateralized, allowing
  // this initial borrow to exceed the liquidator's borrow limit as long as it is healthy by the end
  // of the transaction. Repay amount is calculated automatically, so the liquidator only specifies
- // repay and reward token denoms.
- rpc FastLiquidate(MsgFastLiquidate) returns (MsgFastLiquidateResponse);
+ // repay and reward token denoms. For safety, the liquidator cannot exceed 80% of their borrow limit when
+ // executing this transaction, instead of the regular 100%.
+ rpc LeveragedLiquidate(MsgLeveragedLiquidate) returns (MsgLeveragedLiquidateResponse);
 
  // SupplyCollateral combines the Supply and Collateralize actions.
  rpc SupplyCollateral(MsgSupplyCollateral) returns (MsgSupplyCollateralResponse);
@@ -149,15 +150,15 @@ message MsgLiquidate {
  string reward_denom = 4;
 }
 
-// MsgFastLiquidate is the request structure for the FastLiquidate RPC.
-message MsgFastLiquidate {
+// MsgLeveragedLiquidate is the request structure for the LeveragedLiquidate RPC.
+message MsgLeveragedLiquidate {
  // Liquidator is the account address performing a liquidation and the signer
  // of the message.
  string liquidator = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
  // Borrower is the account whose borrow is being repaid, and collateral consumed,
  // by the liquidation. It does not sign the message.
  string borrower = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];
- // RepayDenom is the base token that the liquidator will borrow and repay on behalf of
+ // RepayDenom is the base token that the liquidator will borrow in order to repay on behalf of
  // the borrower.
  string repay_denom = 3;
  // RewardDenom is the uToken denom that the liquidator will receive as a liquidation reward
@@ -226,8 +227,8 @@ message MsgLiquidateResponse {
  cosmos.base.v1beta1.Coin reward = 3 [(gogoproto.nullable) = false];
 }
 
-// MsgFastLiquidateResponse defines the Msg/FastLiquidate response type.
-message MsgFastLiquidateResponse {
+// MsgLeveragedLiquidateResponse defines the Msg/LeveragedLiquidate response type.
+message MsgLeveragedLiquidateResponse {
  // Repaid is the amount of base tokens that the liquidator borrowed and repaid
  // to the module on behalf of the borrower.
  cosmos.base.v1beta1.Coin repaid = 1 [(gogoproto.nullable) = false];

sdkclient/client.go

@@ -23,6 +23,7 @@ type Client struct {
 }
 
 func NewClient(
+ chainDataDir,
  chainID,
  tmrpcEndpoint,
  grpcEndpoint string,
@@ -35,7 +36,7 @@ func NewClient(
  if err != nil {
  return Client{}, err
  }
- uc.Tx, err = tx.NewClient(chainID, tmrpcEndpoint, mnemonics, gasAdjustment, encCfg)
+ uc.Tx, err = tx.NewClient(chainDataDir, chainID, tmrpcEndpoint, mnemonics, gasAdjustment, encCfg)
  return uc, err
 }
 

sdkclient/tx/client.go

@@ -29,10 +29,11 @@ type Client struct {
 }
 
 // Initializes a cosmos sdk client context and transaction factory for
-// signing and broadcasting transactions
+// signing and broadcasting transactions by passing chainDataDir and remaining func arguments
 // Note: For signing the transactions accounts are created by names like this val0, val1....
 func NewClient(
- chainID string,
+ chainDataDir,
+ chainID,
  tmrpcEndpoint string,
  mnemonics map[string]string,
  gasAdjustment float64,
@@ -45,7 +46,7 @@ func NewClient(
  encCfg: encCfg,
  }
 
- c.keyringKeyring, err = keyring.New(keyringAppName, keyring.BackendTest, "", nil, encCfg.Codec)
+ c.keyringKeyring, err = keyring.New(keyringAppName, keyring.BackendTest, chainDataDir, nil, encCfg.Codec)
  if err != nil {
  return nil, err
  }

tests/e2e/setup/setup.go

@@ -62,6 +62,8 @@ type E2ETestSuite struct {
  GravityContractAddr string
  Umee client.Client
  cdc codec.Codec
+ MinNetwork bool // MinNetwork defines which runs only validator wihtout price-feeder, gaia and ibc-relayer
+
 }
 
 func (s *E2ETestSuite) SetupSuite() {
@@ -110,9 +112,13 @@ func (s *E2ETestSuite) SetupSuite() {
  s.initGenesis()
  s.initValidatorConfigs()
  s.runValidators()
- s.runPriceFeeder()
- s.runGaiaNetwork()
- s.runIBCRelayer()
+ if !s.MinNetwork {
+ s.runPriceFeeder()
+ s.runGaiaNetwork()
+ s.runIBCRelayer()
+ } else {
+ s.T().Log("running minimum network withut gaia,price-feeder and ibc-relayer")
+ }
  // s.runContractDeployment()
  // s.runOrchestrators()
  s.initUmeeClient()
@@ -131,9 +137,11 @@ func (s *E2ETestSuite) TearDownSuite() {
  s.T().Log("tearing down e2e integration test suite...")
 
  // s.Require().NoError(s.DkrPool.Purge(s.ethResource))
- s.Require().NoError(s.DkrPool.Purge(s.GaiaResource))
- s.Require().NoError(s.DkrPool.Purge(s.HermesResource))
- s.Require().NoError(s.DkrPool.Purge(s.priceFeederResource))
+ if !s.MinNetwork {
+ s.Require().NoError(s.DkrPool.Purge(s.GaiaResource))
+ s.Require().NoError(s.DkrPool.Purge(s.HermesResource))
+ s.Require().NoError(s.DkrPool.Purge(s.priceFeederResource))
+ }
 
  for _, vc := range s.ValResources {
  s.Require().NoError(s.DkrPool.Purge(vc))
@@ -1062,8 +1070,8 @@ func (s *E2ETestSuite) initUmeeClient() {
  mnemonics[fmt.Sprintf("val%d", index)] = v.mnemonic
  }
  ecfg := app.MakeEncodingConfig()
-
  s.Umee, err = client.NewClient(
+ s.Chain.dataDir,
  s.Chain.ID,
  "tcp://localhost:26657",
  "tcp://localhost:9090",

tests/qa/cw/cw_test.go

@@ -6,19 +6,16 @@ package cw
 import (
  "encoding/json"
  "math/rand"
- "os"
  "strings"
  "sync"
  "testing"
  "time"
 
  "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
- sdkparams "github.com/cosmos/cosmos-sdk/simapp/params"
  sdk "github.com/cosmos/cosmos-sdk/types"
+ "github.com/stretchr/testify/suite"
  "gotest.tools/v3/assert"
 
- "github.com/umee-network/umee/v5/app"
- "github.com/umee-network/umee/v5/client"
  cwutil "github.com/umee-network/umee/v5/tests/util"
 )
 
@@ -33,28 +30,27 @@ var (
  cwGroupMsgExecFunc func(name string, msg GroupExecMsg, wg *sync.WaitGroup, accSeq uint64)
 )
 
-func TestCWPlusGroup(t *testing.T) {
+func TestQA(t *testing.T) {
+ t.Log("Running qa test...")
+ qaTest := new(QATest)
+ qaTest.MinNetwork = true
+ suite.Run(t, qaTest)
+}
+
+func (qaTest *QATest) TestCWPlusGroup() {
+ t := qaTest.T()
  accAddrs := make([]sdk.AccAddress, 0)
  for i := 0; i < TotalAccs; i++ {
  privateKey := secp256k1.GenPrivKey()
  pubKey := privateKey.PubKey()
  accAddrs = append(accAddrs, sdk.AccAddress(pubKey.Address()))
  }
 
- // remove if old keyring exists for testing
- os.RemoveAll("./keyring-test")
- encConfig := app.MakeEncodingConfig()
- cc, err := ReadConfig("./config_example.yaml")
- assert.NilError(t, err)
- // umee client
- client, err := UmeeClient(cc, encConfig)
- assert.NilError(t, err)
-
- cw := cwutil.NewCosmwasmTestSuite(t, client)
+ cw := cwutil.NewCosmwasmTestSuite(qaTest.T(), qaTest.Umee)
  cw.DeployWasmContract(cwGroupPath)
 
  // sender is intital account
- admin := client.Tx.SenderAddr()
+ admin := qaTest.Umee.Tx.SenderAddr()
  // instantiate Contract
  initMsg := GroupInitMsg{
  Admin: admin.String(),
@@ -89,7 +85,7 @@ func TestCWPlusGroup(t *testing.T) {
 
  // doing random txs to flood the cosmwasm network
  wg := &sync.WaitGroup{}
- accSeq, err := client.QueryAuthSeq(admin.String())
+ accSeq, err := qaTest.Umee.QueryAuthSeq(admin.String())
  assert.NilError(t, err)
  total := 0
 
@@ -160,7 +156,3 @@ func TestCWPlusGroup(t *testing.T) {
  assert.NilError(t, err)
  assert.Equal(t, updateAdmin.UpdateAdmin.Admin, adminQuery.Admin)
 }
-
-func UmeeClient(cc *ChainConfig, encConfig sdkparams.EncodingConfig) (client.Client, error) {
- return client.NewClient(cc.ChainID, cc.RPC, cc.GRPC, cc.Mnemonics, 1.5, encConfig)
-}

tests/qa/cw/setup.go

@@ -0,0 +1,9 @@
+package cw
+
+import (
+ "github.com/umee-network/umee/v5/tests/e2e/setup"
+)
+
+type QATest struct {
+ setup.E2ETestSuite
+}