Skip to content

Commit d73096d

Browse files
committed
Fix send
1 parent 016ca6a commit d73096d

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

packages/solo/check.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ func (ch *Chain) CheckAccountLedger() {
6666
require.True(ch.Env.T, ch.L2Assets(coreacc).IsEmpty())
6767

6868
_, bals := ch.GetLatestAnchorWithBalances()
69-
require.True(ch.Env.T, bals.Equals(total))
69+
if !bals.Equals(total) {
70+
require.Failf(ch.Env.T, "failed chain accounts check", "Balances:\nL1: %s\nL2: %s", bals.String(), total.String())
71+
}
7072
}
7173

7274
func (ch *Chain) AssertL2TotalCoins(coinType coin.Type, bal coin.Value) {

packages/vm/core/evm/evmtest/evm_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,8 @@ func TestSendPayableValueTX(t *testing.T) {
626626
require.EqualValues(t, senderInitialBalance-valueInBaseTokens-res.ISCReceipt.GasFeeCharged, env.Chain.L2BaseTokens(isc.NewEthereumAddressAgentID(senderEthAddress)))
627627
// L1 balance of receiver is `values sent in tx`
628628
require.EqualValues(t, valueInBaseTokens, env.solo.L1BaseTokens(receiver))
629+
630+
env.Chain.CheckAccountLedger()
629631
}
630632

631633
func TestSendBaseTokens(t *testing.T) {

packages/vm/vmimpl/send.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,10 @@ const MaxPostedOutputsInOneRequest = 4
99
func (reqctx *requestContext) send(params isc.RequestParameters) {
1010
// simply send assets to a L1 address
1111
reqctx.vm.txbuilder.SendAssets(params.TargetAddress.AsIotaAddress(), params.Assets)
12+
13+
account := reqctx.CurrentContractAccountID()
14+
reqctx.accountsStateWriter(false).DebitFromAccount(account, params.Assets.Coins)
15+
for obj := range params.Assets.Objects.Iterate() {
16+
reqctx.accountsStateWriter(false).DebitObjectFromAccount(account, obj.ID)
17+
}
1218
}

0 commit comments

Comments
 (0)