fix(x/escrow): use auth authorization interface to reach to spend limit

Signed-off-by: Artur Troian <troian@users.noreply.github.com>

Author: troian

go.mod

@@ -47,7 +47,7 @@ require (
 	google.golang.org/grpc v1.74.2
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools/v3 v3.5.2
-	pkg.akt.dev/go v0.0.3-rc15
+	pkg.akt.dev/go v0.0.3-rc16
 	pkg.akt.dev/go/cli v0.0.3-rc13
 	pkg.akt.dev/go/sdl v0.0.2-rc6
 )

go.sum

@@ -3278,8 +3278,8 @@ nhooyr.io/websocket v1.8.11/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA=
 pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
-pkg.akt.dev/go v0.0.3-rc15 h1:tGerlRilP0zS3hF/p1l63nFOw9d200hQo+Ai1JKZ+Ns=
-pkg.akt.dev/go v0.0.3-rc15/go.mod h1:TF85k1RuubGnnESQud3FYoDT4/SWWHlccJ/JPw7gDzo=
+pkg.akt.dev/go v0.0.3-rc16 h1:xhJlm1IC395ZtWeep9z0XJEU8k4NlPz2u80A6aIuZ+0=
+pkg.akt.dev/go v0.0.3-rc16/go.mod h1:TF85k1RuubGnnESQud3FYoDT4/SWWHlccJ/JPw7gDzo=
 pkg.akt.dev/go/cli v0.0.3-rc13 h1:6DgFfrIFLZ3Ii14rYvvH8CP2BaORcz93rjCk7OXnYq8=
 pkg.akt.dev/go/cli v0.0.3-rc13/go.mod h1:hqpNxZAa4yqn6sODAQf/phzX4FQJ9FJIeUQGw4N7Mak=
 pkg.akt.dev/go/sdl v0.0.2-rc6 h1:rlaiBL2xTl06Rq/MNePmMRyl6ucWweA5q4Mt9tZzwzM=

x/escrow/keeper/keeper.go

@@ -211,52 +211,51 @@ func (k *keeper) AuthorizeDeposits(sctx sdk.Context, msg sdk.Msg) ([]etypes.Depo
 			msgTypeUrl := (&ev1.DepositAuthorization{}).MsgTypeURL()
 
 			k.authzKeeper.GetGranteeGrantsByMsgType(sctx, owner, msgTypeUrl, func(ctx context.Context, granter sdk.AccAddress, authorization authz.Authorization, expiration *time.Time) bool {
-				deplAuthz, valid := authorization.(*ev1.DepositAuthorization)
+				depositAuthz, valid := authorization.(ev1.Authorization)
 				if !valid {
 					return false
 				}
 
-				authorizedSpend := sdk.Coin{
-					Denom:  denom,
-					Amount: sdkmath.NewInt(deplAuthz.SpendLimit.Amount.Int64()),
-				}
+				spendableAmount := depositAuthz.GetSpendLimit()
+				requestedSpend := sdk.NewCoin(denom, remainder)
 
 				// bc authz.Accepts take sdk.Msg as an argument, the deposit amount from incoming message
 				// has to be modified in place to correctly calculate what deposits to take from grants
 				switch mt := msg.(type) {
 				case *ev1.MsgAccountDeposit:
-					mt.Deposit.Amount = sdk.NewCoin(denom, sdkmath.NewIntFromBigInt(remainder.BigInt()))
+					mt.Deposit.Amount = requestedSpend
 				case *dv1beta.MsgCreateDeployment:
-					mt.Deposit.Amount = sdk.NewCoin(denom, sdkmath.NewIntFromBigInt(remainder.BigInt()))
+					mt.Deposit.Amount = requestedSpend
 				case *mv1beta.MsgCreateBid:
-					mt.Deposit.Amount = sdk.NewCoin(denom, sdkmath.NewIntFromBigInt(remainder.BigInt()))
+					mt.Deposit.Amount = requestedSpend
 				}
 
-				resp, err := authorization.Accept(ctx, msg)
+				resp, err := depositAuthz.TryAccept(ctx, msg, true)
 				if err != nil {
 					return false
 				}
 
-				if resp.Delete {
-					err = k.authzKeeper.DeleteGrant(ctx, owner, granter, msgTypeUrl)
-				} else if resp.Updated != nil {
-					err = k.authzKeeper.SaveGrant(ctx, owner, granter, resp.Updated, expiration)
+				if !resp.Accept {
+					return false
 				}
 
-				if !resp.Accept {
+				// Delete is ignored here as not all fund may be used during deployment lifetime.
+				// also, there can be another deployment using same authorization and may return funds before deposit is fully used
+				err = k.authzKeeper.SaveGrant(ctx, owner, granter, resp.Updated, expiration)
+				if err != nil {
 					return false
 				}
 
-				deplAuthz = resp.Updated.(*ev1.DepositAuthorization)
+				depositAuthz = resp.Updated.(ev1.Authorization)
 
-				authorizedSpend = authorizedSpend.Sub(deplAuthz.SpendLimit)
+				spendableAmount = spendableAmount.Sub(depositAuthz.GetSpendLimit())
 
 				depositors = append(depositors, etypes.Depositor{
 					Owner:   granter.String(),
 					Height:  sctx.BlockHeight(),
-					Balance: sdk.NewDecCoinFromCoin(authorizedSpend),
+					Balance: sdk.NewDecCoinFromCoin(spendableAmount),
 				})
-				remainder = remainder.Sub(authorizedSpend.Amount)
+				remainder = remainder.Sub(spendableAmount.Amount)
 
 				return remainder.IsZero()
 			})