Skip to content

add txs to api #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
klim0v merged 1 commit into from
Dec 30, 2020
Merged

add txs to api #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions api/v2/service/data_encoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,40 @@ func encode(data transaction.Data, coins coins.RCoins) (*any.Any, error) {
},
MinimumValueToBuy: d.MinimumValueToBuy.String(),
}
case *transaction.CreateTokenData:
m = &pb.CreateTokenData{
Name: d.Name,
Symbol: d.Symbol.String(),
InitialAmount: d.InitialAmount.String(),
MaxSupply: d.MaxSupply.String(),
Mintable: d.Mintable,
Burnable: d.Burnable,
}
case *transaction.RecreateTokenData:
m = &pb.RecreateTokenData{
Name: d.Name,
Symbol: d.Symbol.String(),
InitialAmount: d.InitialAmount.String(),
MaxSupply: d.MaxSupply.String(),
Mintable: d.Mintable,
Burnable: d.Burnable,
}
case *transaction.BurnTokenData:
m = &pb.BurnTokenData{
Coin: &pb.Coin{
Id: uint64(d.Coin),
Symbol: coins.GetCoin(d.Coin).GetFullSymbol(),
},
Value: d.Value.String(),
}
case *transaction.MintTokenData:
m = &pb.MintTokenData{
Coin: &pb.Coin{
Id: uint64(d.Coin),
Symbol: coins.GetCoin(d.Coin).GetFullSymbol(),
},
Value: d.Value.String(),
}
default:
return nil, errors.New("unknown tx type")
}
Expand Down
10 changes: 5 additions & 5 deletions core/transaction/burn_token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"math/big"
)

type BurnToken struct {
type BurnTokenData struct {
Coin types.CoinID
Value *big.Int
}

func (data BurnToken) basicCheck(tx *Transaction, context *state.CheckState) *Response {
func (data BurnTokenData) basicCheck(tx *Transaction, context *state.CheckState) *Response {
coin := context.Coins().GetCoin(data.Coin)
if coin == nil {
return &Response{
Expand Down Expand Up @@ -56,15 +56,15 @@ func (data BurnToken) basicCheck(tx *Transaction, context *state.CheckState) *Re
return nil
}

func (data BurnToken) String() string {
func (data BurnTokenData) String() string {
return fmt.Sprintf("BURN COIN: %d", data.Coin)
}

func (data BurnToken) Gas() int64 {
func (data BurnTokenData) Gas() int64 {
return commissions.EditEmissionData
}

func (data BurnToken) Run(tx *Transaction, context state.Interface, rewardPool *big.Int, currentBlock uint64) Response {
func (data BurnTokenData) Run(tx *Transaction, context state.Interface, rewardPool *big.Int, currentBlock uint64) Response {
sender, _ := tx.Sender()

var checkState *state.CheckState
Expand Down
2 changes: 1 addition & 1 deletion core/transaction/burn_token_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func TestBurnData_aaa(t *testing.T) {
}

subVolume := big.NewInt(1e18)
data := BurnToken{
data := BurnTokenData{
Coin: stateCoin.ID(),
Value: big.NewInt(0).Set(subVolume),
}
Expand Down
4 changes: 2 additions & 2 deletions core/transaction/decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ func getData(txType TxType) (Data, bool) {
case TypeMoveStake:
return &MoveStakeData{}, true
case TypeMintToken:
return &MintCoin{}, true
return &MintTokenData{}, true
case TypeBurnToken:
return &BurnToken{}, true
return &BurnTokenData{}, true
case TypeCreateToken:
return &CreateTokenData{}, true
case TypeRecreateToken:
Expand Down
10 changes: 5 additions & 5 deletions core/transaction/mint_coin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"math/big"
)

type MintCoin struct {
type MintTokenData struct {
Coin types.CoinID
Value *big.Int
}

func (data MintCoin) basicCheck(tx *Transaction, context *state.CheckState) *Response {
func (data MintTokenData) basicCheck(tx *Transaction, context *state.CheckState) *Response {
coin := context.Coins().GetCoin(data.Coin)
if coin == nil {
return &Response{
Expand Down Expand Up @@ -56,15 +56,15 @@ func (data MintCoin) basicCheck(tx *Transaction, context *state.CheckState) *Res
return nil
}

func (data MintCoin) String() string {
func (data MintTokenData) String() string {
return fmt.Sprintf("MINT COIN: %d", data.Coin)
}

func (data MintCoin) Gas() int64 {
func (data MintTokenData) Gas() int64 {
return commissions.EditEmissionData
}

func (data MintCoin) Run(tx *Transaction, context state.Interface, rewardPool *big.Int, currentBlock uint64) Response {
func (data MintTokenData) Run(tx *Transaction, context state.Interface, rewardPool *big.Int, currentBlock uint64) Response {
sender, _ := tx.Sender()

var checkState *state.CheckState
Expand Down
2 changes: 1 addition & 1 deletion core/transaction/mint_token_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func TestMintData_aaa(t *testing.T) {
}

subVolume := big.NewInt(1e18)
data := MintCoin{
data := MintTokenData{
Coin: stateCoin.ID(),
Value: big.NewInt(0).Set(subVolume),
}
Expand Down
3 changes: 1 addition & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/MinterTeam/minter-go-node
go 1.15

require (
github.com/MinterTeam/node-grpc-gateway v1.2.2-0.20201211224753-59a36e8b0b7b
github.com/MinterTeam/node-grpc-gateway v1.2.2-0.20201230134638-96a0c688a77c
github.com/btcsuite/btcd v0.20.1-beta
github.com/c-bata/go-prompt v0.2.3
github.com/go-kit/kit v0.10.0
Expand Down Expand Up @@ -38,5 +38,4 @@ require (
golang.org/x/sys v0.0.0-20201020230747-6e5568b54d1a
google.golang.org/grpc v1.33.1
google.golang.org/protobuf v1.25.0
gopkg.in/errgo.v2 v2.1.0
)
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg=
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4=
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
github.com/MinterTeam/node-grpc-gateway v1.2.2-0.20201211224753-59a36e8b0b7b h1:8e9p/wQftPgZEtYver18hsF9iyIOgfK9Mvn2eG2pMUk=
github.com/MinterTeam/node-grpc-gateway v1.2.2-0.20201211224753-59a36e8b0b7b/go.mod h1:oyBmm4OA4XyHpfbz7gHmP4j82qO3Xb2Z31hydzP192w=
github.com/MinterTeam/node-grpc-gateway v1.2.2-0.20201230134638-96a0c688a77c h1:N611Iet282q2ifN5hacYBfp5sIOav+D1hU4ObGXDa68=
github.com/MinterTeam/node-grpc-gateway v1.2.2-0.20201230134638-96a0c688a77c/go.mod h1:oyBmm4OA4XyHpfbz7gHmP4j82qO3Xb2Z31hydzP192w=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
Expand Down