Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IOS-7967 Enenrgy WEB EVM/X #3975

Merged
merged 10 commits into from
Oct 10, 2024
Merged

IOS-7967 Enenrgy WEB EVM/X #3975

merged 10 commits into from
Oct 10, 2024

Conversation

amuraveinik
Copy link
Contributor

@amuraveinik amuraveinik commented Sep 30, 2024

Vyachesl0ve
Vyachesl0ve previously approved these changes Sep 30, 2024
@amuraveinik amuraveinik marked this pull request as draft September 30, 2024 13:47
@amuraveinik
Copy link
Contributor Author

Пока что билдится не будет, не подключен BSDK

@@ -28,7 +28,7 @@ extension SupportedBlockchains {
/// Blockchains which don't include in supported blockchains by default
static var testableIDs: Set<String> {
// Here version isn't important because we take only coinId
return Set(SupportedBlockchains(version: .v1).testableBlockchains().map { $0.coinId })
return Set(SupportedBlockchains(version: .v1).testableBlockchains().map { $0.networkId })
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Поправьте меня если я не прав, но кажется что тут изначально должно было быть networkId.

Я столкнулся с тем что в разных сетях (energy-web-chain и energy-web-x) coin id может быть одинаковый (energy-web-token), и на бета сборке в supported blockchain будет отображаться energy-web-token.
А в Manage Tokens в свою очередь отобразится только одна сеть

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://api.tangem-tech.com/v1/coins?networkIds=energy-web-chain

{
  "imageHost": "https://s3.eu-central-1.amazonaws.com/tangem.api/coins/",
  "ts": 1728034490106,
  "coins": [
    {
      "id": "energy-web-token",
      "name": "Energy Web",
      "symbol": "EWT",
      "active": true,
      "networks": [
        {
          "networkId": "energy-web-chain",
          "exchangeable": false
        }
      ]
    }
  ],
  "total": 1
}

https://api.tangem-tech.com/v1/coins?networkIds=energy-web-x

{
  "imageHost": "https://s3.eu-central-1.amazonaws.com/tangem.api/coins/",
  "ts": 1728034667245,
  "coins": [
    {
      "id": "energy-web-token",
      "name": "Energy Web",
      "symbol": "EWT",
      "active": true,
      "networks": [
        {
          "networkId": "energy-web-x",
          "exchangeable": false
        }
      ]
    }
  ],
  "total": 1
}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ммм, по большому счет было без разницы, с учетом того, что coinId уникальный, вообще надо проверить по коду не оторвет ли где-то еще повторяющийся айдишник

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

кажется оторвет в сортировке группировке, в менедж токенс, в онбординге раскрытие трескается по coinId

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Я посмотрел, сейчас с бинансом такая же история и вроде как ок, но надо провести ревизию кода, заведу задачу

Copy link
Contributor Author

@amuraveinik amuraveinik Oct 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EWC
image

EWX
image

В предыдущем пре был вопрос по котировакам, вроде все норм, в эксплорере одинаковые цены

@@ -55,15 +55,18 @@ struct SupportedBlockchains {
}

let betaTestingBlockchains = FeatureStorage().supportedBlockchainsIds.compactMap { id in
testableBlockchains().first { $0.coinId == id }
testableBlockchains().first { $0.networkId == id }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Тут соответственно так же

@amuraveinik amuraveinik marked this pull request as ready for review October 9, 2024 15:09
@amuraveinik
Copy link
Contributor Author

Нужно будет еще бампнуть версию BSDK

tureck1y
tureck1y previously approved these changes Oct 9, 2024
@tureck1y
Copy link
Collaborator

похоже я тебе конфликт сделал синком релиза, пофикси плиз и вольем

@@ -140,6 +138,9 @@ struct SupportedBlockchains {
.internetComputer,
.sei(testnet: false),
.sui(curve: ed25519Curve(for: version), testnet: false),
.energyWebEVM(testnet: false),
.energyWebX(curve: ed25519Curve(for: version)),
.core(testnet: false),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Тогглы включил, как договорились на дейлике

@tureck1y tureck1y merged commit 96c53fa into develop Oct 10, 2024
3 checks passed
@tureck1y tureck1y deleted the feature/IOS-7967_energy_web branch October 10, 2024 09:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants