Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Import kliento #267

Merged
merged 14 commits into from
Jul 19, 2024
Merged

Import kliento #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
51d0ea4
Import kliento
palango Jul 17, 2024
8a22c45
Use internal kliento
palango Jul 17, 2024
6e0fe53
Remove kliento/celotokens
palango Jul 17, 2024
68604d1
Remove HeaderListener
palango Jul 17, 2024
6d4098d
Remove example
palango Jul 17, 2024
df187ed
Remove LockedGold
palango Jul 17, 2024
53ad14d
Cleanup math
palango Jul 17, 2024
f87a05b
Remove services
palango Jul 17, 2024
91a64de
Fix lint warnings
palango Jul 17, 2024
05eba6c
Cleanup debug tracer
palango Jul 17, 2024
0357c9c
Update Makefile
palango Jul 17, 2024
ff97c5f
Add missing license
palango Jul 17, 2024
5271056
Allow triggering CI manually
palango Jul 17, 2024
61add56
Update to latest celo-blockchain
palango Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ on:
branches:
- master

workflow_dispatch:

jobs:
CI:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ clean:
go clean -cache

add-license:
${LICENCE_SCRIPT} analyzer airgap cmd db examples internal service main.go
${LICENCE_SCRIPT} analyzer airgap cmd db examples internal kliento service main.go

check-license:
${LICENCE_SCRIPT} -check analyzer airgap cmd db examples internal service main.go
${LICENCE_SCRIPT} -check analyzer airgap cmd db examples internal kliento service main.go

.PHONY: gen-contracts lint fmt
4 changes: 2 additions & 2 deletions airgap/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"github.com/celo-org/celo-blockchain/common"
"github.com/celo-org/celo-blockchain/core/types"
"github.com/celo-org/celo-blockchain/crypto"
"github.com/celo-org/kliento/contracts"
"github.com/celo-org/kliento/registry"
"github.com/celo-org/rosetta/kliento/contracts"
"github.com/celo-org/rosetta/kliento/registry"
)

type clientImpl struct {
Expand Down
2 changes: 1 addition & 1 deletion airgap/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"fmt"

"github.com/celo-org/celo-blockchain/common"
"github.com/celo-org/kliento/registry"
"github.com/celo-org/rosetta/kliento/registry"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion airgap/methods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"math/big"

"github.com/celo-org/celo-blockchain/common"
"github.com/celo-org/kliento/registry"
"github.com/celo-org/rosetta/kliento/registry"
)

var ReleaseGold = "ReleaseGold"
Expand Down
4 changes: 2 additions & 2 deletions airgap/server/methods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"github.com/celo-org/celo-blockchain/accounts/abi"
"github.com/celo-org/celo-blockchain/common"
"github.com/celo-org/celo-blockchain/common/hexutil"
"github.com/celo-org/kliento/contracts"
"github.com/celo-org/kliento/registry"
"github.com/celo-org/rosetta/airgap"
"github.com/celo-org/rosetta/kliento/contracts"
"github.com/celo-org/rosetta/kliento/registry"
"golang.org/x/crypto/sha3"
)

Expand Down
2 changes: 1 addition & 1 deletion airgap/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
ethereum "github.com/celo-org/celo-blockchain"
"github.com/celo-org/celo-blockchain/common"
"github.com/celo-org/celo-blockchain/core/types"
"github.com/celo-org/kliento/registry"
"github.com/celo-org/rosetta/airgap"
"github.com/celo-org/rosetta/kliento/registry"
)

// airGapServerMethod is a function that returns the tx.data for that method + parameters
Expand Down
6 changes: 3 additions & 3 deletions airgap/server/server_context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"github.com/celo-org/celo-blockchain/common"
"github.com/celo-org/celo-blockchain/core/types"
"github.com/celo-org/celo-blockchain/ethclient"
"github.com/celo-org/kliento/client"
"github.com/celo-org/kliento/contracts/helpers"
"github.com/celo-org/kliento/registry"
"github.com/celo-org/rosetta/kliento/client"
"github.com/celo-org/rosetta/kliento/contracts/helpers"
"github.com/celo-org/rosetta/kliento/registry"
)

type ServerContext interface {
Expand Down
4 changes: 2 additions & 2 deletions airgap/server/server_context_stub_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
ethereum "github.com/celo-org/celo-blockchain"
"github.com/celo-org/celo-blockchain/common"
"github.com/celo-org/celo-blockchain/core/types"
"github.com/celo-org/kliento/contracts/helpers"
"github.com/celo-org/kliento/registry"
"github.com/celo-org/rosetta/kliento/contracts/helpers"
"github.com/celo-org/rosetta/kliento/registry"
)

type serverContextStub struct{}
Expand Down
2 changes: 1 addition & 1 deletion analyzer/operations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"reflect"

"github.com/celo-org/celo-blockchain/common"
"github.com/celo-org/kliento/client/debug"
"github.com/celo-org/rosetta/kliento/client/debug"
)

type SubAccountType string
Expand Down
2 changes: 1 addition & 1 deletion analyzer/operations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"testing"

"github.com/celo-org/celo-blockchain/common"
"github.com/celo-org/kliento/client/debug"
"github.com/celo-org/rosetta/kliento/client/debug"
. "github.com/onsi/gomega"
gs "github.com/onsi/gomega/gstruct"
gtypes "github.com/onsi/gomega/types"
Expand Down
4 changes: 2 additions & 2 deletions analyzer/rewards.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"github.com/celo-org/celo-blockchain/accounts/abi/bind"
"github.com/celo-org/celo-blockchain/common"
"github.com/celo-org/celo-blockchain/core/types"
"github.com/celo-org/kliento/client"
"github.com/celo-org/kliento/contracts"
"github.com/celo-org/rosetta/db"
"github.com/celo-org/rosetta/kliento/client"
"github.com/celo-org/rosetta/kliento/contracts"
)

type rewardsContext struct {
Expand Down
8 changes: 4 additions & 4 deletions analyzer/txtracer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import (
"github.com/celo-org/celo-blockchain/core/types"
"github.com/celo-org/celo-blockchain/eth/tracers"
"github.com/celo-org/celo-blockchain/log"
"github.com/celo-org/kliento/client"
"github.com/celo-org/kliento/client/debug"
"github.com/celo-org/kliento/contracts"
"github.com/celo-org/kliento/registry"
"github.com/celo-org/rosetta/db"
"github.com/celo-org/rosetta/internal/utils"
"github.com/celo-org/rosetta/kliento/client"
"github.com/celo-org/rosetta/kliento/client/debug"
"github.com/celo-org/rosetta/kliento/contracts"
"github.com/celo-org/rosetta/kliento/registry"
)

type Tracer struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import (
"time"

"github.com/celo-org/celo-blockchain/log"
"github.com/celo-org/kliento/client"
"github.com/celo-org/rosetta/cmd/internal/utils"
"github.com/celo-org/rosetta/db"
"github.com/celo-org/rosetta/internal/fileutils"
"github.com/celo-org/rosetta/internal/signals"
"github.com/celo-org/rosetta/kliento/client"
"github.com/celo-org/rosetta/service"
"github.com/celo-org/rosetta/service/geth"
"github.com/celo-org/rosetta/service/monitor"
Expand Down
4 changes: 2 additions & 2 deletions examples/airgap/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
// "github.com/celo-org/celo-blockchain/crypto"
"github.com/celo-org/rosetta/airgap"

// celoClient "github.com/celo-org/kliento/client"
// "github.com/celo-org/kliento/registry"
// celoClient "github.com/celo-org/rosetta/kliento/client"
// "github.com/celo-org/rosetta/kliento/registry"

"github.com/coinbase/rosetta-sdk-go/fetcher"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/transfer/transfer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"github.com/celo-org/celo-blockchain/core/types"
"github.com/celo-org/celo-blockchain/log"
"github.com/celo-org/celo-blockchain/mycelo/hdwallet"
"github.com/celo-org/kliento/client"
"github.com/celo-org/rosetta/internal/config"
"github.com/celo-org/rosetta/kliento/client"
)

var beneficiary = common.HexToAddress("0x671d520ae3e89ea5383a5d7162bced79fd25cdee")
Expand Down
3 changes: 1 addition & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ module github.com/celo-org/rosetta
go 1.19

require (
github.com/celo-org/celo-blockchain v1.8.2
github.com/celo-org/kliento v0.2.3
github.com/celo-org/celo-blockchain v1.8.4
github.com/coinbase/rosetta-sdk-go v0.5.9
github.com/felixge/httpsnoop v1.0.4
github.com/gorilla/handlers v1.4.2
Expand Down
Loading