Golang implemented sidechain for Bytom
修订版 | 02c921a590c5d1828fc019ad230aea5ed1cc5b84 (tree) |
---|---|
时间 | 2019-06-19 11:11:16 |
作者 | mars <mars@byto...> |
Commiter | mars |
fix review
@@ -290,8 +290,7 @@ func (a *crossInAction) Build(ctx context.Context, builder *TemplateBuilder) err | ||
290 | 290 | } |
291 | 291 | |
292 | 292 | // arguments will be set when materializeWitnesses |
293 | - fedProg := config.FederationProgrom(config.CommonConfig) | |
294 | - txin := types.NewCrossChainInput(nil, a.SourceID, *a.AssetId, a.Amount, a.SourcePos, a.VMVersion, fedProg, a.RawDefinitionByte, a.IssuanceProgram) | |
293 | + txin := types.NewCrossChainInput(nil, a.SourceID, *a.AssetId, a.Amount, a.SourcePos, a.VMVersion, a.RawDefinitionByte, a.IssuanceProgram) | |
295 | 294 | tplIn := &SigningInstruction{} |
296 | 295 | fed := config.CommonConfig.Federation |
297 | 296 | tplIn.AddRawWitnessKeys(fed.Xpubs, nil, fed.Quorum) |
@@ -696,9 +696,9 @@ type CrossChainInput struct { | ||
696 | 696 | Value *AssetAmount `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"` |
697 | 697 | WitnessDestination *ValueDestination `protobuf:"bytes,3,opt,name=witness_destination,json=witnessDestination" json:"witness_destination,omitempty"` |
698 | 698 | ControlProgram *Program `protobuf:"bytes,4,opt,name=control_program,json=controlProgram" json:"control_program,omitempty"` |
699 | - WitnessArguments [][]byte `protobuf:"bytes,5,rep,name=witness_arguments,json=witnessArguments,proto3" json:"witness_arguments,omitempty"` | |
700 | - Ordinal uint64 `protobuf:"varint,6,opt,name=ordinal" json:"ordinal,omitempty"` | |
701 | - AssetDefinition *AssetDefinition `protobuf:"bytes,7,opt,name=asset_definition,json=assetDefinition" json:"asset_definition,omitempty"` | |
699 | + AssetDefinition *AssetDefinition `protobuf:"bytes,5,opt,name=asset_definition,json=assetDefinition" json:"asset_definition,omitempty"` | |
700 | + WitnessArguments [][]byte `protobuf:"bytes,6,rep,name=witness_arguments,json=witnessArguments,proto3" json:"witness_arguments,omitempty"` | |
701 | + Ordinal uint64 `protobuf:"varint,7,opt,name=ordinal" json:"ordinal,omitempty"` | |
702 | 702 | } |
703 | 703 | |
704 | 704 | func (m *CrossChainInput) Reset() { *m = CrossChainInput{} } |
@@ -734,6 +734,13 @@ func (m *CrossChainInput) GetControlProgram() *Program { | ||
734 | 734 | return nil |
735 | 735 | } |
736 | 736 | |
737 | +func (m *CrossChainInput) GetAssetDefinition() *AssetDefinition { | |
738 | + if m != nil { | |
739 | + return m.AssetDefinition | |
740 | + } | |
741 | + return nil | |
742 | +} | |
743 | + | |
737 | 744 | func (m *CrossChainInput) GetWitnessArguments() [][]byte { |
738 | 745 | if m != nil { |
739 | 746 | return m.WitnessArguments |
@@ -748,13 +755,6 @@ func (m *CrossChainInput) GetOrdinal() uint64 { | ||
748 | 755 | return 0 |
749 | 756 | } |
750 | 757 | |
751 | -func (m *CrossChainInput) GetAssetDefinition() *AssetDefinition { | |
752 | - if m != nil { | |
753 | - return m.AssetDefinition | |
754 | - } | |
755 | - return nil | |
756 | -} | |
757 | - | |
758 | 758 | func init() { |
759 | 759 | proto.RegisterType((*Hash)(nil), "bc.Hash") |
760 | 760 | proto.RegisterType((*Program)(nil), "bc.Program") |
@@ -781,65 +781,65 @@ func init() { | ||
781 | 781 | func init() { proto.RegisterFile("bc.proto", fileDescriptor0) } |
782 | 782 | |
783 | 783 | var fileDescriptor0 = []byte{ |
784 | - // 958 bytes of a gzipped FileDescriptorProto | |
785 | - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x5f, 0x6f, 0x23, 0x35, | |
786 | - 0x10, 0x57, 0x36, 0xdb, 0x24, 0x9d, 0xf4, 0x9a, 0xc4, 0xbd, 0x83, 0xd5, 0xe9, 0x10, 0xd5, 0x4a, | |
787 | - 0x47, 0x0f, 0x21, 0x55, 0xfd, 0x73, 0xfc, 0x79, 0x40, 0x88, 0xd2, 0x72, 0x5c, 0x1e, 0x4e, 0x87, | |
788 | - 0xdc, 0x2a, 0xaf, 0x2b, 0x67, 0xd7, 0x49, 0x2c, 0x92, 0x75, 0xb0, 0xbd, 0xa1, 0xd7, 0xaf, 0xc0, | |
789 | - 0x33, 0x0f, 0x7c, 0x22, 0x1e, 0x10, 0x5f, 0x87, 0x57, 0x90, 0x67, 0xbd, 0xc9, 0xa6, 0x49, 0xdb, | |
790 | - 0xab, 0x10, 0x82, 0x7b, 0xdb, 0x19, 0x8f, 0x7f, 0x33, 0xf3, 0xf3, 0xfc, 0xbc, 0x86, 0x46, 0x3f, | |
791 | - 0xde, 0x9f, 0x2a, 0x69, 0x24, 0xf1, 0xfa, 0x71, 0xf8, 0x02, 0xfc, 0x97, 0x4c, 0x8f, 0xc8, 0x36, | |
792 | - 0x78, 0xb3, 0x83, 0xa0, 0xb2, 0x5b, 0x79, 0x56, 0xa3, 0xde, 0xec, 0x00, 0xed, 0xc3, 0xc0, 0x73, | |
793 | - 0xf6, 0x21, 0xda, 0x47, 0x41, 0xd5, 0xd9, 0x47, 0x68, 0x1f, 0x07, 0xbe, 0xb3, 0x8f, 0xc3, 0x2f, | |
794 | - 0xa1, 0xfe, 0xbd, 0x92, 0x43, 0xc5, 0x26, 0xe4, 0x03, 0x80, 0xd9, 0x24, 0x9a, 0x71, 0xa5, 0x85, | |
795 | - 0x4c, 0x11, 0xd2, 0xa7, 0x9b, 0xb3, 0x49, 0x2f, 0x77, 0x10, 0x02, 0x7e, 0x2c, 0x13, 0x8e, 0xd8, | |
796 | - 0x5b, 0x14, 0xbf, 0xc3, 0x2e, 0xd4, 0x4f, 0xb4, 0xe6, 0xa6, 0x7b, 0xf6, 0x8f, 0x0b, 0x79, 0x05, | |
797 | - 0x4d, 0x84, 0x3a, 0x99, 0xc8, 0x2c, 0x35, 0xe4, 0x23, 0x68, 0x30, 0x6b, 0x46, 0x22, 0x41, 0xd0, | |
798 | - 0xe6, 0x51, 0x73, 0xbf, 0x1f, 0xef, 0xbb, 0x6c, 0xb4, 0x8e, 0x8b, 0xdd, 0x84, 0xbc, 0x07, 0x35, | |
799 | - 0x86, 0x3b, 0x30, 0x95, 0x4f, 0x9d, 0x15, 0x0e, 0xa1, 0x85, 0xb1, 0x67, 0x7c, 0x20, 0x52, 0x61, | |
800 | - 0x6c, 0x03, 0x9f, 0x41, 0x5b, 0x68, 0x9d, 0xb1, 0x34, 0xe6, 0xd1, 0x34, 0xef, 0xb9, 0x0c, 0xed, | |
801 | - 0x68, 0xa0, 0xad, 0x22, 0xa8, 0xe0, 0xe5, 0x09, 0xf8, 0x09, 0x33, 0x0c, 0x13, 0x34, 0x8f, 0x1a, | |
802 | - 0x36, 0xd6, 0x52, 0x4f, 0xd1, 0x1b, 0x8e, 0xa1, 0xd9, 0x63, 0xe3, 0x8c, 0x9f, 0xcb, 0x4c, 0xc5, | |
803 | - 0x9c, 0x3c, 0x86, 0xaa, 0xe2, 0x03, 0x87, 0xbb, 0x88, 0xb5, 0x4e, 0xf2, 0x14, 0x36, 0x66, 0x36, | |
804 | - 0xd4, 0x21, 0xb5, 0xe6, 0x0d, 0xe5, 0x3d, 0xd3, 0x7c, 0x95, 0x3c, 0x86, 0xc6, 0x54, 0x6a, 0xac, | |
805 | - 0x19, 0xf9, 0xf2, 0xe9, 0xdc, 0x0e, 0x7f, 0x84, 0x36, 0x66, 0x3b, 0xe3, 0xda, 0x88, 0x94, 0x61, | |
806 | - 0x5f, 0xff, 0x72, 0xca, 0xbf, 0x3c, 0x68, 0x7e, 0x33, 0x96, 0xf1, 0x0f, 0x2f, 0x39, 0x4b, 0xb8, | |
807 | - 0x22, 0x01, 0xd4, 0x97, 0x67, 0xa4, 0x30, 0xed, 0x59, 0x8c, 0xb8, 0x18, 0x8e, 0xe6, 0x67, 0x91, | |
808 | - 0x5b, 0xe4, 0x39, 0x74, 0xa6, 0x8a, 0xcf, 0x84, 0xcc, 0x74, 0xd4, 0xb7, 0x48, 0xf6, 0x50, 0xab, | |
809 | - 0xd7, 0xca, 0x6d, 0x15, 0x21, 0x98, 0xab, 0x9b, 0x90, 0x27, 0xb0, 0x69, 0xc4, 0x84, 0x6b, 0xc3, | |
810 | - 0x26, 0x53, 0x9c, 0x13, 0x9f, 0x2e, 0x1c, 0xe4, 0x53, 0xe8, 0x18, 0xc5, 0x52, 0xcd, 0x62, 0x5b, | |
811 | - 0xa4, 0x8e, 0x94, 0x94, 0x26, 0xd8, 0xb8, 0x86, 0xd9, 0x2e, 0x87, 0x50, 0x29, 0x0d, 0xf9, 0x1a, | |
812 | - 0xde, 0x2f, 0xf9, 0x22, 0x6d, 0x98, 0xc9, 0x74, 0x34, 0x62, 0x7a, 0x14, 0xd4, 0xae, 0x6d, 0x7e, | |
813 | - 0x54, 0x0a, 0x3c, 0xc7, 0x38, 0x14, 0xdc, 0x19, 0x90, 0x55, 0x84, 0xa0, 0x8e, 0x9b, 0x1f, 0xd9, | |
814 | - 0xcd, 0x17, 0xd7, 0xb7, 0xd1, 0xce, 0x0a, 0x12, 0xf9, 0x04, 0x3a, 0x3f, 0x09, 0x93, 0x72, 0xad, | |
815 | - 0x23, 0xa6, 0x86, 0xd9, 0x84, 0xa7, 0x46, 0x07, 0x8d, 0xdd, 0xea, 0xb3, 0x2d, 0xda, 0x76, 0x0b, | |
816 | - 0x27, 0x85, 0x3f, 0xfc, 0xa5, 0x02, 0x8d, 0x8b, 0xcb, 0x3b, 0xe9, 0xdf, 0x83, 0x96, 0xe6, 0x4a, | |
817 | - 0xb0, 0xb1, 0xb8, 0xe2, 0x49, 0xa4, 0xc5, 0x15, 0x77, 0xe7, 0xb0, 0xbd, 0x70, 0x9f, 0x8b, 0x2b, | |
818 | - 0x6e, 0x85, 0x6e, 0x89, 0x8c, 0x14, 0x4b, 0x87, 0xdc, 0x9d, 0x37, 0x52, 0x4b, 0xad, 0x83, 0xec, | |
819 | - 0x01, 0x28, 0xae, 0xb3, 0xb1, 0xd5, 0x9e, 0x0e, 0xfc, 0xdd, 0xea, 0x12, 0x2d, 0x9b, 0xf9, 0x5a, | |
820 | - 0x37, 0xd1, 0xe1, 0x21, 0x6c, 0x5f, 0x5c, 0xf6, 0xb8, 0x12, 0x83, 0x37, 0x14, 0x9d, 0xe4, 0x43, | |
821 | - 0x68, 0x3a, 0x4a, 0x07, 0x4c, 0x8c, 0xb1, 0xc0, 0x06, 0x85, 0xdc, 0xf5, 0x82, 0x89, 0x71, 0x38, | |
822 | - 0x80, 0xce, 0x0a, 0x3f, 0xb7, 0xb4, 0xf4, 0x39, 0x3c, 0x98, 0x21, 0x7e, 0xc1, 0xb3, 0x87, 0xd5, | |
823 | - 0x10, 0xe4, 0x79, 0x29, 0x35, 0xdd, 0xca, 0x03, 0x73, 0xc8, 0xf0, 0x8f, 0x0a, 0x54, 0x5f, 0x65, | |
824 | - 0x97, 0xe4, 0x63, 0xa8, 0x6b, 0x14, 0xa6, 0x0e, 0x2a, 0xb8, 0x15, 0x15, 0x50, 0x12, 0x2c, 0x2d, | |
825 | - 0xd6, 0xc9, 0x53, 0xa8, 0x17, 0xb7, 0x82, 0xb7, 0x7a, 0x2b, 0x14, 0x6b, 0xe4, 0x3b, 0x78, 0x58, | |
826 | - 0x9c, 0x5c, 0xb2, 0x10, 0xa1, 0x0e, 0xaa, 0x08, 0xff, 0x70, 0x0e, 0x5f, 0x52, 0x28, 0xdd, 0x71, | |
827 | - 0x3b, 0x4a, 0xbe, 0x1b, 0x46, 0xc0, 0xbf, 0x61, 0x04, 0x24, 0x34, 0x4e, 0xa5, 0x48, 0xfb, 0x4c, | |
828 | - 0x73, 0xf2, 0x2d, 0xec, 0xac, 0xa9, 0xc0, 0xe9, 0x7f, 0x7d, 0x01, 0x64, 0xb5, 0x00, 0xab, 0x2f, | |
829 | - 0xa6, 0xfa, 0xc2, 0x28, 0xa6, 0xde, 0xb8, 0x4b, 0x7d, 0xe1, 0x08, 0x7f, 0xae, 0x40, 0xbb, 0x9b, | |
830 | - 0x1a, 0xc5, 0x4e, 0x47, 0x4c, 0xa4, 0xaf, 0x33, 0x33, 0xcd, 0x0c, 0xd9, 0x83, 0x5a, 0xce, 0x96, | |
831 | - 0x4b, 0xb6, 0x42, 0xa6, 0x5b, 0x26, 0xcf, 0xa1, 0x15, 0xcb, 0xd4, 0x28, 0x39, 0x8e, 0x6e, 0xe1, | |
832 | - 0x74, 0xdb, 0xc5, 0x14, 0x17, 0x6d, 0x00, 0x75, 0xa9, 0x12, 0x91, 0xb2, 0xb1, 0x1b, 0xca, 0xc2, | |
833 | - 0xc4, 0x6a, 0x4e, 0x95, 0xd4, 0xfa, 0x7f, 0x51, 0xcd, 0xaf, 0x15, 0x80, 0x9e, 0x34, 0xfc, 0x3f, | |
834 | - 0xae, 0xc3, 0xfe, 0x91, 0x67, 0xd2, 0x70, 0xbc, 0x1c, 0xb7, 0x28, 0x7e, 0x87, 0xbf, 0x57, 0x60, | |
835 | - 0xb3, 0xc7, 0x8d, 0xec, 0xa6, 0xb6, 0xb4, 0x03, 0x68, 0xe9, 0x29, 0x4f, 0x4d, 0x24, 0xb1, 0xd4, | |
836 | - 0xc5, 0xcf, 0x74, 0xa1, 0xe7, 0x07, 0x18, 0x90, 0xb7, 0xd2, 0x4d, 0x6e, 0x1a, 0x2e, 0xef, 0x9e, | |
837 | - 0xc3, 0xb5, 0x76, 0xb8, 0xab, 0xeb, 0x87, 0xbb, 0xdc, 0xa1, 0xbf, 0xcc, 0xf4, 0x6b, 0x00, 0xca, | |
838 | - 0x8d, 0x50, 0xdc, 0x06, 0xbe, 0x3d, 0xd1, 0x25, 0x40, 0x6f, 0x19, 0xf0, 0xb7, 0x0a, 0x6c, 0x9c, | |
839 | - 0x4f, 0x79, 0x9a, 0xbc, 0xf3, 0xd4, 0xfc, 0xe9, 0x41, 0x6b, 0x21, 0x89, 0xfc, 0xb8, 0xbf, 0x80, | |
840 | - 0x9d, 0x09, 0x13, 0x69, 0x6c, 0x3d, 0xb7, 0xf4, 0xd5, 0x99, 0x07, 0xcd, 0x7b, 0x7b, 0xcb, 0x77, | |
841 | - 0xc2, 0x0d, 0x14, 0x54, 0xef, 0x49, 0xc1, 0x1a, 0x21, 0xf8, 0x77, 0x0b, 0x61, 0x2d, 0x71, 0x1b, | |
842 | - 0x77, 0x13, 0x57, 0x5b, 0x56, 0xcd, 0x57, 0xd0, 0xce, 0x5f, 0x96, 0xc9, 0xfc, 0x69, 0xe8, 0x7e, | |
843 | - 0xdf, 0x3b, 0xf3, 0xae, 0x17, 0xaf, 0x46, 0xda, 0x62, 0xcb, 0x8e, 0x7e, 0x0d, 0x1f, 0xe1, 0xc7, | |
844 | - 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x92, 0x71, 0x95, 0x90, 0x0b, 0x00, 0x00, | |
784 | + // 960 bytes of a gzipped FileDescriptorProto | |
785 | + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4d, 0x6f, 0x1b, 0x37, | |
786 | + 0x13, 0x86, 0x56, 0x6b, 0x49, 0x1e, 0x39, 0x96, 0x44, 0x27, 0xef, 0xbb, 0x08, 0x52, 0xd4, 0x58, | |
787 | + 0x20, 0x75, 0x8a, 0x02, 0x86, 0x3f, 0xd2, 0x8f, 0x43, 0x51, 0xd4, 0xb5, 0x9b, 0x46, 0x87, 0x20, | |
788 | + 0x05, 0x6d, 0xe8, 0xba, 0xa0, 0x76, 0x29, 0x89, 0xa8, 0xb4, 0x54, 0x49, 0xae, 0xea, 0xf8, 0x2f, | |
789 | + 0xf4, 0xdc, 0x43, 0x7f, 0x51, 0x0f, 0x45, 0xff, 0x4e, 0xaf, 0x2d, 0x38, 0xcb, 0x95, 0x56, 0x1f, | |
790 | + 0xb6, 0x13, 0x14, 0x45, 0xdb, 0xdb, 0xce, 0x70, 0xf8, 0xcc, 0x33, 0x0f, 0x67, 0xb8, 0x84, 0x46, | |
791 | + 0x3f, 0x3e, 0x9c, 0x2a, 0x69, 0x24, 0xf1, 0xfa, 0x71, 0xf8, 0x02, 0xfc, 0x97, 0x4c, 0x8f, 0xc8, | |
792 | + 0x2e, 0x78, 0xb3, 0xa3, 0xa0, 0xb2, 0x5f, 0x79, 0x56, 0xa3, 0xde, 0xec, 0x08, 0xed, 0xe3, 0xc0, | |
793 | + 0x73, 0xf6, 0x31, 0xda, 0x27, 0x41, 0xd5, 0xd9, 0x27, 0x68, 0x9f, 0x06, 0xbe, 0xb3, 0x4f, 0xc3, | |
794 | + 0xcf, 0xa1, 0xfe, 0xad, 0x92, 0x43, 0xc5, 0x26, 0xe4, 0x3d, 0x80, 0xd9, 0x24, 0x9a, 0x71, 0xa5, | |
795 | + 0x85, 0x4c, 0x11, 0xd2, 0xa7, 0xdb, 0xb3, 0x49, 0x2f, 0x77, 0x10, 0x02, 0x7e, 0x2c, 0x13, 0x8e, | |
796 | + 0xd8, 0x3b, 0x14, 0xbf, 0xc3, 0x2e, 0xd4, 0xcf, 0xb4, 0xe6, 0xa6, 0x7b, 0xf1, 0x97, 0x89, 0xbc, | |
797 | + 0x82, 0x26, 0x42, 0x9d, 0x4d, 0x64, 0x96, 0x1a, 0xf2, 0x01, 0x34, 0x98, 0x35, 0x23, 0x91, 0x20, | |
798 | + 0x68, 0xf3, 0xa4, 0x79, 0xd8, 0x8f, 0x0f, 0x5d, 0x36, 0x5a, 0xc7, 0xc5, 0x6e, 0x42, 0xfe, 0x07, | |
799 | + 0x35, 0x86, 0x3b, 0x30, 0x95, 0x4f, 0x9d, 0x15, 0x0e, 0xa1, 0x85, 0xb1, 0x17, 0x7c, 0x20, 0x52, | |
800 | + 0x61, 0x6c, 0x01, 0x9f, 0x40, 0x5b, 0x68, 0x9d, 0xb1, 0x34, 0xe6, 0xd1, 0x34, 0xaf, 0xb9, 0x0c, | |
801 | + 0xed, 0x64, 0xa0, 0xad, 0x22, 0xa8, 0xd0, 0xe5, 0x09, 0xf8, 0x09, 0x33, 0x0c, 0x13, 0x34, 0x4f, | |
802 | + 0x1a, 0x36, 0xd6, 0x4a, 0x4f, 0xd1, 0x1b, 0x8e, 0xa1, 0xd9, 0x63, 0xe3, 0x8c, 0x5f, 0xca, 0x4c, | |
803 | + 0xc5, 0x9c, 0x3c, 0x86, 0xaa, 0xe2, 0x03, 0x87, 0xbb, 0x88, 0xb5, 0x4e, 0xf2, 0x14, 0xb6, 0x66, | |
804 | + 0x36, 0xd4, 0x21, 0xb5, 0xe6, 0x05, 0xe5, 0x35, 0xd3, 0x7c, 0x95, 0x3c, 0x86, 0xc6, 0x54, 0x6a, | |
805 | + 0xe4, 0x8c, 0x7a, 0xf9, 0x74, 0x6e, 0x87, 0xdf, 0x43, 0x1b, 0xb3, 0x5d, 0x70, 0x6d, 0x44, 0xca, | |
806 | + 0xb0, 0xae, 0xbf, 0x39, 0xe5, 0x1f, 0x1e, 0x34, 0xbf, 0x1a, 0xcb, 0xf8, 0xbb, 0x97, 0x9c, 0x25, | |
807 | + 0x5c, 0x91, 0x00, 0xea, 0xcb, 0x3d, 0x52, 0x98, 0xf6, 0x2c, 0x46, 0x5c, 0x0c, 0x47, 0xf3, 0xb3, | |
808 | + 0xc8, 0x2d, 0xf2, 0x1c, 0x3a, 0x53, 0xc5, 0x67, 0x42, 0x66, 0x3a, 0xea, 0x5b, 0x24, 0x7b, 0xa8, | |
809 | + 0xd5, 0x15, 0xba, 0xad, 0x22, 0x04, 0x73, 0x75, 0x13, 0xf2, 0x04, 0xb6, 0x8d, 0x98, 0x70, 0x6d, | |
810 | + 0xd8, 0x64, 0x8a, 0x7d, 0xe2, 0xd3, 0x85, 0x83, 0x7c, 0x0c, 0x1d, 0xa3, 0x58, 0xaa, 0x59, 0x6c, | |
811 | + 0x49, 0xea, 0x48, 0x49, 0x69, 0x82, 0xad, 0x15, 0xcc, 0x76, 0x39, 0x84, 0x4a, 0x69, 0xc8, 0x97, | |
812 | + 0xf0, 0xff, 0x92, 0x2f, 0xd2, 0x86, 0x99, 0x4c, 0x47, 0x23, 0xa6, 0x47, 0x41, 0x6d, 0x65, 0xf3, | |
813 | + 0xa3, 0x52, 0xe0, 0x25, 0xc6, 0xe1, 0xc0, 0x5d, 0x00, 0x59, 0x47, 0x08, 0xea, 0xb8, 0xf9, 0x91, | |
814 | + 0xdd, 0x7c, 0xb5, 0xba, 0x8d, 0x76, 0xd6, 0x90, 0xc8, 0x47, 0xd0, 0xf9, 0x41, 0x98, 0x94, 0x6b, | |
815 | + 0x1d, 0x31, 0x35, 0xcc, 0x26, 0x3c, 0x35, 0x3a, 0x68, 0xec, 0x57, 0x9f, 0xed, 0xd0, 0xb6, 0x5b, | |
816 | + 0x38, 0x2b, 0xfc, 0xe1, 0x4f, 0x15, 0x68, 0x5c, 0x5d, 0xdf, 0x2b, 0xff, 0x01, 0xb4, 0x34, 0x57, | |
817 | + 0x82, 0x8d, 0xc5, 0x0d, 0x4f, 0x22, 0x2d, 0x6e, 0xb8, 0x3b, 0x87, 0xdd, 0x85, 0xfb, 0x52, 0xdc, | |
818 | + 0x70, 0x3b, 0xe8, 0x56, 0xc8, 0x48, 0xb1, 0x74, 0xc8, 0xdd, 0x79, 0xa3, 0xb4, 0xd4, 0x3a, 0xc8, | |
819 | + 0x01, 0x80, 0xe2, 0x3a, 0x1b, 0xdb, 0xd9, 0xd3, 0x81, 0xbf, 0x5f, 0x5d, 0x92, 0x65, 0x3b, 0x5f, | |
820 | + 0xeb, 0x26, 0x3a, 0x3c, 0x86, 0xdd, 0xab, 0xeb, 0x1e, 0x57, 0x62, 0xf0, 0x86, 0xa2, 0x93, 0xbc, | |
821 | + 0x0f, 0x4d, 0x27, 0xe9, 0x80, 0x89, 0x31, 0x12, 0x6c, 0x50, 0xc8, 0x5d, 0x2f, 0x98, 0x18, 0x87, | |
822 | + 0x03, 0xe8, 0xac, 0xe9, 0x73, 0x47, 0x49, 0x9f, 0xc2, 0x83, 0x19, 0xe2, 0x17, 0x3a, 0x7b, 0xc8, | |
823 | + 0x86, 0xa0, 0xce, 0x4b, 0xa9, 0xe9, 0x4e, 0x1e, 0x98, 0x43, 0x86, 0xbf, 0x55, 0xa0, 0xfa, 0x2a, | |
824 | + 0xbb, 0x26, 0x1f, 0x42, 0x5d, 0xe3, 0x60, 0xea, 0xa0, 0x82, 0x5b, 0x71, 0x02, 0x4a, 0x03, 0x4b, | |
825 | + 0x8b, 0x75, 0xf2, 0x14, 0xea, 0xc5, 0xad, 0xe0, 0xad, 0xdf, 0x0a, 0xc5, 0x1a, 0xf9, 0x06, 0x1e, | |
826 | + 0x16, 0x27, 0x97, 0x2c, 0x86, 0x50, 0x07, 0x55, 0x84, 0x7f, 0x38, 0x87, 0x2f, 0x4d, 0x28, 0xdd, | |
827 | + 0x73, 0x3b, 0x4a, 0xbe, 0x5b, 0x5a, 0xc0, 0xbf, 0xa5, 0x05, 0x24, 0x34, 0xce, 0xa5, 0x48, 0xfb, | |
828 | + 0x4c, 0x73, 0xf2, 0x35, 0xec, 0x6d, 0x60, 0xe0, 0xe6, 0x7f, 0x33, 0x01, 0xb2, 0x4e, 0xc0, 0xce, | |
829 | + 0x17, 0x53, 0x7d, 0x61, 0x14, 0x53, 0x6f, 0xdc, 0xa5, 0xbe, 0x70, 0x84, 0x3f, 0x56, 0xa0, 0xdd, | |
830 | + 0x4d, 0x8d, 0x62, 0xe7, 0x23, 0x26, 0xd2, 0xd7, 0x99, 0x99, 0x66, 0x86, 0x1c, 0x40, 0x2d, 0x57, | |
831 | + 0xcb, 0x25, 0x5b, 0x13, 0xd3, 0x2d, 0x93, 0xe7, 0xd0, 0x8a, 0x65, 0x6a, 0x94, 0x1c, 0x47, 0x77, | |
832 | + 0x68, 0xba, 0xeb, 0x62, 0x8a, 0x8b, 0x36, 0x80, 0xba, 0x54, 0x89, 0x48, 0xd9, 0xd8, 0x35, 0x65, | |
833 | + 0x61, 0x22, 0x9b, 0x73, 0x25, 0xb5, 0xfe, 0x57, 0xb0, 0xf9, 0xb9, 0x02, 0xd0, 0x93, 0x86, 0xff, | |
834 | + 0xc3, 0x3c, 0xec, 0x1f, 0x79, 0x26, 0x0d, 0xc7, 0xcb, 0x71, 0x87, 0xe2, 0x77, 0xf8, 0x6b, 0x05, | |
835 | + 0xb6, 0x7b, 0xdc, 0xc8, 0x6e, 0x6a, 0xa9, 0x1d, 0x41, 0x4b, 0x4f, 0x79, 0x6a, 0x22, 0x89, 0x54, | |
836 | + 0x17, 0x3f, 0xd3, 0xc5, 0x3c, 0x3f, 0xc0, 0x80, 0xbc, 0x94, 0x6e, 0x72, 0x5b, 0x73, 0x79, 0xef, | |
837 | + 0xd8, 0x5c, 0x1b, 0x9b, 0xbb, 0xba, 0xb9, 0xb9, 0xcb, 0x15, 0xfa, 0xcb, 0x4a, 0xbf, 0x06, 0xa0, | |
838 | + 0xdc, 0x08, 0xc5, 0x6d, 0xe0, 0xdb, 0x0b, 0x5d, 0x02, 0xf4, 0x96, 0x01, 0x7f, 0xa9, 0xc0, 0xd6, | |
839 | + 0xe5, 0x94, 0xa7, 0xc9, 0x7f, 0x5e, 0x9a, 0xdf, 0x3d, 0x68, 0x2d, 0x46, 0x22, 0x3f, 0xee, 0xcf, | |
840 | + 0x60, 0x6f, 0xc2, 0x44, 0x1a, 0x5b, 0xcf, 0x1d, 0x75, 0x75, 0xe6, 0x41, 0xf3, 0xda, 0xde, 0xf2, | |
841 | + 0x9d, 0x70, 0x8b, 0x04, 0xd5, 0x77, 0x94, 0x60, 0xc3, 0x20, 0xf8, 0xf7, 0x0f, 0xc2, 0x17, 0xd0, | |
842 | + 0xce, 0x9f, 0x84, 0xc9, 0xfc, 0x4d, 0xe7, 0xfe, 0xf8, 0x7b, 0x73, 0xba, 0x8b, 0xe7, 0x1e, 0x6d, | |
843 | + 0xb1, 0x95, 0xf7, 0xdf, 0x46, 0xe1, 0x6b, 0xf7, 0x0b, 0x5f, 0x5f, 0x12, 0xbe, 0x5f, 0xc3, 0x47, | |
844 | + 0xf8, 0xe9, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2b, 0x1b, 0x9e, 0x47, 0x90, 0x0b, 0x00, 0x00, | |
845 | 845 | } |
@@ -130,7 +130,7 @@ message CrossChainInput { | ||
130 | 130 | AssetAmount value = 2; |
131 | 131 | ValueDestination witness_destination = 3; |
132 | 132 | Program control_program = 4; |
133 | - repeated bytes witness_arguments = 5; | |
134 | - uint64 ordinal = 6; | |
135 | - AssetDefinition asset_definition = 7; | |
133 | + AssetDefinition asset_definition = 5; | |
134 | + repeated bytes witness_arguments = 6; | |
135 | + uint64 ordinal = 7; | |
136 | 136 | } |
@@ -18,7 +18,7 @@ type CrossChainInput struct { | ||
18 | 18 | // NewCrossChainInput create a new CrossChainInput struct. |
19 | 19 | // The source is created/issued by trusted federation and hence there is no need |
20 | 20 | // to refer to it. |
21 | -func NewCrossChainInput(arguments [][]byte, sourceID bc.Hash, assetID bc.AssetID, amount, sourcePos, vmVersion uint64, controlProgram, assetDefinition, issuanceProgram []byte) *TxInput { | |
21 | +func NewCrossChainInput(arguments [][]byte, sourceID bc.Hash, assetID bc.AssetID, amount, sourcePos, vmVersion uint64, assetDefinition, issuanceProgram []byte) *TxInput { | |
22 | 22 | sc := SpendCommitment{ |
23 | 23 | AssetAmount: bc.AssetAmount{ |
24 | 24 | AssetId: &assetID, |
@@ -27,7 +27,6 @@ func NewCrossChainInput(arguments [][]byte, sourceID bc.Hash, assetID bc.AssetID | ||
27 | 27 | SourceID: sourceID, |
28 | 28 | SourcePosition: sourcePos, |
29 | 29 | VMVersion: 1, |
30 | - ControlProgram: controlProgram, | |
31 | 30 | } |
32 | 31 | return &TxInput{ |
33 | 32 | AssetVersion: 1, |
@@ -141,7 +141,6 @@ func mapTx(tx *TxData) (headerID bc.Hash, hdr *bc.TxHeader, entryMap map[bc.Hash | ||
141 | 141 | vetoInputs = append(vetoInputs, vetoInput) |
142 | 142 | |
143 | 143 | case *CrossChainInput: |
144 | - // TODO: fed peg script | |
145 | 144 | prog := &bc.Program{VmVersion: inp.VMVersion, Code: inp.ControlProgram} |
146 | 145 | src := &bc.ValueSource{ |
147 | 146 | Ref: &inp.SourceID, |
@@ -72,20 +72,19 @@ func TestSerializationCrossIn(t *testing.T) { | ||
72 | 72 | []byte("arguments2"), |
73 | 73 | } |
74 | 74 | |
75 | - crossIn := NewCrossChainInput(arguments, testutil.MustDecodeHash("fad5195a0c8e3b590b86a3c0a95e7529565888508aecca96e9aeda633002f409"), testutil.MustDecodeAsset("fe9791d71b67ee62515e08723c061b5ccb952a80d804417c8aeedf7f633c524a"), 254354, 3, 1, []byte("crossInProgram"), []byte("whatever"), []byte("IssuanceProgram")) | |
75 | + crossIn := NewCrossChainInput(arguments, testutil.MustDecodeHash("fad5195a0c8e3b590b86a3c0a95e7529565888508aecca96e9aeda633002f409"), testutil.MustDecodeAsset("fe9791d71b67ee62515e08723c061b5ccb952a80d804417c8aeedf7f633c524a"), 254354, 3, 1, []byte("whatever"), []byte("IssuanceProgram")) | |
76 | 76 | |
77 | 77 | wantHex := strings.Join([]string{ |
78 | 78 | "01", // asset version |
79 | - "56", // input commitment length | |
79 | + "48", // input commitment length | |
80 | 80 | "00", // cross-chain input type flag |
81 | - "54", // cross-chain input commitment length | |
81 | + "46", // cross-chain input commitment length | |
82 | 82 | "fad5195a0c8e3b590b86a3c0a95e7529565888508aecca96e9aeda633002f409", // source id |
83 | 83 | "fe9791d71b67ee62515e08723c061b5ccb952a80d804417c8aeedf7f633c524a", // assetID |
84 | 84 | "92c30f", // amount |
85 | 85 | "03", // source position |
86 | 86 | "01", // vm version |
87 | - "0e", // spend program length | |
88 | - "63726f7373496e50726f6772616d", // spend program | |
87 | + "00", // spend program length | |
89 | 88 | "31", // witness length |
90 | 89 | "02", // argument array length |
91 | 90 | "0a", // first argument length |
@@ -254,7 +254,7 @@ func checkValid(vs *validationState, e bc.Entry) (err error) { | ||
254 | 254 | if *e.Value.AssetId != *consensus.BTMAssetID && *e.Value.AssetId != assetID { |
255 | 255 | return errors.New("incorrect asset_id while check CrossChainInput") |
256 | 256 | } |
257 | - | |
257 | + e.ControlProgram.Code = config.FederationProgrom(config.CommonConfig) | |
258 | 258 | _, err := vm.Verify(NewTxVMContext(vs, e, e.ControlProgram, e.WitnessArguments), consensus.DefaultGasCredit) |
259 | 259 | if err != nil { |
260 | 260 | return errors.Wrap(err, "checking cross-chain input control program") |
@@ -671,8 +671,8 @@ func TestTxOutToUtxos(t *testing.T) { | ||
671 | 671 | { |
672 | 672 | tx: types.NewTx(types.TxData{ |
673 | 673 | Inputs: []*types.TxInput{ |
674 | - types.NewCrossChainInput([][]byte{}, bc.Hash{V0: 1}, bc.AssetID{V0: 1}, 5, 1, 1, []byte{0x51}, []byte("asset1"), []byte("IssuanceProgram")), | |
675 | - types.NewCrossChainInput([][]byte{}, bc.Hash{V0: 2}, *consensus.BTMAssetID, 7, 1, 1, []byte{0x51}, []byte("assetbtm"), []byte("IssuanceProgram"))}, | |
674 | + types.NewCrossChainInput([][]byte{}, bc.Hash{V0: 1}, bc.AssetID{V0: 1}, 5, 1, 1, []byte("asset1"), []byte("IssuanceProgram")), | |
675 | + types.NewCrossChainInput([][]byte{}, bc.Hash{V0: 2}, *consensus.BTMAssetID, 7, 1, 1, []byte("assetbtm"), []byte("IssuanceProgram"))}, | |
676 | 676 | Outputs: []*types.TxOutput{ |
677 | 677 | types.NewIntraChainOutput(bc.AssetID{V0: 1}, 2, []byte{0x51}), |
678 | 678 | types.NewIntraChainOutput(bc.AssetID{V0: 1}, 3, []byte{0x52}), |
@@ -684,35 +684,35 @@ func TestTxOutToUtxos(t *testing.T) { | ||
684 | 684 | blockHeight: 0, |
685 | 685 | wantUtxos: []*account.UTXO{ |
686 | 686 | &account.UTXO{ |
687 | - OutputID: bc.Hash{V0: 10846235764839195676, V1: 17124764185649747439, V2: 10628685558750997961, V3: 13297206452120029075}, | |
687 | + OutputID: bc.Hash{V0: 5429526025956869574, V1: 12188959875155232503, V2: 14722092106507294798, V3: 27876074648890075}, | |
688 | 688 | AssetID: bc.AssetID{V0: 1}, |
689 | 689 | Amount: 2, |
690 | 690 | ControlProgram: []byte{0x51}, |
691 | - SourceID: bc.Hash{V0: 2677144440510642284, V1: 17300012684713233857, V2: 8104296098763882727, V3: 11299124826964505999}, | |
691 | + SourceID: bc.Hash{V0: 10187915247323429348, V1: 4770401581694266753, V2: 4182269187154655368, V3: 9030883832705174512}, | |
692 | 692 | SourcePos: 0, |
693 | 693 | }, |
694 | 694 | &account.UTXO{ |
695 | - OutputID: bc.Hash{V0: 3381014554514609900, V1: 5680175057309334270, V2: 3343119029029595104, V3: 2354639458888741781}, | |
695 | + OutputID: bc.Hash{V0: 18100481287404207387, V1: 3365694797435565990, V2: 8136211093499423216, V3: 12028531817690438568}, | |
696 | 696 | AssetID: bc.AssetID{V0: 1}, |
697 | 697 | Amount: 3, |
698 | 698 | ControlProgram: []byte{0x52}, |
699 | - SourceID: bc.Hash{V0: 2677144440510642284, V1: 17300012684713233857, V2: 8104296098763882727, V3: 11299124826964505999}, | |
699 | + SourceID: bc.Hash{V0: 10187915247323429348, V1: 4770401581694266753, V2: 4182269187154655368, V3: 9030883832705174512}, | |
700 | 700 | SourcePos: 1, |
701 | 701 | }, |
702 | 702 | &account.UTXO{ |
703 | - OutputID: bc.Hash{V0: 2129811970775447483, V1: 5529067197700587525, V2: 17837487178845335220, V3: 1815160195786226238}, | |
703 | + OutputID: bc.Hash{V0: 15745816911932387102, V1: 5035893487696724781, V2: 10084725527786878517, V3: 11270352747873435606}, | |
704 | 704 | AssetID: *consensus.BTMAssetID, |
705 | 705 | Amount: 2, |
706 | 706 | ControlProgram: []byte{0x53}, |
707 | - SourceID: bc.Hash{V0: 2677144440510642284, V1: 17300012684713233857, V2: 8104296098763882727, V3: 11299124826964505999}, | |
707 | + SourceID: bc.Hash{V0: 10187915247323429348, V1: 4770401581694266753, V2: 4182269187154655368, V3: 9030883832705174512}, | |
708 | 708 | SourcePos: 2, |
709 | 709 | }, |
710 | 710 | &account.UTXO{ |
711 | - OutputID: bc.Hash{V0: 8285123326464348167, V1: 11183568691487503969, V2: 2744924970797742540, V3: 7859069673372366746}, | |
711 | + OutputID: bc.Hash{V0: 10165799535720725897, V1: 9618876671942765420, V2: 17982649347111502590, V3: 15837286550437859084}, | |
712 | 712 | AssetID: *consensus.BTMAssetID, |
713 | 713 | Amount: 5, |
714 | 714 | ControlProgram: []byte{0x54}, |
715 | - SourceID: bc.Hash{V0: 2677144440510642284, V1: 17300012684713233857, V2: 8104296098763882727, V3: 11299124826964505999}, | |
715 | + SourceID: bc.Hash{V0: 10187915247323429348, V1: 4770401581694266753, V2: 4182269187154655368, V3: 9030883832705174512}, | |
716 | 716 | SourcePos: 3, |
717 | 717 | }, |
718 | 718 | }, |