Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
sidecar-client-chain33
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
sidecar-client-chain33
Commits
62da68a3
Commit
62da68a3
authored
Apr 27, 2022
by
suyanlong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update dep
parent
c4065239
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
evmxgo.go
evmxgo/evmxgo.go
+4
-3
go.mod
go.mod
+1
-1
go.sum
go.sum
+2
-0
paracross.go
paracross/paracross.go
+4
-2
No files found.
evmxgo/evmxgo.go
View file @
62da68a3
...
@@ -11,6 +11,7 @@ import (
...
@@ -11,6 +11,7 @@ import (
"github.com/33cn/chain33/common/db"
"github.com/33cn/chain33/common/db"
types33
"github.com/33cn/chain33/types"
types33
"github.com/33cn/chain33/types"
evmxgotypes
"github.com/33cn/plugin/plugin/dapp/evmxgo/types"
evmxgotypes
"github.com/33cn/plugin/plugin/dapp/evmxgo/types"
"github.com/sirupsen/logrus"
"github.com/spf13/cast"
"github.com/spf13/cast"
"gitlab.33.cn/link33/sidecar-client-chain33/client/rpc"
"gitlab.33.cn/link33/sidecar-client-chain33/client/rpc"
"gitlab.33.cn/link33/sidecar-client-chain33/config"
"gitlab.33.cn/link33/sidecar-client-chain33/config"
...
@@ -36,7 +37,8 @@ var (
...
@@ -36,7 +37,8 @@ var (
PluginName
=
evmxgotypes
.
EvmxgoX
PluginName
=
evmxgotypes
.
EvmxgoX
ID
=
evmxgotypes
.
EvmxgoX
ID
=
evmxgotypes
.
EvmxgoX
execer
=
evmxgotypes
.
EvmxgoX
execer
=
evmxgotypes
.
EvmxgoX
logger
=
log
.
NewWithModule
(
"chain33-client-"
+
PluginName
)
logger
*
logrus
.
Entry
// logger = log.NewWithModuleLevel("chain33-client-"+PluginName, "trace")
)
)
type
Evmxgo
struct
{
type
Evmxgo
struct
{
...
@@ -107,8 +109,7 @@ func (e *Evmxgo) Initialize(configPath string, _ string, _ []byte) error {
...
@@ -107,8 +109,7 @@ func (e *Evmxgo) Initialize(configPath string, _ string, _ []byte) error {
if
err
!=
nil
{
if
err
!=
nil
{
return
fmt
.
Errorf
(
"log initialize: %w"
,
err
)
return
fmt
.
Errorf
(
"log initialize: %w"
,
err
)
}
}
log
.
ParseLevel
(
chain33Config
.
Log
.
Level
)
logger
=
log
.
NewWithModuleLevel
(
"chain33-client-"
+
PluginName
,
chain33Config
.
Log
.
Level
)
// 初始化e.client工作
// 初始化e.client工作
e
.
eventC
=
make
(
chan
*
pb
.
IBTP
,
10
)
e
.
eventC
=
make
(
chan
*
pb
.
IBTP
,
10
)
e
.
done
=
make
(
chan
bool
)
e
.
done
=
make
(
chan
bool
)
...
...
go.mod
View file @
62da68a3
...
@@ -16,7 +16,7 @@ require (
...
@@ -16,7 +16,7 @@ require (
github.com/spf13/viper v1.9.0
github.com/spf13/viper v1.9.0
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.7.0
github.com/tjfoc/gmsm v1.3.2
github.com/tjfoc/gmsm v1.3.2
gitlab.33.cn/link33/sidecar v0.0.0-2022042
0092621-9b8b4066de20
gitlab.33.cn/link33/sidecar v0.0.0-2022042
7101012-0a02084a88fb
go.starlark.net v0.0.0-20220302181546-5411bad688d1
go.starlark.net v0.0.0-20220302181546-5411bad688d1
go.uber.org/atomic v1.9.0
go.uber.org/atomic v1.9.0
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
...
...
go.sum
View file @
62da68a3
...
@@ -1878,6 +1878,8 @@ github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc/go.mod h1:FM4U1E3NzlN
...
@@ -1878,6 +1878,8 @@ github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc/go.mod h1:FM4U1E3NzlN
github.com/zmap/zlint/v3 v3.1.0/go.mod h1:L7t8s3sEKkb0A2BxGy1IWrxt1ZATa1R4QfJZaQOD3zU=
github.com/zmap/zlint/v3 v3.1.0/go.mod h1:L7t8s3sEKkb0A2BxGy1IWrxt1ZATa1R4QfJZaQOD3zU=
gitlab.33.cn/link33/sidecar v0.0.0-20220420092621-9b8b4066de20 h1:7uzWh6Jk4RoIX6qJcImkwhtq3fko0kNCOC27YqEqG00=
gitlab.33.cn/link33/sidecar v0.0.0-20220420092621-9b8b4066de20 h1:7uzWh6Jk4RoIX6qJcImkwhtq3fko0kNCOC27YqEqG00=
gitlab.33.cn/link33/sidecar v0.0.0-20220420092621-9b8b4066de20/go.mod h1:aFc7lPoNOUAYjHPdLsjoH6OMlZlSeLS+D2yD1h0T2Ow=
gitlab.33.cn/link33/sidecar v0.0.0-20220420092621-9b8b4066de20/go.mod h1:aFc7lPoNOUAYjHPdLsjoH6OMlZlSeLS+D2yD1h0T2Ow=
gitlab.33.cn/link33/sidecar v0.0.0-20220427101012-0a02084a88fb h1:jCN5aNygEfYeiylq72GOCqWr72zUAJ0hk9E0PrTMpv0=
gitlab.33.cn/link33/sidecar v0.0.0-20220427101012-0a02084a88fb/go.mod h1:aFc7lPoNOUAYjHPdLsjoH6OMlZlSeLS+D2yD1h0T2Ow=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
...
...
paracross/paracross.go
View file @
62da68a3
...
@@ -11,6 +11,8 @@ import (
...
@@ -11,6 +11,8 @@ import (
"path/filepath"
"path/filepath"
"time"
"time"
"github.com/sirupsen/logrus"
"gitlab.33.cn/link33/sidecar/pkg/log"
"gitlab.33.cn/link33/sidecar/pkg/log"
"github.com/33cn/chain33/common"
"github.com/33cn/chain33/common"
...
@@ -36,7 +38,7 @@ var (
...
@@ -36,7 +38,7 @@ var (
PluginName
=
paracorssTypes
.
ParaX
PluginName
=
paracorssTypes
.
ParaX
ID
=
paracorssTypes
.
ParaX
ID
=
paracorssTypes
.
ParaX
execer
=
paracorssTypes
.
ParaX
execer
=
paracorssTypes
.
ParaX
logger
=
log
.
NewWithModule
(
"chain33-client-"
+
PluginName
)
logger
*
logrus
.
Entry
)
)
type
Paracross
struct
{
type
Paracross
struct
{
...
@@ -128,7 +130,7 @@ func (p *Paracross) Initialize(configPath string, ID string, extra []byte) error
...
@@ -128,7 +130,7 @@ func (p *Paracross) Initialize(configPath string, ID string, extra []byte) error
if
err
!=
nil
{
if
err
!=
nil
{
return
fmt
.
Errorf
(
"log initialize: %w"
,
err
)
return
fmt
.
Errorf
(
"log initialize: %w"
,
err
)
}
}
log
.
ParseLevel
(
chain33Config
.
Log
.
Level
)
log
ger
=
log
.
NewWithModuleLevel
(
"chain33-client-"
+
PluginName
,
chain33Config
.
Log
.
Level
)
// 初始化e.client工作
// 初始化e.client工作
p
.
eventC
=
make
(
chan
*
pb
.
IBTP
,
10
)
p
.
eventC
=
make
(
chan
*
pb
.
IBTP
,
10
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment