Merge pull request #129 from klaytn/release/v1.0.2

[rosetta-klaytn]_release/v1.0.2

.github/workflows/CodeQL.yml

@@ -0,0 +1,51 @@
+name: "Code Scanning - Action"
+
+on:
+  pull_request:
+    branches: [dev, master]
+    types: [opened, synchronize]
+
+jobs:
+  CodeQL-Build:
+    # CodeQL runs on ubuntu-latest, windows-latest, and macos-latest
+    runs-on: ubuntu-latest
+
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: go
+        # Override language selection by uncommenting this and choosing your languages
+        # with:
+        #   languages: go, javascript, csharp, python, cpp, java
+
+      # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below).
+      # - name: Autobuild
+      #   uses: github/codeql-action/autobuild@v2
+
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following
+      #    three lines and modify them (or add more) to build your code if your
+      #    project uses a compiled language
+
+      #- run: |
+      #     make bootstrap
+      #     make release
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

Dockerfile

@@ -45,10 +45,10 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 # Compile ken
 FROM golang-builder as ken-builder
 
-# VERSION: klaytn v.1.8.3-rc.1
+# VERSION: klaytn v.1.9.1
 RUN git clone https://github.com/klaytn/klaytn \
   && cd klaytn \
-  && git checkout 6a8902f34346d188f57a4140e24936669a387bb2
+  && git checkout v1.9.1
 
 RUN cd klaytn \
   && make ken

configuration/configuration.go

@@ -86,7 +86,7 @@ const (
 	SkipAdminEnv = "SKIP_ADMIN"
 
 	// MiddlewareVersion is the version of rosetta-klaytn.
-	MiddlewareVersion = "1.0.1"
+	MiddlewareVersion = "1.0.2"
 )
 
 // Configuration determines how

go.mod

@@ -2,7 +2,7 @@ module github.com/klaytn/rosetta-klaytn
 
 require (
 	github.com/fatih/color v1.13.0
-	github.com/klaytn/klaytn v1.9.0
+	github.com/klaytn/klaytn v1.9.1
 	github.com/klaytn/rosetta-sdk-go-klaytn v0.7.10
 	github.com/spf13/cobra v1.5.0
 	github.com/stretchr/testify v1.8.0

go.sum

@@ -42,6 +42,7 @@ git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFN
 git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9/go.mod h1:BVJwbDfVjCjoFiKrhkei6NdGcZYpkDkdyCdg1ukytRA=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9 h1:HD8gA2tkByhMAwYaFAX9w2l7vxvBQ5NMoxDrkhqhtn4=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
@@ -383,8 +384,8 @@ github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPR
 github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/klauspost/reedsolomon v1.9.2/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4=
 github.com/klaytn/klaytn v1.8.3/go.mod h1:bbf8dqgZn/cLZ+ns+N416knDMKVpyWuUfuOXACpCVH0=
-github.com/klaytn/klaytn v1.9.0 h1:FwZJhka+ncXNPpNDfMZ27s0lMpkVqHVw02eENVuhxgE=
-github.com/klaytn/klaytn v1.9.0/go.mod h1:VA9XF1tmHz1eNXok0GaELY9kugMKdV2NciROWsWxjzI=
+github.com/klaytn/klaytn v1.9.1 h1:MYUyjrRbGPiI1nHyMJUE1yFqYBblVz8c+b6AHLFVzzE=
+github.com/klaytn/klaytn v1.9.1/go.mod h1:VA9XF1tmHz1eNXok0GaELY9kugMKdV2NciROWsWxjzI=
 github.com/klaytn/rosetta-sdk-go-klaytn v0.7.10 h1:ykCtbjVUQQ8NQbWRROXFunmTo81KIdmsujgOPDwPW0M=
 github.com/klaytn/rosetta-sdk-go-klaytn v0.7.10/go.mod h1:YS9Wj5EvKh7leQJYmtfomC6kMEaqNwjtys+zXbSz0hE=
 github.com/klaytn/xgo v0.0.0-20220420020737-0d7e3e080122/go.mod h1:1p9sFrvjHQrEknvDHha17xKMZMOqE73LNEGiBt3/3o0=

integration/integration_test_helper.go

@@ -19,7 +19,6 @@ import (
 	"crypto/ecdsa"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"math/big"
 	"os"
 	"path/filepath"
@@ -128,7 +127,7 @@ func getAccountFromCliConfig(t *testing.T) {
 	}
 	path = filepath.Join(path, "../rosetta-cli-conf/"+networkName+"/config.json")
 
-	cliConfFile, err := ioutil.ReadFile(path)
+	cliConfFile, err := os.ReadFile(path)
 	assert.Nil(t, err)
 	var cliConf map[string]interface{}
 	err = json.Unmarshal(cliConfFile, &cliConf)

klaytn/client.go

@@ -22,6 +22,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/klaytn/klaytn/node/cn/tracers"
 	"log"
 	"math/big"
 	"net/http"
@@ -35,7 +36,6 @@ import (
 	"github.com/klaytn/klaytn/common"
 	"github.com/klaytn/klaytn/networks/p2p"
 	"github.com/klaytn/klaytn/networks/rpc"
-	"github.com/klaytn/klaytn/node/cn"
 	"github.com/klaytn/klaytn/params"
 	"github.com/klaytn/klaytn/reward"
 	"github.com/klaytn/klaytn/rlp"
@@ -66,7 +66,7 @@ const (
 // Client borrows HEAVILY from https://github.com/klaytn/klaytn/blob/dev/client/klay_client.go
 type Client struct {
 	p  *params.ChainConfig
-	tc *cn.TraceConfig
+	tc *tracers.TraceConfig
 
 	c JSONRPC