Merge branch 'main' of github.com:argentlabs/argent-contracts-starknet-private into update

Author: Sergio Garcia

.github/workflows/integration-ci.yml

@@ -7,12 +7,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out main branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Read .nvmrc
         run: echo "NVMRC=$(cat .nvmrc)" >> $GITHUB_OUTPUT
         id: nvm
 
+      - name: Use correct node version
+        uses: actions/setup-node@v3
+        with:
+          node-version: '${{ steps.nvm.outputs.NVMRC }}'
+
       - name: Setup Scarb
         uses: software-mansion/[email protected]
 
@@ -61,23 +66,41 @@ jobs:
   format:
     runs-on: ubuntu-latest
     steps:
-      - name: Step 1 - Check out main branch
-        uses: actions/checkout@v3
+      - name: Check out main branch
+        uses: actions/checkout@v4
+
+      - name: Read .nvmrc
+        run: echo "NVMRC=$(cat .nvmrc)" >> $GITHUB_OUTPUT
+        id: nvm
+
+      - name: Use correct node version
+        uses: actions/setup-node@v3
+        with:
+          node-version: '${{ steps.nvm.outputs.NVMRC }}'
 
-      - name: Step 2 - Install project
+      - name: Install project
         run: yarn install --frozen-lockfile
 
-      - name: Step 3 - Check correct formatting
+      - name: Check correct formatting
         run: yarn prettier --check .
 
   lint:
     runs-on: ubuntu-latest
     steps:
-      - name: Step 1 - Check out main branch
-        uses: actions/checkout@v3
+      - name: Check out main branch
+        uses: actions/checkout@v4
 
-      - name: Step 2 - Install project
+      - name: Read .nvmrc
+        run: echo "NVMRC=$(cat .nvmrc)" >> $GITHUB_OUTPUT
+        id: nvm
+
+      - name: Use correct node version
+        uses: actions/setup-node@v3
+        with:
+          node-version: '${{ steps.nvm.outputs.NVMRC }}'
+
+      - name: Install project
         run: yarn install --frozen-lockfile
 
-      - name: Step 3 - Check correct linting
+      - name: Check correct linting
         run: yarn eslint .

.nvmrc

@@ -1 +1 @@
-18
+22

.prettierignore

@@ -8,3 +8,5 @@ tests-integration/fixtures
 starknet-devnet-rs
 .svelte-kit
 docs
+# Uses his own prettier config
+examples

Dockerfile

@@ -1,8 +1,12 @@
 # Use the base image
-FROM shardlabs/starknet-devnet-rs:0.3.0-rc.0-seed0
+FROM shardlabs/starknet-devnet-rs:0.6.0-seed0
 
 # Expose port 5050
 EXPOSE 5050
 
 # Set default command to run the container
-CMD ["--gas-price", "6000000000", "--data-gas-price", "1", "--timeout", "320", "--lite-mode", "--gas-price-fri", "35000000000000", "--data-gas-price-fri", "1", "--initial-balance", "1000000000000000000000000"]
+# Values taken at block 2529608 and ceil them
+# l1_data_gas_price: { price_in_fri: '0x8362', price_in_wei: '0x1' },
+# l1_gas_price: { price_in_fri: '0x267745a34c04', price_in_wei: '0x4af31412' },
+# l2_gas_price: { price_in_fri: '0xb2d05e00', price_in_wei: '0x15c69' },
+CMD ["--timeout", "320", "--lite-mode", "--gas-price-fri", "45000000000000", "--data-gas-price-fri", "35000", "--l2-gas-price-fri", "3000000000", "--initial-balance", "1000000000000000000000000"]

Scarb.toml

@@ -18,20 +18,21 @@ alexandria_merkle_tree = "0.4.0"
 openzeppelin_security = "1.0.0"
 openzeppelin_presets = "1.0.0"
 
+[dev-dependencies]
+snforge_std = "0.38.3"
+assert_macros = "2.10.1"
+
 [tool.fmt]
 max-line-length = 120
 sort-module-level-items = true
 
-[dev-dependencies]
-assert_macros = "2.10.1"
-snforge_std = "0.38.3"
-
 [scripts]
 test = "snforge test"
 format = "scarb fmt && yarn prettier --write ."
 lint = "yarn eslint ."
 test-ts = "scarb --profile release build && yarn tsc && yarn mocha --recursive tests-integration/ --extension .test.ts"
 test-ts-sc = "yarn mocha --require ts-node/register/transpile-only --recursive tests-integration/**/*.test.ts"
+test-upgrade = "yarn mocha --require ts-node/register/transpile-only --recursive tests-integration/upgrade.ts"
 test-multisig = "scarb --profile release build && yarn tsc && yarn mocha tests-integration/multisig*.test.ts"
 test-session = "scarb --profile release build && yarn tsc && yarn mocha tests-integration/session/*.test.ts"
 test-multiowner = "scarb --profile release build && yarn tsc && yarn mocha tests-integration/multiowner/*.test.ts"