Chain id and version in transaction structure #2040
Conversation
…ed with chain id now)
# Conflicts: # cmd/node/factory/structs.go # epochStart/bootstrap/factory/epochStartInterceptorsContainerFactory.go # integrationTests/multiShard/transaction/interceptedResolvedBulkTx/interceptedResolvedBulkTx_test.go # integrationTests/singleShard/transaction/interceptedBulkTx/interceptedBulkTx_test.go # integrationTests/testProcessorNode.go # node/node.go # node/nodeTesting.go # node/nodeTesting_test.go # process/factory/interceptorscontainer/args.go # process/factory/interceptorscontainer/metaInterceptorsContainerFactory.go # process/factory/interceptorscontainer/metaInterceptorsContainerFactory_test.go # process/factory/interceptorscontainer/shardInterceptorsContainerFactory.go # process/factory/interceptorscontainer/shardInterceptorsContainerFactory_test.go # process/interceptors/factory/argInterceptedDataFactory.go # process/interceptors/factory/interceptedMetaHeaderDataFactory_test.go # process/interceptors/factory/interceptedTxDataFactory.go # process/transaction/interceptedTransaction.go # process/transaction/interceptedTransaction_test.go # update/factory/fullSyncInterceptors.go
| 10, | ||
| 100000, | ||
| []byte("data@~`!@#$^&*()_=[]{};'<>?,./|<>><!!!!!"), | ||
| []byte("erd-test-data"), |
There was a problem hiding this comment.
you discarded the special characters. Does they still work?
There was a problem hiding this comment.
they work. I just generated something different for Mihai to test and forgot to add back that data field. Will be updated
There was a problem hiding this comment.
added again special characters
| @@ -216,6 +222,9 @@ func (inTx *InterceptedTransaction) processFields(txBuff []byte) error { | |||
|
|
|||
| // integrity checks for not nil fields and negative value | |||
| func (inTx *InterceptedTransaction) integrity(tx *transaction.Transaction) error { | |||
| if tx.ChainID == nil || !bytes.Equal(tx.ChainID, inTx.chainID) { | |||
There was a problem hiding this comment.
do this directly:
if !bytes.Equal(tx.ChainID, inTx.chainID) {# Conflicts: # integrationTests/multiShard/block/executingMiniblocks/executingMiniblocks_test.go
miiu96
changed the title
| @@ -26,7 +26,7 @@ type Facade struct { | |||
| GenerateTransactionHandler func(sender string, receiver string, value *big.Int, code string) (*transaction.Transaction, error) | |||
| GetTransactionHandler func(hash string) (*transaction.ApiTransactionResult, error) | |||
| CreateTransactionHandler func(nonce uint64, value string, receiverHex string, senderHex string, gasPrice uint64, | |||
| gasLimit uint64, data string, signatureHex string, chainID string) (*transaction.Transaction, []byte, error) | |||
| gasLimit uint64, data string, signatureHex string, chainID string, version uint32) (*transaction.Transaction, []byte, error) | |||
There was a problem hiding this comment.
do not forget to expose the minimum transaction version on the network config route (in order to be used by the frontend). Also, create PR to update the proxy/txgen repos. Frontend should be upgraded too.
There was a problem hiding this comment.
Add unit tests all over the PR where the new data field are verified.
There was a problem hiding this comment.
Already exposed minimum transaction version in api route /network/config. And PR for proxy and tx-gen will be opened soon (work in progress).
There was a problem hiding this comment.
more unit tests added
| @@ -76,6 +76,12 @@ func NewShardInterceptorsContainerFactory( | |||
| if check.IfNil(args.EpochStartTrigger) { | |||
| return nil, process.ErrNilEpochStartTrigger | |||
| } | |||
| if len(args.ChainID) == 0 { | |||
| return nil, process.ErrInvalidChainID | |||
There was a problem hiding this comment.
Please treat those 2 errors in multidata and single data interceptor and blacklist the fromconnected peer and message peer originator
There was a problem hiding this comment.
In multidatainterceptor.go, L186 and in singledatainterceptor.go L95 please add:
isWrongVersion := err == process.ErrInvalidTransactionVersion || err == process.ErrInvalidChainID
if isWrongVersion{
//this situation is so severe that we need to black list de peers
reason := "wrong version of received intercepted data, topic " + mdi.topic + ", error " + err.Error()
mdi.antifloodHandler.BlacklistPeer(originator, reason, core.InvalidMessageBlacklistDuration)
mdi.antifloodHandler.BlacklistPeer(fromConnectedPeer, reason, core.InvalidMessageBlacklistDuration)
} please add tests for these condition. Thanks
…o add-chain-id-in-transaction
…o add-chain-id-in-transaction
| processReceivedMessageMultiDataInvalidVersion(t, process.ErrInvalidChainID) | ||
| } | ||
|
|
||
| func processReceivedMessageMultiDataInvalidVersion(t *testing.T, expectedErr error) { |
| BlacklistPeerCalled: func(peer core.PeerID, reason string, duration time.Duration) { | ||
| switch string(peer) { | ||
| case string(originator): | ||
| isOriginatorBlackListed = true |
Added
chain IDandversionin transaction structure. Now all transaction that are generated (from wallet, erdpy, tx-gen etc must contains correctchain IDandversionin order to be accepted by the observers). Also the transaction must be signed with thechain IDandversion.