Skip to content

Commit

Permalink
Merge branch 'dev' into eip1559-gas-fee-estimate
Browse files Browse the repository at this point in the history
* dev:
  feat(indexeddb): advanced cursor filtering impl (KomodoPlatform#2066)
  update dockerhub destination repository (KomodoPlatform#2082)
  feat(event streaming): configurable worker path, use SharedWorker (KomodoPlatform#2080)
  fix(hd_tests): fix test_hd_utxo_tx_history unit test (KomodoPlatform#2078)
  feat(network): improve efficiency of known peers handling (KomodoPlatform#2074)
  feat(nft): enable eth with non fungible tokens (KomodoPlatform#2049)
  feat(ETH transport & heartbeats): various enhancements/features (KomodoPlatform#2058)
  • Loading branch information
dimxy committed Mar 13, 2024
2 parents 3413447 + 96fac7c commit 9347f10
Show file tree
Hide file tree
Showing 57 changed files with 3,367 additions and 1,240 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/dev-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ jobs:
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/dev'
run: |
CONTAINER_TAG="dev-$COMMIT_HASH"
docker build -t komodoofficial/atomicdexapi:"$CONTAINER_TAG" -t komodoofficial/atomicdexapi:dev-latest -f .docker/Dockerfile.dev-release .
docker push komodoofficial/atomicdexapi:"$CONTAINER_TAG"
docker push komodoofficial/atomicdexapi:dev-latest
docker build -t komodoofficial/komodo-defi-framework:"$CONTAINER_TAG" -t komodoofficial/komodo-defi-framework:dev-latest -f .docker/Dockerfile.dev-release .
docker push komodoofficial/komodo-defi-framework:"$CONTAINER_TAG"
docker push komodoofficial/komodo-defi-framework:dev-latest
mac-x86-64:
timeout-minutes: 60
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ jobs:
- name: Build and push container image
run: |
export CONTAINER_TAG=$(./target/release/mm2 --version | awk '{print $3}')
docker build -t komodoofficial/atomicdexapi:"$CONTAINER_TAG" -t komodoofficial/atomicdexapi:main-latest -f .docker/Dockerfile.release .
docker push komodoofficial/atomicdexapi:"$CONTAINER_TAG"
docker push komodoofficial/atomicdexapi:main-latest
docker build -t komodoofficial/komodo-defi-framework:"$CONTAINER_TAG" -t komodoofficial/komodo-defi-framework:main-latest -f .docker/Dockerfile.release .
docker push komodoofficial/komodo-defi-framework:"$CONTAINER_TAG"
docker push komodoofficial/komodo-defi-framework:main-latest
mac-x86-64:
timeout-minutes: 60
Expand Down
3 changes: 3 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion mm2src/coins/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ ethereum-types = { version = "0.13", default-features = false, features = ["std"
ethkey = { git = "https://github.com/KomodoPlatform/mm2-parity-ethereum.git" }
# Waiting for https://github.com/rust-lang/rust/issues/54725 to use on Stable.
#enum_dispatch = "0.1"
tokio-tungstenite-wasm = { git = "https://github.com/KomodoPlatform/tokio-tungstenite-wasm", rev = "d20abdb", features = ["rustls-tls-native-roots"]}
futures01 = { version = "0.1", package = "futures" }
futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] }
futures-ticker = "0.0.3"
# using select macro requires the crate to be named futures, compilation failed with futures03 name
futures = { version = "0.3", package = "futures", features = ["compat", "async-await"] }
group = "0.8.0"
Expand Down Expand Up @@ -100,6 +100,7 @@ sha3 = "0.9"
utxo_signer = { path = "utxo_signer" }
# using the same version as cosmrs
tendermint-rpc = { version = "=0.23.7", default-features = false }
tokio-tungstenite-wasm = { git = "https://github.com/KomodoPlatform/tokio-tungstenite-wasm", rev = "d20abdb", features = ["rustls-tls-native-roots"]}
tiny-bip39 = "0.8.0"
url = { version = "2.2.2", features = ["serde"] }
uuid = { version = "1.2.2", features = ["fast-rng", "serde", "v4"] }
Expand Down
3 changes: 3 additions & 0 deletions mm2src/coins/coin_errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ pub enum ValidatePaymentError {
WatcherRewardError(String),
/// Input payment timelock overflows the type used by specific coin.
TimelockOverflow(TryFromIntError),
#[display(fmt = "Nft Protocol is not supported yet!")]
NftProtocolNotSupported,
}

impl From<rlp::DecoderError> for ValidatePaymentError {
Expand Down Expand Up @@ -79,6 +81,7 @@ impl From<Web3RpcError> for ValidatePaymentError {
Web3RpcError::Internal(internal)
| Web3RpcError::Timeout(internal)
| Web3RpcError::InvalidGasApiConfig(internal) => ValidatePaymentError::InternalError(internal),
Web3RpcError::NftProtocolNotSupported => ValidatePaymentError::NftProtocolNotSupported,
}
}
}
Expand Down
Loading

0 comments on commit 9347f10

Please sign in to comment.