Skip to content

Commit

Permalink
ADD: egolang type for chaincode
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangsk committed Feb 16, 2022
1 parent c11b1b6 commit 81df9e0
Show file tree
Hide file tree
Showing 275 changed files with 136,111 additions and 590 deletions.
15 changes: 12 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ generate-metrics-doc: buildenv
$(BUILD_DIR)/%/chaintool: Makefile
@echo "Installing chaintool"
@mkdir -p $(@D)
curl -fL $(CHAINTOOL_URL) > $@
cp chaintool .build/bin/chaintool
chmod +x $@

# We (re)build a package within a docker context but persist the $GOPATH/pkg
Expand Down Expand Up @@ -272,15 +272,24 @@ $(BUILD_DIR)/image/ccenv/payload: $(BUILD_DIR)/docker/gotools/bin/protoc-ge
$(BUILD_DIR)/bin/chaintool \
$(BUILD_DIR)/goshim.tar.bz2
$(BUILD_DIR)/image/peer/payload: $(BUILD_DIR)/docker/bin/peer \
$(BUILD_DIR)/sampleconfig.tar.bz2
$(BUILD_DIR)/sampleconfig.tar.bz2 \
$(BUILD_DIR)/docker/library \
$(BUILD_DIR)/enclave.signed.so
$(BUILD_DIR)/image/orderer/payload: $(BUILD_DIR)/docker/bin/orderer \
$(BUILD_DIR)/sampleconfig.tar.bz2
$(BUILD_DIR)/image/buildenv/payload: $(BUILD_DIR)/gotools.tar.bz2 \
$(BUILD_DIR)/docker/gotools/bin/protoc-gen-go

$(BUILD_DIR)/enclave.signed.so:
cp -r peer/node/enclave/enclave.signed.so $@

$(BUILD_DIR)/docker/library:
mkdir -p $@
cp -r peer/node/enclave/sgxsdk/lib64/* $@

$(BUILD_DIR)/image/%/payload:
mkdir -p $@
cp $^ $@
cp -r $^ $@

.PRECIOUS: $(BUILD_DIR)/image/%/Dockerfile

Expand Down
21 changes: 20 additions & 1 deletion core/chaincode/container_runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func (c *ContainerRuntime) LaunchConfig(cname string, ccType string) (*LaunchCon
var lc LaunchConfig

// common environment variables
lc.Envs = append(c.CommonEnv, "CORE_CHAINCODE_ID_NAME="+cname)
lc.Envs = append(c.CommonEnv, "CORE_CHAINCODE_ID_NAME="+cname, "OE_SIMULATION=1")

// language specific arguments
switch ccType {
Expand All @@ -167,6 +167,25 @@ func (c *ContainerRuntime) LaunchConfig(cname string, ccType string) (*LaunchCon
lc.Args = []string{"/root/chaincode-java/start", "--peerAddress", c.PeerAddress}
case pb.ChaincodeSpec_NODE.String():
lc.Args = []string{"/bin/sh", "-c", fmt.Sprintf("cd /usr/local/src; npm start -- --peer.address %s", c.PeerAddress)}
case pb.ChaincodeSpec_EGOLANG.String():
lc.Args = []string{"/bin/sh", "-c", fmt.Sprintf(
"ego sign /usr/local/bin/chaincode; "+
"sed -i 's/\"env\".*,/\"env\":["+
"{\"name\":\"CORE_CHAINCODE_ID_NAME\",\"fromHost\":true},"+
"{\"name\":\"CORE_PEER_TLS_ENABLED\",\"fromHost\":true},"+
"{\"name\":\"CORE_TLS_CLIENT_KEY_PATH\",\"fromHost\":true},"+
"{\"name\":\"CORE_TLS_CLIENT_CERT_PATH\",\"fromHost\":true},"+
"{\"name\":\"CORE_PEER_TLS_ROOTCERT_FILE\",\"fromHost\":true},"+
"{\"name\":\"CORE_CHAINCODE_LOGGING_LEVEL\",\"fromHost\":true},"+
"{\"name\":\"CORE_CHAINCODE_LOGGING_SHIM\",\"fromHost\":true},"+
"{\"name\":\"CORE_CHAINCODE_LOGGING_FORMAT\",\"fromHost\":true},"+
"{\"name\":\"CORE_CHAINCODE_BCCSP\",\"fromHost\":true}"+
"],/#g' enclave.json; "+
"sed -i 's/\"mounts\".*,/\"mounts\":["+
"{\"source\":\"\\/etc\\/hyperledger\\/fabric\\/\",\"target\":\"\\/etc\\/hyperledger\\/fabric\\/\",\"type\": \"hostfs\",\"readOnly\": false}"+
"],/#g' enclave.json; "+
"ego sign enclave.json; "+
"ego run /usr/local/bin/chaincode -peer.address=%s", c.PeerAddress)}
default:
return nil, errors.Errorf("unknown chaincodeType: %s", ccType)
}
Expand Down
89 changes: 89 additions & 0 deletions core/chaincode/platforms/egolang/env.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
/*
Copyright 2017 - Greg Haskins <gregory.haskins@gmail.com>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package egolang

import (
"os"
"path/filepath"
"strings"
"time"
)

type Env map[string]string

func getEnv() Env {
env := make(Env)
for _, entry := range os.Environ() {
tokens := strings.SplitN(entry, "=", 2)
if len(tokens) > 1 {
env[tokens[0]] = tokens[1]
}
}

return env
}

func getGoEnv() (Env, error) {
env := getEnv()

goenvbytes, err := runProgram(env, 10*time.Second, "ego-go", "env")
if err != nil {
return nil, err
}

goenv := make(Env)

envout := strings.Split(string(goenvbytes), "\n")
for _, entry := range envout {
tokens := strings.SplitN(entry, "=", 2)
if len(tokens) > 1 {
goenv[tokens[0]] = strings.Trim(tokens[1], "\"")
}
}

return goenv, nil
}

func flattenEnv(env Env) []string {
result := make([]string, 0)
for k, v := range env {
result = append(result, k+"="+v)
}

return result
}

type Paths map[string]bool

func splitEnvPaths(value string) Paths {
_paths := filepath.SplitList(value)
paths := make(Paths)
for _, path := range _paths {
paths[path] = true
}
return paths
}

func flattenEnvPaths(paths Paths) string {

_paths := make([]string, 0)
for path := range paths {
_paths = append(_paths, path)
}

return strings.Join(_paths, string(os.PathListSeparator))
}
40 changes: 40 additions & 0 deletions core/chaincode/platforms/egolang/env_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
Copyright 2017 - Greg Haskins <gregory.haskins@gmail.com>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package egolang

import (
"os"
"testing"

"github.com/stretchr/testify/assert"
)

func Test_splitEnvPath(t *testing.T) {
paths := splitEnvPaths("foo" + string(os.PathListSeparator) + "bar" + string(os.PathListSeparator) + "baz")
assert.Equal(t, len(paths), 3)
}

func Test_getGoEnv(t *testing.T) {
goenv, err := getGoEnv()
assert.NoError(t, err)

_, ok := goenv["GOPATH"]
assert.Equal(t, ok, true)

_, ok = goenv["GOROOT"]
assert.Equal(t, ok, true)
}
79 changes: 79 additions & 0 deletions core/chaincode/platforms/egolang/list.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/*
Copyright 2017 - Greg Haskins <gregory.haskins@gmail.com>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package egolang

import (
"bytes"
"context"
"fmt"
"os/exec"
"strings"
"time"
)

//runProgram non-nil Env, timeout (typically secs or millisecs), program name and args
func runProgram(env Env, timeout time.Duration, pgm string, args ...string) ([]byte, error) {
if env == nil {
return nil, fmt.Errorf("<%s, %v>: nil env provided", pgm, args)
}

ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()
cmd := exec.CommandContext(ctx, pgm, args...)
cmd.Env = flattenEnv(env)
stdErr := &bytes.Buffer{}
cmd.Stderr = stdErr

out, err := cmd.Output()

if ctx.Err() == context.DeadlineExceeded {
err = fmt.Errorf("timed out after %s", timeout)
}

if err != nil {
return nil,
fmt.Errorf(
"command <%s %s>: failed with error: \"%s\"\n%s",
pgm,
strings.Join(args, " "),
err,
string(stdErr.Bytes()))
}
return out, nil
}

// Logic inspired by: https://dave.cheney.net/2014/09/14/go-list-your-swiss-army-knife
func list(env Env, template, pkg string) ([]string, error) {
if env == nil {
env = getEnv()
}

lst, err := runProgram(env, 60*time.Second, "go", "list", "-f", template, pkg)
if err != nil {
return nil, err
}

return strings.Split(strings.Trim(string(lst), "\n"), "\n"), nil
}

func listDeps(env Env, pkg string) ([]string, error) {
return list(env, "{{ join .Deps \"\\n\"}}", pkg)
}

func listImports(env Env, pkg string) ([]string, error) {
return list(env, "{{ join .Imports \"\\n\"}}", pkg)
}
50 changes: 50 additions & 0 deletions core/chaincode/platforms/egolang/list_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
Copyright 2017 - Greg Haskins <gregory.haskins@gmail.com>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package egolang

import (
"testing"
"time"

"github.com/stretchr/testify/assert"
)

func Test_listDeps(t *testing.T) {
_, err := listDeps(nil, "github.com/hyperledger/fabric/peer")
if err != nil {
t.Errorf("list failed: %s", err)
}
}

func Test_runProgram(t *testing.T) {
_, err := runProgram(
getEnv(),
10*time.Millisecond,
"go",
"build",
"github.com/hyperledger/fabric/peer",
)
assert.Contains(t, err.Error(), "timed out")

_, err = runProgram(
getEnv(),
1*time.Second,
"go",
"cmddoesnotexist",
)
assert.Contains(t, err.Error(), "unknown command")
}
Loading

0 comments on commit 81df9e0

Please sign in to comment.