New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make gas units more granular #1245

Merged

jmcardon merged 16 commits into master from jose/microgas

Aug 3, 2023

Member

jmcardon commented Jun 27, 2023 •

edited

Loading

This is a change primarily to our units of gas, wherein 1 Gas = 1000 MilliGas. With our current gas metering, we have 1 Gas = 2500 ns, thus, 1 MilliGas = 2.5 ns.

PR checklist:

Test coverage for the proposed changes
PR description contains example output from repl interaction or a snippet from unit test output
Documentation has been updated if new natives or FV properties have been added. To generate new documentation, issue cabal run tests. If they pass locally, docs are generated.
Any changes that could be relevant to users have been recorded in the changelog
In case of changes to the Pact trace output (pact -t), make sure pact-lsp is in sync.

Additionally, please justify why you should or should not do the following:

Confirm replay/back compat
Benchmark regressions
(For Kadena engineers) Run integration-tests against a Chainweb built with this version of Pact

jmcardon added 3 commits

June 22, 2023 22:18


          wip microgas

01e2303


          wip remove gas tupling

aa9f73c


          microgas fix compile

18c7831

jmcardon commented

View reviewed changes

src/Pact/Types/Native.hs Show resolved Hide resolved

src/Pact/Repl/Lib.hs Outdated Show resolved Hide resolved

src/Pact/Native/Db.hs Outdated Show resolved Hide resolved

src/Pact/Gas.hs Show resolved Hide resolved

src/Pact/Eval.hs Outdated Show resolved Hide resolved

src/Pact/Types/Term.hs Outdated Show resolved Hide resolved


          fix microgaslimit

7f1ce92

imalsogreg reviewed

View reviewed changes

src/Pact/Eval.hs Show resolved Hide resolved


          s/micro/milli :)

1051a1b

imalsogreg reviewed

View reviewed changes

src/Pact/Types/Term.hs Outdated Show resolved Hide resolved


          fix old error messages, swap to gMillisUsed

7ff3d73

imalsogreg reviewed

View reviewed changes

src-ghc/Pact/Server/PactService.hs Show resolved Hide resolved

imalsogreg reviewed

View reviewed changes

src-ghc/Pact/Interpreter.hs Outdated Show resolved Hide resolved

imalsogreg reviewed

View reviewed changes

src/Pact/Gas.hs Show resolved Hide resolved

imalsogreg reviewed

View reviewed changes

src/Pact/Gas.hs Show resolved Hide resolved

imalsogreg reviewed

View reviewed changes

src/Pact/Gas.hs Outdated Show resolved Hide resolved


          Fix gas rate

afd8d50

imalsogreg reviewed

View reviewed changes

src/Pact/Gas/Table.hs Show resolved Hide resolved


          fix constant gas model

83ef2b7

imalsogreg reviewed

View reviewed changes

src/Pact/Types/Gas.hs Show resolved Hide resolved

0xd34df00d approved these changes

View reviewed changes

Contributor

0xd34df00d left a comment

Just some very minor nits, please feel free to ignore any of them!

src/Pact/Gas/Table.hs Outdated Show resolved Hide resolved

src/Pact/Eval.hs Outdated Show resolved Hide resolved

src/Pact/Eval.hs Outdated Show resolved Hide resolved

src-ghc/Pact/Interpreter.hs Outdated Show resolved Hide resolved

src-ghc/Pact/Interpreter.hs Outdated Show resolved Hide resolved

src-ghc/Pact/GasModel/Types.hs Outdated Show resolved Hide resolved

src/Pact/Gas.hs Show resolved Hide resolved

src/Pact/Types/Term.hs Outdated Show resolved Hide resolved

src/Pact/Types/Term.hs Outdated Show resolved Hide resolved

emilypi reviewed

View reviewed changes

src/Pact/Eval.hs Outdated Show resolved Hide resolved

src/Pact/Gas.hs Show resolved Hide resolved

src/Pact/Types/Term.hs Outdated Show resolved Hide resolved

jmcardon and others added 3 commits

July 12, 2023 19:20


          address most comments

0f83f3a


          space

9fda5db


          fix merge conflicts

7f80324

jwiegley reviewed

View reviewed changes

src/Pact/Gas.hs Outdated Show resolved Hide resolved

jwiegley reviewed

View reviewed changes

src/Pact/Gas/Table.hs Outdated Show resolved Hide resolved

jwiegley reviewed

View reviewed changes

src/Pact/Repl.hs

@@ @@ -130,7 +130,7 @@ initPureEvalEnv verifyUri = do @@
               initEvalEnv :: LibState -> IO (EvalEnv LibState)
               initEvalEnv ls = do
                 mv <- newMVar ls
-                gasRef <- newIORef 0
+                gasRef <- newIORef mempty

Contributor

jwiegley Jul 26, 2023

If this is because it's newtype-wrapped, then ignore this and all related comments.

jmcardon added 2 commits

July 26, 2023 17:37


          Merge branch 'master' into jose/microgas

6d8ed44


          address comments, fork gas rounding

c7c557f

jmcardon marked this pull request as ready for review

July 26, 2023 22:30

jmcardon requested a review from sirlensalot as a code owner

July 26, 2023 22:30

emilypi reviewed

View reviewed changes

Member

emilypi left a comment

Epic work, small comment on last pass, but optional. LGTM.

src-ghc/Pact/Interpreter.hs Outdated Show resolved Hide resolved


          address comment by emily

ef79708

emilypi approved these changes

View reviewed changes

jmcardon added 2 commits

August 3, 2023 14:43


          quot over div

6cb43b4


          Merge branch 'master' into jose/microgas

8ac9134

jwiegley approved these changes

View reviewed changes

jmcardon merged commit 20ce37f into master

jmcardon deleted the jose/microgas branch

May 10, 2024 16:24

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

imalsogreg imalsogreg left review comments

jwiegley jwiegley approved these changes

0xd34df00d 0xd34df00d approved these changes

emilypi emilypi approved these changes

sirlensalot Awaiting requested review from sirlensalot

Labels

None yet