This repository was archived by the owner on Nov 15, 2023. It is now read-only.

contract accounting removal#2230

Merged

pepyakin merged 59 commits intomasterfrom

gui-contract-accounting-removal

Apr 30, 2019

Contributor

gui1117 commented Apr 8, 2019 •

edited

Loading

a contract can be in two state: tombstone or alive
a contract can be deleted on calls when paying rents
the contract is evicted if:
- he can't withdraw its rent (rents are up to rent_allowance)
- rent_allowance is reached
  then if it got enough free_balance to make tombstone it makes it
introduce ext_set_rent_allowance, ext_rent_allowance

Another PR:

maybe add a new unbalance associated type

TODO:

document pay_rent better

gui1117 added 3 commits

April 8, 2019 14:35


          first partial implementation

92d2152


          merge + some improvments

1a07b09


          update rent allowance

ab1bcad

gui1117 added the A3-in_progress label

gui1117 requested a review from pepyakin

April 8, 2019 14:39

devops-parity added the A4-gotissues label

bkchr reviewed

View reviewed changes

srml/contract/src/account_db.rs Outdated Show resolved Hide resolved

bkchr reviewed

View reviewed changes

srml/contract/src/account_db.rs Outdated Show resolved Hide resolved

pepyakin reviewed

View reviewed changes

srml/contract/src/account_db.rs Outdated Show resolved Hide resolved

pepyakin reviewed

View reviewed changes

srml/contract/src/account_db.rs Outdated Show resolved Hide resolved

pepyakin reviewed

View reviewed changes

srml/contract/src/account_db.rs Outdated Show resolved Hide resolved

bkchr and others added 3 commits

April 8, 2019 17:11

fmt

94a8a00

Co-Authored-By: thiolliere <gui.thiolliere@gmail.com>


          remove comments

4a0937f


          reward surcharge claims

ef073f2

pepyakin reviewed

View reviewed changes

srml/contract/src/wasm/runtime.rs Outdated Show resolved Hide resolved

gui1117 added 5 commits

April 9, 2019 12:51


          remove rent allowance in param + code_hash changed

cab4aa3


          Fix bug

0841bfe


          fix tests

1be670e

fmt

723eb65


          impl getter setter rent allowance

c7506a1

pepyakin reviewed

View reviewed changes

Contributor

pepyakin left a comment

Great start! Expect another round of comments since I didn't yet grasp the logic changes

srml/contract/src/account_db.rs Show resolved Hide resolved

node/executor/src/lib.rs Outdated Show resolved Hide resolved

node/runtime/wasm/Cargo.lock Show resolved Hide resolved

srml/contract/COMPLEXITY.md Outdated Show resolved Hide resolved

srml/contract/src/wasm/runtime.rs Outdated Show resolved Hide resolved

srml/contract/src/lib.rs Outdated Show resolved Hide resolved

srml/contract/src/lib.rs Show resolved Hide resolved

srml/contract/src/lib.rs Outdated Show resolved Hide resolved

srml/contract/src/lib.rs Outdated Show resolved Hide resolved

pepyakin and others added 9 commits

April 9, 2019 16:43

fmt

d5c8477

Co-Authored-By: thiolliere <gui.thiolliere@gmail.com>


          comments

3711ac2


          doc + be->le

8a2bee2

doc

doc

2598f00


          fix improve fast return

3fc2cf2


          renamings

aba8d7f


          rename + COMPLEXITY

c30778c


          COMPLEXITY

36b70a9

pepyakin added 2 commits

April 29, 2019 12:28


          insert_with

59a4a17


          Add some comments.

86e330b

devops-parity added the B2-breaksapi label

pepyakin added 7 commits

April 29, 2019 14:15


          Refactor

7952ff3


          Shuffle and fix comments

806a479


          More comment fixes.

f6c696d


          dues limited

405ae98


          Add comment

b3c7795


          Handicap

c6338ff


          Docs.

d040fb9

gui1117 commented

View reviewed changes

srml/contract/src/rent.rs Outdated Show resolved Hide resolved

srml/contract/src/rent.rs Outdated Show resolved Hide resolved

srml/contract/src/rent.rs Outdated Show resolved Hide resolved

gui1117 commented

View reviewed changes

srml/contract/src/rent.rs Outdated Show resolved Hide resolved

gui1117 and others added 3 commits

April 29, 2019 15:15


          Apply suggestions from code review

a252095

Co-Authored-By: pepyakin <s.pepyakin@gmail.com>


          Merge branch 'gui-contract-accounting-removal' of github.com:parityte…

5053ef8

…ch/substrate into gui-contract-accounting-removal


          Coalesce block_passed in a block

bfb8a13

gui1117 commented

View reviewed changes

srml/contract/src/rent.rs Outdated Show resolved Hide resolved

srml/contract/src/rent.rs Outdated Show resolved Hide resolved

pepyakin added 4 commits

April 29, 2019 15:30


          Fix build

9a491c7


          Paid → Ok

be7e1d8


          match → if

63620c5


          Imrpove handicap description

381cf62

pepyakin removed the A4-gotissues label


          Merge remote-tracking branch 'origin/master' into gui-contract-accoun…

0bc79d9

…ting-removal

pepyakin added A8-looksgood and removed A0-please_review labels

pepyakin approved these changes

View reviewed changes

pepyakin merged commit 563e787 into master

pepyakin deleted the gui-contract-accounting-removal branch

April 30, 2019 07:41

xlc reviewed

View reviewed changes

srml/contract/src/lib.rs Show resolved Hide resolved

xlc mentioned this pull request

Implementation of accounting and removal #1882

Closed

MTDK1 pushed a commit to bdevux/substrate that referenced this pull request


          Contract accounting removal (paritytech#2230)

1f2dfa3

* first partial implementation

* update rent allowance

* fmt

Co-Authored-By: thiolliere <gui.thiolliere@gmail.com>

* remove comments

* reward surcharge claims

* remove rent allowance in param + code_hash changed

* Fix bug

* fix tests

* fmt

* impl getter setter rent allowance

* fmt

Co-Authored-By: thiolliere <gui.thiolliere@gmail.com>

* comments

* doc + be->le

* doc

* doc

* fix improve fast return

* renamings

* rename + COMPLEXITY

* COMPLEXITY

* add test

* etrinsic claim surcharge delay configurable

* comment addressed

* move and rewrite of pay_rent

* remove child trie

* fmt

* use derive

* arithmetic operation

* fix

* fix storage root + checked_mul + test

* WIP: test

* WIP

* add tests and fix

* fmt

* typo and doc suggestions

Co-Authored-By: thiolliere <gui.thiolliere@gmail.com>

* WIP

* address some comments

divide tests + some docs

* use br_table

* remove unused function

* Bump the runtime version

* insert_with

* Add some comments.

* Refactor

* Shuffle and fix comments

* More comment fixes.

* dues limited

* Add comment

* Handicap

* Docs.

* Apply suggestions from code review

Co-Authored-By: pepyakin <s.pepyakin@gmail.com>

* Coalesce block_passed in a block

* Fix build

* Paid → Ok

* match → if

* Imrpove handicap description

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

Reviewers

6 more reviewers

gavofyork gavofyork left review comments

xlc xlc left review comments

shawntabrizi shawntabrizi left review comments

pepyakin pepyakin approved these changes

bkchr bkchr left review comments

Demi-Marie Demi-Marie left review comments

Labels

None yet