Skip to content
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.

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

Fixes bug when replacing asset on sample implementation of 5773 #6202

Merged
merged 2 commits into from
Dec 21, 2022

Conversation

steven2308
Copy link
Contributor

A test which failed before fixing the bug was included.

@eth-bot
Copy link
Collaborator

eth-bot commented Dec 21, 2022

All tests passed; auto-merging...

(pass) eip-5773.md

classification
updateEIP
  • passed!

(pass) assets/eip-5773/contracts/MultiAssetToken.sol

classification
ambiguous
  • file assets/eip-5773/contracts/MultiAssetToken.sol is associated with EIP 5773; because there are also changes being made to EIPS/eip-5773.md all changes to corresponding assets are also allowed

(pass) assets/eip-5773/test/multiasset.ts

classification
ambiguous
  • file assets/eip-5773/test/multiasset.ts is associated with EIP 5773; because there are also changes being made to EIPS/eip-5773.md all changes to corresponding assets are also allowed

The smart contract specification was renamed to be identic to the name
of the proposal. This has been done so that the assets changes can be
merged.
@github-actions github-actions bot added c-update Modifies an existing proposal s-review This EIP is in Review t-erc labels Dec 21, 2022
@eth-bot eth-bot enabled auto-merge (squash) December 21, 2022 22:03
@eth-bot eth-bot merged commit 2f369da into ethereum:master Dec 21, 2022
@ThunderDeliverer ThunderDeliverer deleted the 5773-fix branch December 21, 2022 22:07
Pandapip1 added a commit that referenced this pull request Dec 25, 2022
* Add EIP-6110: Supply validator deposits on chain (#6110)

* EIP-6110: initial draft

* Fix header

* Fill out the discussions-to

* Make linter happy

* Fix color schema for python snippets

* Apply suggestions from code review

Co-authored-by: Danny Ryan <dannyjryan@gmail.com>

* Fix anchor

* Fix eip4881 link

* Fix eip4881 link once again

Co-authored-by: Danny Ryan <dannyjryan@gmail.com>

* Update EIP-5507: Fix typo (wei is a reserved name) (#6191)

* 3540,4570,5450: update EOF container format (#6156)

* 3540: update eof contain format

* 4750,5450: update for new 3540 changes, disallow unreachble code

* 4750,5450: remove ref impls for now

* appease our overlord, walidator

* Apply suggestions from code review

Co-authored-by: Andrei Maiboroda <andrei@ethereum.org>
Co-authored-by: Jochem Brouwer <jochembrouwer96@gmail.com>

* reword type section intro

Co-authored-by: Paweł Bylica <chfast@gmail.com>

* apply feedback from review

Co-authored-by: Paweł Bylica <chfast@gmail.com>

* 4750: do not cleanup stack after jumpf or retf

* remove rationale for stack cleanup

* Apply suggestions from code review

Co-authored-by: Paweł Bylica <chfast@gmail.com>

* 4750: remove jumpf for later definition

* fix stale comment

Co-authored-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

* fix a couple typos and improve clarity

* appease link checker

* note terminating instruction requirement from 5450

* cap max_stack_height at 1023

* add padding to table

* fix padding

Co-authored-by: Andrei Maiboroda <andrei@ethereum.org>

* revert terminating instructions change to 3670

* fix rearranged sections

Co-authored-by: Andrei Maiboroda <andrei@ethereum.org>

* Apply suggestions from code review

Co-authored-by: Paweł Bylica <chfast@gmail.com>

Co-authored-by: Andrei Maiboroda <andrei@ethereum.org>
Co-authored-by: Jochem Brouwer <jochembrouwer96@gmail.com>
Co-authored-by: Paweł Bylica <chfast@gmail.com>
Co-authored-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

* Fixes bug when replacing asset on sample implementation of 5773 (#6202)

* Fixes bug when replacing asset on sample implementation of 5773.

* Rename the smart contract in specification

The smart contract specification was renamed to be identic to the name
of the proposal. This has been done so that the assets changes can be
merged.

Co-authored-by: Jan Turk <jan.turk12@gmail.com>

* 4750,5450: Specify stack overflow check only in CALLF (#6205)

* 4750,5450: Specify stack overflow check only in CALLF

* Apply suggestions from code review

Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com>

Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com>

* Add EIP-6206: EOF - JUMPF instruction (#6206)

* add jumpf eip

* add eip number and discussion link

* Fix markdownlint errors

* Last markdownlint error

* Fix invalid link

* Formatting stuff

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>

* Update EIP-5115: Updates to interface based on community feedback (#6207)

* Update EIP-5115: Changes based from community feedback

* Update EIP-5115: Changes in interface and definitions

* Update EIP-5115: Linting fixes

* Update EIP-5115: Minor correction on interface (#6208)

* Update eip-4337.md : typo desribed -> described (#6169)

* clarify that initcode which fails validation still pays 3860 initcode cost (#6210)

* remove pc instruction from eof (#6209)

* Add EIP-6170: Cross-Chain Messaging Interface (#6172)

* cross-chain messaging interface

* fix: markdown linter fix

* chore: updating EIP name

* Apply suggestions from code review

* chore: changing specification to natspec interface

* Update eip-6170.md

Co-authored-by: Matt Stam <mattstam@live.com>

* Update eip-6170.md

* Update eip-6170.md

* chore: remove events to discuss further

* Move file to correct folder

Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com>
Co-authored-by: Matt Stam <mattstam@live.com>

* Ignore JetBrains project files (#6211)

* Update EIP-5568: Move to review (#6177)

* Update EIP-5606: Move to Last Call (#6151)

* Update EIP-5606: Moving to Last Call

* Update EIP-5606: Added Last Call Deadline

* Update EIP-5606: Fixed a typo

* Update EIPS/eip-5606.md

Co-authored-by: Sam Wilson <57262657+SamWilsn@users.noreply.github.com>

* Update EIP-5219: Move to review (#6180)

* Update EIP-5219: Move to review

* Merge master into eip-5219-review (#6183)

* Update EIP-5507: Add Rationale stub (#6181)

* Update EIP-5219: Fix small typo (#6182)

* Update EIP-5380: Second Revision (#6214)

Co-authored-by: Mikhail Kalinin <noblesse.knight@gmail.com>
Co-authored-by: Danny Ryan <dannyjryan@gmail.com>
Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com>
Co-authored-by: Andrei Maiboroda <andrei@ethereum.org>
Co-authored-by: Jochem Brouwer <jochembrouwer96@gmail.com>
Co-authored-by: Paweł Bylica <chfast@gmail.com>
Co-authored-by: Danno Ferrin <danno.ferrin@swirldslabs.com>
Co-authored-by: Steven Pineda <steven2308@outlook.com>
Co-authored-by: Jan Turk <jan.turk12@gmail.com>
Co-authored-by: Anton Buenavista <ay.buenavista@gmail.com>
Co-authored-by: taek <leekt216@gmail.com>
Co-authored-by: Sujith Somraaj <35634175+sujithsomraaj@users.noreply.github.com>
Co-authored-by: Matt Stam <mattstam@live.com>
Co-authored-by: Paweł Bylica <pawel@hepcolgum.band>
Co-authored-by: Gaurang Torvekar <gaurangtorvekar@gmail.com>
Co-authored-by: Sam Wilson <57262657+SamWilsn@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c-update Modifies an existing proposal s-review This EIP is in Review t-erc
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants