aboutsummaryrefslogtreecommitdiff
path: root/plugin/evm
diff options
context:
space:
mode:
authorDeterminant <[email protected]>2020-09-19 19:32:37 -0400
committerDeterminant <[email protected]>2020-09-19 19:32:37 -0400
commit80f76ae97372ea074ce660dbcaffd97c648ece22 (patch)
treee9029d3ff63fa84ee2089ad4b020c40772e4d768 /plugin/evm
parent4a447f41d8f03796e8581031a41976fb5ba299b4 (diff)
fully support C<->X asset transferv0.3.1-rc.1
Diffstat (limited to 'plugin/evm')
-rw-r--r--plugin/evm/export_tx.go30
-rw-r--r--plugin/evm/service.go3
2 files changed, 19 insertions, 14 deletions
diff --git a/plugin/evm/export_tx.go b/plugin/evm/export_tx.go
index 9cfd5ba..8b512df 100644
--- a/plugin/evm/export_tx.go
+++ b/plugin/evm/export_tx.go
@@ -198,23 +198,25 @@ func (vm *VM) newExportTx(
signers = append(signers, signers2...)
}
+ exportOuts := []*avax.TransferableOutput{{ // Exported to X-Chain
+ Asset: avax.Asset{ID: assetID},
+ Out: &secp256k1fx.TransferOutput{
+ Amt: amount,
+ OutputOwners: secp256k1fx.OutputOwners{
+ Locktime: 0,
+ Threshold: 1,
+ Addrs: []ids.ShortID{to},
+ },
+ },
+ }}
+
// Create the transaction
utx := &UnsignedExportTx{
NetworkID: vm.ctx.NetworkID,
BlockchainID: vm.ctx.ChainID,
DestinationChain: chainID,
Ins: ins,
- ExportedOutputs: []*avax.TransferableOutput{{ // Exported to X-Chain
- Asset: avax.Asset{ID: assetID},
- Out: &secp256k1fx.TransferOutput{
- Amt: amount,
- OutputOwners: secp256k1fx.OutputOwners{
- Locktime: 0,
- Threshold: 1,
- Addrs: []ids.ShortID{to},
- },
- },
- }},
+ ExportedOutputs: exportOuts,
}
tx := &Tx{UnsignedTx: utx}
if err := tx.Sign(vm.codec, signers); err != nil {
@@ -224,6 +226,7 @@ func (vm *VM) newExportTx(
}
func (tx *UnsignedExportTx) EVMStateTransfer(vm *VM, state *state.StateDB) error {
+ addrs := map[[20]byte]uint64{}
for _, from := range tx.Ins {
log.Info("crosschain C->X", "addr", from.Address, "amount", from.Amount)
amount := new(big.Int).Mul(
@@ -243,7 +246,10 @@ func (tx *UnsignedExportTx) EVMStateTransfer(vm *VM, state *state.StateDB) error
if state.GetNonce(from.Address) != from.Nonce {
return errInvalidNonce
}
- state.SetNonce(from.Address, from.Nonce+1)
+ addrs[from.Address] = from.Nonce
+ }
+ for addr, nonce := range addrs {
+ state.SetNonce(addr, nonce+1)
}
return nil
}
diff --git a/plugin/evm/service.go b/plugin/evm/service.go
index f50d66a..c34a59d 100644
--- a/plugin/evm/service.go
+++ b/plugin/evm/service.go
@@ -329,10 +329,9 @@ func (service *AvaxAPI) Export(_ *http.Request, args *ExportArgs, response *api.
return fmt.Errorf("couldn't get addresses controlled by the user: %w", err)
}
- assetID := service.vm.ctx.AVAXAssetID
// Create the transaction
tx, err := service.vm.newExportTx(
- assetID, // AssetID
+ args.AssetID, // AssetID
uint64(args.Amount), // Amount
chainID, // ID of the chain to send the funds to
to, // Address