Skip to content

GitLab

Commit 3d72ff01 authored by Yury's avatar Yury
Browse files

update vendor. Update common module. Message: update security

parent 84f8fec1
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 737 additions and 460 deletions
+737 -460
vendor/gitlab.smartblocklab.com/smartcontracts/common/nums/functions.go
View file @ 3d72ff01
......@@ -98,8 +98,14 @@ func (obj *PlainCurrencyNumber) Number() (*CurrencyNumber, error) {
if err != nil {
return nil, err
}
asset, _ := CurrencyTypeFrom(obj.CurrencyType)
amount, _ := decimal.NewFromString(obj.Amount)
asset, err := CurrencyTypeFrom(obj.CurrencyType)
if err != nil {
return nil, err
}
amount, err := decimal.NewFromString(obj.Amount)
if err != nil {
return nil, err
}
currencyNumber := &CurrencyNumber{
Asset: asset,
......@@ -207,8 +213,8 @@ func (res *CurrencyNumber) Validate() (*CurrencyNumber, error) {
if res.Num.LessThan(decimal.Zero) ||
((res.Num.GreaterThan(res.Asset.MaxValue) && !res.Asset.MaxValue.Equals(flag)) ||
(res.Num.LessThan(res.Asset.MinValue) && !res.Asset.MinValue.Equals(flag))) &&
!res.Num.Equals(decimal.Zero) {
(res.Num.LessThan(res.Asset.MinValue) && !res.Asset.MinValue.Equals(flag))) &&
!res.Num.Equals(decimal.Zero) {
//assetMinValue := res.Asset.MinValue.RoundBank(int32(res.Asset.Scale)).StringFixed(int32(res.Asset.Scale))
//assetMaxValue := res.Asset.MaxValue.RoundBank(int32(res.Asset.Scale)).StringFixed(int32(res.Asset.Scale))
......@@ -226,8 +232,8 @@ func (res *CurrencyNumber) Validate() (*CurrencyNumber, error) {
// также amount проверяется по таблице ограничений для валюты
func NumFromString(amount string, currencyType string) (*CurrencyNumber, error) {
plainCurrencyNumber := PlainCurrencyNumber{
Amount:amount,
CurrencyType:currencyType,
Amount: amount,
CurrencyType: currencyType,
}
number, err := plainCurrencyNumber.Number()
if err != nil {
......@@ -256,4 +262,4 @@ func FormatFloat(f float64, scale uint) string {
func One(n *CurrencyNumber) (*CurrencyNumber, error) {
return NumFromFloat(1, n.Asset.CurrencyType)
}
\ No newline at end of file
}
vendor/gitlab.smartblocklab.com/smartcontracts/common/remote/remote_transaction/remote.go
View file @ 3d72ff01
package remote_transaction
import (
"gitlab.smartblocklab.com/smartcontracts/common/interfaces/itransaction"
"gitlab.smartblocklab.com/smartcontracts/common/model/transactionCC"
"gitlab.smartblocklab.com/smartcontracts/common/chaincode"
"encoding/json"
"github.com/pkg/errors"
"gitlab.smartblocklab.com/smartcontracts/common/model/requests"
"gitlab.smartblocklab.com/smartcontracts/common/chaincode"
"gitlab.smartblocklab.com/smartcontracts/common/interfaces/itransaction"
"gitlab.smartblocklab.com/smartcontracts/common/invoke"
"encoding/json"
"gitlab.smartblocklab.com/smartcontracts/common/model/requests"
"gitlab.smartblocklab.com/smartcontracts/common/model/transactionCC"
)
type TransactionRemoteManagerImpl struct {
......@@ -50,6 +50,7 @@ func (this TransactionRemoteManagerImpl) UnlockFundsOnAccount(transfer *transact
}
// query
// TODO tododocs deprecated function CheckExistsTransactionByList
func (this TransactionRemoteManagerImpl) CheckExistsTransactionByList(syncRequest *transactionCC.SyncRequest) (*transactionCC.CheckExistsResult, error) {
if resp := this.SignedInvokeChaincode(this.GetChannelName(), this.GetChaincodeName(), invoke.CheckExistsTransactionByListFunction, syncRequest); resp.Status != 200 {
return nil, errors.New(resp.Message)
......
vendor/vendor.json
View file @ 3d72ff01
......@@ -53,200 +53,200 @@
{
"checksumSHA1": "EOrQawAh9RxVKQQIYGF8hA71sCU=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/chaincode",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "l6Zj9/V3dFoNNpOiV0pGQie3Rzc=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/interfaces/iaccount",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "hHXicNPfvuUnTEvpEZq4FN1BfNg=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/interfaces/iethereum",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "QjCjLnm5sdAsTjspRpZ5sLq8ko4=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/interfaces/ikeyvalue",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "OIYl5lGCHxLOVW0TKLUcrCMBrjk=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/interfaces/iorganization",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "eP9s5XRgtg1mbysZyRJGrFy9skQ=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/interfaces/isystempreference",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "O53XMb3G/Eta2XuvjhR8nW/A3Yw=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/interfaces/itransaction",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "/LEiYlOEx2ZbQUw614iq5L2M4QY=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/interfaces/iuser",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "oqsQbQVPCSBzx5XzPL6mLoYGvow=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/invoke",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "y8XBhgS5hzCtU1hfJibpEsyWR5c=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/logging",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "Lep129g1wHrPu7slklvY4AnmfRE=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/accountCC",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "R0SIPy2jUYBUMIkq7Q98bCBnQ5s=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/bitcoinCC",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "QnhEkTRVueFJFALk/LNFoI989b8=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/commissionCC",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "j2vKpejG5D/em+KZvz0VwfWuELw=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/cryptocurrencyCC",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "vmhVyy9Xo9fW8d/sY2Vgrc/7nCo=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/ethereumCC",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "upmUDUFx5SUlk5smaAEOXSulV8U=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/keyValueCC",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "3YMKRl7w4+TPRPv0aJyj2yr7Zzk=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/offerCC",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "zpMDUjfiS5wVg+QfydBqW/LLuvw=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/organizationCC",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "jKsnp2T6n9fMY7aJGb9zkp6od94=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/preferenceCC",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "1PuzRBhGfI1y25Ae9hzvofGicaQ=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/requests",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "1Fsvp1K3HCbvoK0k6/XmovVHiDw=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/system_user",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "wv4kYUUmMjv3JfW5wk+E/L/kZmM=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/systempreferenceCC",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "IYuAA5qZj8mFI5eAIQdzcDe0Rb0=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/transactionCC",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "zJ4/aPMV6GLmkJZw/fVvMSdi7E0=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/userCC",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "Ys5CN+BN/1+niS/RvMW3FGdNT/0=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/userPreferenceCC",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "KArBxudD1MtRXf8nIuZcl0B1cg8=",
"checksumSHA1": "gb9GfwEKafFaaE0YJSqJzklOobU=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/nums",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "zVYKXnw/OGXY9/Tv1ldoGvJ9/K8=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/remote/remote_account",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "d+D6K2B7w1V2DZZhqxw70CK0f20=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/remote/remote_keyvalue",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "DNgvi7H8/ANU2eExflueAtKKGgQ=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/remote/remote_organization",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "7gco/+1krQQnrUgxSD4pmIjxJdM=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/remote/remote_systempreference",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "NEhw2ugOkOlh2HqaAdJIvk+mV6k=",
"checksumSHA1": "R0RHcCZiK/j5d8p85Gk2Pt5iN1o=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/remote/remote_transaction",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "8QWUhnMqrEAH8LOAfEQINdmhor8=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/remote/remote_user",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"checksumSHA1": "7CoAQjGY7zO5eLjzlXOyaGks+dk=",
"checksumSHA1": "LHhirhY6h/fbzp5BRW/BuywTce4=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/security/actions",
"revision": "67c8c0aa0a0facb5590233cf3bcf75d0025b4e13",
"revisionTime": "2019-05-23T15:23:23Z"
"revision": "9708fee7d47f3139063932f48f1130ad4f4644ff",
"revisionTime": "2019-06-28T09:53:06Z"
},
{
"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