Merge branch 'main' into e2e-pqe

Author: xcolwell

connect/resident.go

@@ -21,6 +21,11 @@ import (
 
 	"golang.org/x/exp/maps"
 
+<<<<<<< HEAD
+=======
+	// "google.golang.org/protobuf/proto"
+
+>>>>>>> main
 	"github.com/urnetwork/glog"
 
 	"github.com/urnetwork/connect"
@@ -2044,3 +2049,4 @@ func (self *limiter) delay() {
 		}
 	}
 }
+

taskworker/work/account_payment_work.go

@@ -41,10 +41,11 @@ func Payout(
 	schedulePayout *SchedulePayoutArgs,
 	clientSession *session.ClientSession,
 ) (*SchedulePayoutResult, error) {
-	err := controller.SendPayments(clientSession)
-	if err != nil {
-		return nil, err
-	}
+	// FIXME disable payments until we figure out the account bug
+	// err := controller.SendPayments(clientSession)
+	// if err != nil {
+	// 	return nil, err
+	// }
 
 	return &SchedulePayoutResult{
 		Success: true,