From fbcfc73c7a92d0a2615ef90c4dffa4746161b9c7 Mon Sep 17 00:00:00 2001 From: Determinant Date: Wed, 19 Aug 2020 11:45:32 -0400 Subject: ... --- plugin/evm/block.go | 6 +++--- plugin/evm/vm.go | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/plugin/evm/block.go b/plugin/evm/block.go index 45a888f..a2ffb69 100644 --- a/plugin/evm/block.go +++ b/plugin/evm/block.go @@ -80,12 +80,12 @@ func (b *Block) Verify() error { p = p.Parent().(*Block) } for i := len(path) - 1; i >= 0; i-- { - inputs_copy := new(ids.Set) + inputsCopy := new(ids.Set) p := path[i] atx := vm.getAtomicTx(p.ethBlock) inputs.Union(atx.UnsignedTx.(UnsignedAtomicTx).InputUTXOs()) - inputs_copy.Union(*inputs) - vm.blockAtomicInputCache.Put(p.ID(), inputs_copy) + inputsCopy.Union(*inputs) + vm.blockAtomicInputCache.Put(p.ID(), inputsCopy) } tx := b.vm.getAtomicTx(b.ethBlock) atx := tx.UnsignedTx.(*UnsignedImportTx) diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go index 7a310bf..b72ac49 100644 --- a/plugin/evm/vm.go +++ b/plugin/evm/vm.go @@ -173,6 +173,8 @@ func (vm *VM) Initialize( } vm.ctx = ctx + vm.avaxAssetID = ctx.AVAXAssetID + vm.avm = ctx.XChainID vm.chaindb = Database{db} g := new(core.Genesis) err := json.Unmarshal(b, g) @@ -237,6 +239,11 @@ func (vm *VM) Initialize( chain.SetOnExtraStateChange(func(block *types.Block, statedb *state.StateDB) error { atx := vm.getAtomicTx(block).UnsignedTx.(*UnsignedImportTx) vm.ctx.Log.Info(atx.ID().String()) + for _, to := range atx.Outs { + amount := new(big.Int) + amount.SetUint64(to.Amount) + statedb.AddBalance(to.Address, amount) + } return nil }) vm.blockCache = cache.LRU{Size: 2048} -- cgit v1.2.3