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

cf15d28e · jianan · 5ba99569 · 3d2bb9ca · 5ba99569 · 5ba99569
Commit cf15d28e authored May 06, 2022 by jianan
9 changed files
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
--- a/.idea/chainmaker-contract-sdk-docker-go.iml
+++ b/.idea/chainmaker-contract-sdk-docker-go.iml
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="Go" enabled="true" />
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GOROOT" path="/usr/local/go" />
-</project>
\ No newline at end of file
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/chainmaker-contract-sdk-docker-go.iml" filepath="$PROJECT_DIR$/.idea/chainmaker-contract-sdk-docker-go.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
--- a/demo/contract_cut.go
+++ b/demo/contract_cut.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 demo

 import (
-	"chainmaker.org/chainmaker/chainmaker-contract-sdk-docker-go/pb/protogo"
-	"chainmaker.org/chainmaker/chainmaker-contract-sdk-docker-go/shim"
 	"fmt"
 	"log"
+
+	"chainmaker.org/chainmaker/chainmaker-contract-sdk-docker-go/pb/protogo"
+	"chainmaker.org/chainmaker/chainmaker-contract-sdk-docker-go/shim"
 )

 type ContractCut struct {

--- a/demo/contract_raffle.go
+++ b/demo/contract_raffle.go
 /*
- Copyright (C) THL A29 Limited, a Tencent company. All rights reserved.
-   SPDX-License-Identifier: Apache-2.0
+Copyright (C) BABEC. All rights reserved.
+Copyright (C) THL A29 Limited, a Tencent company. All rights reserved.
+
+SPDX-License-Identifier: Apache-2.0
 */

 package demo

--- a/demo/contract_transfer.go
+++ b/demo/contract_transfer.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 demo

 import (
-	"chainmaker.org/chainmaker/chainmaker-contract-sdk-docker-go/pb/protogo"
-	"chainmaker.org/chainmaker/chainmaker-contract-sdk-docker-go/shim"
 	"fmt"
 	"log"
 	"strconv"
+
+	"chainmaker.org/chainmaker/chainmaker-contract-sdk-docker-go/pb/protogo"
+	"chainmaker.org/chainmaker/chainmaker-contract-sdk-docker-go/shim"
 )

 type TransferContract struct {

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

 import (