feature-ethtx #1217
feature-ethtx #1217
Conversation
libangzhu
commented
Jun 29, 2022
•
libangzhu
commented
- 增加nonce 自增机制
- 调整chain33 兼容交易全部走evm通道
- evm check 中新增 交易 取消，加速等功能
Codecov Report
@@ Coverage Diff @@
## master #1217 +/- ##
==========================================
+ Coverage 56.15% 56.24% +0.08%
==========================================
Files 211 211
Lines 35118 35127 +9
==========================================
+ Hits 19721 19757 +36
+ Misses 13651 13624 -27
Partials 1746 1746
Continue to review full report at Codecov.
|
| log15.Info("ecrecover::Run", "hash", common.Bytes2Hex(input[:32])) | ||
| log15.Info("ecrecover::Run", "signature", common.Bytes2Hex(sig)) | ||
|
|
||
| //log15.Info("ecrecover::pubkey", "pubkey", common.Bytes2Hex(pubKey)) | ||
| log15.Info("ecrecover::pubkey", "pubkey", common.Bytes2Hex(pubKey)) |
| @@ -146,6 +149,16 @@ func NewContractAddress(b Address, txHash []byte) Address { | |||
| return PubKey2Address(execPub) | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
这个应该是生成合约地址的老的接口, 是不是应该在这个基础上改, 以及调用这个接口的相关代码(如rpc 命令行等)
There was a problem hiding this comment.
考虑到兼容之前的合约地址创建方式，所以通过地址+哈希的方式被保留下来，仅ETH 签名类型的合约创建 才使用地址+nonce 的方式
plugin/dapp/evm/executor/exec.go
Outdated
| } | ||
|
|
||
| // 通用的EVM合约执行逻辑封装 | ||
| // readOnly 是否只读调用，仅执行evm abi查询时为true | ||
| func (evm *EVMExecutor) innerExec(msg *common.Message, txHash []byte, index int, txFee uint64, readOnly bool) (receipt *types.Receipt, err error) { | ||
| func (evm *EVMExecutor) innerExec(msg *common.Message, tx *types.Transaction, txHash []byte, index int, txFee uint64, readOnly bool) (receipt *types.Receipt, err error) { |
There was a problem hiding this comment.
这里就不要增加tx这个参数了，原则就是将执行过程中需要的参数解析到msg或EVMExecutor中
|
🎉 This PR is included in version 1.67.4 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
