Perunio api

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 executors:
   perun-node-executor:
     docker:
-      - image: cimg/go:1.16.4-node
+      - image: cimg/go:1.19.10-node
     environment:
       RESULTS: /tmp/results
       ARTIFACTS: /tmp/artifacts
@@ -58,7 +58,7 @@ jobs:
       - make-results-artifacts-dir
       - run:
           name: Install linter
-          command: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.40.1
+          command: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.3
       - install-txt-to-html-coverter-aha
       - run:
           name: Run linter

.gitignore

@@ -1,2 +1,3 @@
 *~
 app/payment/perun.log
+demo

.golangci.yml

@@ -34,14 +34,11 @@ linters:
       # restrict dependencies
     - depguard
       # detect unused, duplicate code
-    - deadcode
     - dupl
     - goconst
-    - structcheck
     - unconvert
     - unparam
     - unused
-    - varcheck
       # check code complexity
     - funlen
     - gocognit
@@ -61,11 +58,13 @@ linters-settings:
     check-blank: true
 
   depguard:
-    list-type: blacklist
-    include-go-root: true
-    packages-with-error-message:
-      - github.com/ethereum/go-ethereum: "It contains code licensed under LGPL, import is allowed only inside perun-node/blockchain/ethereum"
-      - perun.network/go-perun/backend/ethereum:  "It uses code licensed under LGPL, import is allowed only inside perun-node/blockchain/ethereum"
+    rules:
+      main:
+        deny:
+          - pkg: "github.com/ethereum/go-ethereum"
+            desc: It contains code licensed under LGPL, import is allowed only inside perun-node/blockchain/ethereum
+          - pkg: "perun.network/go-perun/backend/ethereum"
+            desc: It uses code licensed under LGPL, import is allowed only inside perun-node/blockchain/ethereum"
 
   dupl:
     # tokens count to trigger issue, 150 by default

MAINTAINERS.md

@@ -7,27 +7,21 @@ single approval from a non-author maintainer for pull requests to be merged.
 
 <!-- Please keep this sorted alphabetically by github -->
 
-| Name             | GitHub                                          | [Chat][_chat-url] |
-| ---------------- | ----------------------------------------------- | ----------------- |
-| Chris Hoeppler   | [choeppler](https://github.com/choeppler)       | choeppler         |
-| Daniel Kunz      | [danielksan81](https://github.com/danielksan81) | danielksan81      |
-| Manoranjith      | [manoranjith](https://github.com/manoranjith)   | mano-ranjith      |
+| Name             | GitHub                                          | [Discord][_chat-url] |
+| ---------------- | ----------------------------------------------- | -------------------- |
+| Chris Hoeppler   | [choeppler](https://github.com/choeppler)       | choeppler#8002       |
+| Daniel Kunz      | [danielksan81](https://github.com/danielksan81) | danielksan81#1327    |
+| Manoranjith      | [manoranjith](https://github.com/manoranjith)   | manoranjith#8124     |
 
 ## Emeritus Maintainers
 
 <!-- Please keep this sorted alphabetically by github -->
 
-| Name             | GitHub                                          | [Chat][_chat-url] |
-| ---------------- | ----------------------------------------------- | ----------------- |
-| Anagha Sukumaran | [anagha-ks](https://github.com/anagha-ks)       | anagha-ks         |
+| Name             | GitHub                                          | [Discord][_chat-url] |
+| ---------------- | ----------------------------------------------- | -------------------- |
+| Anagha Sukumaran | [anagha-ks](https://github.com/anagha-ks)       |                      |
 
-[_chat-url]: https://chat.hyperledger.org/channel/perun
-
-## Emeritus Maintainers
-
-| Name   | GitHub | Chat | Email |
-| ------ | ------ | ---- | ----- |
-| &nbsp; |        |      |       |
+[_chat-url]: https://discord.com/channels/905194001349627914/955484679635632148
 
 ---
 This work is licensed under a [Creative Commons Attribution 4.0 International

Makefile

@@ -11,12 +11,19 @@ CLI_BIN := perunnodecli
 TUI_PKG := ./cmd/perunnodetui
 TUI_BIN := perunnodetui
 
+DEMO_DIR := demo
+
 LDFLAGS=-ldflags "-X 'main.version=$(VERSION)' -X 'main.gitCommitID=$(GIT_COMMIT_ID)' -X 'main.goperunVersion=$(GOPERUN_VERSION)'"
 
-build:
-	go build $(LDFLAGS) $(NODE_PKG)
-	go build $(CLI_PKG)
-	go build $(TUI_PKG)
+install:
+	go install $(LDFLAGS) $(NODE_PKG)
+	go install $(CLI_PKG)
+	go install $(TUI_PKG)
+
+generate: install
+	@mkdir $(DEMO_DIR)
+	@cd $(DEMO_DIR) && $(NODE_BIN) generate
+	@echo "Configuration files for demo generated in ./$(DEMO_DIR)"
 
 clean:
-	rm -rf $(NODE_BIN) $(CLI_BIN) $(TUI_BIN) node.yaml alice bob
+	rm -rf demo

README.md

@@ -77,15 +77,15 @@ For a tutorial on using perun-node with `perunnodecli`, see the
 on the project documentation website.
 
 For a tutorial on using perun-node with `perunnodetui`, see
-[this section](cmd/perunnodetui/Readme.md). A talk on overview of perun,
+[this section](cmd/perunnodetui/README.md). A talk on overview of perun,
 including a hands-on demo of using the perunnode with `perunnodetui` can be
 found [here](https://youtu.be/sASYSJm3QKw?t=916).
 
 ## Getting Started
 
 Install the following pre-requisites.
 
-    1. Go (v1.14 or later).
+    1. Go (v1.19 or later).
     2. ganache-cli (v6.9.1 or later).
 
 Clone the project and sync the dependencies:
@@ -114,7 +114,7 @@ Run the linter and tests from the project root directory:
 golangci-lint run ./...
 
 # Test
-go test -tags=integration -count=1 ./...
+go test -tags=integration -count=1 -p=1 ./...
 
 # Build perunnode and perunnodecli binaries
 make

api/grpc/funding.go

@@ -0,0 +1,82 @@
+// Copyright (c) 2023 - for information on the respective copyright owner
+// see the NOTICE file and/or the repository at
+// https://github.com/hyperledger-labs/perun-node
+//
+// 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 grpc
+
+import (
+	"context"
+
+	"github.com/hyperledger-labs/perun-node/api/grpc/pb"
+	"github.com/hyperledger-labs/perun-node/api/handlers"
+)
+
+// fundingServer represents a grpc server that can serve funding API.
+type fundingServer struct {
+	pb.UnimplementedFunding_APIServer
+	*handlers.FundingHandler
+}
+
+// Fund wraps session.Fund.
+func (a *fundingServer) Fund(ctx context.Context, req *pb.FundReq) (*pb.FundResp, error) {
+	return a.FundingHandler.Fund(ctx, req)
+}
+
+// RegisterAssetERC20 is a stub that always returns false. Because, the remote
+// funder does not support use of assets other than the default ERC20 asset.
+//
+// TODO: Make actual implementation.
+func (a *fundingServer) RegisterAssetERC20(ctx context.Context, req *pb.RegisterAssetERC20Req) (
+	*pb.RegisterAssetERC20Resp, error,
+) {
+	return a.FundingHandler.RegisterAssetERC20(ctx, req)
+}
+
+// IsAssetRegistered wraps session.IsAssetRegistered.
+func (a *fundingServer) IsAssetRegistered(ctx context.Context, req *pb.IsAssetRegisteredReq) (
+	*pb.IsAssetRegisteredResp,
+	error,
+) {
+	return a.FundingHandler.IsAssetRegistered(ctx, req)
+}
+
+// Register wraps session.Register.
+func (a *fundingServer) Register(ctx context.Context, req *pb.RegisterReq) (*pb.RegisterResp, error) {
+	return a.FundingHandler.Register(ctx, req)
+}
+
+// Withdraw wraps session.Withdraw.
+func (a *fundingServer) Withdraw(ctx context.Context, req *pb.WithdrawReq) (*pb.WithdrawResp, error) {
+	return a.FundingHandler.Withdraw(ctx, req)
+}
+
+// Progress wraps session.Progress.
+func (a *fundingServer) Progress(ctx context.Context, req *pb.ProgressReq) (*pb.ProgressResp, error) {
+	return a.FundingHandler.Progress(ctx, req)
+}
+
+// Subscribe wraps session.Subscribe.
+
+func (a *fundingServer) Subscribe(req *pb.SubscribeReq, stream pb.Funding_API_SubscribeServer) error {
+	notify := func(notif *pb.SubscribeResp) error {
+		return stream.Send(notif)
+	}
+
+	return a.FundingHandler.Subscribe(req, notify)
+}
+
+func (a *fundingServer) Unsubscribe(ctx context.Context, req *pb.UnsubscribeReq) (*pb.UnsubscribeResp, error) {
+	return a.FundingHandler.Unsubscribe(ctx, req)
+}