update failing tests

AryanGodara · Apr 10, 2024 · d81c7e7 · d81c7e7
1 parent dc5051b
commit d81c7e7
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 64 deletions.
diff --git a/rpc/transaction_test.go b/rpc/transaction_test.go
@@ -23,54 +23,31 @@ func TestTransactionByHash(t *testing.T) {
 		ExpectedTxn Transaction
 	}
 
-	var InvokeTxnV1example = InvokeTxnV1{
-		Type:    TransactionType_Invoke,
-		MaxFee:  utils.TestHexToFelt(t, "0x17970b794f000"),
-		Version: TransactionV1,
-		Nonce:   utils.TestHexToFelt(t, "0x2d"),
+	var DeclareTxnV2Example = DeclareTxnV2{
+		Type:              TransactionType_Declare,
+		Version:           TransactionV2,
+		MaxFee:            utils.TestHexToFelt(t, "0x4a0fbb2d7a43"),
+		ClassHash:         utils.TestHexToFelt(t, "0x79b7ec8fdf40a4ff6ed47123049dfe36b5c02db93aa77832682344775ef70c6"),
+		CompiledClassHash: utils.TestHexToFelt(t, "0x7130f75fc2f1400813d1e96ea7ebee334b568a87b645a62aade0eb2fa2cf252"),
+		Nonce:             utils.TestHexToFelt(t, "0x16e"),
 		Signature: []*felt.Felt{
-			utils.TestHexToFelt(t, "0xe500c4014c055c3304d8a125cfef44638ffa5b0f6840916049667a4c38aa1c"),
-			utils.TestHexToFelt(t, "0x45ac538bfce5d8c5741b4421bbdc99f5849451acae75d2048d7cc4bb029ca77"),
-		},
-		SenderAddress: utils.TestHexToFelt(t, "0x66dd340c03b6b7866fa7bb4bb91cc9e9c2a8eedc321985f334fd55de5e4e071"),
-		Calldata: []*felt.Felt{
-			utils.TestHexToFelt(t, "0x3"),
-			utils.TestHexToFelt(t, "0x39a04b968d794fb076b0fbb146c12b48a23aa785e3d2e5be1982161f7536218"),
-			utils.TestHexToFelt(t, "0x2f0b3c5710379609eb5495f1ecd348cb28167711b73609fe565a72734550354"),
-			utils.TestHexToFelt(t, "0x0"),
-			utils.TestHexToFelt(t, "0x3"),
-			utils.TestHexToFelt(t, "0x3207980cd08767c9310d197c38b1a58b2a9bceb61dd9a99f51b407798702991"),
-			utils.TestHexToFelt(t, "0x2f0b3c5710379609eb5495f1ecd348cb28167711b73609fe565a72734550354"),
-			utils.TestHexToFelt(t, "0x3"),
-			utils.TestHexToFelt(t, "0x3"),
-			utils.TestHexToFelt(t, "0x42969068f9e84e9bf1c7bb6eb627455287e58f866ba39e45b123f9656aed5e9"),
-			utils.TestHexToFelt(t, "0x2f0b3c5710379609eb5495f1ecd348cb28167711b73609fe565a72734550354"),
-			utils.TestHexToFelt(t, "0x6"),
-			utils.TestHexToFelt(t, "0x3"),
-			utils.TestHexToFelt(t, "0x9"),
-			utils.TestHexToFelt(t, "0x47487560da4c5c5755897e527a5fda37422b5ba02a2aba1ca3ce2b24dfd142e"),
-			utils.TestHexToFelt(t, "0xde0b6b3a7640000"),
-			utils.TestHexToFelt(t, "0x0"),
-			utils.TestHexToFelt(t, "0x47487560da4c5c5755897e527a5fda37422b5ba02a2aba1ca3ce2b24dfd142e"),
-			utils.TestHexToFelt(t, "0x10f0cf064dd59200000"),
-			utils.TestHexToFelt(t, "0x0"),
-			utils.TestHexToFelt(t, "0x47487560da4c5c5755897e527a5fda37422b5ba02a2aba1ca3ce2b24dfd142e"),
-			utils.TestHexToFelt(t, "0x21e19e0c9bab2400000"),
-			utils.TestHexToFelt(t, "0x0"),
+			utils.TestHexToFelt(t, "0x5569787df42fece1184537b0d480900a403386355b9d6a59e7c7a7e758287f0"),
+			utils.TestHexToFelt(t, "0x2acaeea2e0817da33ed5dbeec295b0177819b5a5a50b0a669e6eecd88e42e92"),
 		},
+		SenderAddress: utils.TestHexToFelt(t, "0x5fd4befee268bf6880f955875cbed3ade8346b1f1e149cc87b317e62b6db569"),
 	}
 
 	testSet := map[string][]testSetType{
 		"mock": {
 			{
-				TxHash:      utils.TestHexToFelt(t, "0x1779df1c6de5136ad2620f704b645e9cbd554b57d37f08a06ea60142269c5a5"),
-				ExpectedTxn: InvokeTxnV1example,
+				TxHash:      utils.TestHexToFelt(t, "0xd109474cd037bad60a87ba0ccf3023d5f2d1cd45220c62091d41a614d38eda"),
+				ExpectedTxn: DeclareTxnV2Example,
 			},
 		},
 		"testnet": {
 			{
-				TxHash:      utils.TestHexToFelt(t, "0x1779df1c6de5136ad2620f704b645e9cbd554b57d37f08a06ea60142269c5a5"),
-				ExpectedTxn: InvokeTxnV1example,
+				TxHash:      utils.TestHexToFelt(t, "0xd109474cd037bad60a87ba0ccf3023d5f2d1cd45220c62091d41a614d38eda"),
+				ExpectedTxn: DeclareTxnV2Example,
 			},
 		},
 		"mainnet": {},
@@ -86,11 +63,11 @@ func TestTransactionByHash(t *testing.T) {
 			t.Fatal("transaction should exist")
 		}
 
-		txCasted, ok := (tx).(InvokeTxnV1)
+		txCasted, ok := (tx).(DeclareTxnV2)
 		if !ok {
-			t.Fatalf("transaction should be InvokeTxnV1, instead %T", tx)
+			t.Fatalf("transaction should be DeclareTnxV2, instead %T", tx)
 		}
-		require.Equal(t, txCasted.Type, TransactionType_Invoke)
+		require.Equal(t, txCasted.Type, TransactionType_Declare)
 		require.Equal(t, txCasted, test.ExpectedTxn)
 	}
 }
@@ -142,6 +119,7 @@ func TestTransactionByBlockIdAndIndex(t *testing.T) {
 				ExpectedTxn: InvokeTxnV1example,
 			},
 		},
+
 		"mainnet": {},
 	}[testEnv]
 	for _, test := range testSet {
@@ -170,41 +148,51 @@ func TestTransactionReceipt(t *testing.T) {
 		TxnHash      *felt.Felt
 		ExpectedResp TransactionReceiptWithBlockInfo
 	}
-	var receiptTxn310370_0 = InvokeTransactionReceipt(CommonTransactionReceipt{
-		TransactionHash: utils.TestHexToFelt(t, "0x40c82f79dd2bc1953fc9b347a3e7ab40fe218ed5740bf4e120f74e8a3c9ac99"),
-		ActualFee:       FeePayment{Amount: utils.TestHexToFelt(t, "0x1709a2f3a2"), Unit: UnitWei},
+	var receiptTxn52767_16 = InvokeTransactionReceipt(CommonTransactionReceipt{
+		TransactionHash: utils.TestHexToFelt(t, "0xf2f3d50192637e8d5e817363460c39d3a668fe12f117ecedb9749466d8352b"),
+		BlockHash:       utils.TestHexToFelt(t, "0x4ae5d52c75e4dea5694f456069f830cfbc7bec70427eee170c3385f751b8564"),
+		BlockNumber:     52767,
+		ActualFee: FeePayment{
+			Amount: utils.TestHexToFelt(t, "0x16409a78a10b00"),
+			Unit:   UnitStrk,
+		},
 		Type:            "INVOKE",
 		ExecutionStatus: TxnExecutionStatusSUCCEEDED,
 		FinalityStatus:  TxnFinalityStatusAcceptedOnL1,
 		MessagesSent:    []MsgToL1{},
 		Events: []Event{
 			{
-				FromAddress: utils.TestHexToFelt(t, "0x37de00fb1416936b3074fc78bcc811d83046009b162c4a822ce84dabedd0ea9"),
+				FromAddress: utils.TestHexToFelt(t, "0x243d436e1f7cea085aaa42834975488029b1ebf67cea1d2e86f7de58e7d34a3"),
 				Data: []*felt.Felt{
-					utils.TestHexToFelt(t, "0x0"),
-					utils.TestHexToFelt(t, "0x35b32bb4a1969175fb14b6c09838d1b3200724cc4d2b0891be319764021f5ac"),
-					utils.TestHexToFelt(t, "0xe9"),
-					utils.TestHexToFelt(t, "0x0"),
+					utils.TestHexToFelt(t, "0x3028044a4c4df95c0b0a907307c6feffa76b9c38e83088ade29b186a250eb13"),
+					utils.TestHexToFelt(t, "0x3"),
+					utils.TestHexToFelt(t, "0x17a393a5e943cec833c8a8f4cbbf7c58361fb2fdd9caa0c36d901eedec4938e"),
+					utils.TestHexToFelt(t, "0x776731d30bd922ac0390edfc664ed31b232aa7c7ce389c333e34c6b32957532"),
+					utils.TestHexToFelt(t, "0x40851db0ebaebb9f8a18eda25005c050793f2a69e9e7d1f44bc133752898918"),
+				},
+				Keys: []*felt.Felt{
+					utils.TestHexToFelt(t, "0x243d436e1f7cea085aaa42834975488029b1ebf67cea1d2e86f7de58e7d34a3"),
 				},
-				Keys: []*felt.Felt{utils.TestHexToFelt(t, "0x99cd8bde557814842a3121e8ddfd433a539b8c9f14bf31ebf108d12e6196e9")},
 			},
 			{
-				FromAddress: utils.TestHexToFelt(t, "0x33830ce413e4c096eef81b5e6ffa9b9f5d963f57b8cd63c9ae4c839c383c1a6"),
+				FromAddress: utils.TestHexToFelt(t, "0x243d436e1f7cea085aaa42834975488029b1ebf67cea1d2e86f7de58e7d34a3"),
 				Data: []*felt.Felt{
-					utils.TestHexToFelt(t, "0x61c6e7484657e5dc8b21677ffa33e4406c0600bba06d12cf1048fdaa55bdbc3"),
-					utils.TestHexToFelt(t, "0x2e28403d7ee5e337b7d456327433f003aa875c29631906908900058c83d8cb6"),
+					utils.TestHexToFelt(t, "0x6016d919abf2ddefe03dacc2ff5c8f42eb80cf65add1e90dd73c5c5e06ef3e2"),
+					utils.TestHexToFelt(t, "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8"),
+					utils.TestHexToFelt(t, "0x16409a78a10b00"),
+					utils.TestHexToFelt(t, "0x0"),
+				},
+				Keys: []*felt.Felt{
+					utils.TestHexToFelt(t, "0x15bd0500dc9d7e69ab9577f73a8d753e8761bed10f25ba0f124254dc4edb8b4"),
 				},
-				Keys: []*felt.Felt{utils.TestHexToFelt(t, "0xf806f71b19e4744968b37e3fb288e61309ab33a782ea9d11e18f67a1fbb110")},
 			},
 		},
 		ExecutionResources: ExecutionResources{
 			ComputationResources: ComputationResources{
-				Steps:          217182,
-				MemoryHoles:    6644,
-				PedersenApps:   2142,
-				RangeCheckApps: 8867,
-				BitwiseApps:    900,
-				ECDSAApps:      1,
+				Steps:          5774,
+				PedersenApps:   24,
+				ECOPApps:       3,
+				RangeCheckApps: 152,
 			},
 		},
 	})
@@ -252,11 +240,11 @@ func TestTransactionReceipt(t *testing.T) {
 		"mock": {},
 		"testnet": {
 			{
-				TxnHash: utils.TestHexToFelt(t, "0x40c82f79dd2bc1953fc9b347a3e7ab40fe218ed5740bf4e120f74e8a3c9ac99"),
+				TxnHash: utils.TestHexToFelt(t, "0xf2f3d50192637e8d5e817363460c39d3a668fe12f117ecedb9749466d8352b"),
 				ExpectedResp: TransactionReceiptWithBlockInfo{
-					TransactionReceipt: receiptTxn310370_0,
-					BlockNumber:        310370,
-					BlockHash:          utils.TestHexToFelt(t, "0x6c2fe3db009a2e008c2d65fca14204f3405cb74742fcf685f02473acaf70c72"),
+					TransactionReceipt: receiptTxn52767_16,
+					BlockNumber:        52767,
+					BlockHash:          utils.TestHexToFelt(t, "0x4ae5d52c75e4dea5694f456069f830cfbc7bec70427eee170c3385f751b8564"),
 				},
 			},
 		},
@@ -296,7 +284,7 @@ func TestGetTransactionStatus(t *testing.T) {
 		"mock": {},
 		"testnet": {
 			{
-				TxnHash:      utils.TestHexToFelt(t, "0x46a9f52a96b2d226407929e04cb02507e531f7c78b9196fc8c910351d8c33f3"),
+				TxnHash:      utils.TestHexToFelt(t, "0xd109474cd037bad60a87ba0ccf3023d5f2d1cd45220c62091d41a614d38eda"),
 				ExpectedResp: TxnStatusResp{FinalityStatus: TxnStatus_Accepted_On_L1, ExecutionStatus: TxnExecutionStatusSUCCEEDED},
 			},
 		},

diff --git a/rpc/types_transaction_receipt.go b/rpc/types_transaction_receipt.go
@@ -25,6 +25,8 @@ const (
 type CommonTransactionReceipt struct {
 	// TransactionHash The hash identifying the transaction
 	TransactionHash *felt.Felt `json:"transaction_hash"`
+	BlockHash       *felt.Felt `json:"block_hash,omitempty"`
+	BlockNumber     uint       `json:"block_number,omitempty"`
 	// ActualFee The fee that was charged by the sequencer
 	ActualFee       FeePayment         `json:"actual_fee"`
 	ExecutionStatus TxnExecutionStatus `json:"execution_status"`