feat: make idempotency feature check inputs

internal/numscript.go → internal/api/common/numscript.go

@@ -1,7 +1,9 @@
-package ledger
+package common
 
 import (
 	"fmt"
+	"github.com/formancehq/ledger/internal"
+	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
 	"sort"
 	"strings"
 
@@ -13,15 +15,15 @@ type variable struct {
 	value string
 }
 
-func TxToScriptData(txData TransactionData, allowUnboundedOverdrafts bool) RunScript {
+func TxToScriptData(txData ledger.TransactionData, allowUnboundedOverdrafts bool) ledgercontroller.RunScript {
 	sb := strings.Builder{}
 	monetaryToVars := map[string]variable{}
 	accountsToVars := map[string]variable{}
 	i := 0
 	j := 0
 	for _, p := range txData.Postings {
 		if _, ok := accountsToVars[p.Source]; !ok {
-			if p.Source != WORLD {
+			if p.Source != ledger.WORLD {
 				accountsToVars[p.Source] = variable{
 					name:  fmt.Sprintf("va%d", i),
 					value: p.Source,
@@ -30,7 +32,7 @@ func TxToScriptData(txData TransactionData, allowUnboundedOverdrafts bool) RunSc
 			}
 		}
 		if _, ok := accountsToVars[p.Destination]; !ok {
-			if p.Destination != WORLD {
+			if p.Destination != ledger.WORLD {
 				accountsToVars[p.Destination] = variable{
 					name:  fmt.Sprintf("va%d", i),
 					value: p.Destination,
@@ -74,7 +76,7 @@ func TxToScriptData(txData TransactionData, allowUnboundedOverdrafts bool) RunSc
 			panic(fmt.Sprintf("monetary %s not found", m))
 		}
 		sb.WriteString(fmt.Sprintf("send $%s (\n", mon.name))
-		if p.Source == WORLD {
+		if p.Source == ledger.WORLD {
 			sb.WriteString("\tsource = @world\n")
 		} else {
 			src, ok := accountsToVars[p.Source]
@@ -87,7 +89,7 @@ func TxToScriptData(txData TransactionData, allowUnboundedOverdrafts bool) RunSc
 			}
 			sb.WriteString("\n")
 		}
-		if p.Destination == WORLD {
+		if p.Destination == ledger.WORLD {
 			sb.WriteString("\tdestination = @world\n")
 		} else {
 			dest, ok := accountsToVars[p.Destination]
@@ -111,8 +113,8 @@ func TxToScriptData(txData TransactionData, allowUnboundedOverdrafts bool) RunSc
 		txData.Metadata = metadata.Metadata{}
 	}
 
-	return RunScript{
-		Script: Script{
+	return ledgercontroller.RunScript{
+		Script: ledgercontroller.Script{
 			Plain: sb.String(),
 			Vars:  vars,
 		},

internal/api/v1/controllers_accounts_add_metadata.go

@@ -2,6 +2,7 @@ package v1
 
 import (
 	"encoding/json"
+	"github.com/formancehq/ledger/internal/controller/ledger"
 	"github.com/formancehq/ledger/pkg/accounts"
 	"net/http"
 	"net/url"
@@ -15,13 +16,13 @@ import (
 
 func addAccountMetadata(w http.ResponseWriter, r *http.Request) {
 	l := common.LedgerFromContext(r.Context())
-	param, err := url.PathUnescape(chi.URLParam(r, "address"))
+	address, err := url.PathUnescape(chi.URLParam(r, "address"))
 	if err != nil {
 		api.BadRequestWithDetails(w, ErrValidation, err, err.Error())
 		return
 	}
 
-	if !accounts.ValidateAddress(param) {
+	if !accounts.ValidateAddress(address) {
 		api.BadRequest(w, ErrValidation, errors.New("invalid account address format"))
 		return
 	}
@@ -32,7 +33,10 @@ func addAccountMetadata(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err = l.SaveAccountMetadata(r.Context(), getCommandParameters(r), param, m)
+	err = l.SaveAccountMetadata(r.Context(), getCommandParameters(r, ledger.SaveAccountMetadata{
+		Address:  address,
+		Metadata: m,
+	}))
 	if err != nil {
 		api.InternalServerError(w, r, err)
 		return

internal/api/v1/controllers_accounts_add_metadata_test.go

@@ -87,7 +87,12 @@ func TestAccountsAddMetadata(t *testing.T) {
 			systemController, ledgerController := newTestingSystemController(t, true)
 			if testCase.expectStatusCode == http.StatusNoContent {
 				ledgerController.EXPECT().
-					SaveAccountMetadata(gomock.Any(), ledgercontroller.Parameters{}, testCase.account, testCase.body).
+					SaveAccountMetadata(gomock.Any(), ledgercontroller.Parameters[ledgercontroller.SaveAccountMetadata]{
+						Input: ledgercontroller.SaveAccountMetadata{
+							Address:  testCase.account,
+							Metadata: testCase.body.(metadata.Metadata),
+						},
+					}).
 					Return(nil)
 			}
 

internal/api/v1/controllers_accounts_delete_metadata.go

@@ -1,6 +1,7 @@
 package v1
 
 import (
+	"github.com/formancehq/ledger/internal/controller/ledger"
 	"net/http"
 	"net/url"
 
@@ -10,7 +11,7 @@ import (
 )
 
 func deleteAccountMetadata(w http.ResponseWriter, r *http.Request) {
-	param, err := url.PathUnescape(chi.URLParam(r, "address"))
+	address, err := url.PathUnescape(chi.URLParam(r, "address"))
 	if err != nil {
 		api.BadRequestWithDetails(w, ErrValidation, err, err.Error())
 		return
@@ -19,9 +20,10 @@ func deleteAccountMetadata(w http.ResponseWriter, r *http.Request) {
 	if err := common.LedgerFromContext(r.Context()).
 		DeleteAccountMetadata(
 			r.Context(),
-			getCommandParameters(r),
-			param,
-			chi.URLParam(r, "key"),
+			getCommandParameters(r, ledger.DeleteAccountMetadata{
+				Address: address,
+				Key:     chi.URLParam(r, "key"),
+			}),
 		); err != nil {
 		api.InternalServerError(w, r, err)
 		return

internal/api/v1/controllers_accounts_delete_metadata_test.go

@@ -60,7 +60,15 @@ func TestAccountsDeleteMetadata(t *testing.T) {
 
 			if tc.expectBackendCall {
 				ledgerController.EXPECT().
-					DeleteAccountMetadata(gomock.Any(), ledgercontroller.Parameters{}, tc.account, "foo").
+					DeleteAccountMetadata(
+						gomock.Any(),
+						ledgercontroller.Parameters[ledgercontroller.DeleteAccountMetadata]{
+							Input: ledgercontroller.DeleteAccountMetadata{
+								Address: tc.account,
+								Key:     "foo",
+							},
+						},
+					).
 					Return(tc.returnErr)
 			}
 

internal/api/v1/controllers_transactions_add_metadata.go

@@ -29,7 +29,10 @@ func addTransactionMetadata(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if err := l.SaveTransactionMetadata(r.Context(), getCommandParameters(r), int(txID), m); err != nil {
+	if err := l.SaveTransactionMetadata(r.Context(), getCommandParameters(r, ledgercontroller.SaveTransactionMetadata{
+		TransactionID: int(txID),
+		Metadata:      m,
+	})); err != nil {
 		switch {
 		case errors.Is(err, ledgercontroller.ErrNotFound):
 			api.NotFound(w, err)

internal/api/v1/controllers_transactions_add_metadata_test.go

@@ -50,7 +50,12 @@ func TestTransactionsAddMetadata(t *testing.T) {
 			systemController, ledgerController := newTestingSystemController(t, true)
 			if testCase.expectStatusCode == http.StatusNoContent {
 				ledgerController.EXPECT().
-					SaveTransactionMetadata(gomock.Any(), ledgercontroller.Parameters{}, 0, testCase.body).
+					SaveTransactionMetadata(gomock.Any(), ledgercontroller.Parameters[ledgercontroller.SaveTransactionMetadata]{
+						Input: ledgercontroller.SaveTransactionMetadata{
+							TransactionID: 0,
+							Metadata:      testCase.body.(metadata.Metadata),
+						},
+					}).
 					Return(nil)
 			}
 

internal/api/v1/controllers_transactions_create.go

@@ -17,11 +17,11 @@ import (
 )
 
 type Script struct {
-	ledger.Script
+	ledgercontroller.Script
 	Vars map[string]json.RawMessage `json:"vars"`
 }
 
-func (s Script) ToCore() (*ledger.Script, error) {
+func (s Script) ToCore() (*ledgercontroller.Script, error) {
 	s.Script.Vars = map[string]string{}
 	for k, v := range s.Vars {
 
@@ -83,7 +83,7 @@ func createTransaction(w http.ResponseWriter, r *http.Request) {
 			Metadata:  payload.Metadata,
 		}
 
-		res, err := l.CreateTransaction(r.Context(), getCommandParameters(r), ledger.TxToScriptData(txData, false))
+		res, err := l.CreateTransaction(r.Context(), getCommandParameters(r, common.TxToScriptData(txData, false)))
 		if err != nil {
 			switch {
 			case errors.Is(err, &ledgercontroller.ErrInsufficientFunds{}):
@@ -92,9 +92,10 @@ func createTransaction(w http.ResponseWriter, r *http.Request) {
 				api.BadRequest(w, ErrScriptCompilationFailed, err)
 			case errors.Is(err, &ledgercontroller.ErrMetadataOverride{}):
 				api.BadRequest(w, ErrScriptMetadataOverride, err)
-			case errors.Is(err, ledgercontroller.ErrNoPostings):
+			case errors.Is(err, ledgercontroller.ErrNoPostings) ||
+				errors.Is(err, ledgercontroller.ErrInvalidIdempotencyInput{}):
 				api.BadRequest(w, ErrValidation, err)
-			case errors.Is(err, ledgercontroller.ErrReferenceConflict{}):
+			case errors.Is(err, ledgercontroller.ErrTransactionReferenceConflict{}):
 				api.WriteErrorResponse(w, http.StatusConflict, ErrConflict, err)
 			default:
 				api.InternalServerError(w, r, err)
@@ -111,24 +112,25 @@ func createTransaction(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	runScript := ledger.RunScript{
+	runScript := ledgercontroller.RunScript{
 		Script:    *script,
 		Timestamp: payload.Timestamp,
 		Reference: payload.Reference,
 		Metadata:  payload.Metadata,
 	}
 
-	res, err := l.CreateTransaction(r.Context(), getCommandParameters(r), runScript)
+	res, err := l.CreateTransaction(r.Context(), getCommandParameters(r, runScript))
 	if err != nil {
 		switch {
 		case errors.Is(err, &ledgercontroller.ErrInsufficientFunds{}):
 			api.BadRequest(w, ErrInsufficientFund, err)
 		case errors.Is(err, &ledgercontroller.ErrInvalidVars{}) ||
 			errors.Is(err, ledgercontroller.ErrCompilationFailed{}) ||
 			errors.Is(err, &ledgercontroller.ErrMetadataOverride{}) ||
+			errors.Is(err, ledgercontroller.ErrInvalidIdempotencyInput{}) ||
 			errors.Is(err, ledgercontroller.ErrNoPostings):
 			api.BadRequest(w, ErrValidation, err)
-		case errors.Is(err, ledgercontroller.ErrReferenceConflict{}):
+		case errors.Is(err, ledgercontroller.ErrTransactionReferenceConflict{}):
 			api.WriteErrorResponse(w, http.StatusConflict, ErrConflict, err)
 		default:
 			api.InternalServerError(w, r, err)

internal/api/v1/controllers_transactions_create_test.go

@@ -2,6 +2,7 @@ package v1
 
 import (
 	"encoding/json"
+	"github.com/formancehq/ledger/internal/api/common"
 	"math/big"
 	"net/http"
 	"net/http/httptest"
@@ -23,7 +24,7 @@ func TestTransactionsCreate(t *testing.T) {
 	type testCase struct {
 		name               string
 		expectedPreview    bool
-		expectedRunScript  ledger.RunScript
+		expectedRunScript  ledgercontroller.RunScript
 		payload            any
 		expectedStatusCode int
 		expectedErrorCode  string
@@ -35,13 +36,13 @@ func TestTransactionsCreate(t *testing.T) {
 			name: "using plain numscript",
 			payload: CreateTransactionRequest{
 				Script: Script{
-					Script: ledger.Script{
+					Script: ledgercontroller.Script{
 						Plain: `XXX`,
 					},
 				},
 			},
-			expectedRunScript: ledger.RunScript{
-				Script: ledger.Script{
+			expectedRunScript: ledgercontroller.RunScript{
+				Script: ledgercontroller.Script{
 					Plain: `XXX`,
 					Vars:  map[string]string{},
 				},
@@ -51,7 +52,7 @@ func TestTransactionsCreate(t *testing.T) {
 			name: "using plain numscript with variables",
 			payload: CreateTransactionRequest{
 				Script: Script{
-					Script: ledger.Script{
+					Script: ledgercontroller.Script{
 						Plain: `vars {
 						monetary $val
 					}
@@ -66,8 +67,8 @@ func TestTransactionsCreate(t *testing.T) {
 					},
 				},
 			},
-			expectedRunScript: ledger.RunScript{
-				Script: ledger.Script{
+			expectedRunScript: ledgercontroller.RunScript{
+				Script: ledgercontroller.Script{
 					Plain: `vars {
 						monetary $val
 					}
@@ -86,7 +87,7 @@ func TestTransactionsCreate(t *testing.T) {
 			name: "using plain numscript with variables (legacy format)",
 			payload: CreateTransactionRequest{
 				Script: Script{
-					Script: ledger.Script{
+					Script: ledgercontroller.Script{
 						Plain: `vars {
 						monetary $val
 					}
@@ -104,8 +105,8 @@ func TestTransactionsCreate(t *testing.T) {
 					},
 				},
 			},
-			expectedRunScript: ledger.RunScript{
-				Script: ledger.Script{
+			expectedRunScript: ledgercontroller.RunScript{
+				Script: ledgercontroller.Script{
 					Plain: `vars {
 						monetary $val
 					}
@@ -124,16 +125,16 @@ func TestTransactionsCreate(t *testing.T) {
 			name: "using plain numscript and dry run",
 			payload: CreateTransactionRequest{
 				Script: Script{
-					Script: ledger.Script{
+					Script: ledgercontroller.Script{
 						Plain: `send (
 						source = @world
 						destination = @bank
 					)`,
 					},
 				},
 			},
-			expectedRunScript: ledger.RunScript{
-				Script: ledger.Script{
+			expectedRunScript: ledgercontroller.RunScript{
+				Script: ledgercontroller.Script{
 					Plain: `send (
 						source = @world
 						destination = @bank
@@ -153,7 +154,7 @@ func TestTransactionsCreate(t *testing.T) {
 					ledger.NewPosting("world", "bank", "USD", big.NewInt(100)),
 				},
 			},
-			expectedRunScript: ledger.TxToScriptData(ledger.NewTransactionData().WithPostings(
+			expectedRunScript: common.TxToScriptData(ledger.NewTransactionData().WithPostings(
 				ledger.NewPosting("world", "bank", "USD", big.NewInt(100)),
 			), false),
 		},
@@ -168,7 +169,7 @@ func TestTransactionsCreate(t *testing.T) {
 				},
 			},
 			expectedPreview: true,
-			expectedRunScript: ledger.TxToScriptData(ledger.NewTransactionData().WithPostings(
+			expectedRunScript: common.TxToScriptData(ledger.NewTransactionData().WithPostings(
 				ledger.NewPosting("world", "bank", "USD", big.NewInt(100)),
 			), false),
 		},
@@ -190,7 +191,7 @@ func TestTransactionsCreate(t *testing.T) {
 					},
 				},
 				Script: Script{
-					Script: ledger.Script{
+					Script: ledgercontroller.Script{
 						Plain: `
 						send [COIN 100] (
 						  source = @world
@@ -225,9 +226,10 @@ func TestTransactionsCreate(t *testing.T) {
 			if testCase.expectedStatusCode < 300 && testCase.expectedStatusCode >= 200 {
 				testCase.expectedRunScript.Timestamp = time.Time{}
 				ledgerController.EXPECT().
-					CreateTransaction(gomock.Any(), ledgercontroller.Parameters{
+					CreateTransaction(gomock.Any(), ledgercontroller.Parameters[ledgercontroller.RunScript]{
 						DryRun: tc.expectedPreview,
-					}, testCase.expectedRunScript).
+						Input: testCase.expectedRunScript,
+					}).
 					Return(pointer.For(expectedTx), nil)
 			}