feat(x/swingset): allow third party to provision wallet

golang/cosmos/x/swingset/keeper/keeper.go

@@ -380,7 +380,7 @@ func makeFeeMenu(powerFlagFees []types.PowerFlagFee) map[string]sdk.Coins {
 
 var privilegedProvisioningCoins sdk.Coins = sdk.NewCoins(sdk.NewInt64Coin("provisionpass", 1))
 
-func calculateFees(balances sdk.Coins, submitter, addr sdk.AccAddress, powerFlags []string, powerFlagFees []types.PowerFlagFee) (sdk.Coins, error) {
+func calculateFees(balances sdk.Coins, powerFlags []string, powerFlagFees []types.PowerFlagFee) (sdk.Coins, error) {
 	fees := sdk.NewCoins()
 
 	// See if we have the balance needed for privileged provisioning.
@@ -389,10 +389,6 @@ func calculateFees(balances sdk.Coins, submitter, addr sdk.AccAddress, powerFlag
 		return fees, nil
 	}
 
-	if !submitter.Equals(addr) {
-		return nil, fmt.Errorf("submitter is not the same as target address for fee-based provisioning")
-	}
-
 	if len(powerFlags) == 0 {
 		return nil, fmt.Errorf("must specify powerFlags for fee-based provisioning")
 	}
@@ -412,9 +408,9 @@ func calculateFees(balances sdk.Coins, submitter, addr sdk.AccAddress, powerFlag
 	return fees, nil
 }
 
-func (k Keeper) ChargeForProvisioning(ctx sdk.Context, submitter, addr sdk.AccAddress, powerFlags []string) error {
+func (k Keeper) ChargeForProvisioning(ctx sdk.Context, submitter sdk.AccAddress, powerFlags []string) error {
 	balances := k.bankKeeper.GetAllBalances(ctx, submitter)
-	fees, err := calculateFees(balances, submitter, addr, powerFlags, k.GetParams(ctx).PowerFlagFees)
+	fees, err := calculateFees(balances, powerFlags, k.GetParams(ctx).PowerFlagFees)
 	if err != nil {
 		return err
 	}

golang/cosmos/x/swingset/keeper/keeper_test.go

@@ -61,15 +61,6 @@ func Test_calculateFees(t *testing.T) {
 			},
 			want: cns(),
 		},
-		{
-			name: "cannot pay fee to provision third party",
-			args: args{
-				submitter:  submitAddr,
-				addr:       utilAddr,
-				powerFlags: []string{"powerflag1"},
-			},
-			errMsg: "submitter is not the same as target address for fee-based provisioning",
-		},
 		{
 			name: "need powerflags for fee provisioning",
 			args: args{
@@ -106,6 +97,21 @@ func Test_calculateFees(t *testing.T) {
 			},
 			want: cns(a(1300)),
 		},
+		{
+			name: "can pay fee to provision third party",
+			args: args{
+				submitter:  submitAddr,
+				addr:       utilAddr,
+				powerFlags: []string{"power1"},
+				powerFlagFees: []types.PowerFlagFee{
+					{
+						PowerFlag: "power1",
+						Fee:       cns(a(1000)),
+					},
+				},
+			},
+			want: cns(a(1000)),
+		},
 		{
 			name: "later menu entries do not override",
 			args: args{
@@ -173,7 +179,7 @@ func Test_calculateFees(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := calculateFees(tt.args.balances, tt.args.submitter, tt.args.addr, tt.args.powerFlags, tt.args.powerFlagFees)
+			got, err := calculateFees(tt.args.balances, tt.args.powerFlags, tt.args.powerFlagFees)
 			var errMsg string
 			if err != nil {
 				errMsg = err.Error()

golang/cosmos/x/swingset/keeper/msg_server.go

@@ -158,7 +158,7 @@ func (keeper msgServer) provisionIfNeeded(ctx sdk.Context, owner sdk.AccAddress)
 func (keeper msgServer) Provision(goCtx context.Context, msg *types.MsgProvision) (*types.MsgProvisionResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	err := keeper.ChargeForProvisioning(ctx, msg.Submitter, msg.Address, msg.PowerFlags)
+	err := keeper.ChargeForProvisioning(ctx, msg.Submitter, msg.PowerFlags)
 	if err != nil {
 		return nil, err
 	}