feat: absorb ant-evm payment types into evmlib#3
Merged
mickvandijke merged 1 commit intomainfrom Mar 31, 2026
Merged
Conversation
Merge the needed types from the external ant-evm crate directly into evmlib, eliminating the separate dependency. This adds: - data_payments module: EncodedPeerId (now [u8; 32] instead of libp2p Vec<u8>), PaymentQuote, ProofOfPayment - merkle_payments module: MerklePaymentCandidateNode/Pool/Proof, MerkleTree, MerkleBranch, verify_merkle_proof All libp2p and ed25519 signing code has been stripped — the saorsa network uses native 32-byte PeerIds (BLAKE3 of ML-DSA-65 public key) and ML-DSA-65 signatures instead. Unused ant-evm types (AttoTokens, ClientProofOfPayment, EvmError) are dropped entirely. New dependencies: xor_name, rmp-serde, tiny-keccak, ant-merkle.
This was referenced Mar 31, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
ant-evmcrate directly into evmlibdata_paymentsmodule:EncodedPeerId(native 32-byte),PaymentQuote,ProofOfPaymentmerkle_paymentsmodule:MerklePaymentCandidateNode/Pool/Proof,MerkleTree,MerkleBranchAttoTokens,ClientProofOfPayment,EvmError) droppedxor_name,rmp-serde,tiny-keccak,ant-merkleContext
ant-node and ant-client both depend on
ant-evm(thin wrapper around evmlib) andevmlibsimultaneously.ant-evmadds libp2p as a dependency solely forEncodedPeerIdencoding, but saorsa uses its own 32-byte PeerId (BLAKE3 of ML-DSA-65 public key). This PR eliminates the wrapper crate and the libp2p dependency by absorbing only the types that consumers actually use.Test plan
cargo checkpassescargo fmt + clippyclean