diff --git a/chain/proto/minter/v1/pool.proto b/chain/proto/minter/v1/pool.proto index 8b09fe8..a094d2c 100644 --- a/chain/proto/minter/v1/pool.proto +++ b/chain/proto/minter/v1/pool.proto @@ -8,10 +8,18 @@ option go_package = "github.com/MinterTeam/mhub/chain/x/minter/types"; // OutgoingTx is a withdrawal on the bridged contract // TODO: can this type be replaced by outgoing transfer tx +message OutgoingTxDeprecated { + string sender = 1; + string dest_addr = 2; + cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false]; + string tx_hash = 7; +} + message OutgoingTx { string sender = 1; string dest_addr = 2; cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false]; + cosmos.base.v1beta1.Coin val_fee = 4 [(gogoproto.nullable) = false]; string tx_hash = 7; } diff --git a/chain/proto/peggy/v1/pool.proto b/chain/proto/peggy/v1/pool.proto index f159a73..af1a37c 100644 --- a/chain/proto/peggy/v1/pool.proto +++ b/chain/proto/peggy/v1/pool.proto @@ -8,7 +8,7 @@ option go_package = "github.com/MinterTeam/mhub/chain/x/peggy/types"; // OutgoingTx is a withdrawal on the bridged contract // TODO: can this type be replaced by outgoing transfer tx -message OutgoingTx { +message OutgoingTxDeprecated { string sender = 1; string dest_addr = 2; string refund_addr = 3; @@ -18,5 +18,16 @@ message OutgoingTx { string tx_hash = 7; } +message OutgoingTx { + string sender = 1; + string dest_addr = 2; + string refund_addr = 3; + int64 expiration_time = 4; + cosmos.base.v1beta1.Coin amount = 5 [(gogoproto.nullable) = false]; + cosmos.base.v1beta1.Coin bridge_fee = 6 [(gogoproto.nullable) = false]; + cosmos.base.v1beta1.Coin val_fee = 7 [(gogoproto.nullable) = false]; + string tx_hash = 8; +} + // IDSet represents a set of IDs message IDSet { repeated uint64 ids = 1; } \ No newline at end of file diff --git a/chain/x/minter/handler.go b/chain/x/minter/handler.go index 2dd0d44..4d0e7c2 100644 --- a/chain/x/minter/handler.go +++ b/chain/x/minter/handler.go @@ -278,7 +278,8 @@ func handleMsgSendToMinter(ctx sdk.Context, keeper keeper.Keeper, msg *types.Msg } sender, _ := sdk.AccAddressFromBech32(msg.Sender) - txID, err := keeper.AddToOutgoingPool(ctx, sender, msg.MinterDest, "todo", msg.Amount) // todo: txhash + commission := sdk.NewCoin(msg.Amount.Denom, msg.Amount.Amount.ToDec().Mul(keeper.OracleKeeper().GetCommissionForDemon(ctx, msg.Amount.Denom)).RoundInt()) + txID, err := keeper.AddToOutgoingPool(ctx, sender, msg.MinterDest, "todo", msg.Amount.Sub(commission), commission) // todo: txhash if err != nil { return &sdk.Result{}, nil // todo log } diff --git a/chain/x/minter/keeper/attestation_handler.go b/chain/x/minter/keeper/attestation_handler.go index 82713f5..7b9823c 100644 --- a/chain/x/minter/keeper/attestation_handler.go +++ b/chain/x/minter/keeper/attestation_handler.go @@ -48,34 +48,6 @@ func (a *AttestationHandler) Handle(ctx sdk.Context, att types.Attestation, clai return sdkerrors.Wrap(err, "invalid receiver address") } - // pay commissions - { - valset := a.keeper.GetCurrentValset(ctx) - commission := sdk.NewCoin(coin.Denom, coin.Amount.ToDec().Mul(a.keeper.oracleKeeper.GetCommissionForDemon(ctx, coin.Denom)).RoundInt()) // total commission - if commission.IsPositive() { - vouchers = sdk.Coins{coin.Sub(commission)} - - if err = a.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, sdk.AccAddress{}, sdk.Coins{commission}); err != nil { - return sdkerrors.Wrap(err, "transfer vouchers") - } - - var totalPower uint64 - for _, val := range valset.Members { - totalPower += val.Power - } - - for _, val := range valset.Members { - amount := commission.Amount.Mul(sdk.NewIntFromUint64(val.Power)).Quo(sdk.NewIntFromUint64(totalPower)) - _, err := a.keeper.AddToOutgoingPool(ctx, sdk.AccAddress{}, val.MinterAddress, "#commission", sdk.NewCoin(commission.Denom, amount)) - if err != nil { - return sdkerrors.Wrap(err, "commission withdrawal") - } - } - - a.keeper.BuildOutgoingTXBatch(ctx, OutgoingTxBatchSize) - } - } - if err = a.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, addr, vouchers); err != nil { return sdkerrors.Wrap(err, "transfer vouchers") } @@ -147,7 +119,7 @@ func (a *AttestationHandler) Handle(ctx sdk.Context, att types.Attestation, clai } if feeIsOk { - _, err := a.peggyKeeper.AddToOutgoingPool(ctx, receiver, claim.EthReceiver, claim.MinterSender, claim.TxHash, sdk.NewCoin(denom, claim.Amount).Sub(commission).Sub(fee), fee) + _, err := a.peggyKeeper.AddToOutgoingPool(ctx, receiver, claim.EthReceiver, claim.MinterSender, claim.TxHash, sdk.NewCoin(denom, claim.Amount).Sub(commission).Sub(fee), fee, commission) if err != nil { return sdkerrors.Wrap(err, "withdraw") } @@ -161,7 +133,7 @@ func (a *AttestationHandler) Handle(ctx sdk.Context, att types.Attestation, clai a.keeper.oracleKeeper.SetTxStatus(ctx, claim.TxHash, oracletypes.TX_STATUS_REFUNDED, "") - _, err := a.keeper.AddToOutgoingPool(ctx, receiver, claim.MinterSender, claim.TxHash, sdk.NewCoin(denom, claim.Amount).Sub(commission)) + _, err := a.keeper.AddToOutgoingPool(ctx, receiver, claim.MinterSender, claim.TxHash, sdk.NewCoin(denom, claim.Amount), sdk.NewInt64Coin(denom, 0)) if err != nil { return sdkerrors.Wrap(err, "refund") } diff --git a/chain/x/minter/keeper/batch.go b/chain/x/minter/keeper/batch.go index f9919b3..4c6db64 100644 --- a/chain/x/minter/keeper/batch.go +++ b/chain/x/minter/keeper/batch.go @@ -62,11 +62,43 @@ func (k Keeper) OutgoingTxBatchExecuted(ctx sdk.Context, nonce uint64, hash stri return sdkerrors.Wrap(types.ErrUnknown, "nonce") } - // cleanup outgoing TX pool + fees := sdk.Coins{} + // cleanup outgoing TX pool and calculate total fees for _, tx := range b.Transactions { + pe, _ := k.getPoolEntry(ctx, tx.Id) + if !pe.ValFee.Amount.IsNil() { + fees = fees.Add(pe.ValFee) + } k.removePoolEntry(ctx, tx.Id) } + if !fees.IsZero() { + if err := k.bankKeeper.MintCoins(ctx, types.ModuleName, fees); err != nil { + return sdkerrors.Wrapf(err, "mint vouchers coins: %s", fees) + } + if err := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, sdk.AccAddress{}, fees); err != nil { + return sdkerrors.Wrap(err, "transfer vouchers") + } + + valset := k.GetCurrentValset(ctx) + var totalPower uint64 + for _, val := range valset.Members { + totalPower += val.Power + } + + for _, fee := range fees { + if fee.IsPositive() { + for _, val := range valset.Members { + amount := fee.Amount.Mul(sdk.NewIntFromUint64(val.Power)).Quo(sdk.NewIntFromUint64(totalPower)) + _, err := k.AddToOutgoingPool(ctx, sdk.AccAddress{}, val.MinterAddress, "#commission", sdk.NewCoin(fee.Denom, amount), sdk.NewInt64Coin(fee.Denom, 0)) + if err != nil { + return sdkerrors.Wrap(err, "commission withdrawal") + } + } + } + } + } + // Iterate through remaining batches k.IterateOutgoingTXBatches(ctx, func(key []byte, iter_batch *types.OutgoingTxBatch) bool { // If the iterated batches nonce is lower than the one that was just executed, cancel it diff --git a/chain/x/minter/keeper/keeper.go b/chain/x/minter/keeper/keeper.go index a3439cb..a4280b5 100644 --- a/chain/x/minter/keeper/keeper.go +++ b/chain/x/minter/keeper/keeper.go @@ -436,7 +436,7 @@ func (k Keeper) ColdStorageTransfer(ctx sdk.Context, c *types.ColdStorageTransfe return sdkerrors.Wrap(err, "transfer vouchers") } - txID, err := k.AddToOutgoingPool(ctx, defaultSender, coldStorageAddr, "", coin) + txID, err := k.AddToOutgoingPool(ctx, defaultSender, coldStorageAddr, "", coin, sdk.NewInt64Coin(coin.Denom, 0)) if err != nil { return err } diff --git a/chain/x/minter/keeper/pool.go b/chain/x/minter/keeper/pool.go index f983212..0d409a1 100644 --- a/chain/x/minter/keeper/pool.go +++ b/chain/x/minter/keeper/pool.go @@ -16,8 +16,9 @@ import ( // - burns the voucher for transfer amount and fees // - persists an OutgoingTx // - adds the TX to the `available` TX pool via a second index -func (k Keeper) AddToOutgoingPool(ctx sdk.Context, sender sdk.AccAddress, counterpartReceiver string, txHash string, amount sdk.Coin) (uint64, error) { +func (k Keeper) AddToOutgoingPool(ctx sdk.Context, sender sdk.AccAddress, counterpartReceiver string, txHash string, amount sdk.Coin, valFee sdk.Coin) (uint64, error) { totalInVouchers := sdk.Coins{amount} + totalInVouchers.Add(valFee) // Ensure that the coin is a peggy voucher if _, err := types.ValidatePeggyCoin(amount, ctx, k.oracleKeeper); err != nil { @@ -42,6 +43,7 @@ func (k Keeper) AddToOutgoingPool(ctx sdk.Context, sender sdk.AccAddress, counte Sender: sender.String(), DestAddr: counterpartReceiver, Amount: amount, + ValFee: valFee, TxHash: txHash, } diff --git a/chain/x/minter/module.go b/chain/x/minter/module.go index 877ee29..6b164e5 100644 --- a/chain/x/minter/module.go +++ b/chain/x/minter/module.go @@ -171,6 +171,8 @@ func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.Val } } + am.keeper.BuildOutgoingTXBatch(ctx, keeper.OutgoingTxBatchSize) + return []abci.ValidatorUpdate{} } diff --git a/chain/x/minter/types/expected_keepers.go b/chain/x/minter/types/expected_keepers.go index 4e48ef1..4e8c0e9 100644 --- a/chain/x/minter/types/expected_keepers.go +++ b/chain/x/minter/types/expected_keepers.go @@ -23,5 +23,5 @@ type BankKeeper interface { // PeggyKeeper defines the expected peggy keeper methods type PeggyKeeper interface { - AddToOutgoingPool(ctx sdk.Context, sender sdk.AccAddress, counterpartReceiver string, refundAddr string, txHash string, amount sdk.Coin, fee sdk.Coin) (uint64, error) + AddToOutgoingPool(ctx sdk.Context, sender sdk.AccAddress, counterpartReceiver string, refundAddr string, txHash string, amount sdk.Coin, fee sdk.Coin, valFee sdk.Coin) (uint64, error) } diff --git a/chain/x/minter/types/pool.pb.go b/chain/x/minter/types/pool.pb.go index 0875072..f6aba46 100644 --- a/chain/x/minter/types/pool.pb.go +++ b/chain/x/minter/types/pool.pb.go @@ -26,10 +26,79 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // OutgoingTx is a withdrawal on the bridged contract // TODO: can this type be replaced by outgoing transfer tx +type OutgoingTxDeprecated struct { + Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"` + DestAddr string `protobuf:"bytes,2,opt,name=dest_addr,json=destAddr,proto3" json:"dest_addr,omitempty"` + Amount types.Coin `protobuf:"bytes,3,opt,name=amount,proto3" json:"amount"` + TxHash string `protobuf:"bytes,7,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` +} + +func (m *OutgoingTxDeprecated) Reset() { *m = OutgoingTxDeprecated{} } +func (m *OutgoingTxDeprecated) String() string { return proto.CompactTextString(m) } +func (*OutgoingTxDeprecated) ProtoMessage() {} +func (*OutgoingTxDeprecated) Descriptor() ([]byte, []int) { + return fileDescriptor_86823eeec411a049, []int{0} +} +func (m *OutgoingTxDeprecated) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *OutgoingTxDeprecated) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_OutgoingTxDeprecated.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *OutgoingTxDeprecated) XXX_Merge(src proto.Message) { + xxx_messageInfo_OutgoingTxDeprecated.Merge(m, src) +} +func (m *OutgoingTxDeprecated) XXX_Size() int { + return m.Size() +} +func (m *OutgoingTxDeprecated) XXX_DiscardUnknown() { + xxx_messageInfo_OutgoingTxDeprecated.DiscardUnknown(m) +} + +var xxx_messageInfo_OutgoingTxDeprecated proto.InternalMessageInfo + +func (m *OutgoingTxDeprecated) GetSender() string { + if m != nil { + return m.Sender + } + return "" +} + +func (m *OutgoingTxDeprecated) GetDestAddr() string { + if m != nil { + return m.DestAddr + } + return "" +} + +func (m *OutgoingTxDeprecated) GetAmount() types.Coin { + if m != nil { + return m.Amount + } + return types.Coin{} +} + +func (m *OutgoingTxDeprecated) GetTxHash() string { + if m != nil { + return m.TxHash + } + return "" +} + type OutgoingTx struct { Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"` DestAddr string `protobuf:"bytes,2,opt,name=dest_addr,json=destAddr,proto3" json:"dest_addr,omitempty"` Amount types.Coin `protobuf:"bytes,3,opt,name=amount,proto3" json:"amount"` + ValFee types.Coin `protobuf:"bytes,4,opt,name=val_fee,json=valFee,proto3" json:"val_fee"` TxHash string `protobuf:"bytes,7,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` } @@ -37,7 +106,7 @@ func (m *OutgoingTx) Reset() { *m = OutgoingTx{} } func (m *OutgoingTx) String() string { return proto.CompactTextString(m) } func (*OutgoingTx) ProtoMessage() {} func (*OutgoingTx) Descriptor() ([]byte, []int) { - return fileDescriptor_86823eeec411a049, []int{0} + return fileDescriptor_86823eeec411a049, []int{1} } func (m *OutgoingTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -87,6 +156,13 @@ func (m *OutgoingTx) GetAmount() types.Coin { return types.Coin{} } +func (m *OutgoingTx) GetValFee() types.Coin { + if m != nil { + return m.ValFee + } + return types.Coin{} +} + func (m *OutgoingTx) GetTxHash() string { if m != nil { return m.TxHash @@ -103,7 +179,7 @@ func (m *IDSet) Reset() { *m = IDSet{} } func (m *IDSet) String() string { return proto.CompactTextString(m) } func (*IDSet) ProtoMessage() {} func (*IDSet) Descriptor() ([]byte, []int) { - return fileDescriptor_86823eeec411a049, []int{1} + return fileDescriptor_86823eeec411a049, []int{2} } func (m *IDSet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -140,6 +216,7 @@ func (m *IDSet) GetIds() []uint64 { } func init() { + proto.RegisterType((*OutgoingTxDeprecated)(nil), "minter.v1.OutgoingTxDeprecated") proto.RegisterType((*OutgoingTx)(nil), "minter.v1.OutgoingTx") proto.RegisterType((*IDSet)(nil), "minter.v1.IDSet") } @@ -147,26 +224,83 @@ func init() { func init() { proto.RegisterFile("minter/v1/pool.proto", fileDescriptor_86823eeec411a049) } var fileDescriptor_86823eeec411a049 = []byte{ - // 300 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x2c, 0x90, 0xbd, 0x4e, 0xc3, 0x30, - 0x14, 0x85, 0x63, 0x5a, 0x5a, 0x6a, 0x16, 0x14, 0x55, 0x90, 0x16, 0xc9, 0x54, 0x9d, 0x3a, 0xf9, - 0x2a, 0x30, 0x30, 0x53, 0x18, 0xe8, 0x80, 0x90, 0x4a, 0x27, 0x96, 0xca, 0x89, 0xad, 0xc4, 0x12, - 0xf1, 0xad, 0x62, 0xa7, 0x0a, 0x6f, 0x81, 0xc4, 0x4b, 0x75, 0xec, 0xc8, 0x84, 0x50, 0xfb, 0x22, - 0x28, 0x3f, 0xdb, 0xf1, 0xf1, 0x91, 0xee, 0xa7, 0x8f, 0x0e, 0x33, 0x6d, 0x9c, 0xca, 0x61, 0x1b, - 0xc2, 0x06, 0xf1, 0x83, 0x6f, 0x72, 0x74, 0xe8, 0x0f, 0x9a, 0x96, 0x6f, 0xc3, 0x31, 0x8b, 0xd1, - 0x66, 0x68, 0x21, 0x12, 0x56, 0xc1, 0x36, 0x8c, 0x94, 0x13, 0x21, 0xc4, 0xa8, 0x4d, 0x33, 0x1d, - 0x0f, 0x13, 0x4c, 0xb0, 0x8e, 0x50, 0xa5, 0xa6, 0x9d, 0x7e, 0x13, 0x4a, 0x5f, 0x0b, 0x97, 0xa0, - 0x36, 0xc9, 0xaa, 0xf4, 0x2f, 0x69, 0xcf, 0x2a, 0x23, 0x55, 0x1e, 0x90, 0x09, 0x99, 0x0d, 0x96, - 0xed, 0xcb, 0xbf, 0xa6, 0x03, 0xa9, 0xac, 0x5b, 0x0b, 0x29, 0xf3, 0xe0, 0xa4, 0xfe, 0x3a, 0xab, - 0x8a, 0x07, 0x29, 0x73, 0xff, 0x9e, 0xf6, 0x44, 0x86, 0x85, 0x71, 0x41, 0x67, 0x42, 0x66, 0xe7, - 0xb7, 0x23, 0xde, 0xa0, 0xf0, 0x0a, 0x85, 0xb7, 0x28, 0xfc, 0x11, 0xb5, 0x99, 0x77, 0x77, 0xbf, - 0x37, 0xde, 0xb2, 0x9d, 0xfb, 0x57, 0xb4, 0xef, 0xca, 0x75, 0x2a, 0x6c, 0x1a, 0xf4, 0x9b, 0x73, - 0xae, 0x7c, 0x16, 0x36, 0x9d, 0x8e, 0xe8, 0xe9, 0xe2, 0xe9, 0x4d, 0x39, 0xff, 0x82, 0x76, 0xb4, - 0xb4, 0x01, 0x99, 0x74, 0x66, 0xdd, 0x65, 0x15, 0xe7, 0x8b, 0xdd, 0x81, 0x91, 0xfd, 0x81, 0x91, - 0xbf, 0x03, 0x23, 0x5f, 0x47, 0xe6, 0xed, 0x8f, 0xcc, 0xfb, 0x39, 0x32, 0xef, 0x1d, 0x12, 0xed, - 0xd2, 0x22, 0xe2, 0x31, 0x66, 0xf0, 0x52, 0x6b, 0x59, 0x29, 0x91, 0x41, 0x96, 0x16, 0x11, 0xc4, - 0xa9, 0xd0, 0x06, 0x4a, 0x68, 0x25, 0xba, 0xcf, 0x8d, 0xb2, 0x51, 0xaf, 0x56, 0x70, 0xf7, 0x1f, - 0x00, 0x00, 0xff, 0xff, 0x9e, 0xe1, 0xf9, 0xd6, 0x5b, 0x01, 0x00, 0x00, + // 345 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x92, 0xbf, 0x4e, 0xeb, 0x30, + 0x18, 0xc5, 0xe3, 0xdb, 0xde, 0xf6, 0xd6, 0x77, 0x41, 0x51, 0x05, 0x69, 0x91, 0x42, 0xd5, 0xa9, + 0x93, 0xad, 0xc0, 0x00, 0x2b, 0xa5, 0x42, 0x74, 0x40, 0x48, 0xa5, 0x13, 0x4b, 0xe5, 0xc4, 0x1f, + 0x89, 0xa5, 0xc6, 0x8e, 0x62, 0x27, 0x0a, 0x6f, 0xc1, 0x0b, 0xf0, 0x3e, 0x5d, 0x90, 0x3a, 0x32, + 0x21, 0xd4, 0xbe, 0x08, 0xca, 0x1f, 0x89, 0x09, 0x89, 0x89, 0xed, 0xf8, 0xf8, 0x58, 0xfe, 0x7d, + 0x3a, 0x1f, 0xee, 0xc7, 0x42, 0x1a, 0x48, 0x69, 0xee, 0xd1, 0x44, 0xa9, 0x35, 0x49, 0x52, 0x65, + 0x94, 0xdd, 0xab, 0x5d, 0x92, 0x7b, 0x43, 0x37, 0x50, 0x3a, 0x56, 0x9a, 0xfa, 0x4c, 0x03, 0xcd, + 0x3d, 0x1f, 0x0c, 0xf3, 0x68, 0xa0, 0x84, 0xac, 0xa3, 0xc3, 0x7e, 0xa8, 0x42, 0x55, 0x49, 0x5a, + 0xaa, 0xda, 0x1d, 0xbf, 0x20, 0xdc, 0xbf, 0xcb, 0x4c, 0xa8, 0x84, 0x0c, 0x97, 0xc5, 0x0c, 0x92, + 0x14, 0x02, 0x66, 0x80, 0xdb, 0x87, 0xb8, 0xa3, 0x41, 0x72, 0x48, 0x1d, 0x34, 0x42, 0x93, 0xde, + 0xa2, 0x39, 0xd9, 0xc7, 0xb8, 0xc7, 0x41, 0x9b, 0x15, 0xe3, 0x3c, 0x75, 0xfe, 0x54, 0x57, 0xff, + 0x4a, 0xe3, 0x92, 0xf3, 0xd4, 0x3e, 0xc7, 0x1d, 0x16, 0xab, 0x4c, 0x1a, 0xa7, 0x35, 0x42, 0x93, + 0xff, 0xa7, 0x03, 0x52, 0x43, 0x91, 0x12, 0x8a, 0x34, 0x50, 0xe4, 0x4a, 0x09, 0x39, 0x6d, 0x6f, + 0xde, 0x4f, 0xac, 0x45, 0x13, 0xb7, 0x8f, 0x70, 0xd7, 0x14, 0xab, 0x88, 0xe9, 0xc8, 0xe9, 0xd6, + 0xdf, 0x99, 0xe2, 0x86, 0xe9, 0x68, 0xfc, 0x8a, 0x30, 0xfe, 0xe2, 0xfb, 0x65, 0xaa, 0x0b, 0xdc, + 0xcd, 0xd9, 0x7a, 0xf5, 0x08, 0xe0, 0xb4, 0x7f, 0xf8, 0x32, 0x67, 0xeb, 0x6b, 0x80, 0xef, 0xe7, + 0x19, 0xe0, 0xbf, 0xf3, 0xd9, 0x3d, 0x18, 0xfb, 0x00, 0xb7, 0x04, 0xd7, 0x0e, 0x1a, 0xb5, 0x26, + 0xed, 0x45, 0x29, 0xa7, 0xf3, 0xcd, 0xce, 0x45, 0xdb, 0x9d, 0x8b, 0x3e, 0x76, 0x2e, 0x7a, 0xde, + 0xbb, 0xd6, 0x76, 0xef, 0x5a, 0x6f, 0x7b, 0xd7, 0x7a, 0xa0, 0xa1, 0x30, 0x51, 0xe6, 0x93, 0x40, + 0xc5, 0xf4, 0xb6, 0x2a, 0x7c, 0x09, 0x2c, 0xa6, 0x71, 0x94, 0xf9, 0x34, 0x88, 0x98, 0x90, 0xb4, + 0xa0, 0xcd, 0x7a, 0x98, 0xa7, 0x04, 0xb4, 0xdf, 0xa9, 0xca, 0x3d, 0xfb, 0x0c, 0x00, 0x00, 0xff, + 0xff, 0xdc, 0xda, 0xfe, 0x2e, 0x35, 0x02, 0x00, 0x00, +} + +func (m *OutgoingTxDeprecated) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *OutgoingTxDeprecated) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OutgoingTxDeprecated) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.TxHash) > 0 { + i -= len(m.TxHash) + copy(dAtA[i:], m.TxHash) + i = encodeVarintPool(dAtA, i, uint64(len(m.TxHash))) + i-- + dAtA[i] = 0x3a + } + { + size, err := m.Amount.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintPool(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + if len(m.DestAddr) > 0 { + i -= len(m.DestAddr) + copy(dAtA[i:], m.DestAddr) + i = encodeVarintPool(dAtA, i, uint64(len(m.DestAddr))) + i-- + dAtA[i] = 0x12 + } + if len(m.Sender) > 0 { + i -= len(m.Sender) + copy(dAtA[i:], m.Sender) + i = encodeVarintPool(dAtA, i, uint64(len(m.Sender))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } func (m *OutgoingTx) Marshal() (dAtA []byte, err error) { @@ -196,6 +330,16 @@ func (m *OutgoingTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } + { + size, err := m.ValFee.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintPool(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 { size, err := m.Amount.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -244,20 +388,20 @@ func (m *IDSet) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if len(m.Ids) > 0 { - dAtA3 := make([]byte, len(m.Ids)*10) - var j2 int + dAtA5 := make([]byte, len(m.Ids)*10) + var j4 int for _, num := range m.Ids { for num >= 1<<7 { - dAtA3[j2] = uint8(uint64(num)&0x7f | 0x80) + dAtA5[j4] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j2++ + j4++ } - dAtA3[j2] = uint8(num) - j2++ + dAtA5[j4] = uint8(num) + j4++ } - i -= j2 - copy(dAtA[i:], dAtA3[:j2]) - i = encodeVarintPool(dAtA, i, uint64(j2)) + i -= j4 + copy(dAtA[i:], dAtA5[:j4]) + i = encodeVarintPool(dAtA, i, uint64(j4)) i-- dAtA[i] = 0xa } @@ -275,6 +419,29 @@ func encodeVarintPool(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } +func (m *OutgoingTxDeprecated) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Sender) + if l > 0 { + n += 1 + l + sovPool(uint64(l)) + } + l = len(m.DestAddr) + if l > 0 { + n += 1 + l + sovPool(uint64(l)) + } + l = m.Amount.Size() + n += 1 + l + sovPool(uint64(l)) + l = len(m.TxHash) + if l > 0 { + n += 1 + l + sovPool(uint64(l)) + } + return n +} + func (m *OutgoingTx) Size() (n int) { if m == nil { return 0 @@ -291,6 +458,8 @@ func (m *OutgoingTx) Size() (n int) { } l = m.Amount.Size() n += 1 + l + sovPool(uint64(l)) + l = m.ValFee.Size() + n += 1 + l + sovPool(uint64(l)) l = len(m.TxHash) if l > 0 { n += 1 + l + sovPool(uint64(l)) @@ -320,6 +489,188 @@ func sovPool(x uint64) (n int) { func sozPool(x uint64) (n int) { return sovPool(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +func (m *OutgoingTxDeprecated) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: OutgoingTxDeprecated: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: OutgoingTxDeprecated: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthPool + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPool + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Sender = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DestAddr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthPool + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPool + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DestAddr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPool + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPool + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthPool + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPool + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TxHash = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipPool(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthPool + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthPool + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *OutgoingTx) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -446,6 +797,39 @@ func (m *OutgoingTx) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ValFee", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPool + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPool + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.ValFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) diff --git a/chain/x/peggy/abci.go b/chain/x/peggy/abci.go index a3ef8aa..18a11f9 100644 --- a/chain/x/peggy/abci.go +++ b/chain/x/peggy/abci.go @@ -1,7 +1,6 @@ package peggy import ( - minterkeeper "github.com/MinterTeam/mhub/chain/x/minter/keeper" "github.com/MinterTeam/mhub/chain/x/peggy/keeper" "github.com/MinterTeam/mhub/chain/x/peggy/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -24,8 +23,8 @@ func EndBlocker(ctx sdk.Context, k keeper.Keeper) { }) } - if hasRefunds { - k.MinterKeeper().BuildOutgoingTXBatch(ctx, minterkeeper.OutgoingTxBatchSize) + for _, coin := range k.OracleKeeper().GetCoins(ctx).List() { + k.BuildOutgoingTXBatch(ctx, coin.EthAddr, keeper.OutgoingTxBatchSize) } // valsets are sorted so the most recent one is first diff --git a/chain/x/peggy/keeper/attestation_handler.go b/chain/x/peggy/keeper/attestation_handler.go index 7161669..bfd5906 100644 --- a/chain/x/peggy/keeper/attestation_handler.go +++ b/chain/x/peggy/keeper/attestation_handler.go @@ -45,34 +45,6 @@ func (a AttestationHandler) Handle(ctx sdk.Context, att types.Attestation, claim return sdkerrors.Wrap(err, "invalid reciever address") } - // pay commissions - { - valset := a.minterKeeper.GetCurrentValset(ctx) - commission := sdk.NewCoin(coin.Denom, coin.Amount.ToDec().Mul(a.keeper.oracleKeeper.GetCommissionForDemon(ctx, coin.Denom)).RoundInt()) // total commission - if commission.IsPositive() { - vouchers = sdk.Coins{coin.Sub(commission)} - - if err = a.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, sdk.AccAddress{}, sdk.Coins{commission}); err != nil { - return sdkerrors.Wrap(err, "transfer vouchers") - } - - var totalPower uint64 - for _, val := range valset.Members { - totalPower += val.Power - } - - for _, val := range valset.Members { - amount := commission.Amount.Mul(sdk.NewIntFromUint64(val.Power)).Quo(sdk.NewIntFromUint64(totalPower)) - _, err := a.minterKeeper.AddToOutgoingPool(ctx, sdk.AccAddress{}, val.MinterAddress, "#commission", sdk.NewCoin(commission.Denom, amount)) - if err != nil { - return sdkerrors.Wrap(err, "commission withdrawal") - } - } - - a.minterKeeper.BuildOutgoingTXBatch(ctx, minterkeeper.OutgoingTxBatchSize) - } - } - if err = a.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, addr, vouchers); err != nil { return sdkerrors.Wrap(err, "transfer vouchers") } @@ -111,7 +83,7 @@ func (a AttestationHandler) Handle(ctx sdk.Context, att types.Attestation, claim } commission := sdk.NewCoin(denom, amount.ToDec().Mul(a.keeper.oracleKeeper.GetCommissionForDemon(ctx, denom)).RoundInt()) - _, err = a.minterKeeper.AddToOutgoingPool(ctx, receiver, claim.MinterReceiver, claim.TxHash, sdk.NewCoin(denom, amount).Sub(commission)) + _, err = a.minterKeeper.AddToOutgoingPool(ctx, receiver, claim.MinterReceiver, claim.TxHash, sdk.NewCoin(denom, amount).Sub(commission), commission) if err != nil { return sdkerrors.Wrap(err, "withdraw") } diff --git a/chain/x/peggy/keeper/batch.go b/chain/x/peggy/keeper/batch.go index 6f21700..af3e7cd 100644 --- a/chain/x/peggy/keeper/batch.go +++ b/chain/x/peggy/keeper/batch.go @@ -4,7 +4,6 @@ import ( "fmt" "strconv" - minterkeeper "github.com/MinterTeam/mhub/chain/x/minter/keeper" oracletypes "github.com/MinterTeam/mhub/chain/x/oracle/types" "github.com/MinterTeam/mhub/chain/x/peggy/types" @@ -102,13 +101,45 @@ func (k Keeper) OutgoingTxBatchExecuted(ctx sdk.Context, tokenContract string, n return sdkerrors.Wrap(types.ErrUnknown, "nonce") } + valFees := sdk.Coins{} totalFee := sdk.NewInt64Coin(b.Transactions[0].Erc20Fee.PeggyCoin(ctx, k.oracleKeeper).Denom, 0) // cleanup outgoing TX pool for _, tx := range b.Transactions { totalFee = totalFee.Add(tx.Erc20Fee.PeggyCoin(ctx, k.oracleKeeper)) + pe, _ := k.getPoolEntry(ctx, tx.Id) + if !pe.ValFee.Amount.IsNil() { + valFees = valFees.Add(pe.ValFee) + } k.removePoolEntry(ctx, tx.Id) } + if !valFees.IsZero() { + if err := k.bankKeeper.MintCoins(ctx, types.ModuleName, valFees); err != nil { + return sdkerrors.Wrapf(err, "mint vouchers coins: %s", valFees) + } + if err := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, sdk.AccAddress{}, valFees); err != nil { + return sdkerrors.Wrap(err, "transfer vouchers") + } + + valset := k.minterKeeper.GetCurrentValset(ctx) + var totalPower uint64 + for _, val := range valset.Members { + totalPower += val.Power + } + + for _, fee := range valFees { + if fee.IsPositive() { + for _, val := range valset.Members { + amount := fee.Amount.Mul(sdk.NewIntFromUint64(val.Power)).Quo(sdk.NewIntFromUint64(totalPower)) + _, err := k.minterKeeper.AddToOutgoingPool(ctx, sdk.AccAddress{}, val.MinterAddress, "#commission", sdk.NewCoin(fee.Denom, amount), sdk.NewInt64Coin(fee.Denom, 0)) + if err != nil { + return sdkerrors.Wrap(err, "commission withdrawal") + } + } + } + } + } + if totalFee.IsPositive() { commissionKeeperAddress := sdk.AccAddress{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} vouchers := sdk.Coins{totalFee} @@ -120,8 +151,7 @@ func (k Keeper) OutgoingTxBatchExecuted(ctx sdk.Context, tokenContract string, n return sdkerrors.Wrap(err, "transfer vouchers") } - k.minterKeeper.AddToOutgoingPool(ctx, commissionKeeperAddress, "Mx"+txSender[2:], txHash, totalFee) - k.minterKeeper.BuildOutgoingTXBatch(ctx, minterkeeper.OutgoingTxBatchSize) + k.minterKeeper.AddToOutgoingPool(ctx, commissionKeeperAddress, "Mx"+txSender[2:], txHash, totalFee, sdk.NewInt64Coin(totalFee.Denom, 0)) } // Iterate through remaining batches diff --git a/chain/x/peggy/keeper/keeper.go b/chain/x/peggy/keeper/keeper.go index 6d2bb26..17f3516 100644 --- a/chain/x/peggy/keeper/keeper.go +++ b/chain/x/peggy/keeper/keeper.go @@ -419,6 +419,9 @@ func (k Keeper) RefundOutgoingTx(ctx sdk.Context, id uint64, tx *types.OutgoingT vouchers := sdk.NewCoins(sdk.NewCoin(tx.Amount.Denom, k.oracleKeeper.ConvertFromEthValue(ctx, contractAddr, tx.Amount.Amount))) vouchers = vouchers.Add(tx.BridgeFee) + if !tx.ValFee.Amount.IsNil() { + vouchers = vouchers.Add(tx.ValFee) + } if err := k.bankKeeper.MintCoins(ctx, types.ModuleName, vouchers); err != nil { panic(sdkerrors.Wrapf(err, "mint vouchers coins: %s", vouchers)) @@ -429,7 +432,7 @@ func (k Keeper) RefundOutgoingTx(ctx sdk.Context, id uint64, tx *types.OutgoingT if err := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, receiver, vouchers); err != nil { panic(err) } - if _, err := k.minterKeeper.AddToOutgoingPool(ctx, receiver, tx.RefundAddr, tx.TxHash, vouchers[0]); err != nil { + if _, err := k.minterKeeper.AddToOutgoingPool(ctx, receiver, tx.RefundAddr, tx.TxHash, vouchers[0], sdk.NewInt64Coin(vouchers[0].Denom, 0)); err != nil { panic(err) } } else { @@ -471,7 +474,7 @@ func (k Keeper) ColdStorageTransfer(ctx sdk.Context, c *types.ColdStorageTransfe } fee := sdk.NewCoin(coin.Denom, sdk.NewInt(0)) - txID, err := k.AddToOutgoingPool(ctx, defaultSender, coldStorageAddr, defaultSender.String(), "", coin, fee) + txID, err := k.AddToOutgoingPool(ctx, defaultSender, coldStorageAddr, defaultSender.String(), "", coin, fee, fee) if err != nil { return err } diff --git a/chain/x/peggy/keeper/msg_server.go b/chain/x/peggy/keeper/msg_server.go index f041fc1..810c3f6 100644 --- a/chain/x/peggy/keeper/msg_server.go +++ b/chain/x/peggy/keeper/msg_server.go @@ -161,7 +161,10 @@ func (k msgServer) SendToEth(c context.Context, msg *types.MsgSendToEth) (*types return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "bridge fee is not sufficient") } - txID, err := k.AddToOutgoingPool(ctx, sender, msg.EthDest, sender.String(), "todo", msg.Amount, msg.BridgeFee) // todo + totalAmount := msg.Amount.Add(msg.BridgeFee) + commission := sdk.NewCoin(totalAmount.Denom, totalAmount.Amount.ToDec().Mul(k.oracleKeeper.GetCommissionForDemon(ctx, totalAmount.Denom)).RoundInt()) + + txID, err := k.AddToOutgoingPool(ctx, sender, msg.EthDest, sender.String(), "todo", msg.Amount.Sub(commission), msg.BridgeFee, commission) // todo if err != nil { return nil, err } diff --git a/chain/x/peggy/keeper/pool.go b/chain/x/peggy/keeper/pool.go index 8147fb8..4c07055 100644 --- a/chain/x/peggy/keeper/pool.go +++ b/chain/x/peggy/keeper/pool.go @@ -17,8 +17,9 @@ import ( // - burns the voucher for transfer amount and fees // - persists an OutgoingTx // - adds the TX to the `available` TX pool via a second index -func (k Keeper) AddToOutgoingPool(ctx sdk.Context, sender sdk.AccAddress, counterpartReceiver string, refundAddr string, txHash string, amount sdk.Coin, fee sdk.Coin) (uint64, error) { +func (k Keeper) AddToOutgoingPool(ctx sdk.Context, sender sdk.AccAddress, counterpartReceiver string, refundAddr string, txHash string, amount sdk.Coin, fee sdk.Coin, valFee sdk.Coin) (uint64, error) { totalAmount := amount.Add(fee) + totalAmount = totalAmount.Add(valFee) totalInVouchers := sdk.Coins{totalAmount} // Ensure that the coin is a peggy voucher @@ -48,6 +49,7 @@ func (k Keeper) AddToOutgoingPool(ctx sdk.Context, sender sdk.AccAddress, counte ExpirationTime: ctx.BlockTime().Add(time.Hour).Unix(), Amount: sdk.NewCoin(amount.Denom, k.oracleKeeper.ConvertToEthValue(ctx, contractAddr, amount.Amount)), BridgeFee: fee, + ValFee: valFee, TxHash: txHash, } diff --git a/chain/x/peggy/types/pool.pb.go b/chain/x/peggy/types/pool.pb.go index 7ca5482..37525a4 100644 --- a/chain/x/peggy/types/pool.pb.go +++ b/chain/x/peggy/types/pool.pb.go @@ -26,7 +26,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // OutgoingTx is a withdrawal on the bridged contract // TODO: can this type be replaced by outgoing transfer tx -type OutgoingTx struct { +type OutgoingTxDeprecated struct { Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"` DestAddr string `protobuf:"bytes,2,opt,name=dest_addr,json=destAddr,proto3" json:"dest_addr,omitempty"` RefundAddr string `protobuf:"bytes,3,opt,name=refund_addr,json=refundAddr,proto3" json:"refund_addr,omitempty"` @@ -36,11 +36,104 @@ type OutgoingTx struct { TxHash string `protobuf:"bytes,7,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` } +func (m *OutgoingTxDeprecated) Reset() { *m = OutgoingTxDeprecated{} } +func (m *OutgoingTxDeprecated) String() string { return proto.CompactTextString(m) } +func (*OutgoingTxDeprecated) ProtoMessage() {} +func (*OutgoingTxDeprecated) Descriptor() ([]byte, []int) { + return fileDescriptor_de0a859def4c189a, []int{0} +} +func (m *OutgoingTxDeprecated) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *OutgoingTxDeprecated) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_OutgoingTxDeprecated.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *OutgoingTxDeprecated) XXX_Merge(src proto.Message) { + xxx_messageInfo_OutgoingTxDeprecated.Merge(m, src) +} +func (m *OutgoingTxDeprecated) XXX_Size() int { + return m.Size() +} +func (m *OutgoingTxDeprecated) XXX_DiscardUnknown() { + xxx_messageInfo_OutgoingTxDeprecated.DiscardUnknown(m) +} + +var xxx_messageInfo_OutgoingTxDeprecated proto.InternalMessageInfo + +func (m *OutgoingTxDeprecated) GetSender() string { + if m != nil { + return m.Sender + } + return "" +} + +func (m *OutgoingTxDeprecated) GetDestAddr() string { + if m != nil { + return m.DestAddr + } + return "" +} + +func (m *OutgoingTxDeprecated) GetRefundAddr() string { + if m != nil { + return m.RefundAddr + } + return "" +} + +func (m *OutgoingTxDeprecated) GetExpirationTime() int64 { + if m != nil { + return m.ExpirationTime + } + return 0 +} + +func (m *OutgoingTxDeprecated) GetAmount() types.Coin { + if m != nil { + return m.Amount + } + return types.Coin{} +} + +func (m *OutgoingTxDeprecated) GetBridgeFee() types.Coin { + if m != nil { + return m.BridgeFee + } + return types.Coin{} +} + +func (m *OutgoingTxDeprecated) GetTxHash() string { + if m != nil { + return m.TxHash + } + return "" +} + +type OutgoingTx struct { + Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"` + DestAddr string `protobuf:"bytes,2,opt,name=dest_addr,json=destAddr,proto3" json:"dest_addr,omitempty"` + RefundAddr string `protobuf:"bytes,3,opt,name=refund_addr,json=refundAddr,proto3" json:"refund_addr,omitempty"` + ExpirationTime int64 `protobuf:"varint,4,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"` + Amount types.Coin `protobuf:"bytes,5,opt,name=amount,proto3" json:"amount"` + BridgeFee types.Coin `protobuf:"bytes,6,opt,name=bridge_fee,json=bridgeFee,proto3" json:"bridge_fee"` + ValFee types.Coin `protobuf:"bytes,7,opt,name=val_fee,json=valFee,proto3" json:"val_fee"` + TxHash string `protobuf:"bytes,8,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` +} + func (m *OutgoingTx) Reset() { *m = OutgoingTx{} } func (m *OutgoingTx) String() string { return proto.CompactTextString(m) } func (*OutgoingTx) ProtoMessage() {} func (*OutgoingTx) Descriptor() ([]byte, []int) { - return fileDescriptor_de0a859def4c189a, []int{0} + return fileDescriptor_de0a859def4c189a, []int{1} } func (m *OutgoingTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -111,6 +204,13 @@ func (m *OutgoingTx) GetBridgeFee() types.Coin { return types.Coin{} } +func (m *OutgoingTx) GetValFee() types.Coin { + if m != nil { + return m.ValFee + } + return types.Coin{} +} + func (m *OutgoingTx) GetTxHash() string { if m != nil { return m.TxHash @@ -127,7 +227,7 @@ func (m *IDSet) Reset() { *m = IDSet{} } func (m *IDSet) String() string { return proto.CompactTextString(m) } func (*IDSet) ProtoMessage() {} func (*IDSet) Descriptor() ([]byte, []int) { - return fileDescriptor_de0a859def4c189a, []int{1} + return fileDescriptor_de0a859def4c189a, []int{2} } func (m *IDSet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -164,6 +264,7 @@ func (m *IDSet) GetIds() []uint64 { } func init() { + proto.RegisterType((*OutgoingTxDeprecated)(nil), "peggy.v1.OutgoingTxDeprecated") proto.RegisterType((*OutgoingTx)(nil), "peggy.v1.OutgoingTx") proto.RegisterType((*IDSet)(nil), "peggy.v1.IDSet") } @@ -171,31 +272,109 @@ func init() { func init() { proto.RegisterFile("peggy/v1/pool.proto", fileDescriptor_de0a859def4c189a) } var fileDescriptor_de0a859def4c189a = []byte{ - // 369 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x31, 0x6f, 0xd4, 0x30, - 0x1c, 0xc5, 0xcf, 0xcd, 0x35, 0xed, 0xb9, 0x12, 0x20, 0x83, 0x20, 0x2d, 0x52, 0x1a, 0x75, 0x21, - 0x93, 0xad, 0xc0, 0xc0, 0x86, 0x44, 0x41, 0xa8, 0x0c, 0x08, 0x29, 0xdc, 0xc4, 0x12, 0x39, 0xf1, - 0xbf, 0x8e, 0x25, 0x62, 0x47, 0xb6, 0x73, 0x4a, 0xbf, 0x05, 0x5f, 0x80, 0xef, 0xd3, 0xf1, 0x46, - 0x26, 0x84, 0xee, 0xbe, 0x08, 0x4a, 0x7c, 0x12, 0x6b, 0xb7, 0xf7, 0xff, 0xbd, 0xf7, 0x1f, 0x9e, - 0x1e, 0x7e, 0xda, 0x83, 0x94, 0x77, 0x6c, 0x53, 0xb0, 0xde, 0x98, 0x1f, 0xb4, 0xb7, 0xc6, 0x1b, - 0x72, 0x3a, 0x43, 0xba, 0x29, 0x2e, 0xd2, 0xc6, 0xb8, 0xce, 0x38, 0x56, 0x73, 0x07, 0x6c, 0x53, - 0xd4, 0xe0, 0x79, 0xc1, 0x1a, 0xa3, 0x74, 0x48, 0x5e, 0x3c, 0x93, 0x46, 0x9a, 0x59, 0xb2, 0x49, - 0x05, 0x7a, 0xf5, 0xeb, 0x08, 0xe3, 0xaf, 0x83, 0x97, 0x46, 0x69, 0xb9, 0x1e, 0xc9, 0x73, 0x1c, - 0x3b, 0xd0, 0x02, 0x6c, 0x82, 0x32, 0x94, 0xaf, 0xca, 0xc3, 0x45, 0x5e, 0xe2, 0x95, 0x00, 0xe7, - 0x2b, 0x2e, 0x84, 0x4d, 0x8e, 0x66, 0xeb, 0x74, 0x02, 0xef, 0x85, 0xb0, 0xe4, 0x12, 0x9f, 0x59, - 0xb8, 0x1d, 0xb4, 0x08, 0x76, 0x34, 0xdb, 0x38, 0xa0, 0x39, 0xf0, 0x0a, 0x3f, 0x86, 0xb1, 0x57, - 0x96, 0x7b, 0x65, 0x74, 0xe5, 0x55, 0x07, 0xc9, 0x32, 0x43, 0x79, 0x54, 0x3e, 0xfa, 0x8f, 0xd7, - 0xaa, 0x03, 0xf2, 0x16, 0xc7, 0xbc, 0x33, 0x83, 0xf6, 0xc9, 0x71, 0x86, 0xf2, 0xb3, 0xd7, 0xe7, - 0x34, 0x94, 0xa2, 0x53, 0x29, 0x7a, 0x28, 0x45, 0x3f, 0x18, 0xa5, 0xaf, 0x97, 0xf7, 0x7f, 0x2e, - 0x17, 0xe5, 0x21, 0x4e, 0xde, 0x61, 0x5c, 0x5b, 0x25, 0x24, 0x54, 0xb7, 0x00, 0x49, 0xfc, 0xb0, - 0xe7, 0x55, 0x78, 0xf9, 0x04, 0x40, 0x5e, 0xe0, 0x13, 0x3f, 0x56, 0x2d, 0x77, 0x6d, 0x72, 0x12, - 0x8a, 0xfb, 0xf1, 0x86, 0xbb, 0xf6, 0xea, 0x1c, 0x1f, 0x7f, 0xfe, 0xf8, 0x0d, 0x3c, 0x79, 0x82, - 0x23, 0x25, 0x5c, 0x82, 0xb2, 0x28, 0x5f, 0x96, 0x93, 0xbc, 0xbe, 0xb9, 0xdf, 0xa5, 0x68, 0xbb, - 0x4b, 0xd1, 0xdf, 0x5d, 0x8a, 0x7e, 0xee, 0xd3, 0xc5, 0x76, 0x9f, 0x2e, 0x7e, 0xef, 0xd3, 0xc5, - 0x77, 0x2a, 0x95, 0x6f, 0x87, 0x9a, 0x36, 0xa6, 0x63, 0x5f, 0x94, 0xf6, 0x60, 0xd7, 0xc0, 0x3b, - 0xd6, 0xb5, 0x43, 0xcd, 0x9a, 0x96, 0x2b, 0xcd, 0x46, 0x16, 0xc6, 0xf4, 0x77, 0x3d, 0xb8, 0x3a, - 0x9e, 0xb7, 0x78, 0xf3, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x53, 0xce, 0xaa, 0x70, 0xe2, 0x01, 0x00, - 0x00, + // 408 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x53, 0xcf, 0x6a, 0x14, 0x31, + 0x1c, 0xde, 0xd9, 0xdd, 0xee, 0x9f, 0x5f, 0x41, 0x25, 0x16, 0x9d, 0x56, 0x98, 0x2e, 0xbd, 0xb8, + 0xa7, 0x84, 0xd5, 0x83, 0x9e, 0x04, 0x6b, 0x91, 0x7a, 0x10, 0x61, 0xdd, 0x93, 0x97, 0x25, 0x33, + 0xf9, 0x35, 0x13, 0xd8, 0x49, 0x86, 0x24, 0x33, 0x4c, 0xdf, 0xc2, 0xb7, 0xf0, 0x55, 0x7a, 0xec, + 0x4d, 0x4f, 0x22, 0xbb, 0x2f, 0x22, 0x33, 0x59, 0x28, 0x7a, 0xea, 0xbd, 0xb7, 0x2f, 0xdf, 0x1f, + 0xc2, 0xf7, 0x91, 0xc0, 0xd3, 0x12, 0xa5, 0xbc, 0x66, 0xf5, 0x82, 0x95, 0xc6, 0x6c, 0x68, 0x69, + 0x8d, 0x37, 0x64, 0xd2, 0x91, 0xb4, 0x5e, 0x9c, 0x24, 0x99, 0x71, 0x85, 0x71, 0x2c, 0xe5, 0x0e, + 0x59, 0xbd, 0x48, 0xd1, 0xf3, 0x05, 0xcb, 0x8c, 0xd2, 0xc1, 0x79, 0x72, 0x24, 0x8d, 0x34, 0x1d, + 0x64, 0x2d, 0x0a, 0xec, 0xd9, 0x8f, 0x3e, 0x1c, 0x7d, 0xa9, 0xbc, 0x34, 0x4a, 0xcb, 0x55, 0x73, + 0x81, 0xa5, 0xc5, 0x8c, 0x7b, 0x14, 0xe4, 0x19, 0x8c, 0x1c, 0x6a, 0x81, 0x36, 0x8e, 0x66, 0xd1, + 0x7c, 0xba, 0xdc, 0x9f, 0xc8, 0x0b, 0x98, 0x0a, 0x74, 0x7e, 0xcd, 0x85, 0xb0, 0x71, 0xbf, 0x93, + 0x26, 0x2d, 0xf1, 0x5e, 0x08, 0x4b, 0x4e, 0xe1, 0xd0, 0xe2, 0x55, 0xa5, 0x45, 0x90, 0x07, 0x9d, + 0x0c, 0x81, 0xea, 0x0c, 0x2f, 0xe1, 0x31, 0x36, 0xa5, 0xb2, 0xdc, 0x2b, 0xa3, 0xd7, 0x5e, 0x15, + 0x18, 0x0f, 0x67, 0xd1, 0x7c, 0xb0, 0x7c, 0x74, 0x47, 0xaf, 0x54, 0x81, 0xe4, 0x0d, 0x8c, 0x78, + 0x61, 0x2a, 0xed, 0xe3, 0x83, 0x59, 0x34, 0x3f, 0x7c, 0x75, 0x4c, 0x43, 0x3d, 0xda, 0xd6, 0xa3, + 0xfb, 0x7a, 0xf4, 0x83, 0x51, 0xfa, 0x7c, 0x78, 0xf3, 0xfb, 0xb4, 0xb7, 0xdc, 0xdb, 0xc9, 0x3b, + 0x80, 0xd4, 0x2a, 0x21, 0x71, 0x7d, 0x85, 0x18, 0x8f, 0xee, 0x17, 0x9e, 0x86, 0xc8, 0x47, 0x44, + 0xf2, 0x1c, 0xc6, 0xbe, 0x59, 0xe7, 0xdc, 0xe5, 0xf1, 0x38, 0x14, 0xf7, 0xcd, 0x25, 0x77, 0xf9, + 0xd9, 0xcf, 0x3e, 0xc0, 0xdd, 0x52, 0x0f, 0x76, 0x9f, 0xb7, 0x30, 0xae, 0xf9, 0xa6, 0x0b, 0x8f, + 0xef, 0x79, 0x73, 0xcd, 0x37, 0xff, 0x2d, 0x3b, 0xf9, 0x67, 0xd9, 0x63, 0x38, 0xf8, 0x74, 0xf1, + 0x15, 0x3d, 0x79, 0x02, 0x03, 0x25, 0x5c, 0x1c, 0xcd, 0x06, 0xf3, 0xe1, 0xb2, 0x85, 0xe7, 0x97, + 0x37, 0xdb, 0x24, 0xba, 0xdd, 0x26, 0xd1, 0x9f, 0x6d, 0x12, 0x7d, 0xdf, 0x25, 0xbd, 0xdb, 0x5d, + 0xd2, 0xfb, 0xb5, 0x4b, 0x7a, 0xdf, 0xa8, 0x54, 0x3e, 0xaf, 0x52, 0x9a, 0x99, 0x82, 0x7d, 0x56, + 0xda, 0xa3, 0x5d, 0x21, 0x2f, 0x58, 0x91, 0x57, 0x29, 0xcb, 0x72, 0xae, 0x34, 0x6b, 0x58, 0xf8, + 0x30, 0xfe, 0xba, 0x44, 0x97, 0x8e, 0xba, 0xf7, 0xfe, 0xfa, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x02, 0x2f, 0x81, 0xab, 0x46, 0x03, 0x00, 0x00, +} + +func (m *OutgoingTxDeprecated) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *OutgoingTxDeprecated) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OutgoingTxDeprecated) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.TxHash) > 0 { + i -= len(m.TxHash) + copy(dAtA[i:], m.TxHash) + i = encodeVarintPool(dAtA, i, uint64(len(m.TxHash))) + i-- + dAtA[i] = 0x3a + } + { + size, err := m.BridgeFee.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintPool(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 + { + size, err := m.Amount.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintPool(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + if m.ExpirationTime != 0 { + i = encodeVarintPool(dAtA, i, uint64(m.ExpirationTime)) + i-- + dAtA[i] = 0x20 + } + if len(m.RefundAddr) > 0 { + i -= len(m.RefundAddr) + copy(dAtA[i:], m.RefundAddr) + i = encodeVarintPool(dAtA, i, uint64(len(m.RefundAddr))) + i-- + dAtA[i] = 0x1a + } + if len(m.DestAddr) > 0 { + i -= len(m.DestAddr) + copy(dAtA[i:], m.DestAddr) + i = encodeVarintPool(dAtA, i, uint64(len(m.DestAddr))) + i-- + dAtA[i] = 0x12 + } + if len(m.Sender) > 0 { + i -= len(m.Sender) + copy(dAtA[i:], m.Sender) + i = encodeVarintPool(dAtA, i, uint64(len(m.Sender))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } func (m *OutgoingTx) Marshal() (dAtA []byte, err error) { @@ -223,8 +402,18 @@ func (m *OutgoingTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.TxHash) i = encodeVarintPool(dAtA, i, uint64(len(m.TxHash))) i-- - dAtA[i] = 0x3a + dAtA[i] = 0x42 } + { + size, err := m.ValFee.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintPool(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x3a { size, err := m.BridgeFee.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -295,20 +484,20 @@ func (m *IDSet) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if len(m.Ids) > 0 { - dAtA4 := make([]byte, len(m.Ids)*10) - var j3 int + dAtA7 := make([]byte, len(m.Ids)*10) + var j6 int for _, num := range m.Ids { for num >= 1<<7 { - dAtA4[j3] = uint8(uint64(num)&0x7f | 0x80) + dAtA7[j6] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j3++ + j6++ } - dAtA4[j3] = uint8(num) - j3++ + dAtA7[j6] = uint8(num) + j6++ } - i -= j3 - copy(dAtA[i:], dAtA4[:j3]) - i = encodeVarintPool(dAtA, i, uint64(j3)) + i -= j6 + copy(dAtA[i:], dAtA7[:j6]) + i = encodeVarintPool(dAtA, i, uint64(j6)) i-- dAtA[i] = 0xa } @@ -326,6 +515,38 @@ func encodeVarintPool(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } +func (m *OutgoingTxDeprecated) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Sender) + if l > 0 { + n += 1 + l + sovPool(uint64(l)) + } + l = len(m.DestAddr) + if l > 0 { + n += 1 + l + sovPool(uint64(l)) + } + l = len(m.RefundAddr) + if l > 0 { + n += 1 + l + sovPool(uint64(l)) + } + if m.ExpirationTime != 0 { + n += 1 + sovPool(uint64(m.ExpirationTime)) + } + l = m.Amount.Size() + n += 1 + l + sovPool(uint64(l)) + l = m.BridgeFee.Size() + n += 1 + l + sovPool(uint64(l)) + l = len(m.TxHash) + if l > 0 { + n += 1 + l + sovPool(uint64(l)) + } + return n +} + func (m *OutgoingTx) Size() (n int) { if m == nil { return 0 @@ -351,6 +572,8 @@ func (m *OutgoingTx) Size() (n int) { n += 1 + l + sovPool(uint64(l)) l = m.BridgeFee.Size() n += 1 + l + sovPool(uint64(l)) + l = m.ValFee.Size() + n += 1 + l + sovPool(uint64(l)) l = len(m.TxHash) if l > 0 { n += 1 + l + sovPool(uint64(l)) @@ -380,6 +603,272 @@ func sovPool(x uint64) (n int) { func sozPool(x uint64) (n int) { return sovPool(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +func (m *OutgoingTxDeprecated) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: OutgoingTxDeprecated: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: OutgoingTxDeprecated: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthPool + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPool + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Sender = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DestAddr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthPool + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPool + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DestAddr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RefundAddr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthPool + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPool + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.RefundAddr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ExpirationTime", wireType) + } + m.ExpirationTime = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ExpirationTime |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPool + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPool + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BridgeFee", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPool + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPool + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.BridgeFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthPool + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPool + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TxHash = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipPool(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthPool + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthPool + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *OutgoingTx) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -591,6 +1080,39 @@ func (m *OutgoingTx) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ValFee", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPool + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPool + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPool + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.ValFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) } diff --git a/minter-connector/cmd/mhub-minter-connector/main.go b/minter-connector/cmd/mhub-minter-connector/main.go index c2e5c9f..f82de9d 100644 --- a/minter-connector/cmd/mhub-minter-connector/main.go +++ b/minter-connector/cmd/mhub-minter-connector/main.go @@ -517,7 +517,7 @@ func relayMinterEvents(ctx context.Context) context.Context { } if len(deposits) > 0 || len(batches) > 0 || len(valsets) > 0 { - cosmos.SendCosmosTx(cosmos.CreateClaims(ctx.CosmosConn, ctx.OrcAddress, deposits, batches, valsets, ctx.Logger), ctx.OrcAddress, ctx.OrcPriv, ctx.CosmosConn, ctx.Logger, true) + cosmos.SendCosmosTx(cosmos.CreateClaims(ctx.OrcAddress, deposits, batches, valsets, ctx.Logger), ctx.OrcAddress, ctx.OrcPriv, ctx.CosmosConn, ctx.Logger, true) } return ctx diff --git a/minter-connector/cosmos/cosmos.go b/minter-connector/cosmos/cosmos.go index f50157e..c288a6a 100644 --- a/minter-connector/cosmos/cosmos.go +++ b/minter-connector/cosmos/cosmos.go @@ -4,8 +4,6 @@ import ( "context" "github.com/MinterTeam/mhub/chain/app" mhub "github.com/MinterTeam/mhub/chain/x/minter/types" - oracleTypes "github.com/MinterTeam/mhub/chain/x/oracle/types" - phub "github.com/MinterTeam/mhub/chain/x/peggy/types" "github.com/MinterTeam/minter-hub-connector/command" "github.com/MinterTeam/minter-hub-connector/config" "github.com/cosmos/cosmos-sdk/crypto/hd" @@ -56,27 +54,12 @@ func Setup() { config.Seal() } -func CreateClaims(cosmosConn *grpc.ClientConn, orcAddress sdk.AccAddress, deposits []Deposit, batches []Batch, valsets []Valset, logger log.Logger) []sdk.Msg { - oracleClient := oracleTypes.NewQueryClient(cosmosConn) - coinList, err := oracleClient.Coins(context.Background(), &oracleTypes.QueryCoinsRequest{}) - if err != nil { - logger.Error("Error getting hub coins", "err", err.Error()) - time.Sleep(time.Second) - return CreateClaims(cosmosConn, orcAddress, deposits, batches, valsets, logger) - } - - coins := oracleTypes.NewCoins(coinList.GetCoins()) - +func CreateClaims(orcAddress sdk.AccAddress, deposits []Deposit, batches []Batch, valsets []Valset, logger log.Logger) []sdk.Msg { var msgs []sdk.Msg for _, deposit := range deposits { amount, _ := sdk.NewIntFromString(deposit.Amount) fee, _ := sdk.NewIntFromString(deposit.Fee) - denom, err := coins.GetDenomByMinterId(deposit.CoinID) - if err != nil { - panic(err) - } - if deposit.Type == command.TypeSendToEth { msgs = append(msgs, &mhub.MsgSendToEthClaim{ EventNonce: deposit.EventNonce, @@ -87,9 +70,6 @@ func CreateClaims(cosmosConn *grpc.ClientConn, orcAddress sdk.AccAddress, deposi EthReceiver: deposit.Recipient, Orchestrator: orcAddress.String(), TxHash: deposit.TxHash, - }, &phub.MsgRequestBatch{ - Orchestrator: orcAddress.String(), - Denom: denom, }) } else { msgs = append(msgs, &mhub.MsgDepositClaim{ diff --git a/orchestrator/cosmos_peggy/src/send.rs b/orchestrator/cosmos_peggy/src/send.rs index 61e8008..a08cbf5 100644 --- a/orchestrator/cosmos_peggy/src/send.rs +++ b/orchestrator/cosmos_peggy/src/send.rs @@ -204,12 +204,6 @@ pub async fn send_ethereum_claims( ))) } - if !transfers.is_empty() { - msgs.push(PeggyMsg::RequestMinterBatchMsg(RequestMinterBatchMsg { - requester: our_address, - })) - } - msgs.sort(); let std_sign_msg = StdSignMsg {