Skip to content

GitLab

Commit 6f0732dd authored by Yury's avatar Yury
Browse files

update vendor. Update common module. Message: Offers map[string]*Offer -... 

update vendor. Update common module. Message: Offers map[string]*Offer - хранение заявок по operation id
parent cfb921eb
Hide whitespace changes
Inline Side-by-side
Showing
with 89 additions and 98 deletions
+89 -98
vendor/gitlab.smartblocklab.com/smartcontracts/common/chaincode/adapter.go
View file @ 6f0732dd
......@@ -17,7 +17,7 @@ var (
var CommonChaincodeActionVar = map[string]CommonChaincodeAction{
invoke.Ping: Ping, // Проверка установки чейнкода и возможности записи в леджер
// invoke.ClearLedger: ClearLedger, // Метод очищает все данные в ledger реализован в каждом чейнкоде
// init - испосльзуется для инициализации информации в канале
// Configure - испосльзуется для инициализации информации в канале
}
var ChaincodeParameters ChaincodeParameter
......@@ -38,24 +38,6 @@ func timeFuncFactory(adapter shim.ChaincodeStubInterface) func() (int64, error)
// Init initialize chaincode with proper parameters
func (this CommonChaincode) Init(adapter shim.ChaincodeStubInterface) (response pb.Response) {
defer func() {
GlobalLogger.Info("end init")
if r := recover(); r != nil {
response = shim.Error(fmt.Sprintf("FATAL_ERROR: %f", r))
}
}()
GlobalLogger.Info("Start initializing ..")
_, args := adapter.GetFunctionAndParameters()
if len(args) == 1 {
err := this.InitCC([]byte(args[0]));
if err != nil {
GlobalLogger.Error(err.Error())
return shim.Error(err.Error())
}
}
return shim.Success([]byte("Chaincode initialized successfully"))
}
......@@ -73,20 +55,27 @@ func (this CommonChaincode) InitCC(chaincodeParametersByteArray []byte) error {
return nil
}
func (this CommonChaincode) InitChaincode(initArgs []string) error {
lenArguments := len(initArgs)
func (this CommonChaincode) Configure(configArgs []string) error {
lenArguments := len(configArgs)
if lenArguments == 1 {
var signedMessage requests.FullSignedRequest
if err := json.Unmarshal([]byte(initArgs[0]), &signedMessage); err != nil {
if err := json.Unmarshal([]byte(configArgs[0]), &signedMessage); err != nil {
return err
}
var systemParam *requests.Parameter
if err := json.Unmarshal(signedMessage.Parameters.SystemParams, &systemParam); err != nil {
return logging.Get().Errorf("CheckAccess: Unmarshal error: %s", err.Error())
return logging.Get().Errorf("CheckAccess: Unmarshaling error: %s", err.Error())
}
GlobalLogger.Infof("configArgs: %v", configArgs)
if err := json.Unmarshal(systemParam.Param, &ChaincodeParameters); err != nil {
return GlobalLogger.Errorf(err.Error())
}
return this.InitCC(systemParam.Param)
GlobalLogger.Info("ChaincodeParameters ")
GlobalLogger.Info(ChaincodeParameters.ToString())
} else {
return GlobalLogger.Errorf("Incorrect number of arguments. Expected 1 argument - ChaincodeParameter. But got %d", lenArguments)
}
......@@ -109,21 +98,21 @@ func (this CommonChaincode) Invoke(adapter shim.ChaincodeStubInterface) (respons
GlobalLogger.Infof("ChaincodeName: %s", ChaincodeParameters.ChaincodeName)
GlobalLogger.Infof("functionName: %s", functionName)
if functionName == "init" {
if functionName == invoke.Configure {
defer func() {
GlobalLogger.Info("end init")
GlobalLogger.Info("end Configure")
if r := recover(); r != nil {
response = shim.Error(fmt.Sprintf("FATAL_ERROR: %f", r))
}
}()
GlobalLogger.Info("Start initializing ..")
GlobalLogger.Info("Start configuring ..")
if err := this.InitChaincode(args); err != nil {
if err := this.Configure(args); err != nil {
GlobalLogger.Error(err.Error())
return shim.Error(err.Error())
}
return shim.Success([]byte("Chaincode initialized successfully"))
return shim.Success([]byte("Chaincode configured successfully"))
}
timeGetter := timeFuncFactory(adapter)
......
vendor/gitlab.smartblocklab.com/smartcontracts/common/invoke/common.go
View file @ 6f0732dd
......@@ -6,4 +6,5 @@ const (
Ping = "ping" // Проверка установки чейнкода и возможности записи в леджер
ClearLedger = "clearLedger" // Метод очищает все данные в ledger
Configure = "configure" // Метод очищает все данные в ledger
)
vendor/gitlab.smartblocklab.com/smartcontracts/common/invoke/offerCC.go
View file @ 6f0732dd
......@@ -16,20 +16,7 @@ const (
ExternalOfferCC = "externalofferCC"
ExternalOfferChannel = "externalofferchannel"
AddOfferFunction = "addOffer"
UpdateOfferFunction = "updateOffer"
GetUserIncomingRequestsByStatusFunction = "getUserIncomingRequestsByStatus"
GetUserOutgoingRequestsByStatusFunction = "getUserOutgoingRequestsByStatus"
GetHistoryUserIncomingRequestsFunction = "getHistoryUserIncomingRequests"
GetHistoryUserOutgoingRequestsFunction = "getHistoryUserOutgoingRequests"
GetOfferFunction = "getOffer"
GetOffersFunction = "getOffers"
SetOfferStatusByOperationIdFunction = "setOfferStatusByOperationId"
PutOfferPropertiesByOperationIdFunction = "putOfferPropertiesByOperationId"
GetRequestsByStatusFunction = "getRequestsByStatus"
IsOfferApprovedFunction = "isOfferApproved"
GetRequestsByStatusAndCurrencyTypeFunction = "getRequestsByStatusAndCurrencyType"
AddOfferFunction = "addOffer"
GetOffersFunction = "getOffers"
GetOfferRecordsFunction = "getOfferRecords"
)
vendor/gitlab.smartblocklab.com/smartcontracts/common/security/actions/SecurityPreferenceArray.go
View file @ 6f0732dd
......@@ -6,6 +6,7 @@ import "gitlab.smartblocklab.com/smartcontracts/common/invoke"
const ping = "ping"
const clearLedger = "clearLedger"
const configure = "configure"
......@@ -62,6 +63,31 @@ var SecurityPreferenceArray = []SecurityPreference{
SecurityPreference{invoke.KycRuleStatusCC, clearLedger, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.EthereumInputCC, clearLedger, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
// configure
SecurityPreference{invoke.AccountCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.MarketaccountCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.AuthCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.CommissionCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.CryptocurrencyCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.OfferCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.ExternalOfferCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.TransactionCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.UserCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.OrganizationCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.UserpreferenceCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.SystempreferenceCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.DevicepreferenceCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.SessionCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.ProcesstypecryptocurrencyCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.CryptocurrencyconstraintCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.KycUserCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.KycRuleCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.KycDocumentCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.KycDocumentStatusCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.KycRuleStatusCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.EthereumInputCC, configure, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
// AccountCC
// invoke
......@@ -130,29 +156,17 @@ var SecurityPreferenceArray = []SecurityPreference{
// invoke
SecurityPreference{invoke.OfferCC, invoke.AddOfferFunction, ComplexParameter, []Roles{UserRole}},
SecurityPreference{invoke.OfferCC, invoke.UpdateOfferFunction, ComplexParameter, []Roles{UserRole}},
SecurityPreference{invoke.OfferCC, invoke.SetOfferStatusByOperationIdFunction, UserParameter, []Roles{UserRole}},
SecurityPreference{invoke.OfferCC, invoke.PutOfferPropertiesByOperationIdFunction, UserParameter, []Roles{UserRole}},
// query
SecurityPreference{invoke.OfferCC, invoke.GetOfferFunction, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.OfferCC, invoke.GetOffersFunction, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.OfferCC, invoke.GetRequestsByStatusFunction, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.OfferCC, invoke.IsOfferApprovedFunction, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.OfferCC, invoke.GetRequestsByStatusAndCurrencyTypeFunction, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.OfferCC, invoke.GetOfferRecordsFunction, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
// ExternalOfferCC
// invoke
SecurityPreference{invoke.ExternalOfferCC, invoke.AddOfferFunction, ComplexParameter, []Roles{UserRole}},
SecurityPreference{invoke.ExternalOfferCC, invoke.UpdateOfferFunction, ComplexParameter, []Roles{UserRole}},
SecurityPreference{invoke.ExternalOfferCC, invoke.SetOfferStatusByOperationIdFunction, UserParameter, []Roles{UserRole}},
SecurityPreference{invoke.ExternalOfferCC, invoke.PutOfferPropertiesByOperationIdFunction, UserParameter, []Roles{UserRole}},
// query
SecurityPreference{invoke.ExternalOfferCC, invoke.GetOfferFunction, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.ExternalOfferCC, invoke.GetOffersFunction, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.ExternalOfferCC, invoke.GetRequestsByStatusFunction, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.ExternalOfferCC, invoke.IsOfferApprovedFunction, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.ExternalOfferCC, invoke.GetRequestsByStatusAndCurrencyTypeFunction, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
SecurityPreference{invoke.ExternalOfferCC, invoke.GetOfferRecordsFunction, ServiceParameter | UnsecuredParameter, []Roles{UserRole}},
// TransactionCC
......
vendor/vendor.json
View file @ 6f0732dd
......@@ -45,112 +45,112 @@
"revisionTime": "2017-08-14T20:04:35Z"
},
{
"checksumSHA1": "zvYErmN/4i9RjKaKSvwTzRiCryo=",
"checksumSHA1": "CiYfjfUH/ZU3PB9xyyhBMu4pFf4=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/chaincode",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "OIYl5lGCHxLOVW0TKLUcrCMBrjk=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/interfaces/iorganization",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "i5Tivl+u5oAZvO6mqjUon+/9n5k=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/interfaces/isystempreference",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "w+xk18gJVJRP6SysUEYZ9hqyUKQ=",
"checksumSHA1": "j24jgF8YBCGEJ3yXKQLd0Rwcxwo=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/invoke",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "y8XBhgS5hzCtU1hfJibpEsyWR5c=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/logging",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "ugXju39MuxTC6yOtsa/5aYRY9Ao=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/accountCC",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "0uVmgG3k5Oa/M8PwPBGrB7xEwJw=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/commissionCC",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "BGwzdt8F6mJvpB1eeeeHnvPnhjg=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/organizationCC",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "5H11uQeLyMa/EhxZGUxwk7mTf1c=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/preferenceCC",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "1PuzRBhGfI1y25Ae9hzvofGicaQ=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/requests",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "qiG//m4d1c9Z2ZGWJcO1Bpg8H+s=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/system_user",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "r2WjHBX1KbfdKxTBKDijg0aPRXY=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/systempreferenceCC",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "KA6KgJxrGK6HLsuGTmHwAbSQ8LU=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/transactionCC",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "zKS+ZjB/PH8XptwXXVPIhkL5h0o=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/userCC",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "lLukW38IQ4LeuwwPPoBFpH6zCpE=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/nums",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "DNgvi7H8/ANU2eExflueAtKKGgQ=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/remote/remote_organization",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "DWjSP0WJ29YPsri6+KBnC31G8Qo=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/remote/remote_systempreference",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "nHRU+7OvT6OSuPp477a6LQBd/Xk=",
"checksumSHA1": "YAax3Mv4uzgiDbby/0sToRvlY30=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/security/actions",
"revision": "251e6e15bbad1691125cb7994bfd01003accff16",
"revisionTime": "2018-12-13T10:10:35Z"
"revision": "c46f80152be7543e2a0dbaa57d2f0e96f2597d6f",
"revisionTime": "2018-12-14T09:47:08Z"
},
{
"checksumSHA1": "5Yb2z6UO+Arm/TEd+OEtdnwOt1A=",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Menu

Help