Increase NEAR Gas for ft_on_transfer #389

mrLSD · 2021-12-09T14:37:17Z

PR related to the issue: #381

Increased NEAR Gas:

deposit to 80 Tgas
ft_on_transfer 30 TGas

Solution

The main solution is not to fix the amount of gas for promise call ft_on_transfer. For this, a formula is introduced according to which we can use more gas, depending on how much gas was initially released.

GAS_FOR_FT_ON_TRANSFER = prepaid_gas - GAS_FOR_FT_TRANSFER_CALL - GAS_FOR_RESOLVE_TRASNFER

added new Sdk and Env method - prepaid_gas
introduced a new constant GAS_FOR_FT_TRANSFER_CALL = 35 TGas. This constant indicates how much gas is allocated to make a call ft_transfer_call.
To invoke a ft_on_transferpromise, a formula for gas counting has been introduced:GAS_FOR_FT_ON_TRANSFER = prepaid_gas - GAS_FOR_FT_TRANSFER_CALL - GAS_FOR_RESOLVE_TRASNFER`

This will allow the use of dedicated gas for this method.

engine/src/fungible_token.rs

joshuajbouw

This isn't the solution that was shown.

joshuajbouw · 2021-12-09T18:57:48Z

Please also describe the rational and the solution to the issue outlined in #381.

birchmd

Nice! Looks pretty good to me. I think we should use a more descriptive variable name than simply gas and I think we should have a constant for the default prepaid gas value (mostly used in the standalone engine), and after that it should be good to go

engine-sdk/src/near_runtime.rs

engine-standalone-storage/src/relayer_db/mod.rs

engine-standalone-storage/src/sync/mod.rs

engine-tests/src/test_utils/standalone/mocks/mod.rs

engine-tests/src/tests/standalone/sanity.rs

engine/src/connector.rs

engine/src/fungible_token.rs

Co-authored-by: Michael Birch <birchmd8@gmail.com>

…is-near/aurora-engine into feat/ft-on-trasnfer-increase-gas

birchmd

Almost there!

engine-standalone-storage/src/relayer_db/mod.rs

engine/src/connector.rs

engine/src/fungible_token.rs

Co-authored-by: Michael Birch <birchmd8@gmail.com>

…is-near/aurora-engine into feat/ft-on-trasnfer-increase-gas

mrLSD · 2021-12-09T21:51:41Z

And you're confident it is enough to cover all mainnet use cases? Did you include some extra just to be on the safe side?
@birchmd

I changed to 35 TGas. So we can guaranty the same workflow with gas, as in the current contract.
But from Evgeny Kuzyakiv sample code, that constant is 25 TGas.

We should decide carefully that value.

birchmd

LGTM
Nice work

joshuajbouw

Looks good to me here.

joshuajbouw · 2021-12-10T06:55:40Z

Please squash & rebase so that I can merge. Thanks.

* Feat(engine): London hard fork support (#244) * Fix(exit precompile): Address to refund in case of error is an argument (#311) * Feat(engine): Make engine parametric in storage access (#314) * Test verifying the EVM log returns the correct address (#341) * Remove sdk::current_account_id usage from engine-precompiles (#346) * Remove Default trait bound from engine IO (#342) * Remove some sdk usage from core logic (#347) * Factor out blockchain environment variable access as a trait (#349) * Factor out NEAR promise host functions into a trait (#353) * Borsh deserialized value field for call args (#351) * Refactor(eth-connector): Use Result return values instead of panicking (#355) * Gate all NEAR host functions behind the contract feature (#356) * Bump @openzeppelin/contracts from 4.3.2 to 4.3.3 in /etc/eth-contracts * Chore: Newtypes for gas (#344) * Feat(standalone): Standalone (#345) * Minor fixes to sdk refactor (#359) * Refactor(engine): Move submit logic into engine module (#366) * Feat(standalone): Storage backend (#375) * NEAR random numbers from solidity contract (#368) * Feat(standalone): EVM tracing via SputnikVM (#383) * Feat(standalone): Bootstrap storage from relayer and state snapshots (#379) * Feat(standalone): Structures and logic for keeping storage in sync with the blockchain (#382) * Feat(standalone): Capture geth-like tracing from SputnikVM events (#384) * Connector cleanup (#374) * Remove betanet * Fix(engine): original_storage bug fix; more tracing tests (#390) * Increase NEAR Gas for ft_on_transfer (#389) Co-authored-by: Andrew Bednoff <andrew.bednoff@aurora.dev> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Evgeny Ukhanov <evgeny.ukhanov@aurora.dev> Co-authored-by: Marcelo Fornet <marcelo.fornet@aurora.dev> Co-authored-by: Michael Birch <michael.birch@aurora.dev>

Increase Near Gas for: deposit, ft_on_transfe. Add comments

0bc5971

mrLSD added the C-enhancement Category: New feature or request label Dec 9, 2021

mrLSD self-assigned this Dec 9, 2021

mrLSD requested a review from joshuajbouw as a code owner December 9, 2021 14:37

mrLSD changed the base branch from master to develop December 9, 2021 14:38

mrLSD requested a review from birchmd December 9, 2021 14:40

birchmd requested changes Dec 9, 2021

View reviewed changes

engine/src/fungible_token.rs Outdated Show resolved Hide resolved

joshuajbouw suggested changes Dec 9, 2021

View reviewed changes

Added prepaid gas

e26caa9

Added prepaid_gas function. Changed tests. Changed gas invokes

8f075cd

mrLSD requested review from birchmd and joshuajbouw December 9, 2021 20:40

birchmd reviewed Dec 9, 2021

View reviewed changes

mrLSD and others added 8 commits December 9, 2021 23:05

Update engine/src/connector.rs

a86a79a

Co-authored-by: Michael Birch <birchmd8@gmail.com>

Update engine-tests/src/test_utils/standalone/mocks/mod.rs

97cbbb2

Co-authored-by: Michael Birch <birchmd8@gmail.com>

Update engine-tests/src/tests/standalone/sanity.rs

050fab4

Co-authored-by: Michael Birch <birchmd8@gmail.com>

Update engine/src/connector.rs

0a0cf44

Co-authored-by: Michael Birch <birchmd8@gmail.com>

Update engine/src/fungible_token.rs

d97184c

Co-authored-by: Michael Birch <birchmd8@gmail.com>

Added constant

76debca

Merge branch 'feat/ft-on-trasnfer-increase-gas' of github.com:aurora-…

08e0290

…is-near/aurora-engine into feat/ft-on-trasnfer-increase-gas

Changes for prepoid_gas

fdebe76

birchmd reviewed Dec 9, 2021

View reviewed changes

engine-standalone-storage/src/relayer_db/mod.rs Outdated Show resolved Hide resolved

engine/src/connector.rs Outdated Show resolved Hide resolved

engine/src/fungible_token.rs Outdated Show resolved Hide resolved

mrLSD and others added 4 commits December 9, 2021 23:40

Update engine/src/connector.rs

f14b0fb

Co-authored-by: Michael Birch <birchmd8@gmail.com>

Added DEFAULT_PREPAID_GAS

1e556fc

Merge branch 'feat/ft-on-trasnfer-increase-gas' of github.com:aurora-…

d93f0a8

…is-near/aurora-engine into feat/ft-on-trasnfer-increase-gas

Remove NearGas dependency from test

42bea06

birchmd approved these changes Dec 9, 2021

View reviewed changes

joshuajbouw approved these changes Dec 10, 2021

View reviewed changes

mrLSD merged commit a103714 into develop Dec 10, 2021

mrLSD deleted the feat/ft-on-trasnfer-increase-gas branch December 10, 2021 07:16

joshuajbouw mentioned this pull request Dec 10, 2021

Release 2.3.0. #392

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Increase NEAR Gas for ft_on_transfer #389

Increase NEAR Gas for ft_on_transfer #389

mrLSD commented Dec 9, 2021 •

edited

Loading

joshuajbouw left a comment

joshuajbouw commented Dec 9, 2021

birchmd left a comment

birchmd left a comment

mrLSD commented Dec 9, 2021

birchmd left a comment

joshuajbouw left a comment

joshuajbouw commented Dec 10, 2021

Increase NEAR Gas for ft_on_transfer #389

Increase NEAR Gas for ft_on_transfer #389

Conversation

mrLSD commented Dec 9, 2021 • edited Loading

Solution

joshuajbouw left a comment

Choose a reason for hiding this comment

joshuajbouw commented Dec 9, 2021

birchmd left a comment

Choose a reason for hiding this comment

birchmd left a comment

Choose a reason for hiding this comment

mrLSD commented Dec 9, 2021

birchmd left a comment

Choose a reason for hiding this comment

joshuajbouw left a comment

Choose a reason for hiding this comment

joshuajbouw commented Dec 10, 2021

mrLSD commented Dec 9, 2021 •

edited

Loading