Merge branch 'v2.2.0_qc' into v2.2.1_qc

f85385e0 · Devin Zeng · 9f600bfc · 1be6e411 · f85385e0 · f85385e0
Commit f85385e0 authored May 05, 2022 by Devin Zeng 👽
Hide whitespace changes
Inline Side-by-side

Showing with 32 additions and 18 deletions

Makefile Makefile +9 -9

go.mod go.mod +3 -3

go.sum go.sum +6 -6

v210/common/gas.go v210/common/gas.go +7 -0

v210/common/result.go v210/common/result.go +7 -0

No files found.
--- a/Makefile
+++ b/Makefile
-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:

--- 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

--- a/go.sum
+++ b/go.sum
-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=

--- a/v210/common/gas.go
+++ b/v210/common/gas.go
+/*
+ * 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"

--- a/v210/common/result.go
+++ b/v210/common/result.go
+/*
+ * 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 (