feat: changed to filterTransferAccount

perpsv3.go

@@ -814,7 +814,7 @@ func (p *Perpsv3) init() error {
 		return err
 	}
 
-	srv, err := services.NewService(rpcClient, p.config, coreContact, perpsMarketContract)
+	srv, err := services.NewService(rpcClient, p.config, coreContact, perpsMarketContract, accountContract)
 	if err != nil {
 		return err
 	}

services/accounts.go

@@ -11,6 +11,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 
 	"github.com/gateway-fm/perpsv3-Go/config"
+	"github.com/gateway-fm/perpsv3-Go/contracts/Account"
 	"github.com/gateway-fm/perpsv3-Go/contracts/core"
 	"github.com/gateway-fm/perpsv3-Go/contracts/forwarder"
 	"github.com/gateway-fm/perpsv3-Go/errors"
@@ -798,7 +799,7 @@ func (s *Service) RetrieveChangeOwner(fromBlock, toBlock, limit uint64) ([]*mode
 
 		opts := s.getFilterOptsCore(startBlockOfIteration, &endBlockOfIteration)
 
-		iterator, err := s.core.FilterOwnerChanged(opts)
+		iterator, err := s.accountContract.FilterTransfer(opts, nil, nil, nil)
 		if err != nil {
 			return nil, err
 		}
@@ -854,17 +855,16 @@ func permissionGrantedToPermissionChanged(revoked *core.CorePermissionGranted) (
 	}, nil
 }
 
-func (s *Service) toOwnerTransfered(changed *core.CoreOwnerChanged) (*models.AccountTransfer, error) {
+func (s *Service) toOwnerTransfered(changed *Account.AccountTransfer) (*models.AccountTransfer, error) {
 	block, err := s.rpcClient.BlockByHash(context.Background(), changed.Raw.BlockHash)
 	if err != nil {
 		return nil, err
 	}
 	return &models.AccountTransfer{
-		From:           changed.OldOwner,
-		To:             changed.NewOwner,
+		From:           changed.From,
+		To:             changed.To,
 		BlockNumber:    changed.Raw.BlockNumber,
 		BlockTimestamp: block.Time(),
-		//! We don't have account address in here
-		//! So we know from and to but do not know what
+		TokenID:        changed.TokenId,
 	}, nil
 }

services/accounts_test.go

@@ -1,16 +1,18 @@
 package services
 
 import (
-	"github.com/gateway-fm/perpsv3-Go/config"
 	"log"
 	"math/big"
 	"os"
 	"testing"
 
+	"github.com/gateway-fm/perpsv3-Go/config"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/stretchr/testify/require"
 
+	"github.com/gateway-fm/perpsv3-Go/contracts/Account"
 	"github.com/gateway-fm/perpsv3-Go/contracts/core"
 	"github.com/gateway-fm/perpsv3-Go/contracts/perpsMarket"
 	"github.com/gateway-fm/perpsv3-Go/models"
@@ -29,6 +31,8 @@ func TestService_FormatAccount_OnChain(t *testing.T) {
 	coreC, _ := core.NewCore(common.HexToAddress("0x76490713314fCEC173f44e99346F54c6e92a8E42"), rpcClient)
 	perps, _ := perpsMarket.NewPerpsMarket(common.HexToAddress("0xf272382cB3BE898A8CdB1A23BE056fA2Fcf4513b"), rpcClient)
 
+	acc, _ := Account.NewAccount(common.HexToAddress("0x63f4Dd0434BEB5baeCD27F3778a909278d8cf5b8"), rpcClient)
+
 	idPer := new(big.Int)
 	idPer.SetString("170141183460469231731687303715884105754", 10)
 
@@ -59,7 +63,7 @@ func TestService_FormatAccount_OnChain(t *testing.T) {
 	}
 	for _, tt := range testCases {
 		t.Run(tt.name, func(t *testing.T) {
-			s, _ := NewService(rpcClient, conf, coreC, perps)
+			s, _ := NewService(rpcClient, conf, coreC, perps, acc)
 
 			res, err := s.FormatAccount(tt.id)
 
@@ -85,8 +89,10 @@ func TestService_FormatAccounts_OnChain_Limit(t *testing.T) {
 
 	coreC, _ := core.NewCore(common.HexToAddress("0x76490713314fCEC173f44e99346F54c6e92a8E42"), rpcClient)
 	perps, _ := perpsMarket.NewPerpsMarket(common.HexToAddress("0xf272382cB3BE898A8CdB1A23BE056fA2Fcf4513b"), rpcClient)
+	acc, _ := Account.NewAccount(common.HexToAddress("0x63f4Dd0434BEB5baeCD27F3778a909278d8cf5b8"), rpcClient)
+
 
-	s, _ := NewService(rpcClient, conf, coreC, perps)
+	s, _ := NewService(rpcClient, conf, coreC, perps, acc)
 
 	_, err := s.FormatAccountsLimit(20000)