8000 merge irms branches by hanchon · Pull Request #66 · evmos/evmos · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

merge irms branches #66

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
Merged
merged 10 commits into from
Oct 26, 2021
Merged

merge irms branches #66

merged 10 commits into from
Oct 26, 2021

Conversation

hanchon
Copy link
Contributor
@hanchon hanchon commented Oct 25, 2021

Closes: #XXX

Description

For contributor use:

  • Targeted PR against correct branch (see CONTRIBUTING.md)
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Code follows the module structure standards.
  • Wrote unit and integration tests
  • Updated relevant documentation (docs/) or specification (x/<module>/spec/)
  • Added relevant godoc comments.
  • Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
  • Re-reviewed Files changed in the Github PR explorer

For admin use:

  • Added appropriate labels to PR (ex. WIP, R4R, docs, etc)
  • Reviewers assigned
  • Squashed all commits, uses message "Merge pull request #XYZ: [title]" (coding standards)

hanchon
hanchon commented Oct 25, 2021
View reviewed changes
hanchon
hanchon commented Oct 25, 2021
View reviewed changes
fedekunze
fedekunze reviewed Oct 25, 2021
View reviewed changes
@hanchon hanchon changed the title merge irms branchs merge irms branches Oct 25, 2021
@hanchon
Copy link
Contributor Author
hanchon commented Oct 25, 2021

Removed generic unpacks and now it uses the correct interfaces

fedekunze
fedekunze reviewed Oct 26, 2021
View reviewed changes
x/intrarelayer/keeper/evm.go Outdated
@@ -16,11 +16,18 @@ import (
"github.com/tharsis/evmos/x/intrarelayer/types/contracts"
)

type ERC20Data struct {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's move this to types/

x/intrarelayer/keeper/evm.go Outdated
return ret, err
}

nameResp := struct {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's move all these structs also to types/

x/intrarelayer/keeper/proposals.go
@@ -69,13 +65,13 @@ func (k Keeper) CreateMetadata(ctx sdk.Context, pair types.TokenPair) error {
Exponent: 0,
},
{
Denom: token,
Exponent: decimals,
Denom: erc20Data.Name,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm I think validation could potentially fail here if the name has spaces

@fedekunze fedekunze merged commit fb61dbd into fedekunze/irm Oct 26, 2021
@fedekunze fedekunze deleted the guille/mergeirm branch October 26, 2021 15:59
fedekunze added a commit that referenced this pull request Nov 17, 2021
@ramacarlucho @fedekunze
@danburck @hanchon
feat: intrarelayer module (#82)
62b8f10 
* irm

* events and comments

* tests wip

* comments & genesis

* grpc queries

* mint test

* abi added

* Add TestGetTokenPairID

* testing: irm type tests (#57)

* Validate genesis fix. genesis and params tests

* initial structure for msg and proposal tests

* testing: proposal tests addeds

* testing: update token pair erc20 with invalid addresses

* token pair and msgs test

Co-authored-by: ramacarlucho <ramirocarlucho@gmail.com>

* WIP TestGetAllTokenPairs

* Testing (TokenPairs): Add tests for full coverage and fix GrpcQuery test

* WIP Keepertests(TestRegisterTokenPair)

* add missing fields for metadata

* Add Keepertests(TestRegisterTokenPair)

* add Keepertests(TestEnabledRelay)

* add Keepertests(UpdateTokenPairERC20)

* WIP goc_hooks tests

* gov hooks tests wip

* WIP Keeper tests(AfterProposalDeposit)

* wip: refactor 2

* hook wip

* fix ABI and integrations (#66)

* merge irms branchs

* Fix pack method

* removed valid test from TestRegisterTokenPair, this should be tested on TestRegisterTokenPairWithContract

* using ethermint CompiledContract

* removed unused import

* unpacking using interfaces

* Update x/intrarelayer/types/contracts/erc20.go

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* moved evm types to types folder

* feemarket enabled by default on test suite

* contracts function and test setup moved to keeper_test

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* WIP(Keeper tests): gov_hooks_test, msg_server_test, proposals_test

* vbank module verification after token pair creation

* EnableRelay test added

* wip update token function

* WIP (Keepertests) msg_server tests

* fix panic on test

* Add SetDenomMap and SetERC20Map to RegisterTokenPair

* force dynamic fee

* wip update token pair

* keeper: evm hooks and tests (#68)

* merge irms branchs

* Fix pack method

* removed valid test from TestRegisterTokenPair, this should be tested on TestRegisterTokenPairWithContract

* using ethermint CompiledContract

* removed unused import

* unpacking using interfaces

* wip evmhooks tests

* evmhooks working

* Update x/intrarelayer/types/contracts/erc20.go

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* moved evm types to types folder

* feemarket enabled by default on test suite

* contracts function and test setup moved to keeper_test

* check correct execution

* more test cases

* pr suggestions

* pr suggestions

* Apply suggestions from code review

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

Co-authored-by: Hanchon <guillermo.paoletti@gmail.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* force dynamic fee

* merge rama changes

* proposal tests green

* proposal tests updated

* add setupNewTokenPair to msg_server_test

* dynamic fee fix

* WIP(Intrarelayer): TestUpdateTokenPairERC20

* WIP(Intrarelayer): TestUpdateTokenPairERC20 delete non TDD test

* WIP(Intrarelayer): Refactor TestRegisterTokenPair to use TDD and add all missing  cases

* WIP(Intrarelayer): Refactor TestToggleRelay to use TDD and add all missing cases

* share

* fixes to minting from module

* cleanup keeper test suite

* tests: irm proposal tests  (#69)

* vbank module verification after token pair creation

* EnableRelay test added

* wip update token function

* force dynamic fee

* wip update token pair

* force dynamic fee

* merge rama changes

* proposal tests green

* proposal tests updated

* dynamic fee fix

* WIP(Intrarelayer): TestUpdateTokenPairERC20

* WIP(Intrarelayer): TestUpdateTokenPairERC20 delete non TDD test

* WIP(Intrarelayer): Refactor TestRegisterTokenPair to use TDD and add all missing  cases

* pr changes

* Apply suggestions from code review

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* enable to toggle rename

Co-authored-by: ramacarlucho <ramirocarlucho@gmail.com>
Co-authored-by: Daniel Burckhardt <daniel.m.burckhardt@gmail.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* fail early

* burn and mint fixes. Send tx module address as burn test

* calling evm directly

* sending evm transactions using module address

* transfering tokens using evmcall

* Wip: Refactor Coin/Token proposal

* wip: tests compiling, not working

* Wip: register coin and register token proposals

* wip: missing contract deployment and tests

* wip evmhooks working

* escrow fix on converterc20

* initial msg_server_tests working

* tests fixes

* changed erc20 metadata. RegisterErc20 token tests working

* wip deploy contract

* IRM(new Specs): Split EventRegiesterTokenPair into two Events Coin & ERC20

* IRM(new Specs): Refactor with isNativeCoin() and isNavtiveERC20() methods

* IRM(new Specs): Add tests for  isNativeCoin() and isNavtiveERC20() methods

* deployment first approach working

* Intrarelayer(Tests): Add TestRegisterCoin

* moduleAccount nonce. ConvertToken fixes

* cleanup

* rm nonce key

* rm nonce key.go

* validate genesis state

* err

* IRM(new Specs): Add tests for token_pairs delete methods

* SDK fork

* fix log read on hook. Use simple call to deploy contract

* delete unnecessary functions. cleanup

* convert coins/tokens cases

* evm hooks register coin case

* Intrarelayer(new Specs): Add more types tests

* Intrarelayer(new Specs): Add EnableEVMHook Parameter with default true

* Intrarelayer(new Specs): Add types msg tests

* Intrarelayer(new Specs): Add evm & genesis tests

* Intrarelayer(new Specs): Add last types/proposal tests

* gov hooks fixes and testing

* minor changes

* linter fixes

* Intrarelayer(new Specs): Refactor Msg_server methods

* nolint

* Intrarelayer(new Specs): Refactor msg_server tests

* convert erc20 event

* missing Evm executions checks

* Intrarelayer(new Specs): Add keeper/evm tests

* function comments added

* use ERC20 with custom burn

Co-authored-by: Federico Kunze <federico.kunze94@gmail.com>
Co-authored-by: jolube <64335177+jolube@users.noreply.github.com>
Co-authored-by: Daniel Burckhardt <daniel.m.burckhardt@gmail.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: Guillermo Paoletti <guillermo.paoletti@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fedekunze fedekunze fedekunze approved these changes

@jolube jolube Awaiting requested review from jolube

@khoslaventures khoslaventures Awaiting requested review from khoslaventures

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hanchon @fedekunze
0