Merge branch 'main' into call-update

AryanGodara · May 16, 2024 · 2fffbef · 2fffbef
2 parents d29e4aa + c76fd3f
commit 2fffbef
Show file tree

Hide file tree

Showing 18 changed files with 753 additions and 681 deletions.
diff --git a/.github/workflows/main_ci_check.yml b/.github/workflows/main_ci_check.yml
@@ -11,7 +11,7 @@ jobs:
 
     services:
       devnet:
-        image: shardlabs/starknet-devnet:latest
+        image: shardlabs/starknet-devnet-rs:0.0.5
         ports:
           - 5050:5050
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
 
     services:
       devnet:
-        image: shardlabs/starknet-devnet:0.3.4
+        image: shardlabs/starknet-devnet-rs:0.0.5
         ports:
           - 5050:5050
 

diff --git a/.github/workflows/test_account.yml b/.github/workflows/test_account.yml
@@ -13,7 +13,7 @@ jobs:
 
     services:
       devnet:
-        image: shardlabs/starknet-devnet:0.5.5
+        image: shardlabs/starknet-devnet-rs:0.0.5
         ports:
           - 5050:5050
 

diff --git a/.github/workflows/test_rpc.yml b/.github/workflows/test_rpc.yml
@@ -13,7 +13,7 @@ jobs:
 
     services:
       devnet:
-        image: shardlabs/starknet-devnet:latest
+        image: shardlabs/starknet-devnet-rs:0.0.5
         ports:
           - 5050:5050
 

diff --git a/account/account_test.go b/account/account_test.go
@@ -970,10 +970,9 @@ func TestWaitForTransactionReceiptMOCK(t *testing.T) {
 				Hash:                         new(felt.Felt).SetUint64(2),
 				ShouldCallTransactionReceipt: true,
 				ExpectedReceipt: &rpc.TransactionReceiptWithBlockInfo{
-					TransactionReceipt: rpc.InvokeTransactionReceipt{
-						TransactionHash: new(felt.Felt).SetUint64(2),
-						ExecutionStatus: rpc.TxnExecutionStatusSUCCEEDED,
-					},
+					UnknownTransactionReceipt: rpc.UnknownTransactionReceipt{},
+					BlockHash:                 new(felt.Felt).SetUint64(2),
+					BlockNumber:               2,
 				},
 
 				ExpectedErr: nil,

diff --git a/devnet/devnet.go b/devnet/devnet.go
@@ -60,7 +60,9 @@ func (devnet *DevNet) api(uri string) string {
 // the list of accounts and any error that occurred during the process.
 //
 // Parameters:
-//   none
+//
+//	none
+//
 // Returns:
 // - []TestAccount: a slice of TestAccount structs
 func (devnet *DevNet) Accounts() ([]TestAccount, error) {
@@ -87,9 +89,12 @@ func (devnet *DevNet) Accounts() ([]TestAccount, error) {
 // and false otherwise.
 //
 // Parameters:
-//  none
+//
+//	none
+//
 // Returns:
-//  bool: true if the DevNet is alive, false otherwise
+//
+//	bool: true if the DevNet is alive, false otherwise
 func (devnet *DevNet) IsAlive() bool {
 	req, err := http.NewRequest(http.MethodGet, devnet.api("/is_alive"), nil)
 	if err != nil {
@@ -107,8 +112,9 @@ func (devnet *DevNet) IsAlive() bool {
 }
 
 type MintResponse struct {
-	NewBalance *big.Int `json:"new_balance"`
-	Unit       string   `json:"unit"`
+	NewBalance      string `json:"new_balance"`
+	Unit            string `json:"unit"`
+	TransactionHash string `json:"tx_hash"`
 }
 
 // Mint mints a certain amount of tokens for a given address.
@@ -160,7 +166,9 @@ type FeeToken struct {
 // to retrieve the fee token.
 //
 // Parameters:
-//   none
+//
+//	none
+//
 // Returns:
 //   - *FeeToken: a pointer to a FeeToken object
 //   - error: an error, if any

diff --git a/devnet/devnet_test.go b/devnet/devnet_test.go
@@ -2,6 +2,7 @@ package devnet
 
 import (
 	"math/big"
+	"strconv"
 	"strings"
 	"testing"
 
@@ -16,7 +17,8 @@ import (
 // Parameters:
 // - t: is the testing.T instance for running the test
 // Returns:
-//   none
+//
+//	none
 func TestDevnet_IsAlive(t *testing.T) {
 	d := NewDevNet()
 	if !d.IsAlive() {
@@ -30,9 +32,11 @@ func TestDevnet_IsAlive(t *testing.T) {
 // account addresses are valid.
 //
 // Parameters:
-//  - t: is the testing.T instance for running the test
+//   - t: is the testing.T instance for running the test
+//
 // Returns:
-//  none
+//
+//	none
 func TestDevnet_Accounts(t *testing.T) {
 	d := NewDevNet()
 	accounts, err := d.Accounts()
@@ -44,26 +48,6 @@ func TestDevnet_Accounts(t *testing.T) {
 	}
 }
 
-// TestDevnet_FeeToken tests the FeeToken function of the Devnet struct.
-//
-// The function retrieves the fee token from the Devnet instance and checks that
-// it matches the expected ETH address.
-//
-// Parameters:
-// - t: is the testing.T instance for running the test
-// Returns:
-//   none
-func TestDevnet_FeeToken(t *testing.T) {
-	d := NewDevNet()
-	token, err := d.FeeToken()
-	if err != nil {
-		t.Fatalf("Reading token should succeed, instead: %v", err)
-	}
-	if token.Address.String() != DevNetETHAddress {
-		t.Fatalf("devnet ETH address, instead %s", token.Address.String())
-	}
-}
-
 // TestDevnet_Mint is a test function that tests the Mint method of the Devnet struct.
 //
 // It initializes a new Devnet instance and sets the amount to 1000000000000000000.
@@ -74,15 +58,17 @@ func TestDevnet_FeeToken(t *testing.T) {
 // Parameters:
 // - t: is the testing.T instance for running the test
 // Returns:
-//   none
+//
+//	none
 func TestDevnet_Mint(t *testing.T) {
 	d := NewDevNet()
 	amount := big.NewInt(int64(1000000000000000000))
 	resp, err := d.Mint(utils.TestHexToFelt(t, "0x1"), amount)
 	if err != nil {
 		t.Fatalf("Minting ETH should succeed, instead: %v", err)
 	}
-	if resp.NewBalance.Cmp(amount) < 0 {
-		t.Fatalf("ETH should be higher than the last mint, instead: %d", resp.NewBalance)
+	balance, _ := (strconv.ParseInt(resp.NewBalance, 10, 64))
+	if balance < 0 {
+		t.Fatalf("ETH should be higher than the last mint, instead: %d", balance)
 	}
 }