Merge branch 'develop' into develop-airdrop-leaderboard-1000

cmd/connector-common-user-actions-timescale/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	database "github.com/fluidity-money/fluidity-app/lib/databases/timescale/user-actions"
 	queue "github.com/fluidity-money/fluidity-app/lib/queues/user-actions"
+	"github.com/fluidity-money/fluidity-app/lib/log"
 )
 
 func main() {

cmd/connector-sui-amqp/main.go

@@ -10,10 +10,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/block-vision/sui-go-sdk/models"
+	"github.com/fluidity-money/sui-go-sdk/models"
 
-	"github.com/block-vision/sui-go-sdk/sui"
-	"github.com/fluidity-money/fluidity-app/cmd/connector-solana-amqp/lib/redis"
+	"github.com/fluidity-money/sui-go-sdk/sui"
 	"github.com/fluidity-money/fluidity-app/lib/log"
 	"github.com/fluidity-money/fluidity-app/lib/queue"
 	sui_queue "github.com/fluidity-money/fluidity-app/lib/queues/sui"
@@ -62,7 +61,7 @@ func main() {
 
 	// if unset, try use the last checkpoint
 	if firstCheckpoint == 0 {
-		firstCheckpoint = redis.GetLastBlock(RedisLastCheckpoint)
+		firstCheckpoint = GetLastBlock(RedisLastCheckpoint)
 	}
 
 	// if env unset and nothing in Redis, start from the very first block
@@ -87,7 +86,7 @@ func main() {
 
 // paginateCheckpoints to infinitely search for new checkpoints and send them down a queue
 func paginateCheckpoints(client sui.ISuiAPI, firstCheckpoint uint64, waitDuration time.Duration) {
-	var lastCheckpoint uint64 = redis.GetLastBlock(RedisLastCheckpoint)
+	var lastCheckpoint uint64 = GetLastBlock(RedisLastCheckpoint)
 
 	// user-set checkpoint takes precedence
 	if lastCheckpoint < firstCheckpoint {
@@ -187,7 +186,7 @@ func paginateCheckpoints(client sui.ISuiAPI, firstCheckpoint uint64, waitDuratio
 
 			timestamp := time.Unix(timestamp_/1000, 0).UTC()
 
-			redis.WriteLastBlock(RedisLastCheckpoint, sequenceNumber)
+			WriteLastBlock(RedisLastCheckpoint, sequenceNumber)
 
 			sequenceNumberInt, ok := new(big.Int).SetString(sequenceNumberString, 10)
 

cmd/microservice-sui-user-actions/Dockerfile

@@ -1,16 +1,16 @@
 FROM fluidity/build-container:latest AS build
 
-WORKDIR /usr/local/src/fluidity/cmd/microservice-user-actions-sui
+WORKDIR /usr/local/src/fluidity/cmd/microservice-sui-user-actions
 
 COPY . .
 RUN make
 
 
 FROM fluidity/runtime-container:latest
 
-COPY --from=build /usr/local/src/fluidity/cmd/microservice-user-actions-sui/microservice-user-actions-sui.out .
+COPY --from=build /usr/local/src/fluidity/cmd/microservice-sui-user-actions/microservice-sui-user-actions.out .
 
 ENTRYPOINT [ \
 	"wait-for-amqp", \
-	"./microservice-user-actions-sui.out" \
+	"./microservice-sui-user-actions.out" \
 ]

cmd/microservice-sui-user-actions/main.go

@@ -8,7 +8,7 @@ import (
 	"math/big"
 	"strconv"
 
-	"github.com/block-vision/sui-go-sdk/sui"
+	"github.com/fluidity-money/sui-go-sdk/sui"
 	"github.com/fluidity-money/fluidity-app/common/sui/applications"
 	"github.com/fluidity-money/fluidity-app/lib/databases/timescale/spooler"
 	"github.com/fluidity-money/fluidity-app/lib/log"
@@ -443,10 +443,12 @@ func main() {
 		// now send to the respective queues
 
 		// worker doesn't re-process transfers without an application, so send immediately
-		queue.SendMessage(
-			user_actions.TopicUserActionsSui,
-			userActions,
-		)
+		for _, userAction := range userActions {
+			queue.SendMessage(
+				user_actions.TopicUserActionsSui,
+				userAction,
+			)
+		}
 		// decorated user actions are processed by the application server to add application info
 		queue.SendMessage(sui_queue.TopicDecoratedTransfers, decoratedTransfers)
 

cmd/microservice-sui-user-actions/state.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/block-vision/sui-go-sdk/models"
-	"github.com/block-vision/sui-go-sdk/sui"
+	"github.com/fluidity-money/sui-go-sdk/models"
+	"github.com/fluidity-money/sui-go-sdk/sui"
 
 	"github.com/fluidity-money/fluidity-app/lib/log"
 	"github.com/fluidity-money/fluidity-app/lib/state"

cmd/microservice-sui-user-actions/util.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/block-vision/sui-go-sdk/models"
-	"github.com/block-vision/sui-go-sdk/sui"
+	"github.com/fluidity-money/sui-go-sdk/models"
+	"github.com/fluidity-money/sui-go-sdk/sui"
 	"github.com/fluidity-money/fluidity-app/lib/log"
 )
 

cmd/microservice-sui-worker/main.go

@@ -10,8 +10,8 @@ import (
 	"math/big"
 	"strconv"
 
-	"github.com/block-vision/sui-go-sdk/signer"
-	suiSdk "github.com/block-vision/sui-go-sdk/sui"
+	"github.com/fluidity-money/sui-go-sdk/signer"
+	suiSdk "github.com/fluidity-money/sui-go-sdk/sui"
 
 	"github.com/fluidity-money/fluidity-app/common/calculation/probability"
 	"github.com/fluidity-money/fluidity-app/common/ethereum/fluidity"
@@ -71,7 +71,7 @@ const (
 
 func main() {
 	var (
-		utilities      = suiApps.UtilityListFromEnvOrFatal(EnvUtilityContracts)
+		utilities      = suiApps.UtilityListFromEnv(EnvUtilityContracts)
 		baseTokenName  = util.GetEnvOrFatal(EnvUnderlyingTokenName)
 		decimalPlaces_ = util.GetEnvOrFatal(EnvTokenDecimals)
 		suiHttpUrl     = util.PickEnvOrFatal(EnvSuiHttpUrl)
@@ -173,8 +173,13 @@ func main() {
 			// AppData is not yet used on Sui
 			feeData, _, emission, err := suiApps.GetApplicationFee(transfer, *event, *application)
 
-			utilityDetails, _ := utilities[packageId]
-			utility := utilityDetails.Utility
+			var utility applications.UtilityName
+			utilityDetails, ok := utilities[packageId]
+			if ok {
+				utility = utilityDetails.Utility
+			} else {
+				utility = applications.UtilityFluid
+			}
 
 			var (
 				fee    = feeData.Fee

cmd/microservice-sui-worker/spooler.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/block-vision/sui-go-sdk/signer"
-	suiSdk "github.com/block-vision/sui-go-sdk/sui"
+	"github.com/fluidity-money/sui-go-sdk/signer"
+	suiSdk "github.com/fluidity-money/sui-go-sdk/sui"
 	commonSpooler "github.com/fluidity-money/fluidity-app/common/ethereum/spooler"
 	"github.com/fluidity-money/fluidity-app/lib/databases/postgres/worker"
 	"github.com/fluidity-money/fluidity-app/lib/databases/timescale/spooler"

cmd/microservice-sui-worker/transaction.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/block-vision/sui-go-sdk/models"
-	"github.com/block-vision/sui-go-sdk/signer"
-	suiSdk "github.com/block-vision/sui-go-sdk/sui"
+	"github.com/fluidity-money/sui-go-sdk/models"
+	"github.com/fluidity-money/sui-go-sdk/signer"
+	suiSdk "github.com/fluidity-money/sui-go-sdk/sui"
 	"github.com/fluidity-money/fluidity-app/lib/log"
 	"github.com/fluidity-money/fluidity-app/lib/types/sui"
 	worker_types "github.com/fluidity-money/fluidity-app/lib/types/worker"

common/sui/applications/applications.go

@@ -100,3 +100,58 @@ func UtilityListFromEnvOrFatal(key string) map[string]UtilityDetails {
 
 	return utilities
 }
+
+// UtilityListFromEnv parses a list of `utility:token_short_name:token_decimals:address:address,utility:token_short_name:token_decimals:address:address` into a map of {utility => app, token details}
+// or return an empty map if no utilities are set
+func UtilityListFromEnv(key string) map[string]UtilityDetails {
+	utilitiesList := util.GetEnvOrDefault(key, "")
+
+	utilities := make(map[string]UtilityDetails)
+
+	// exit early if there are no utilities
+	if utilitiesList == "" {
+		return utilities
+	}
+
+	for _, appAddresses_ := range strings.Split(utilitiesList, ",") {
+		appAddresses := strings.Split(appAddresses_, ":")
+
+		if len(appAddresses) < 4 {
+			log.Fatal(func(k *log.Log) {
+				k.Format(
+					"Malformed utilities address line '%s'!",
+					appAddresses_,
+				)
+			})
+		}
+
+		utility := applications.UtilityName(appAddresses[0])
+
+		var (
+			tokenShortName      = appAddresses[1]
+			tokenDecimalsString = appAddresses[2]
+		)
+
+		tokenDecimals, err := strconv.Atoi(tokenDecimalsString)
+		if err != nil {
+			log.Fatal(func(k *log.Log) {
+				k.Format(
+					"Failed to parse token decimals '%s'!",
+					tokenDecimalsString,
+				)
+				k.Payload = err
+			})
+		}
+
+		tokenDetails := token_details.New(tokenShortName, tokenDecimals)
+
+		for _, address := range appAddresses[3:] {
+			utilities[address] = UtilityDetails{
+				Utility:      utility,
+				TokenDetails: tokenDetails,
+			}
+		}
+	}
+
+	return utilities
+}

common/sui/applications/prize-pool/prize-pool.go

@@ -9,8 +9,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/block-vision/sui-go-sdk/models"
-	"github.com/block-vision/sui-go-sdk/sui"
+	"github.com/fluidity-money/sui-go-sdk/models"
+	"github.com/fluidity-money/sui-go-sdk/sui"
 )
 
 // GetMintSupply fetches the supply of a token via its mint address (unscaled)
@@ -45,7 +45,12 @@ func GetMintSupply(client sui.ISuiAPI, coinType string) (uint64, error) {
 // TODO cache with redis
 // GetVaultBalance fetches the balance of a UserVault, ProtocolVault, or CoinReserve
 func GetVaultBalance(client sui.ISuiAPI, vaultObjectId string) (uint64, error) {
-	response, err := client.SuiGetObject(context.Background(), models.SuiGetObjectRequest{ObjectId: vaultObjectId})
+	response, err := client.SuiGetObject(context.Background(), models.SuiGetObjectRequest{
+		ObjectId: vaultObjectId,
+		Options: models.SuiObjectDataOptions{
+			ShowContent: true,
+		},
+	})
 	if err != nil {
 		return 0, fmt.Errorf(
 			"failed to fetch balance of vault with id %v - %v",

common/sui/applications/transfers.go

@@ -3,7 +3,7 @@ package applications
 import (
 	"fmt"
 
-	"github.com/block-vision/sui-go-sdk/models"
+	"github.com/fluidity-money/sui-go-sdk/models"
 	"github.com/fluidity-money/fluidity-app/lib/queues/sui"
 	"github.com/fluidity-money/fluidity-app/lib/types/applications"
 )

go.mod

@@ -4,10 +4,9 @@ go 1.17
 
 require (
 	filippo.io/edwards25519 v1.0.0
-	github.com/block-vision/sui-go-sdk v1.0.5
 	github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
 	github.com/ethereum/go-ethereum v1.11.5
-	github.com/fardream/go-bcs v0.4.0
+	github.com/fluidity-money/sui-go-sdk v1.0.52
 	github.com/getsentry/sentry-go v0.18.0
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/go-redsync/redsync/v4 v4.6.0
@@ -30,8 +29,6 @@ require (
 	github.com/go-playground/validator/v10 v10.12.0 // indirect
 	github.com/holiman/uint256 v1.2.2 // indirect
 	github.com/leodido/go-urn v1.2.2 // indirect
-	github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
-	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/tidwall/gjson v1.14.4 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect

go.sum

@@ -1,5 +1,3 @@
-9fans.net/go v0.0.4 h1:g7K+b5I1PlSBFLnjuco3LAx5boK39UUl0Gsrmw6Gl2U=
-9fans.net/go v0.0.4/go.mod h1:lfPdxjq9v8pVQXUMBCx5EO5oLXWQFlKRQgs1kEkjoIM=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -67,8 +65,6 @@ github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
-github.com/block-vision/sui-go-sdk v1.0.5 h1:zM9gJOksgFQkIqJuCi/W4ytwcQYVsOA5AGgbk5WnONc=
-github.com/block-vision/sui-go-sdk v1.0.5/go.mod h1:5a7Ubw+dC2LjdsL+zWMEplSA622MPmTp8uGL5sl1rRY=
 github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
@@ -138,10 +134,11 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/ethereum/go-ethereum v1.10.4/go.mod h1:nEE0TP5MtxGzOMd7egIrbPJMQBnhVU3ELNxhBglIzhg=
 github.com/ethereum/go-ethereum v1.11.5 h1:3M1uan+LAUvdn+7wCEFrcMM4LJTeuxDrPTg/f31a5QQ=
 github.com/ethereum/go-ethereum v1.11.5/go.mod h1:it7x0DWnTDMfVFdXcU6Ti4KEFQynLHVRarcSlPr0HBo=
-github.com/fardream/go-bcs v0.4.0/go.mod h1:UsoxhIoe2GsVexX0s5NDLIChxeb/JUbjw7IWzzgF3Xk=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
+github.com/fluidity-money/sui-go-sdk v1.0.52 h1:SlGVSGWu2wEduqg2GZG3KwTKdJbQ7hZxDNPjU8mkg7I=
+github.com/fluidity-money/sui-go-sdk v1.0.52/go.mod h1:J2pRG9Ue2UKiPi6WPKZUkGxJFzSt6+xbK6aJP491r1g=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
@@ -162,6 +159,7 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
@@ -337,7 +335,6 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/miguelmota/go-ethereum-hdwallet v0.1.1 h1:zdXGlHao7idpCBjEGTXThVAtMKs+IxAgivZ75xqkWK0=
 github.com/miguelmota/go-ethereum-hdwallet v0.1.1/go.mod h1:f9m9uXokAHA6WNoYOPjj4AqjJS5pquQRiYYj/XSyPYc=
-github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
 github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=
 github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -422,7 +419,6 @@ github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAm
 github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
@@ -444,7 +440,6 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
@@ -623,8 +618,6 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
-golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -643,7 +636,6 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=