Skip to content

Commit 55163ae

Browse files
committed
Merge branch 'main' into 177-upgrade-pydantic-version
# Conflicts: # pyproject.toml
2 parents 6ded657 + e40033f commit 55163ae

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

pyproject.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ dynamic = [ "version" ]
3030
dependencies = [
3131
"aiohttp>=3.8.3",
3232
"aioresponses>=0.7.6",
33-
"aleph-message @ git+https://github.com/aleph-im/aleph-message@108-upgrade-pydantic-version#egg=aleph-message",
33+
"aleph-message>=1.0.0",
3434
"aleph-superfluid>=0.2.1",
35-
"base58==2.1.1", # Needed now as default with _load_account changement
35+
"base58==2.1.1", # Needed now as default with _load_account changement
3636
"coincurve; python_version<'3.11'",
3737
"coincurve>=19; python_version>='3.11'",
3838
"eth-abi>=4; python_version>='3.11'",
3939
"eth-typing==4.3.1",
4040
"jwcrypto==1.5.6",
41-
"pydantic-core>=2",
41+
"pydantic>=2,<3.0",
4242
"pydantic-settings>=2",
4343
"pynacl==1.5", # Needed now as default with _load_account changement
4444
"python-magic",
@@ -155,8 +155,6 @@ dependencies = [
155155
"ruff==0.4.8",
156156
"isort==5.13.2",
157157
"pyproject-fmt==2.2.1",
158-
"pydantic-core>=2",
159-
"pydantic-settings>=2",
160158
]
161159
[tool.hatch.envs.linting.scripts]
162160
typing = "mypy --config-file=pyproject.toml {args:} ./src/ ./tests/ ./examples/"

src/aleph/sdk/account.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
Chain.OPTIMISM: EVMAccount,
3737
Chain.POL: EVMAccount,
3838
Chain.SOL: SOLAccount,
39+
Chain.SONIC: EVMAccount,
3940
Chain.WORLDCHAIN: EVMAccount,
4041
Chain.ZORA: EVMAccount,
4142
}

src/aleph/sdk/conf.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,10 @@ class Settings(BaseSettings):
164164
chain_id=137,
165165
rpc="https://polygon.gateway.tenderly.co",
166166
),
167+
Chain.SONIC: ChainInfo(
168+
chain_id=146,
169+
rpc="https://rpc.soniclabs.com",
170+
),
167171
Chain.WORLDCHAIN: ChainInfo(
168172
chain_id=480,
169173
rpc="https://worldchain-mainnet.gateway.tenderly.co",
@@ -190,6 +194,7 @@ class Settings(BaseSettings):
190194
CHAINS_MODE_ACTIVE: Optional[bool] = None
191195
CHAINS_OPTIMISM_ACTIVE: Optional[bool] = None
192196
CHAINS_POL_ACTIVE: Optional[bool] = None
197+
CHAINS_SONIC_ACTIVE: Optional[bool] = None
193198
CHAINS_WORLDCHAIN_ACTIVE: Optional[bool] = None
194199
CHAINS_ZORA_ACTIVE: Optional[bool] = None
195200

@@ -209,6 +214,7 @@ class Settings(BaseSettings):
209214
CHAINS_MODE_RPC: Optional[str] = None
210215
CHAINS_OPTIMISM_RPC: Optional[str] = None
211216
CHAINS_POL_RPC: Optional[str] = None
217+
CHAINS_SONIC_RPC: Optional[str] = None
212218
CHAINS_WORLDCHAIN_RPC: Optional[str] = None
213219
CHAINS_ZORA_RPC: Optional[str] = None
214220

0 commit comments

Comments
 (0)