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

feat: Add Whitelist ERC20 Cli. #1425

Merged
merged 32 commits into from
Feb 21, 2024
Merged

Conversation

lukema95
Copy link
Contributor

@lukema95 lukema95 commented Dec 6, 2023

Description

Add Whitelist ERC20 Cli. #1356

Closes:

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Include instructions and any relevant details so others can reproduce.

  • Tested CCTX in localnet
  • Tested in development environment
  • Go unit tests
  • Go integration tests
  • Tested via GitHub Actions

Checklist:

  • I have added unit tests that prove my fix feature works

Copy link
Member

@lumtis lumtis left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution!
Just left a few comment.
We should also add an entry in changelog.md file for the new command

@lukema95
Copy link
Contributor Author

lukema95 commented Jan 3, 2024

Thanks for the contribution! Just left a few comment. We should also add an entry in changelog.md file for the new command

all done

@lumtis
Copy link
Member

lumtis commented Feb 7, 2024

@lukema95 I think it is ready to be merged.
We would just need:

  • To run make generate
  • Fix the integer overflow warning from cosmos-sec

@lukema95
Copy link
Contributor Author

lukema95 commented Feb 7, 2024

@lukema95 I think it is ready to be merged. We would just need:

  • To run make generate
  • Fix the integer overflow warning from cosmos-sec

all done

@lumtis
Copy link
Member

lumtis commented Feb 7, 2024

Seems like make generate has not successful

@lukema95
Copy link
Contributor Author

@lumtis I run make generate, but it doesn't do anything right now.

@lumtis
Copy link
Member

lumtis commented Feb 15, 2024

@lumtis I run make generate, but it doesn't do anything right now.

It seems there are some differences in the proto generation. What buf version to you use?

buf --version

I have 1.28.0

@lukema95 lukema95 requested a review from skosito as a code owner February 19, 2024 09:20
@lukema95
Copy link
Contributor Author

@lumtis I run make generate, but it doesn't do anything right now.

It seems there are some differences in the proto generation. What buf version to you use?

buf --version

I have 1.28.0

@lumtis I switched buf to 1.28.0 and still nothing has changed. Can you try it to see if you can generate the correct file?

@lumtis
Copy link
Member

lumtis commented Feb 20, 2024

@lumtis I run make generate, but it doesn't do anything right now.

It seems there are some differences in the proto generation. What buf version to you use?

buf --version

I have 1.28.0

@lumtis I switched buf to 1.28.0 and still nothing has changed. Can you try it to see if you can generate the correct file?

This is curious, from the logs it seems you proto generation doesn't add addition lines in common/common.pb.go
Can you maybe try adding these manually?

 type HeaderData struct {
 	// Types that are valid to be assigned to Data:
+	//
 	//	*HeaderData_EthereumHeader
 	//	*HeaderData_BitcoinHeader
 	Data isHeaderData_Data `protobuf_oneof:"data"`
@@ -424,6 +425,7 @@ func (*HeaderData) XXX_OneofWrappers() []interface{} {
 
 type Proof struct {
 	// Types that are valid to be assigned to Proof:
+	//
 	//	*Proof_EthereumProof
 	//	*Proof_BitcoinProof
 	Proof isProof_Proof `protobuf_oneof:"proof"`

@lukema95
Copy link
Contributor Author

@lumtis I run make generate, but it doesn't do anything right now.

It seems there are some differences in the proto generation. What buf version to you use?

buf --version

I have 1.28.0

@lumtis I switched buf to 1.28.0 and still nothing has changed. Can you try it to see if you can generate the correct file?

This is curious, from the logs it seems you proto generation doesn't add addition lines in common/common.pb.go Can you maybe try adding these manually?

 type HeaderData struct {
 	// Types that are valid to be assigned to Data:
+	//
 	//	*HeaderData_EthereumHeader
 	//	*HeaderData_BitcoinHeader
 	Data isHeaderData_Data `protobuf_oneof:"data"`
@@ -424,6 +425,7 @@ func (*HeaderData) XXX_OneofWrappers() []interface{} {
 
 type Proof struct {
 	// Types that are valid to be assigned to Proof:
+	//
 	//	*Proof_EthereumProof
 	//	*Proof_BitcoinProof
 	Proof isProof_Proof `protobuf_oneof:"proof"`

done

@lumtis
Copy link
Member

lumtis commented Feb 20, 2024

@lukema95 in 58d79f8 you modified for HeaderData but there is the same issue with Proof
Still running the CI to check if it changes something

[EDIT] Yeah we only get the error for proof now

@lukema95
Copy link
Contributor Author

@lukema95 in 58d79f8 you modified for HeaderData but there is the same issue with Proof Still running the CI to check if it changes something

[EDIT] Yeah we only get the error for proof now

😂It's weird. Do I need to manually fix the error for Proof again? It is not clear how many such errors there are.

@lumtis
Copy link
Member

lumtis commented Feb 20, 2024

@lukema95 in 58d79f8 you modified for HeaderData but there is the same issue with Proof Still running the CI to check if it changes something
[EDIT] Yeah we only get the error for proof now

😂It's weird. Do I need to manually fix the error for Proof again? It is not clear how many such errors there are.

Yeah, you can do the same thing with Proof and see if it passes

@lumtis lumtis merged commit e93afab into zeta-chain:develop Feb 21, 2024
12 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants