Skip to content

fix(validator): fabric rules validation with new events #65

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

Open
Alexader wants to merge 1 commit into
base: for-bxh-1.6
Choose a base branch
from
Open

fix(validator): fabric rules validation with new events #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions validator/testdata/proof_1.0.0_rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@

C
A
?broker1
pollingEvent
!{"did:bitxhub:etherappchain:.":3}�
P
N
Lbroker>
getOutMessage
*0x857b3305Fcf2BD0b6BFFFEf824C11eCf32BFeFd2
1�

�
�s@�V�e{�'���(��k�IS��=`܇8��
jP
brokerF
.
%out-msg-did:bitxhub:etherappchain:.-4�


outter-meta�

�
P�����Y��t��D�⟫A�U�ly_p�e⁔�
bH
broker>
<
4out-msg-0x857b3305Fcf2BD0b6BFFFEf824C11eCf32BFeFd2-1
lscc

broker���[{"index":4,"dst_contract_did":"did:bitxhub:etherappchain:0x30c5D3aeb4681af4D13384DBc2a717C51cb1cc11","src_contract_id":"mychannel\u0026transfer","func":"interchainCharge","args":"Alice,Alice,1","callback":"","argscb":"","rollback":"interchainRollback","argsrb":"Alice,1"}]" brokerv0�
broker���{"index":1,"dst_chain_id":"0x857b3305Fcf2BD0b6BFFFEf824C11eCf32BFeFd2","src_contract_id":"mychannel\u0026transfer","dst_contract_id":"0x82185AC84abE50D0F21E4476a443367ebcD46732","func":"interchainCharge","args":"Alice,Alice,1","callback":"","argscb":"","rollback":"interchainRollback","argsrb":"Alice,1"}" brokerv0�
�
Org2MSP�-----BEGIN CERTIFICATE-----
MIICJzCCAc6gAwIBAgIQSw2UHr+381efIxVRo7pGgjAKBggqhkjOPQQDAjBzMQsw
Expand All @@ -33,4 +30,4 @@ BCQwIoAgJya0T5F25gNpz4OlRX0jrig7SIE397/Z/pVQvtP1iHowCgYIKoZIzj0E
AwIDRwAwRAIgErFLpmI0Xie3moBv/5oLUGy7HQXh+LZOzHlicRP9c/4CIFsY8QPv
IU2q/pIC7yVO7hKikZyn6DTaRIMdyXxSeotw
-----END CERTIFICATE-----
F0D [F�1%j�ͅc՞o��:ʜ�ӡU��4 8+z6�Ϝ�J���k�KF��'Q�{���~�
F0D S���J4����i����BE�D�p_u��Y�� Ui���J: V�~�`�/g~B��E 0�>�
Expand Down
4 changes: 2 additions & 2 deletions validator/validation_engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func TestFabSimValidator_Verify(t *testing.T) {

content := &pb.Content{
SrcContractId: "mychannel&transfer",
DstContractId: "0x30c5D3aeb4681af4D13384DBc2a717C51cb1cc11",
DstContractId: "0x82185AC84abE50D0F21E4476a443367ebcD46732",
Func: "interchainCharge",
Args: [][]byte{[]byte("Alice"), []byte("Alice"), []byte("1")},
Callback: "",
Expand Down Expand Up @@ -161,7 +161,7 @@ func BenchmarkFabSimValidator_Verify(b *testing.B) {

content := &pb.Content{
SrcContractId: "mychannel&transfer",
DstContractId: "0x30c5D3aeb4681af4D13384DBc2a717C51cb1cc11",
DstContractId: "0x82185AC84abE50D0F21E4476a443367ebcD46732",
Func: "interchainCharge",
Args: [][]byte{[]byte("Alice"), []byte("Alice"), []byte("1")},
Callback: "",
Expand Down
24 changes: 12 additions & 12 deletions validator/validatorlib/fabric_validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/hyperledger/fabric/msp"
"github.com/hyperledger/fabric/protoutil"
"github.com/meshplus/bitxhub-model/pb"
"github.com/meshplus/bitxid"
)

const (
Expand All @@ -40,15 +39,16 @@ type ValidatorInfo struct {
}

type payloadInfo struct {
Index uint64 `json:"index"`
DstContractDID string `json:"dst_contract_did"`
SrcContractID string `json:"src_contract_id"`
Func string `json:"func"`
Args string `json:"args"`
Callback string `json:"callback"`
Argscb string `json:"argscb"`
Rollback string `json:"rollback"`
Argsrb string `json:"argsrb"`
Index uint64 `json:"index"`
DstChainID string `json:"dst_chain_id"`
SrcContractID string `json:"src_contract_id"`
DstContractID string `json:"dst_contract_id"`
Func string `json:"func"`
Args string `json:"args"`
Callback string `json:"callback"`
Argscb string `json:"argscb"`
Rollback string `json:"rollback"`
Argsrb string `json:"argsrb"`
}

func GetPolicyEnvelope(policy string) ([]byte, error) {
Expand Down Expand Up @@ -199,8 +199,8 @@ func ValidatePayload(info payloadInfo, payloadByte []byte) error {
return fmt.Errorf("unmarshal ibtp payload content: %w", err)
}

if bitxid.DID(info.DstContractDID).GetAddress() != content.DstContractId {
return fmt.Errorf("dst contrct id not correct")
if info.DstContractID != content.DstContractId {
return fmt.Errorf("dst contract id not correct")
}
if info.SrcContractID != content.SrcContractId {
return fmt.Errorf("src contrct id not correct")
Expand Down