poanetwork
/
gecko
mirror of https://github.com/poanetwork/gecko.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplify avm export / platform import api

This commit is contained in:
Dan Laine 2020-04-02 09:39:40 -04:00
parent 7ef0f88cb7
commit 1c3f0070f3
2 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vms/avm/service.go
View File

@ -1094,7 +1094,7 @@ type SendExportArgs struct {
Username string `json:"username"`
Password string `json:"password"`
Amount json.Uint64 `json:"amount"`
To string `json:"to"`
To ids.ShortID `json:"to"`
}
// SendExportReply defines the Send replies returned from the API
@ -1110,15 +1110,6 @@ func (service *Service) SendExport(_ *http.Request, args *SendExportArgs, reply
return errInvalidAmount
}
toBytes, err := service.vm.Parse(args.To)
if err != nil {
return fmt.Errorf("problem parsing to address: %w", err)
}
to, err := ids.ToShortID(toBytes)
if err != nil {
return fmt.Errorf("problem parsing to address: %w", err)
}
db, err := service.vm.ctx.Keystore.GetDatabase(args.Username, args.Password)
if err != nil {
return fmt.Errorf("problem retrieving user: %w", err)
@ -1194,7 +1185,7 @@ func (service *Service) SendExport(_ *http.Request, args *SendExportArgs, reply
Locktime: 0,
OutputOwners: secp256k1fx.OutputOwners{
Threshold: 1,
Addrs: []ids.ShortID{to},
Addrs: []ids.ShortID{args.To},
},
},
}}

25
vms/platformvm/service.go
View File

@ -856,17 +856,14 @@ func (service *Service) signAddNonDefaultSubnetValidatorTx(tx *addNonDefaultSubn
// CreateImportTxArgs are the arguments to CreateImportTx
type CreateImportTxArgs struct {
// Addresses that can be used to sign the import
ImportAddresses []ids.ShortID `json:"importAddresses"`
// ID of the account that will receive the imported funds, and pay the
// import fee
// transaction fee
AccountID ids.ShortID `json:"accountID"`
// Nonce of the account that pays the transaction fee
// Next unused nonce of the account
PayerNonce json.Uint64 `json:"payerNonce"`
// User that controls the Addresses
// User that controls the account
Username string `json:"username"`
Password string `json:"password"`
}
@ -884,26 +881,16 @@ func (service *Service) CreateImportTx(_ *http.Request, args *CreateImportTxArgs
user := user{db: db}
kc := secp256k1fx.NewKeychain()
for _, addr := range args.ImportAddresses {
key, err := user.getKey(addr)
if err != nil {
return errDB
}
kc.Add(key)
}
key, err := user.getKey(args.AccountID)
if err != nil {
return errDB
}
kc.Add(key)
addrs := ids.Set{}
for _, addr := range args.ImportAddresses {
addrs.Add(ids.NewID(hashing.ComputeHash256Array(addr.Bytes())))
}
addrSet := ids.Set{}
addrSet.Add(ids.NewID(hashing.ComputeHash256Array(args.AccountID.Bytes())))
utxos, err := service.vm.GetAtomicUTXOs(addrs)
utxos, err := service.vm.GetAtomicUTXOs(addrSet)
if err != nil {
return fmt.Errorf("problem retrieving user's atomic UTXOs: %w", err)
}