Merge branch 'develop' into initial-glazed

Author: cwarnerdev

clients/iscmove/isc_test.go

@@ -17,7 +17,7 @@ import (
 	"github.com/iotaledger/wasp/v2/packages/cryptolib"
 )
 
-func TestIscCodec(t *testing.T) {
+func TestISCCodec(t *testing.T) {
 	type ExampleObj struct {
 		A int
 	}
@@ -51,7 +51,7 @@ func TestIscCodec(t *testing.T) {
 	anchorRef.Object = &iscmovetest.TestAnchor
 	anchorRef.ObjectID = &anchorRef.Object.ID
 	anchorRef.Digest = iotatest.TestDigest
-	bcs.TestCodecAndHash(t, anchorRef, "2ed70074c011")
+	bcs.TestCodecAndHash(t, anchorRef, "2750607f6325")
 
 	bcs.TestCodecAndHash(t, iscmove.AssetsBagWithBalances{
 		AssetsBag: iscmovetest.TestAssetsBag,

clients/iscmove/iscmoveclient/feed_test.go

@@ -4,11 +4,13 @@ import (
 	"context"
 	"testing"
 
+	"github.com/samber/lo"
 	"github.com/stretchr/testify/require"
 
 	"github.com/iotaledger/wasp/v2/clients/iota-go/iotaclient"
 	"github.com/iotaledger/wasp/v2/clients/iota-go/iotaconn"
 	"github.com/iotaledger/wasp/v2/clients/iota-go/iotago"
+	"github.com/iotaledger/wasp/v2/clients/iota-go/iotajsonrpc"
 	testcommon "github.com/iotaledger/wasp/v2/clients/iota-go/test_common"
 	"github.com/iotaledger/wasp/v2/clients/iscmove"
 	"github.com/iotaledger/wasp/v2/clients/iscmove/iscmoveclient"
@@ -106,9 +108,11 @@ func TestRequestsFeed(t *testing.T) {
 			SentAssets:       []iscmoveclient.SentAssets{},
 			StateMetadata:    []byte{1, 2, 3},
 			TopUpAmount:      100,
-			GasPayment:       getCoinsRes.Data[0].Ref(),
-			GasPrice:         iotaclient.DefaultGasPrice,
-			GasBudget:        iotaclient.DefaultGasBudget,
+			GasPayment: lo.MaxBy(getCoinsRes.Data, func(a, b *iotajsonrpc.Coin) bool {
+				return a.Balance.Int.Cmp(b.Balance.Int) >= 0
+			}).Ref(),
+			GasPrice:  iotaclient.DefaultGasPrice,
+			GasBudget: iotaclient.DefaultGasBudget,
 		},
 	)
 	require.NoError(t, err)

packages/solo/ledgerl1l2.go

@@ -183,21 +183,20 @@ func (ch *Chain) Withdraw(assets *isc.Assets, user *cryptolib.KeyPair) error {
 
 // SendFromL1ToL2Account sends ftokens from L1 address to the target account on L2
 // Sender pays the gas fee
-func (ch *Chain) SendFromL1ToL2Account(totalBaseTokens coin.Value, toSend isc.CoinBalances, target isc.AgentID, user *cryptolib.KeyPair) error {
+func (ch *Chain) SendFromL1ToL2Account(toSend isc.CoinBalances, extraDeposit coin.Value, target isc.AgentID, user *cryptolib.KeyPair) error {
 	require.False(ch.Env.T, toSend.IsEmpty())
-	sumAssets := toSend.Clone().AddBaseTokens(totalBaseTokens)
 	_, err := ch.PostRequestSync(
 		NewCallParams(accounts.FuncTransferAllowanceTo.Message(target)).
-			AddFungibleTokens(sumAssets).
+			AddFungibleTokens(toSend.Clone().AddBaseTokens(extraDeposit)).
 			AddAllowance(toSend.ToAssets()).
 			WithGasBudget(math.MaxUint64),
 		user,
 	)
 	return err
 }
 
-func (ch *Chain) SendFromL1ToL2AccountBaseTokens(totalBaseTokens, baseTokensSend coin.Value, target isc.AgentID, user *cryptolib.KeyPair) error {
-	return ch.SendFromL1ToL2Account(totalBaseTokens, isc.NewCoinBalances().AddBaseTokens(baseTokensSend), target, user)
+func (ch *Chain) SendFromL1ToL2AccountBaseTokens(toSend, extraDeposit coin.Value, target isc.AgentID, user *cryptolib.KeyPair) error {
+	return ch.SendFromL1ToL2Account(isc.NewCoinBalances().AddBaseTokens(toSend), extraDeposit, target, user)
 }
 
 // SendFromL2ToL2Account moves ftokens on L2 from user's account to the target

packages/solo/solo.go

@@ -45,6 +45,7 @@ import (
 	"github.com/iotaledger/wasp/v2/packages/vm/core/governance"
 	"github.com/iotaledger/wasp/v2/packages/vm/core/migrations"
 	"github.com/iotaledger/wasp/v2/packages/vm/core/migrations/allmigrations"
+	"github.com/iotaledger/wasp/v2/packages/vm/gas"
 	"github.com/iotaledger/wasp/v2/packages/vm/processors"
 	_ "github.com/iotaledger/wasp/v2/packages/vm/sandbox"
 )
@@ -233,8 +234,9 @@ func (env *Solo) GetChainByName(name string) *Chain {
 	panic("chain not found")
 }
 
-const (
-	DefaultChainAdminBaseTokens = 50 * isc.Million
+var (
+	BaseTokensForL2Gas          = gas.FeeFromGasWithGasPerToken(gas.LimitsDefault.MaxGasPerRequest, gas.DefaultGasPerToken)
+	DefaultChainAdminBaseTokens = 2 * BaseTokensForL2Gas
 )
 
 // NewChain deploys a new default chain instance.

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

@@ -239,13 +239,6 @@ func TestNotEnoughISCGas(t *testing.T) {
 	_, err := storage.store(43)
 	require.NoError(t, err)
 
-	// only the owner can call the setEVMGasRatio endpoint
-	// set the ISC gas ratio VERY HIGH
-	newGasRatio := util.Ratio32{A: gas.DefaultEVMGasRatio.A * 500, B: gas.DefaultEVMGasRatio.B}
-	err = env.setEVMGasRatio(newGasRatio, iscCallOptions{wallet: env.Chain.ChainAdmin})
-	require.NoError(t, err)
-	require.Equal(t, newGasRatio, env.getEVMGasRatio())
-
 	senderAddress := crypto.PubkeyToAddress(storage.defaultSender.PublicKey)
 	nonce := env.getNonce(senderAddress)
 
@@ -281,7 +274,8 @@ func TestLoop(t *testing.T) {
 	gasRatio := env.getEVMGasRatio()
 
 	for _, gasLimit := range []uint64{200000, 400000} {
-		baseTokensSent := coin.Value(gas.EVMGasToISC(gasLimit, &gasRatio))
+		iscGasUnits := gas.EVMGasToISC(gasLimit, &gasRatio)
+		baseTokensSent := gas.FeeFromGasWithGasPerToken(iscGasUnits, gas.DefaultGasPerToken)
 		ethKey2, ethAddr2 := env.Chain.NewEthereumAccountWithL2Funds(baseTokensSent)
 		require.EqualValues(t,
 			env.Chain.L2BaseTokens(isc.NewEthereumAddressAgentID(ethAddr2)),
@@ -307,7 +301,8 @@ func TestLoopWithGasLeft(t *testing.T) {
 	gasRatio := env.getEVMGasRatio()
 	var usedGas []uint64
 	for _, gasLimit := range []uint64{50000, 200000} {
-		baseTokensSent := coin.Value(gas.EVMGasToISC(gasLimit, &gasRatio))
+		iscGasUnits := gas.EVMGasToISC(gasLimit, &gasRatio)
+		baseTokensSent := gas.FeeFromGasWithGasPerToken(iscGasUnits, gas.DefaultGasPerToken)
 		ethKey2, _ := env.Chain.NewEthereumAccountWithL2Funds(baseTokensSent)
 		res, err := iscTest.CallFn([]ethCallOptions{{
 			sender:   ethKey2,
@@ -354,7 +349,8 @@ func TestLoopWithGasLeftEstimateGas(t *testing.T) {
 	t.Log(estimatedGas)
 
 	gasRatio := env.getEVMGasRatio()
-	baseTokensSent := coin.Value(gas.EVMGasToISC(estimatedGas, &gasRatio))
+	iscGasUnits := gas.EVMGasToISC(estimatedGas, &gasRatio)
+	baseTokensSent := gas.FeeFromGasWithGasPerToken(iscGasUnits, gas.DefaultGasPerToken)
 	ethKey2, _ := env.Chain.NewEthereumAccountWithL2Funds(baseTokensSent)
 	res, err := iscTest.CallFn([]ethCallOptions{{
 		sender:   ethKey2,
@@ -692,8 +688,8 @@ func TestCannotDepleteAccount(t *testing.T) {
 	require.Zero(t, env.solo.L1BaseTokens(receiver))
 	senderInitialBalance := env.Chain.L2BaseTokens(isc.NewEthereumAddressAgentID(ethAddress))
 
-	// we eill attempt to transfer so much that we are left with no funds for gas
-	transfer := senderInitialBalance - 300
+	// we will attempt to transfer so much that we are left with no funds for gas
+	transfer := senderInitialBalance - gas.FeeFromGasWithGasPerToken(30_000, gas.DefaultGasPerToken)
 
 	// allow ISCTest to take the tokens
 	_, err := env.ISCMagicSandbox(ethKey).CallFn(
@@ -1335,11 +1331,10 @@ func TestSelfDestruct(t *testing.T) {
 
 	// send some tokens to the ISCTest contract
 	{
-		const baseTokensDepositFee = 500
 		k, _ := env.solo.NewKeyPairWithFunds(env.solo.NewSeedFromTestNameAndTimestamp(t.Name()))
-		err := env.Chain.SendFromL1ToL2AccountBaseTokens(baseTokensDepositFee, 1*isc.Million, iscTestAgentID, k)
+		err := env.Chain.SendFromL1ToL2AccountBaseTokens(solo.BaseTokensForL2Gas, solo.BaseTokensForL2Gas, iscTestAgentID, k)
 		require.NoError(t, err)
-		require.EqualValues(t, 1*isc.Million, env.Chain.L2BaseTokens(iscTestAgentID))
+		require.EqualValues(t, solo.BaseTokensForL2Gas, env.Chain.L2BaseTokens(iscTestAgentID))
 	}
 
 	_, beneficiary := solo.EthereumAccountByIndex(1)
@@ -1353,7 +1348,7 @@ func TestSelfDestruct(t *testing.T) {
 	// except when called in the same transaction as creation
 	require.NotEmpty(t, env.getCode(iscTest.address))
 	require.Zero(t, env.Chain.L2BaseTokens(iscTestAgentID))
-	require.EqualValues(t, 1*isc.Million, env.Chain.L2BaseTokens(isc.NewEthereumAddressAgentID(beneficiary)))
+	require.EqualValues(t, solo.BaseTokensForL2Gas, env.Chain.L2BaseTokens(isc.NewEthereumAddressAgentID(beneficiary)))
 
 	testdbhash.VerifyContractStateHash(env.solo, evm.Contract, "", t.Name())
 }

packages/vm/core/testcore/accounts_test.go

@@ -21,8 +21,6 @@ import (
 	"github.com/iotaledger/wasp/v2/packages/vm/gas"
 )
 
-const BaseTokensDepositFee = 100
-
 func TestAccounts_Deposit(t *testing.T) {
 	env := solo.New(t, &solo.InitOptions{})
 	sender, _ := env.NewKeyPairWithFunds(env.NewSeedFromTestNameAndTimestamp(t.Name()))
@@ -84,15 +82,15 @@ func TestAccounts_WithdrawEverything(t *testing.T) {
 	ch := env.NewChain()
 
 	// deposit some base tokens to L2
-	baseTokensToDepositToL2 := coin.Value(100_000)
+	baseTokensToDepositToL2 := solo.BaseTokensForL2Gas
 	err := ch.DepositBaseTokensToL2(baseTokensToDepositToL2, sender)
 	require.NoError(t, err)
 
 	l2balance := ch.L2BaseTokens(senderAgentID)
 
 	// construct the request to estimate an withdrawal (leave a few tokens to pay for gas)
 	req := solo.NewCallParams(accounts.FuncWithdraw.Message()).
-		AddAllowance(isc.NewAssets(l2balance - 1000)).
+		AddAllowance(isc.NewAssets(l2balance - solo.BaseTokensForL2Gas/10)).
 		WithMaxAffordableGasBudget()
 
 	_, estimate, err := ch.EstimateGasOffLedger(req, sender)
@@ -161,7 +159,7 @@ func initDepositTest(t *testing.T, initCommonAccountBaseTokens ...coin.Value) *a
 // initWithdrawTest deploys TestCoin, mints 1M tokens and deposits 100 to user's account
 func initWithdrawTest(t *testing.T) *accountsDepositTest {
 	v := initDepositTest(t)
-	v.ch.MustDepositBaseTokensToL2(2*isc.Million, v.user)
+	v.ch.MustDepositBaseTokensToL2(solo.BaseTokensForL2Gas, v.user)
 	coinPackageID, treasuryCap := v.ch.Env.L1DeployCoinPackage(v.user)
 	v.coinType = coin.MustTypeFromString(fmt.Sprintf(
 		"%s::%s::%s",
@@ -182,7 +180,7 @@ func initWithdrawTest(t *testing.T) *accountsDepositTest {
 	// prepare request parameters to withdraw
 	// do not run the request yet
 	v.req = solo.NewCallParams(accounts.FuncWithdraw.Message()).
-		AddBaseTokens(12000).
+		AddBaseTokens(solo.BaseTokensForL2Gas / 10).
 		WithGasBudget(100_000)
 	v.printBalances("BEGIN")
 	return v
@@ -247,7 +245,7 @@ func TestAccounts_TransferAndCheckBaseTokens(t *testing.T) {
 
 	// deposit some base tokens into the common account
 	someUserWallet, _ := v.env.NewKeyPairWithFunds()
-	err := v.ch.SendFromL1ToL2Account(11*isc.Million, isc.NewAssets(10*isc.Million).Coins, accounts.CommonAccount(), someUserWallet)
+	err := v.ch.SendFromL1ToL2Account(isc.NewAssets(10*isc.Million).Coins, solo.BaseTokensForL2Gas, accounts.CommonAccount(), someUserWallet)
 	require.NoError(t, err)
 	commonAccBaseTokens := initialCommonAccountBaseTokens + 10*isc.Million
 	require.EqualValues(t, commonAccBaseTokens, v.ch.L2CommonAccountAssets().BaseTokens())
@@ -258,8 +256,8 @@ func TestAccounts_TransferAndCheckBaseTokens(t *testing.T) {
 func TestAccounts_TransferPartialAssets(t *testing.T) {
 	// setup a chain with some base tokens and native tokens for user1
 	v := initWithdrawTest(t)
-	v.ch.MustDepositBaseTokensToL2(10*isc.Million, v.ch.ChainAdmin)
-	v.ch.MustDepositBaseTokensToL2(10*isc.Million, v.user)
+	v.ch.MustDepositBaseTokensToL2(solo.BaseTokensForL2Gas, v.ch.ChainAdmin)
+	v.ch.MustDepositBaseTokensToL2(solo.BaseTokensForL2Gas, v.user)
 
 	v.ch.AssertL2Coins(v.userAgentID, v.coinType, coin.Value(100))
 	v.ch.AssertL2TotalCoins(v.coinType, coin.Value(100))
@@ -270,12 +268,12 @@ func TestAccounts_TransferPartialAssets(t *testing.T) {
 
 	// deposit 1 base token to "create account" for user2 // TODO maybe remove if account creation is not needed
 	v.ch.AssertL2BaseTokens(user2AgentID, 0)
-	const baseTokensToSend = 3 * isc.Million
-	err := v.ch.SendFromL1ToL2AccountBaseTokens(BaseTokensDepositFee, baseTokensToSend, user2AgentID, user2)
+	const baseTokensToSend = 3e6
+	err := v.ch.SendFromL1ToL2AccountBaseTokens(baseTokensToSend, solo.BaseTokensForL2Gas, user2AgentID, user2)
 	rec := v.ch.LastReceipt()
 	require.NoError(t, err)
 	v.env.T.Logf("gas fee charged: %d", rec.GasFeeCharged)
-	expectedUser2 := BaseTokensDepositFee + baseTokensToSend - rec.GasFeeCharged
+	expectedUser2 := solo.BaseTokensForL2Gas + baseTokensToSend - rec.GasFeeCharged
 	v.ch.AssertL2BaseTokens(user2AgentID, expectedUser2)
 	// -----------------------------
 	err = v.ch.SendFromL2ToL2Account(

packages/vm/core/testcore/governance_test.go

@@ -331,7 +331,7 @@ func TestGovernanceL1Metadata(t *testing.T) {
 	ch := env.NewChain()
 
 	// deposit some extra tokens to the common account to accommodate for the SD change
-	ch.SendFromL1ToL2AccountBaseTokens(10*isc.Million, 9*isc.Million, accounts.CommonAccount(), nil)
+	ch.SendFromL1ToL2AccountBaseTokens(solo.BaseTokensForL2Gas, solo.BaseTokensForL2Gas, accounts.CommonAccount(), nil)
 
 	// set max valid size custom metadata
 	publicURLMetadata := "https://iota.org"
@@ -549,7 +549,7 @@ func TestGovernanceGasPayout(t *testing.T) {
 	ownerBal1 := ch.L2Assets(ch.AdminAgentID())
 	commonBal1 := ch.L2CommonAccountAssets()
 	user1Bal1 := ch.L2Assets(user1AgentID)
-	transferAmt := coin.Value(2000)
+	transferAmt := solo.BaseTokensForL2Gas
 	_, _, vmRes, _, err := ch.PostRequestSyncTx(
 		solo.NewCallParams(accounts.FuncDeposit.Message()).
 			AddBaseTokens(transferAmt),

packages/vm/core/testcore/sbtests/call_test.go

@@ -15,8 +15,7 @@ func TestGetSet(t *testing.T) {
 	_, chain := setupChain(t)
 	setupTestSandboxSC(t, chain, nil)
 
-	req := solo.NewCallParams(sbtestsc.FuncSetInt.Message("ppp", 314), ScName).
-		WithGasBudget(100_000)
+	req := solo.NewCallParams(sbtestsc.FuncSetInt.Message("ppp", 314), ScName)
 	_, err := chain.PostRequestSync(req.AddBaseTokens(1), nil)
 	require.NoError(t, err)
 

packages/vm/core/testcore/sbtests/check_ctx_test.go

@@ -8,7 +8,6 @@ import (
 	"github.com/iotaledger/wasp/v2/packages/isc"
 	"github.com/iotaledger/wasp/v2/packages/solo"
 	"github.com/iotaledger/wasp/v2/packages/vm/core/testcore/sbtests/sbtestsc"
-	"github.com/iotaledger/wasp/v2/packages/vm/gas"
 )
 
 func TestMainCallsFromFullEP(t *testing.T) {
@@ -22,8 +21,7 @@ func TestMainCallsFromFullEP(t *testing.T) {
 		chain.AdminAgentID(),
 		userAgentID,
 		isc.NewContractAgentID(HScName),
-	), ScName).
-		WithGasBudget(10 * gas.LimitsDefault.MinGasPerRequest)
+	), ScName)
 	_, err := chain.PostRequestSync(req, user)
 	require.NoError(t, err)
 }

packages/vm/core/testcore/sbtests/send_test.go

@@ -149,17 +149,15 @@ func TestPingBaseTokens1(t *testing.T) {
 	commonBefore := ch.L2CommonAccountAssets()
 	t.Logf("----- BEFORE -----\nUser funds left: %s\nCommon account: %s", userFundsBefore, commonBefore)
 
-	const expectedBack = 1 * isc.Million
+	expectedBack := solo.BaseTokensForL2Gas
 	ch.Env.AssertL1BaseTokens(userAddr, iotaclient.FundsFromFaucetAmount)
 
 	req := solo.NewCallParamsEx(ScName, sbtestsc.FuncPingAllowanceBack.Name).
-		AddBaseTokens(expectedBack + 500). // add extra base tokens besides allowance in order to estimate the gas fees
-		AddAllowanceBaseTokens(expectedBack).
-		WithGasBudget(100_000)
+		AddBaseTokens(expectedBack * 2). // add extra base tokens besides allowance in order to estimate the gas fees
+		AddAllowanceBaseTokens(expectedBack)
 
 	_, estimate, err := ch.EstimateGasOnLedger(req, user)
 	require.NoError(t, err)
-
 	req.
 		WithFungibleTokens(isc.NewAssets(expectedBack + estimate.GasFeeCharged).Coins).
 		WithGasBudget(estimate.GasBurned)
@@ -223,7 +221,7 @@ func TestNFTOffledgerWithdraw(t *testing.T) {
 	wallet, _ := ch.Env.NewKeyPairWithFunds(ch.Env.NewSeedFromTestNameAndTimestamp(t.Name()))
 
 	obj := ch.Env.L1MintObject(wallet)
-	err := ch.DepositAssetsToL2(isc.NewAssets(100_000).AddObject(obj), wallet)
+	err := ch.DepositAssetsToL2(isc.NewAssets(solo.BaseTokensForL2Gas).AddObject(obj), wallet)
 	require.NoError(t, err)
 
 	wdReq := solo.NewCallParams(accounts.FuncWithdraw.Message()).