Spike: Payment channel authorization grants #36

Dockerfile

@@ -51,8 +51,8 @@ ENTRYPOINT ["tpodserver"]
 
 FROM build-common as build-autoscaler
 
-COPY cmd/autoscaler ./cmd/autoscaler
-RUN --mount=type=cache,target=/root/.cache/go-build go build -v -o /usr/local/bin/autoscaler ./cmd/autoscaler
+COPY autoscaler ./autoscaler
+RUN --mount=type=cache,target=/root/.cache/go-build go build -v -o /usr/local/bin/autoscaler ./autoscaler
 
 FROM run-common as autoscaler 
 

cmd/autoscaler/main.go → autoscaler/main.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"net/http"
 
+	"github.com/comrade-coop/apocryph/pkg/autoscaler"
 	pbcon "github.com/comrade-coop/apocryph/pkg/proto/protoconnect"
 	tpraft "github.com/comrade-coop/apocryph/pkg/raft"
 	"golang.org/x/net/http2"
@@ -13,14 +14,21 @@ import (
 
 func main() {
 	mux := http.NewServeMux()
-	self, err := tpraft.NewPeer(fmt.Sprintf("/ip4/0.0.0.0/tcp/%v", RAFT_P2P_PORT))
+	p2pHost, err := tpraft.NewPeer(fmt.Sprintf("/ip4/0.0.0.0/tcp/%v", autoscaler.RAFT_P2P_PORT))
 	if err != nil {
 		fmt.Println("Failed creating p2p node")
 		return
 	}
-	fmt.Printf("PEER ID: %v\n", self.ID())
-	server := &AutoScalerServer{self: self}
-	server.mainLoop = setAppGatewayExample
+
+	log.Printf("PEER ID: %v\n", p2pHost.ID())
+
+	server, err := autoscaler.NewAutoSalerServer("http://eth-rpc.eth.svc.cluster.local:8545", p2pHost)
+	if err != nil {
+		fmt.Println("Failed creating AutoScaler Server")
+		return
+	}
+
+	server.MainLoop = autoscaler.SetAppGatewayExample
 	path, handler := pbcon.NewAutoscalerServiceHandler(server)
 	mux.Handle(path, handler)
 	log.Println("Autoscaler RPC Server Started")

cmd/tpodserver/manifest.go

@@ -61,7 +61,7 @@ var applyManifestCmd = &cobra.Command{
 		response := &pb.ProvisionPodResponse{}
 		namespace := tpk8s.NewTrustedPodsNamespace("tpods-xx", nil)
 		err = tpk8s.RunInNamespaceOrRevert(cmd.Context(), cl, namespace, dryRun, func(cl client.Client) error {
-			return tpk8s.ApplyPodRequest(cmd.Context(), cl, namespace.ObjectMeta.Name, false, pod, images, secrets, response)
+			return tpk8s.ApplyPodRequest(cmd.Context(), cl, namespace.ObjectMeta.Name, false, pod, nil, images, secrets, response)
 		})
 		if err != nil {
 			return err

cmd/trustedpods/deploy.go

@@ -3,6 +3,8 @@
 package main
 
 import (
+	"crypto/ecdsa"
+	"crypto/rand"
 	"fmt"
 	"math/big"
 	"path/filepath"
@@ -11,10 +13,12 @@ import (
 	"github.com/comrade-coop/apocryph/pkg/ethereum"
 	"github.com/comrade-coop/apocryph/pkg/ipcr"
 	tpipfs "github.com/comrade-coop/apocryph/pkg/ipfs"
+	pb "github.com/comrade-coop/apocryph/pkg/proto"
 	pbcon "github.com/comrade-coop/apocryph/pkg/proto/protoconnect"
 	"github.com/comrade-coop/apocryph/pkg/publisher"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ipfs/kubo/client/rpc"
 	"github.com/spf13/cobra"
@@ -93,6 +97,25 @@ var deployPodCmd = &cobra.Command{
 		}
 		configureDeployment(deployment)
 
+		if authorize {
+			// create the keypair that will be accessible for all pods
+			privateKey, err := ecdsa.GenerateKey(crypto.S256(), rand.Reader)
+			if err != nil {
+				return fmt.Errorf("Could not create private key for the application: %w", err)
+			}
+			// Ensure the public key is valid before getting the address
+			if privateKey == nil || privateKey.PublicKey.X == nil || privateKey.PublicKey.Y == nil {
+				return fmt.Errorf("Generated an invalid public key")
+			}
+
+			pubAddress := crypto.PubkeyToAddress(privateKey.PublicKey)
+
+			encodedPrivateKey := ethereum.EncodePrivateKey(crypto.FromECDSA(privateKey))
+
+			pod.KeyPair = &pb.KeyPair{PrivateKey: encodedPrivateKey, PubAddress: pubAddress.Hex()}
+			deployment.KeyPair = pod.KeyPair
+		}
+
 		fundsInt, _ := (&big.Int{}).SetString(funds, 10)
 		if fundsInt == nil {
 			return fmt.Errorf("Invalid number passed for funds: %s", funds)
@@ -130,7 +153,7 @@ var deployPodCmd = &cobra.Command{
 
 		interceptor := pbcon.NewAuthInterceptorClient(deployment, expirationOffset, sign)
 
-		var client *publisher.P2pProvisionPodServiceClient
+		var provisionPodclient *publisher.P2pProvisionPodServiceClient
 		if len(deployment.GetProvider().GetEthereumAddress()) == 0 || deployment.GetProvider().GetLibp2PAddress() == "" {
 			availableProviders, err := fetchAndFilterProviders(ipfs, ethClient)
 			if err != nil {
@@ -139,12 +162,12 @@ var deployPodCmd = &cobra.Command{
 			if len(availableProviders) == 0 {
 				return fmt.Errorf("Failed finding a provider: no available providers found matching filter")
 			}
-			client, err = publisher.SetFirstConnectingProvider(ipfsp2p, availableProviders, deployment, interceptor)
+			provisionPodclient, err = publisher.SetFirstConnectingProvider(ipfsp2p, availableProviders, deployment, interceptor)
 			if err != nil {
 				return fmt.Errorf("Failed setting a provider: %w", err)
 			}
 		} else {
-			client, err = publisher.ConnectToProvider(ipfsp2p, deployment, interceptor)
+			provisionPodclient, err = publisher.ConnectToProvider(ipfsp2p, deployment, interceptor)
 			if err != nil {
 				return err
 			}
@@ -179,10 +202,20 @@ var deployPodCmd = &cobra.Command{
 			return err
 		}
 
-		err = publisher.SendToProvider(cmd.Context(), ipfsp2p, pod, deployment, client)
+		fmt.Printf("PODID is:%v\n", common.BytesToHash(deployment.Payment.PodID))
+
+		response, err := publisher.SendToProvider(cmd.Context(), ipfsp2p, pod, deployment, provisionPodclient)
 		if err != nil {
 			return err
 		}
+		// Authorize the application to manipulate the payment channel and fund
+		// it to make it able to send transactions
+		if authorize {
+			err := publisher.AuthorizeAndFundApplication(cmd.Context(), response.(*pb.ProvisionPodResponse), deployment, ethClient, publisherAuth, publisherKey, 1000000000000000000)
+			if err != nil {
+				return err
+			}
+		}
 
 		return publisher.SaveDeployment(deploymentFile, deploymentFormat, deployment)
 	},
@@ -229,10 +262,11 @@ var deletePodCmd = &cobra.Command{
 			return err
 		}
 
-		err = publisher.SendToProvider(cmd.Context(), tpipfs.NewP2pApi(ipfs, ipfsMultiaddr), nil, deployment, client)
+		_, err = publisher.SendToProvider(cmd.Context(), tpipfs.NewP2pApi(ipfs, ipfsMultiaddr), nil, deployment, client)
 		if err != nil {
 			return err
 		}
+
 		return publisher.SaveDeployment(deploymentFile, deploymentFormat, deployment)
 	},
 }

cmd/trustedpods/flags.go

@@ -21,6 +21,7 @@ var providerEthAddress string
 var registryContractAddress string
 var tokenContractAddress string
 var expirationOffset int64
+var authorize bool
 
 var uploadFlags = &pflag.FlagSet{}
 var ipfsApi string
@@ -59,6 +60,7 @@ var _ = func() error {
 	deploymentFlags.StringVar(&providerEthAddress, "provider-eth", "", "provider public address")
 	deploymentFlags.Int64Var(&expirationOffset, "token-expiration", 10, "authentication token expires after token-expiration seconds (expired after 10 seconds by default)")
 	deploymentFlags.StringVar(&ipfsApi, "ipfs", "/ip4/127.0.0.1/tcp/5001", "multiaddr where the ipfs/kubo api can be accessed")
+	deploymentFlags.BoolVar(&authorize, "authorize", false, "Create a key pair for the application and authorize the returned addresses to control the payment channel")
 
 	uploadFlags.StringVar(&ipfsApi, "ipfs", "/ip4/127.0.0.1/tcp/5001", "multiaddr where the ipfs/kubo api can be accessed")
 	uploadFlags.BoolVar(&uploadImages, "upload-images", true, "upload images")
@@ -73,6 +75,7 @@ var _ = func() error {
 	fundFlags.Int64Var(&unlockTime, "unlock-time", 5*60, "time for unlocking tokens (in seconds)")
 
 	syncFlags.AddFlag(uploadFlags.Lookup("ipfs"))
+	syncFlags.StringVar(&publisherKey, "ethereum-key", "", "account string (private key | http[s]://clef#account | /keystore#account | account (in default keystore))")
 
 	registryFlags.StringVar(&ipfsApi, "ipfs", "/ip4/127.0.0.1/tcp/5001", "multiaddr where the ipfs/kubo api can be accessed")
 	registryFlags.StringVar(&registryContractAddress, "registry-contract", "", "registry contract address")

cmd/trustedpods/log.go

@@ -21,7 +21,7 @@ var containerName string
 var logPodCmd = &cobra.Command{
 	Use:     fmt.Sprintf("log [%s] [deployment.yaml]", publisher.DefaultPodFile),
 	Short:   "get pod container logs",
-	Args:    cobra.ExactArgs(1),
+	Args:    cobra.MaximumNArgs(2),
 	GroupID: "main",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		_, _, pod, deployment, err := publisher.ReadPodAndDeployment(args, manifestFormat, deploymentFormat)
@@ -40,6 +40,7 @@ var logPodCmd = &cobra.Command{
 		}
 
 		if publisherKey == "" {
+			fmt.Printf("publisherKey %v\n", publisherKey)
 			publisherKey = common.BytesToAddress(deployment.Payment.PublisherAddress).String()
 		}
 
@@ -91,6 +92,5 @@ var logPodCmd = &cobra.Command{
 func init() {
 	podCmd.AddCommand(logPodCmd)
 
-	logPodCmd.Flags().AddFlagSet(deploymentFlags)
 	logPodCmd.Flags().AddFlagSet(syncFlags)
 }

cmd/trustedpods/pod.go

@@ -4,6 +4,7 @@ package main
 
 import (
 	"crypto/sha256"
+
 	pb "github.com/comrade-coop/apocryph/pkg/proto"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/spf13/cobra"

cmd/trustedpods/sync.go

@@ -54,7 +54,7 @@ var syncPodCmd = &cobra.Command{
 			return err
 		}
 
-		err = publisher.SendToProvider(cmd.Context(), tpipfs.NewP2pApi(ipfs, ipfsMultiaddr), pod, deployment, client)
+		_, err = publisher.SendToProvider(cmd.Context(), tpipfs.NewP2pApi(ipfs, ipfsMultiaddr), pod, deployment, client)
 		if err != nil {
 			return err
 		}

contracts/src/Payment.sol

@@ -13,6 +13,7 @@ contract Payment {
     error AmountRequired();
     error ChannelLocked();
     error InsufficientFunds();
+    error NotAuthorized();
 
     event UnlockTimerStarted(
         address indexed publisher, address indexed provider, bytes32 indexed podId, uint256 unlockedAt
@@ -30,6 +31,7 @@ contract Payment {
         uint256 withdrawnByProvider;
         uint256 unlockTime; // minimum time in seconds needed to unlock the funds
         uint256 unlockedAt; // time @ unlock + unlockTime
+        mapping(address => bool) authorized;
     }
 
     // publisher => provider => token => PodID => funds
@@ -73,11 +75,13 @@ contract Payment {
     }
 
     // initiate the process of unlocking the funds stored in the contract
-    function unlock(address provider, bytes32 podId) public {
-        address publisher = msg.sender;
+    function unlock(address publisher, address provider, bytes32 podId) public {
+        // check if the caller is authorized to unlock channel
         Channel storage channel = channels[publisher][provider][podId];
         if (channel.investedByPublisher == 0) revert DoesNotExist();
-
+        if (msg.sender != publisher) {
+            if (channel.authorized[msg.sender] == false) revert NotAuthorized();
+        }
         uint256 newUnlockedAt = block.timestamp + channel.unlockTime;
         if (channel.unlockedAt == 0 || channel.unlockedAt < newUnlockedAt) {
             channel.unlockedAt = newUnlockedAt;
@@ -86,9 +90,12 @@ contract Payment {
     }
 
     // transfer the now-unlocked funds back to the publisher
-    function withdrawUnlocked(address provider, bytes32 podId) public {
-        address publisher = msg.sender;
+    function withdrawUnlocked(address publisher, address provider, bytes32 podId) public {
+        // check if the caller is authorized to withdraw
         Channel storage channel = channels[publisher][provider][podId];
+        if (msg.sender != publisher) {
+            if (channel.authorized[msg.sender] == false) revert NotAuthorized();
+        }
         if (channel.unlockedAt == 0 || block.timestamp < channel.unlockedAt) revert ChannelLocked();
 
         uint256 leftoverFunds = channel.investedByPublisher - channel.withdrawnByProvider;
@@ -98,13 +105,17 @@ contract Payment {
 
         emit Unlocked(publisher, provider, podId, leftoverFunds);
 
-        token.safeTransfer(publisher, leftoverFunds);
+        token.safeTransfer(msg.sender, leftoverFunds);
     }
 
     // withdrawUnlockedFunds and destroy all previous traces of the channel's existence
-    function closeChannel(address provider, bytes32 podId) public {
-        address publisher = msg.sender;
+    function closeChannel(address publisher, address provider, bytes32 podId) public {
+        // check if the caller is authorized to close the channel
         Channel storage channel = channels[publisher][provider][podId];
+        if (channel.investedByPublisher == 0) revert DoesNotExist();
+        if (msg.sender != publisher) {
+            if (channel.authorized[msg.sender] == false) revert NotAuthorized();
+        }
         if (channel.unlockedAt == 0 || block.timestamp < channel.unlockedAt) revert ChannelLocked();
 
         uint256 leftoverFunds = channel.investedByPublisher - channel.withdrawnByProvider;
@@ -113,7 +124,7 @@ contract Payment {
         if (leftoverFunds != 0) emit Unlocked(publisher, provider, podId, leftoverFunds);
         emit ChannelClosed(publisher, provider, podId);
 
-        if (leftoverFunds != 0) token.safeTransfer(publisher, leftoverFunds);
+        if (leftoverFunds != 0) token.safeTransfer(msg.sender, leftoverFunds);
     }
 
     // allows the provider to withdraw as many tokens as would be needed to reach totalWithdrawAmount since the opening of the channel
@@ -159,4 +170,61 @@ contract Payment {
         Channel storage channel = channels[publisher][provider][podId];
         return channel.withdrawnByProvider;
     }
+
+    // authorize other addresses to create subChannels
+    function authorize(address _authorized, address provider, bytes32 podId) public {
+        Channel storage channel = channels[msg.sender][provider][podId];
+        if (channel.investedByPublisher == 0) revert DoesNotExist();
+        channel.authorized[_authorized] = true;
+    }
+
+    function isAuthorized(address publisher, address provider, bytes32 podId, address _address)
+        public
+        view
+        returns (bool)
+    {
+        return channels[publisher][provider][podId].authorized[_address];
+    }
+
+    // create a subChannel from a main channel
+    function createSubChannel(
+        address publisher,
+        address provider,
+        bytes32 podId,
+        address newProvider,
+        bytes32 newPodId,
+        uint256 amount
+    ) public {
+        Channel storage channel = channels[publisher][provider][podId];
+        // Ensure the channel exists
+        if (channel.investedByPublisher == 0) revert DoesNotExist();
+
+        // Check if the caller is authorized
+        if (!channel.authorized[msg.sender]) revert NotAuthorized();
+
+        // Ensure there is enough invested by the publisher
+        if (channel.investedByPublisher < amount) revert InsufficientFunds();
+
+        // Ensure channel is unlocked
+        if (channel.unlockedAt == 0 || block.timestamp < channel.unlockedAt) revert ChannelLocked();
+
+        // Deduct the amount from the main channel's funds
+        channel.investedByPublisher -= amount;
+
+        // Create the subChannel for the authorized caller
+        Channel storage subChannel = channels[msg.sender][newProvider][newPodId];
+        if (subChannel.investedByPublisher != 0) revert AlreadyExists();
+
+        // authorize the main channel publisher to control the subchannel
+        subChannel.authorized[publisher] = true;
+
+        // Ensure There are enough LeftOver funds
+        if (channel.investedByPublisher - channel.withdrawnByProvider < amount) revert InsufficientFunds();
+
+        // fund the new sub channel with the deducted amount from the main channel
+        subChannel.investedByPublisher += amount;
+        subChannel.unlockTime = channel.unlockTime; // Inherit unlock time from main channel
+
+        emit Deposited(msg.sender, newProvider, newPodId, amount);
+    }
 }

contracts/src/Registry.sol

@@ -85,7 +85,7 @@ contract Registry {
         subscription[msg.sender][tableId] = false;
     }
 
-    function isSubscribed(address provider ,uint256 tableId) external view returns (bool) {
+    function isSubscribed(address provider, uint256 tableId) external view returns (bool) {
         return subscription[provider][tableId];
     }
 }