Return all addresses in ListAddresses & Fix Transfer rpc (#27)

* Return also internal addresses in ListAddresses rpc * Fix bcScanner GetUtxos * Update Input type & fix Transfer rpc * Fix test
vulpemventures · Nov 11, 2022 · 8576dc5 · 8576dc5
1 parent 7566221
commit 8576dc5
Show file tree

Hide file tree

Showing 13 changed files with 429 additions and 278 deletions.
diff --git a/api-spec/protobuf/gen/go/ocean/v1/types.pb.go b/api-spec/protobuf/gen/go/ocean/v1/types.pb.go
diff --git a/api-spec/protobuf/gen/python/ocean/v1/types_pb2.py b/api-spec/protobuf/gen/python/ocean/v1/types_pb2.py
diff --git a/api-spec/protobuf/ocean/v1/types.proto b/api-spec/protobuf/ocean/v1/types.proto
@@ -38,6 +38,12 @@ message Input {
   string txid = 1;
   // Previous tx output index.
   uint32 index = 2;
+  // Prevout script.
+  string script = 3;
+  // Input scriptsig size.
+  uint64 scriptsig_size = 4;
+  // Input witness size.
+  uint64 witness_size = 5;
 }
 
 message UnblindedInput {

diff --git a/internal/core/application/account_service.go b/internal/core/application/account_service.go
@@ -107,7 +107,7 @@ func (as *AccountService) ListAddressesForAccount(
 		return nil, err
 	}
 
-	addressesInfo, err := w.AllDerivedExternalAddressesForAccount(accountName)
+	addressesInfo, err := w.AllDerivedAddressesForAccount(accountName)
 	if err != nil {
 		return nil, err
 	}
@@ -198,9 +198,6 @@ func (as *AccountService) registerHandlerForWalletEvents() {
 	as.repoManager.RegisterHandlerForWalletEvent(
 		domain.WalletUnlocked, func(event domain.WalletEvent) {
 			w, _ := as.repoManager.WalletRepository().GetWallet(context.Background())
-			for key, acc := range w.AccountsByKey {
-				fmt.Printf("%s %+v\n", key, acc)
-			}
 
 			for accountName := range w.AccountKeysByName {
 				accountKey := w.AccountKeysByName[accountName]

diff --git a/internal/core/application/account_service_test.go b/internal/core/application/account_service_test.go
@@ -46,7 +46,7 @@ func TestAccountService(t *testing.T) {
 
 	addresses, err = svc.ListAddressesForAccount(ctx, accountName)
 	require.NoError(t, err)
-	require.Len(t, addresses, 2)
+	require.GreaterOrEqual(t, len(addresses), 2)
 
 	utxos, err := svc.ListUtxosForAccount(ctx, accountName)
 	require.NoError(t, err)

diff --git a/internal/core/application/mocks_test.go b/internal/core/application/mocks_test.go
@@ -88,8 +88,8 @@ func (m *mockBcScanner) GetBlockHeight(hash []byte) (uint32, error) {
 	return res, args.Error(1)
 }
 
-func (m *mockBcScanner) GetUtxos(utxoKeys []domain.UtxoKey) ([]*domain.Utxo, error) {
-	args := m.Called(utxoKeys)
+func (m *mockBcScanner) GetUtxos(utxos []domain.Utxo) ([]*domain.Utxo, error) {
+	args := m.Called(utxos)
 	var res []*domain.Utxo
 	if a := args.Get(0); a != nil {
 		res = a.([]*domain.Utxo)
@@ -249,10 +249,6 @@ func randomIntInRange(min, max int) int {
 	return int(int(n.Int64())) + min
 }
 
-func b2h(buf []byte) string {
-	return hex.EncodeToString(buf)
-}
-
 func h2b(str string) []byte {
 	buf, _ := hex.DecodeString(str)
 	return buf