Skip to content

Commit

Permalink
chore: bump deps (#1269)
Browse files Browse the repository at this point in the history
<!--- Please provide a general summary of your changes in the title
above -->

<!-- Give an estimate of the time you spent on this PR in terms of work
days.
Did you spend 0.5 days on this PR or rather 2 days?  -->

Time spent on this PR: 0.3d

## Pull request type

<!-- Please try to limit your pull request to one type,
submit multiple pull requests if needed. -->

Please check the type of change your PR introduces:

- [ ] Bugfix
- [ ] Feature
- [ ] Code style update (formatting, renaming)
- [ ] Refactoring (no functional changes, no api changes)
- [ ] Build related changes
- [ ] Documentation content changes
- [ ] Other (please describe):

## What is the current behavior?

<!-- Please describe the current behavior that you are modifying,
or link to a relevant issue. -->

Resolves #<Issue number>

## What is the new behavior?

<!-- Please describe the behavior or changes that are being added by
this PR. -->

- Bumps dependencies, required to use the latest types in the cairo core
lib.
- Bumping starknet-py requires bumping Katana to v1.0, which supports
the latest rpc spec 0.7.1
- Instead of relying on a "hardcoded" erc20 json abi, add the contract
to the list of contracts to compile

<!-- Reviewable:start -->
- - -
This change is [<img src="https://reviewable.io/review_button.svg"
height="34" align="absmiddle"
alt="Reviewable"/>](https://reviewable.io/reviews/kkrt-labs/kakarot/1269)
<!-- Reviewable:end -->

---------

Co-authored-by: Clément Walter <clement0walter@gmail.com>
  • Loading branch information
enitrat and ClementWalter committed Jul 15, 2024
1 parent 93cd65e commit b70fcf8
Show file tree
Hide file tree
Showing 9 changed files with 68 additions and 49,288 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ jobs:
name: kakarot-build
path: ./build/v0
- name: Move ERC20
run: mv build/v0/fixtures/ERC20.json build/common
run: mv build/v0/ERC20.json build/common
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/trunk-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3.10.14
cache: pip
- run: pip install cairo-lang
- run: pip install sympy==1.11.1 cairo-lang==0.13.1

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ endif
KKRT_SSJ_RELEASE_ID = 154615699
# Kakarot SSJ artifacts for precompiles.
KKRT_SSJ_BUILD_ARTIFACT_URL = $(shell curl -L https://api.github.com/repos/kkrt-labs/kakarot-ssj/releases/${KKRT_SSJ_RELEASE_ID} | jq -r '.assets[0].browser_download_url')
KATANA_VERSION = v0.7.2
KATANA_VERSION = v1.0.0-alpha.0
ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))


Expand Down
11 changes: 2 additions & 9 deletions kakarot_scripts/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,13 @@ class NetworkType(Enum):
"type": NetworkType.PROD,
"chain_id": StarknetChainId.MAINNET,
},
"goerli": {
"name": "starknet-goerli",
"explorer_url": "https://testnet.starkscan.co",
"rpc_url": f"https://starknet-goerli.infura.io/v3/{os.getenv('INFURA_KEY')}",
"l1_rpc_url": f"https://goerli.infura.io/v3/{os.getenv('INFURA_KEY')}",
"type": NetworkType.PROD,
"chain_id": StarknetChainId.GOERLI,
},
"sepolia": {
"name": "starknet-sepolia",
"explorer_url": "https://sepolia.starkscan.co/",
"rpc_url": "https://starknet-sepolia.public.blastapi.io/rpc/v0_6",
"l1_rpc_url": f"https://sepolia.infura.io/v3/{os.getenv('INFURA_KEY')}",
"type": NetworkType.PROD,
"chain_id": StarknetChainId.SEPOLIA_TESTNET,
"chain_id": StarknetChainId.SEPOLIA,
"check_interval": 5,
"max_wait": 30,
},
Expand Down Expand Up @@ -234,6 +226,7 @@ class ArtifactType(Enum):
{"contract_name": "replace_class", "cairo_version": ArtifactType.cairo0},
{"contract_name": "Counter", "cairo_version": ArtifactType.cairo0},
{"contract_name": "MockPragmaOracle", "cairo_version": ArtifactType.cairo1},
{"contract_name": "ERC20", "cairo_version": ArtifactType.cairo0},
]

# PRE-EIP155 TX
Expand Down
Loading

0 comments on commit b70fcf8

Please sign in to comment.