Adapt to work with cairo-lang v0.6.2 (#19)

* Adapt to work with cairo-lang v0.6.2

* Set plugin-test no_output_timeout to 1m

* Use settings.ini in test-plugin.sh

* Install plugin from source

.circleci/config.yml

@@ -34,6 +34,7 @@ jobs:
       - run:
           name: Test plugin
           command: ./scripts/test-plugin.sh
+          no_output_timeout: 1m
   package_build_and_publish:
     docker:
       - image: cimg/python:3.7

pyproject.toml

@@ -14,7 +14,7 @@ keywords = ["starknet", "cairo", "testnet", "local", "server"]
 python = "^3.7"
 Flask = {extras = ["async"], version = "^2.0.2"}
 flask-cors = "^3.0.10"
-cairo-lang = "0.6.1"
+cairo-lang = "0.6.2"
 
 [tool.poetry.dev-dependencies]
 

scripts/setup-example.sh

@@ -1,10 +1,19 @@
 #!/bin/bash
 set -e
 
-echo "Cloning branch 'devnet'"
+echo "Installing starknet-hardhat-plugin from source"
+git clone -b master --single-branch [email protected]:Shard-Labs/starknet-hardhat-plugin.git
+cd starknet-hardhat-plugin
+npm ci
+npm run build
+npm link
+cd ..
+
+echo "Cloning starknet-hardhat-example branch 'devnet'"
 git clone -b devnet --single-branch [email protected]:Shard-Labs/starknet-hardhat-example.git
 cd starknet-hardhat-example
 npm ci
+npm link @shardlabs/starknet-hardhat-plugin
 
 # generate artifacts
 npx hardhat starknet-compile

scripts/test-cli-auth.sh

@@ -27,14 +27,14 @@ echo "tx_hash: $deploy_tx_hash"
 
 # inspects status from tx_status object
 deploy_tx_status=$(starknet tx_status --hash $deploy_tx_hash --feeder_gateway_url $FEEDER_GATEWAY_URL | jq ".tx_status" -r)
-if [ "$deploy_tx_status" != "PENDING" ]; then
+if [ "$deploy_tx_status" != "ACCEPTED_ON_L2" ]; then
     echo "Wrong tx_status: $deploy_tx_status"
     exit 2
 fi
 
 # inspects status from tx object
 deploy_tx_status2=$(starknet get_transaction --hash $deploy_tx_hash --feeder_gateway_url $FEEDER_GATEWAY_URL | jq ".status" -r)
-if [ "$deploy_tx_status2" != "PENDING" ]; then
+if [ "$deploy_tx_status2" != "ACCEPTED_ON_L2" ]; then
     echo "Wrong status in tx: $deploy_tx_status2"
     exit 2
 fi

scripts/test-cli.sh

@@ -25,14 +25,14 @@ echo "tx_hash: $deploy_tx_hash"
 
 # inspects status from tx_status object
 deploy_tx_status=$(starknet tx_status --hash $deploy_tx_hash --feeder_gateway_url $FEEDER_GATEWAY_URL | jq ".tx_status" -r)
-if [ "$deploy_tx_status" != "PENDING" ]; then
+if [ "$deploy_tx_status" != "ACCEPTED_ON_L2" ]; then
     echo "Wrong tx_status: $deploy_tx_status"
     exit 2
 fi
 
 # inspects status from tx object
 deploy_tx_status2=$(starknet get_transaction --hash $deploy_tx_hash --feeder_gateway_url $FEEDER_GATEWAY_URL | jq ".status" -r)
-if [ "$deploy_tx_status2" != "PENDING" ]; then
+if [ "$deploy_tx_status2" != "ACCEPTED_ON_L2" ]; then
     echo "Wrong status in tx: $deploy_tx_status2"
     exit 2
 fi

scripts/test-plugin.sh

@@ -1,10 +1,12 @@
 #!/bin/bash
 set -e
 
+source scripts/settings.ini
+[ -f .env ] && source .env
+
 trap 'kill $(jobs -p)' EXIT
 
-poetry run starknet-devnet --host=localhost --port=5000 &
-GATEWAY_URL=http://localhost:5000
+poetry run starknet-devnet --host="$host" --port="$port" &
 sleep 1 # give the server some time to get up
 
 function extract_address () {

starknet_devnet/server.py

@@ -38,7 +38,7 @@ async def add_transaction():
 
     tx_type = transaction.tx_type.name
     result_dict = {}
-    status = TxStatus.PENDING
+    status = TxStatus.ACCEPTED_ON_L2
     error_message = None
 
     if tx_type == TransactionType.DEPLOY.name:

starknet_devnet/util.py

@@ -10,19 +10,22 @@ class TxStatus(Enum):
     According to: https://www.cairo-lang.org/docs/hello_starknet/intro.html#interact-with-the-contract
     """
 
-    PENDING = auto()
-    """The transaction passed the validation and is waiting to be sent on-chain."""
-
     NOT_RECEIVED = auto()
     """The transaction has not been received yet (i.e., not written to storage"""
 
     RECEIVED = auto()
     """The transaction was received by the operator."""
 
+    PENDING = auto()
+    """The transaction passed the validation and entered the pending block."""
+
     REJECTED = auto()
     """The transaction failed validation and thus was skipped."""
 
-    ACCEPTED_ONCHAIN = auto()
+    ACCEPTED_ON_L2 = auto()
+    """The transaction passed the validation and entered an actual created block."""
+
+    ACCEPTED_ON_L1 = auto()
     """The transaction was accepted on-chain."""
 
 def custom_int(arg: str) -> str: