feat: time based settlements (#1711)

ethersphere · May 17, 2021 · c1e87ce · c1e87ce
1 parent 4b730a6
commit c1e87ce
Show file tree

Hide file tree

Showing 28 changed files with 2,085 additions and 415 deletions.
diff --git a/.github/workflows/beekeeper.yml b/.github/workflows/beekeeper.yml
@@ -64,7 +64,7 @@ jobs:
         run: |
           echo -e "127.0.0.10\tregistry.localhost" | sudo tee -a /etc/hosts
           for ((i=0; i<REPLICA; i++)); do echo -e "127.0.1.$((i+1))\tbee-${i}.localhost bee-${i}-debug.localhost"; done | sudo tee -a /etc/hosts
-          timeout 30m ./beeinfra.sh install --local -r "${REPLICA}" --bootnode /dnsaddr/localhost --geth --k3s --pay-threshold 2000000000000 --postage
+          timeout 30m ./beeinfra.sh install --local -r "${REPLICA}" --bootnode /dnsaddr/localhost --geth --k3s --pay-threshold 1500000000000 --postage
       - name: Test pingpong
         id: pingpong-1
         run: until ./beekeeper check pingpong --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}"; do echo "waiting for pingpong..."; sleep .3; done
@@ -73,7 +73,15 @@ jobs:
         run: ./beekeeper check fullconnectivity --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}" 
       - name: Test settlements
         id: settlements-1
-        run: ./beekeeper check settlements --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}" --upload-node-count "${REPLICA}" -t 2000000000000
+        run: |
+          ./beekeeper check settlements --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}" --upload-node-count "${REPLICA}" -t 1500000000000
+          sleep 2
+      - name: Test pss
+        id: pss
+        run: ./beekeeper check pss --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}" --timeout 5m
+      - name: Test soc
+        id: soc
+        run: ./beekeeper check soc --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}"
       - name: Test pushsync (chunks)
         id: pushsync-chunks-1
         run: ./beekeeper check pushsync --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}" --upload-node-count "${REPLICA}" --chunks-per-node 3 --upload-chunks --retry-delay 15s
@@ -83,12 +91,6 @@ jobs:
       - name: Test manifest
         id: manifest-1
         run: ./beekeeper check manifest --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}"
-      - name: Test pss
-        id: pss
-        run: ./beekeeper check pss --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}" --timeout 5m
-      - name: Test soc
-        id: soc
-        run: ./beekeeper check soc --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}"
       - name: Destroy the cluster
         run: |
           ./beeinfra.sh uninstall
@@ -101,7 +103,7 @@ jobs:
           cp /etc/rancher/k3s/k3s.yaml ~/.kube/config
       - name: Set testing cluster (Node connection and clef enabled)
         run: |
-          timeout 30m ./beeinfra.sh install --local -r "${REPLICA}" --geth --clef --k3s --pay-threshold 2000000000000 --postage
+          timeout 30m ./beeinfra.sh install --local -r "${REPLICA}" --geth --clef --k3s --pay-threshold 1500000000000 --postage
       - name: Test pingpong
         id: pingpong-2
         run: until ./beekeeper check pingpong --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}"; do echo "waiting for pingpong..."; sleep .3; done
@@ -110,7 +112,7 @@ jobs:
         run: ./beekeeper check fullconnectivity --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}"
       - name: Test settlements
         id: settlements-2
-        run: ./beekeeper check settlements --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}" --upload-node-count "${REPLICA}" -t 2000000000000
+        run: ./beekeeper check settlements --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}" --upload-node-count "${REPLICA}" -t 1500000000000
       - name: Destroy the cluster
         run: |
           ./beeinfra.sh uninstall
@@ -126,7 +128,7 @@ jobs:
           cp /etc/rancher/k3s/k3s.yaml ~/.kube/config
       - name: Set testing cluster (storage incentives setup)
         run: |
-          timeout 10m ./beeinfra.sh install --local -r "${REPLICA}" --geth --k3s --pay-threshold 2000000000000 --postage --db-capacity 100
+          timeout 10m ./beeinfra.sh install --local -r "${REPLICA}" --geth --k3s --pay-threshold 1500000000000 --postage --db-capacity 100
       - name: Test gc
         id: gc-chunk-1
         run: ./beekeeper check gc --cache-capacity 100 --api-scheme http --debug-api-scheme http --disable-namespace --debug-api-domain localhost --api-domain localhost --node-count "${REPLICA}"

diff --git a/cmd/bee/cmd/cmd.go b/cmd/bee/cmd/cmd.go
@@ -218,7 +218,7 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
 	cmd.Flags().String(optionWelcomeMessage, "", "send a welcome message string during handshakes")
 	cmd.Flags().Bool(optionNameGlobalPinningEnabled, false, "enable global pinning")
 	cmd.Flags().String(optionNamePaymentThreshold, "10000000000000", "threshold in BZZ where you expect to get paid from your peers")
-	cmd.Flags().String(optionNamePaymentTolerance, "50000000000000", "excess debt above payment threshold in BZZ where you disconnect from your peer")
+	cmd.Flags().String(optionNamePaymentTolerance, "10000000000000", "excess debt above payment threshold in BZZ where you disconnect from your peer")
 	cmd.Flags().String(optionNamePaymentEarly, "1000000000000", "amount in BZZ below the peers payment threshold when we initiate settlement")
 	cmd.Flags().StringSlice(optionNameResolverEndpoints, []string{}, "ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url")
 	cmd.Flags().Bool(optionNameGatewayMode, false, "disable a set of sensitive features in the api")

diff --git a/packaging/bee.yaml b/packaging/bee.yaml
@@ -52,8 +52,8 @@ password-file: /var/lib/bee/password
 # payment-early: 1000000000000
 ## threshold in BZZ where you expect to get paid from your peers (default 10000000000000)
 # payment-threshold: 10000000000000
-## excess debt above payment threshold in BZZ where you disconnect from your peer (default 50000000000000)
-# payment-tolerance: 50000000000000
+## excess debt above payment threshold in BZZ where you disconnect from your peer (default 10000000000000)
+# payment-tolerance: 10000000000000
 ## ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url
 # resolver-options: []
 ## whether we want the node to start with no listen addresses for p2p

diff --git a/packaging/docker/env b/packaging/docker/env
@@ -55,12 +55,12 @@ BEE_CLEF_SIGNER_ENABLE=true
 # BEE_PASSWORD=
 ## path to a file that contains password for decrypting keys
 # BEE_PASSWORD_FILE=
-## amount in BZZ below the peers payment threshold when we initiate settlement (default 10000)
-# BEE_PAYMENT_EARLY=10000
-## threshold in BZZ where you expect to get paid from your peers (default 100000)
-# BEE_PAYMENT_THRESHOLD=100000
-## excess debt above payment threshold in BZZ where you disconnect from your peer (default 10000)
-# BEE_PAYMENT_TOLERANCE=10000
+## amount in BZZ below the peers payment threshold when we initiate settlement (default 1000000000000)
+# BEE_PAYMENT_EARLY=1000000000000
+## threshold in BZZ where you expect to get paid from your peers (default 10000000000000)
+# BEE_PAYMENT_THRESHOLD=10000000000000
+## excess debt above payment threshold in BZZ where you disconnect from your peer (default 10000000000000)
+# BEE_PAYMENT_TOLERANCE=10000000000000
 ## ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url
 # BEE_RESOLVER_OPTIONS=[]
 ## whether we want the node to start with no listen addresses for p2p

diff --git a/packaging/homebrew/bee.yaml b/packaging/homebrew/bee.yaml
@@ -52,8 +52,8 @@ password-file: /usr/local/var/lib/swarm-bee/password
 # payment-early: 1000000000000
 ## threshold in BZZ where you expect to get paid from your peers (default 10000000000000)
 # payment-threshold: 10000000000000
-## excess debt above payment threshold in BZZ where you disconnect from your peer (default 50000000000000)
-# payment-tolerance: 50000000000000
+## excess debt above payment threshold in BZZ where you disconnect from your peer (default 10000000000000)
+# payment-tolerance: 10000000000000
 ## ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url
 # resolver-options: []
 ## whether we want the node to start with no listen addresses for p2p

diff --git a/packaging/scoop/bee.yaml b/packaging/scoop/bee.yaml
@@ -38,12 +38,12 @@ data-dir: ./data
 # password: ""
 ## path to a file that contains password for decrypting keys
 password-file: ./password
-## amount in BZZ below the peers payment threshold when we initiate settlement (default 10000)
-# payment-early: 10000
-## threshold in BZZ where you expect to get paid from your peers (default 100000)
-# payment-threshold: 100000
-## excess debt above payment threshold in BZZ where you disconnect from your peer (default 10000)
-# payment-tolerance: 10000
+## amount in BZZ below the peers payment threshold when we initiate settlement (default 1000000000000)
+# payment-early: 1000000000000
+## threshold in BZZ where you expect to get paid from your peers (default 10000000000000)
+# payment-threshold: 10000000000000
+## excess debt above payment threshold in BZZ where you disconnect from your peer (default 10000000000000)
+# payment-tolerance: 10000000000000
 ## ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url
 # resolver-options: []
 ## whether we want the node to start with no listen addresses for p2p