Add actual fee

dipdup-io · Mar 7, 2024 · 8fb2de9 · 8fb2de9
1 parent 2c8edb3
commit 8fb2de9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/dipdup-io/starknet-indexer
 go 1.21
 
 require (
-	github.com/dipdup-io/starknet-go-api v0.0.0-20240130002112-e07f784ea34e
+	github.com/dipdup-io/starknet-go-api v0.0.0-20240307134453-42ca4ba88776
 	github.com/dipdup-io/workerpool v0.0.4
 	github.com/dipdup-net/go-lib v0.3.3
 	github.com/dipdup-net/indexer-sdk v0.0.4

diff --git a/go.sum b/go.sum
@@ -43,6 +43,8 @@ github.com/dipdup-io/starknet-go-api v0.0.0-20240110155038-c97c6d82a0eb h1:IAJCA
 github.com/dipdup-io/starknet-go-api v0.0.0-20240110155038-c97c6d82a0eb/go.mod h1:y3KGLFQtwzUBcT0X2LMj6CxocUimr/A9XYg+j0KIRDE=
 github.com/dipdup-io/starknet-go-api v0.0.0-20240130002112-e07f784ea34e h1:oFFZ77W368tOQuCwReeB3PEpjkJeEGOciOgJFYp+1Y8=
 github.com/dipdup-io/starknet-go-api v0.0.0-20240130002112-e07f784ea34e/go.mod h1:y3KGLFQtwzUBcT0X2LMj6CxocUimr/A9XYg+j0KIRDE=
+github.com/dipdup-io/starknet-go-api v0.0.0-20240307134453-42ca4ba88776 h1:j7CcqHyilB750xiPtUO/HueGE7VtTzixRvLKp4ccPsY=
+github.com/dipdup-io/starknet-go-api v0.0.0-20240307134453-42ca4ba88776/go.mod h1:y3KGLFQtwzUBcT0X2LMj6CxocUimr/A9XYg+j0KIRDE=
 github.com/dipdup-io/workerpool v0.0.4 h1:m58fuFY3VIPRc+trWpjw2Lsm4FvIgtjP/4VRe79r+/s=
 github.com/dipdup-io/workerpool v0.0.4/go.mod h1:m6YMqx7M+fORTyabHD/auKymBRpbDax0t1aPZ1i7GZA=
 github.com/dipdup-net/go-lib v0.3.3 h1:vTUI+sT4L+x+eiMf712Cg8EtlqUCMiN6M3vcNaPlCw8=

diff --git a/pkg/indexer/receiver/node.go b/pkg/indexer/receiver/node.go
@@ -31,7 +31,7 @@ func NewNode(cfg config.DataSource) *Node {
 }
 
 func (n *Node) GetBlock(ctx context.Context, blockId starknetData.BlockID) (block Block, err error) {
-	response, err := n.api.GetBlockWithTxs(ctx, blockId)
+	response, err := n.api.GetBlockWithReceipts(ctx, blockId)
 	if err != nil {
 		return
 	}
@@ -47,11 +47,11 @@ func (n *Node) GetBlock(ctx context.Context, blockId starknetData.BlockID) (bloc
 	block.Transactions = make([]Transaction, len(response.Result.Transactions))
 
 	for i := range response.Result.Transactions {
-		block.Transactions[i].Hash = response.Result.Transactions[i].TransactionHash
-		block.Transactions[i].Type = response.Result.Transactions[i].Type
-		block.Transactions[i].Version = response.Result.Transactions[i].Version
-		block.Transactions[i].Body = response.Result.Transactions[i].Body
-		// TODO: resolve actual fee | block.Transactions[i].ActualFee = ""
+		block.Transactions[i].Hash = response.Result.Transactions[i].Transaction.TransactionHash
+		block.Transactions[i].Type = response.Result.Transactions[i].Transaction.Type
+		block.Transactions[i].Version = response.Result.Transactions[i].Transaction.Version
+		block.Transactions[i].Body = response.Result.Transactions[i].Transaction.Body
+		block.Transactions[i].ActualFee = response.Result.Transactions[i].Receipt.ActualFee.Amount
 	}
 
 	return