diff --git a/Makefile b/Makefile index 0b5a6993a9fa6edecaaf45a414dbd2428ba71f93..4f068ab8ec9b47ce3ab7fd43b7e9a6af0a82f990 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ -VERSION=v2.2.0 -VERSION_DEVELOP=v2.2.0 +VERSION220=v2.2.0 +VERSION221=v2.2.1 gomod: - go get chainmaker.org/chainmaker/pb-go/v2@$(VERSION) - go get chainmaker.org/chainmaker/common/v2@$(VERSION_DEVELOP) - go get chainmaker.org/chainmaker/protocol/v2@$(VERSION) - go get chainmaker.org/chainmaker/logger/v2@$(VERSION_DEVELOP) - go get chainmaker.org/chainmaker/utils/v2@$(VERSION) - go get chainmaker.org/chainmaker/localconf/v2@$(VERSION) - go get chainmaker.org/chainmaker/chainconf/v2@$(VERSION) + go get chainmaker.org/chainmaker/pb-go/v2@$(VERSION220) + go get chainmaker.org/chainmaker/common/v2@$(VERSION220) + go get chainmaker.org/chainmaker/protocol/v2@$(VERSION221) + go get chainmaker.org/chainmaker/logger/v2@$(VERSION220) + go get chainmaker.org/chainmaker/utils/v2@$(VERSION221) + go get chainmaker.org/chainmaker/localconf/v2@$(VERSION220) + go get chainmaker.org/chainmaker/chainconf/v2@$(VERSION221) go mod tidy lint: diff --git a/go.mod b/go.mod index c88c65e7cbbe7cd88e64dc359da3095eac3439b9..a420d0e1cfa7488b81c69258d5c60cc5501f16eb 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,13 @@ module chainmaker.org/chainmaker/vm-native/v2 go 1.15 require ( - chainmaker.org/chainmaker/chainconf/v2 v2.2.0 + chainmaker.org/chainmaker/chainconf/v2 v2.2.1 chainmaker.org/chainmaker/common/v2 v2.2.0 chainmaker.org/chainmaker/localconf/v2 v2.2.0 chainmaker.org/chainmaker/logger/v2 v2.2.0 chainmaker.org/chainmaker/pb-go/v2 v2.2.0 - chainmaker.org/chainmaker/protocol/v2 v2.2.0 - chainmaker.org/chainmaker/utils/v2 v2.2.0 + chainmaker.org/chainmaker/protocol/v2 v2.2.1 + chainmaker.org/chainmaker/utils/v2 v2.2.1 github.com/gogo/protobuf v1.3.2 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.2 diff --git a/go.sum b/go.sum index 0ceb6990d146f607cab1095d3c5a980a056df8bb..75a671156396178b432a34137d2e2c56bff7ac8e 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -chainmaker.org/chainmaker/chainconf/v2 v2.2.0 h1:bLHwUc3lYROVplqUk9KVQpD2AikAec2fDQdDYGK3ceI= -chainmaker.org/chainmaker/chainconf/v2 v2.2.0/go.mod h1:jsvECxm/eklOpSCmn8ugktEfZWrrxcHM65W0EPE338s= +chainmaker.org/chainmaker/chainconf/v2 v2.2.1 h1:b+VdLXzMDdhoxXzlzwgzKC3isVgCF5dg1tHP0VjVMSQ= +chainmaker.org/chainmaker/chainconf/v2 v2.2.1/go.mod h1:TieC8dIHJTEquoS+xRFI1j3KYdjxpVxbUOxbhg4/IYg= chainmaker.org/chainmaker/common/v2 v2.2.0 h1:0uD2pz2Gf1q6TPkM17PnXQ6Jfqrf6iBb4evIk1pikxk= chainmaker.org/chainmaker/common/v2 v2.2.0/go.mod h1:NCQFjdcfzhgOM6r4hRjYxelSrrS4fdUsfAHLtTdq23w= chainmaker.org/chainmaker/localconf/v2 v2.2.0 h1:fYw6zR4hWEwwiqxVDtRGRuv/J4W6S/Sl9VC3d1/sTSQ= @@ -8,10 +8,10 @@ chainmaker.org/chainmaker/logger/v2 v2.2.0 h1:kQ84sVSDAwJ1nFP8dexP21rhE0jqGyDIaL chainmaker.org/chainmaker/logger/v2 v2.2.0/go.mod h1:fux32ogSRS2qKD9m52uE5jW3ngpgyV02Yd4Zed8/n38= chainmaker.org/chainmaker/pb-go/v2 v2.2.0 h1:NRkWOyuHSD/67fKv1TXqHLw0lj2+jYLbLhtjkMh9jcc= chainmaker.org/chainmaker/pb-go/v2 v2.2.0/go.mod h1:b5fg5e93xCjSHU1b5yk/mnslab+z7N08kMkNVDoSpcI= -chainmaker.org/chainmaker/protocol/v2 v2.2.0 h1:XmX56zEcnFFnK312dVSLnhSRAjjEKAT4DBr7Tehx+BE= -chainmaker.org/chainmaker/protocol/v2 v2.2.0/go.mod h1:Oiy+CTqR3S+uy78t278vhLjZ0wh/58n0XzWDUoO0JzE= -chainmaker.org/chainmaker/utils/v2 v2.2.0 h1:dVbrZOUKupCQuxbr64K08Kl4YjoBWV4sto4eVnPkiM4= -chainmaker.org/chainmaker/utils/v2 v2.2.0/go.mod h1:33RLgBsOf0YSY4/AO/QlCqZbe+FvkDpQzARjPfyH7to= +chainmaker.org/chainmaker/protocol/v2 v2.2.1 h1:XWrMecQLl1ZIBopVn3GsoDCqs+R2ugW825L2d7nocJc= +chainmaker.org/chainmaker/protocol/v2 v2.2.1/go.mod h1:Oiy+CTqR3S+uy78t278vhLjZ0wh/58n0XzWDUoO0JzE= +chainmaker.org/chainmaker/utils/v2 v2.2.1 h1:JyRg3i6FGxrwLY+Pswh0N1x5iJxO2irfa7UM6Dr5x88= +chainmaker.org/chainmaker/utils/v2 v2.2.1/go.mod h1:z2HJlhw3ElEtqgCeZrVlC6ajlXb6L2xFPjI1EsFwdcc= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= diff --git a/v210/common/gas.go b/v210/common/gas.go index 611bcdc77b254cb1b854b8493ba3a8702de85455..16d860f83b1efa60b2896f1d64fcc7e4a1b3364d 100644 --- a/v210/common/gas.go +++ b/v210/common/gas.go @@ -1,3 +1,10 @@ +/* + * Copyright (C) BABEC. All rights reserved. + * Copyright (C) THL A29 Limited, a Tencent company. All rights reserved. + * + * SPDX-License-Identifier: Apache-2.0 + */ + package common210 import "chainmaker.org/chainmaker/pb-go/v2/syscontract" diff --git a/v210/common/result.go b/v210/common/result.go index 740fc5f957eaaa8e24d31f657c6867eaf24fa48a..69c086459986aa7d56f5b8a7334b8a8de7875bc9 100644 --- a/v210/common/result.go +++ b/v210/common/result.go @@ -1,3 +1,10 @@ +/* + * Copyright (C) BABEC. All rights reserved. + * Copyright (C) THL A29 Limited, a Tencent company. All rights reserved. + * + * SPDX-License-Identifier: Apache-2.0 + */ + package common210 import (