Skip to content

Commit

Permalink
Merge pull request #81 from keep-network/go-ethereum-1.10.8
Browse files Browse the repository at this point in the history
Update go-ethereum version to v1.10.8
lukasz-zimnoch authored Aug 30, 2021
2 parents d281051 + 83a8d6e commit cecc0d5
Showing 5 changed files with 157 additions and 164 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/client.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: "1.13.x"
go-version: "1.16.x"

- name: Run Go generators
run: go generate ./.../gen
@@ -32,8 +32,6 @@ jobs:

client-scan:
runs-on: ubuntu-latest
env:
GO111MODULE: on
steps:
- uses: actions/checkout@v2
- uses: securego/gosec@master
@@ -46,4 +44,4 @@ jobs:
- uses: actions/checkout@v2

- name: Lint Go
uses: keep-network/golint-action@v1.0.2
uses: keep-network/golint-action@v1.0.2
13 changes: 6 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/keep-network/keep-common

go 1.12
go 1.16

replace github.com/urfave/cli => github.com/keep-network/cli v1.20.0

@@ -10,20 +10,19 @@ require (
github.com/celo-org/celo-blockchain v0.0.0-20210222234634-f8c8f6744526
github.com/cespare/cp v1.1.1 // indirect
github.com/deckarep/golang-set v1.7.1 // indirect
github.com/ethereum/go-ethereum v1.10.1
github.com/ethereum/go-ethereum v1.10.8
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
github.com/ipfs/go-log v0.0.1
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
github.com/karalabe/usb v0.0.0-20191104083709-911d15fe12a9 // indirect
github.com/olekukonko/tablewriter v0.0.2 // indirect
github.com/pborman/uuid v1.2.0 // indirect
github.com/prometheus/tsdb v0.10.0 // indirect
github.com/rjeczalik/notify v0.9.2 // indirect
github.com/status-im/keycard-go v0.0.0-20191119114148-6dd40a46baa0 // indirect
github.com/tyler-smith/go-bip39 v1.0.2 // indirect
github.com/urfave/cli v1.22.1
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
golang.org/x/tools v0.1.0
)
263 changes: 115 additions & 148 deletions go.sum

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion pkg/chain/ethereum/ethutil/rate_limiter.go
Original file line number Diff line number Diff line change
@@ -3,11 +3,12 @@ package ethutil
import (
"context"
"fmt"
"math/big"

"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/keep-network/keep-common/pkg/rate"
"math/big"
)

type rateLimiter struct {
@@ -96,6 +97,18 @@ func (rl *rateLimiter) SuggestGasPrice(
return rl.EthereumClient.SuggestGasPrice(ctx)
}

func (rl *rateLimiter) SuggestGasTipCap(
ctx context.Context,
) (*big.Int, error) {
err := rl.Limiter.AcquirePermit()
if err != nil {
return nil, fmt.Errorf("cannot acquire rate limiter permit: [%v]", err)
}
defer rl.Limiter.ReleasePermit()

return rl.EthereumClient.SuggestGasTipCap(ctx)
}

func (rl *rateLimiter) EstimateGas(
ctx context.Context,
call ethereum.CallMsg,
24 changes: 20 additions & 4 deletions pkg/chain/ethereum/ethutil/rate_limiter_test.go
Original file line number Diff line number Diff line change
@@ -2,15 +2,16 @@ package ethutil

import (
"context"
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/keep-network/keep-common/pkg/rate"
"math/big"
"strings"
"sync"
"testing"
"time"

"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/keep-network/keep-common/pkg/rate"
)

func TestRateLimiter(t *testing.T) {
@@ -365,6 +366,13 @@ func (mec *mockEthereumClient) SuggestGasPrice(
return nil, nil
}

func (mec *mockEthereumClient) SuggestGasTipCap(
ctx context.Context,
) (*big.Int, error) {
mec.mockRequest()
return nil, nil
}

func (mec *mockEthereumClient) EstimateGas(
ctx context.Context,
call ethereum.CallMsg,
@@ -530,6 +538,14 @@ func getTests(
return err
},
},
"test SuggestGasTipCap": {
function: func() error {
_, err := client.SuggestGasTipCap(
context.Background(),
)
return err
},
},
"test EstimateGas": {
function: func() error {
_, err := client.EstimateGas(

0 comments on commit cecc0d5

Please sign in to comment.