Skip to content

Commit 1d736e6

Browse files
authored
chore: versioning; contracts 1.0.0 (#203)
* chore: versioning; contracts 1.0.0 * chore: cargo fmt
1 parent 069ef5e commit 1d736e6

File tree

17 files changed

+59
-50
lines changed

17 files changed

+59
-50
lines changed

Cargo.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
[workspace]
22
resolver = "2"
33
members = ["bots", "common", "contract/*", "mock/*", "test-utils"]
4-
package.license = "MIT"
4+
5+
[workspace.package]
6+
license = "MIT"
7+
repository = "https://github.com/Templar-Protocol/contracts"
8+
edition = "2021"
9+
version = "1.0.0"
510

611
[workspace.dependencies]
712
anyhow = "1.0.95"

bots/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[package]
2+
edition.workspace = true
3+
license.workspace = true
24
name = "templar-bots"
5+
repository.workspace = true
36
version = "0.1.0"
4-
edition = "2024"
5-
license.workspace = true
67

78
[[bin]]
89
name = "liquidator"

bots/src/accumulator.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ use near_primitives::{
99
hash::CryptoHash,
1010
transaction::{Transaction, TransactionV0},
1111
};
12-
use near_sdk::{AccountId, serde_json::json};
12+
use near_sdk::{serde_json::json, AccountId};
1313
use tracing::{error, info, instrument};
1414

1515
use crate::{
16-
BorrowPositions, DEFAULT_GAS, Network,
1716
near::{get_access_key_data, send_tx, serialize_and_encode, view},
17+
BorrowPositions, Network, DEFAULT_GAS,
1818
};
1919

2020
#[derive(Debug, Clone, Parser)]

bots/src/bin/accumulator-bot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use clap::Parser;
44
use templar_bots::accumulator::{Accumulator, Args};
55
use tokio::time::sleep;
66
use tracing::info;
7-
use tracing_subscriber::{EnvFilter, fmt, layer::SubscriberExt, util::SubscriberInitExt};
7+
use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
88

99
#[tokio::main]
1010
async fn main() -> anyhow::Result<()> {

bots/src/bin/liquidator-bot.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use std::time::Duration;
22

33
use clap::Parser;
4-
use templar_bots::liquidator::{Args, LiquidatorResult, setup_liquidators};
4+
use templar_bots::liquidator::{setup_liquidators, Args, LiquidatorResult};
55
use tokio::time::sleep;
66
use tracing::info;
7-
use tracing_subscriber::{EnvFilter, fmt, layer::SubscriberExt, util::SubscriberInitExt};
7+
use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
88

99
#[tokio::main]
1010
async fn main() -> LiquidatorResult {

bots/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::collections::HashMap;
22

33
use clap::ValueEnum;
44
use near_jsonrpc_client::{NEAR_MAINNET_RPC_URL, NEAR_TESTNET_RPC_URL};
5-
use near_sdk::{AccountId, Gas, near};
5+
use near_sdk::{near, AccountId, Gas};
66
use templar_common::borrow::BorrowPosition;
77

88
pub mod accumulator;

bots/src/liquidator.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ use near_primitives::{
1010
transaction::{Transaction, TransactionV0},
1111
};
1212
use near_sdk::{
13-
AccountId, NearToken,
1413
json_types::U128,
1514
serde_json::{self, json},
15+
AccountId, NearToken,
1616
};
1717
use templar_common::{
1818
borrow::{BorrowPosition, BorrowStatus},
19-
market::{DepositMsg, LiquidateMsg, MarketConfiguration, error::RetrievalError},
19+
market::{error::RetrievalError, DepositMsg, LiquidateMsg, MarketConfiguration},
2020
oracle::pyth::{OracleResponse, PriceIdentifier},
2121
};
2222
use tracing::{error, info, instrument};
2323

2424
use crate::{
25-
BorrowPositions, DEFAULT_GAS, Network,
26-
near::{RpcError, get_access_key_data, send_tx, serialize_and_encode, view},
25+
near::{get_access_key_data, send_tx, serialize_and_encode, view, RpcError},
2726
swap::{RheaSwap, Swap, SwapType},
27+
BorrowPositions, Network, DEFAULT_GAS,
2828
};
2929

3030
/// Errors that can occur during liquidation operations.

bots/src/near.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ use std::time::Duration;
33
use base64::Engine;
44
use near_crypto::InMemorySigner;
55
use near_jsonrpc_client::{
6-
JsonRpcClient,
76
errors::JsonRpcError,
87
methods::{
98
query::{RpcQueryError, RpcQueryRequest},
109
send_tx::RpcSendTransactionRequest,
1110
tx::{RpcTransactionError, RpcTransactionStatusRequest, TransactionInfo},
1211
},
12+
JsonRpcClient,
1313
};
1414
use near_jsonrpc_primitives::types::query::QueryResponseKind;
1515
use near_primitives::{
@@ -19,7 +19,7 @@ use near_primitives::{
1919
views::{FinalExecutionStatus, QueryRequest, TxExecutionStatus},
2020
};
2121
use near_sdk::{
22-
serde::{Serialize, de::DeserializeOwned},
22+
serde::{de::DeserializeOwned, Serialize},
2323
serde_json,
2424
};
2525
use tokio::time::Instant;

bots/src/swap.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ use near_primitives::{
66
transaction::{Transaction, TransactionV0},
77
views::FinalExecutionStatus,
88
};
9-
use near_sdk::{AccountId, NearToken, json_types::U128, near, serde_json::json};
9+
use near_sdk::{json_types::U128, near, serde_json::json, AccountId, NearToken};
1010

1111
use crate::{
12-
DEFAULT_GAS, Network,
13-
near::{RpcResult, get_access_key_data, send_tx, serialize_and_encode, view},
12+
near::{get_access_key_data, send_tx, serialize_and_encode, view, RpcResult},
13+
Network, DEFAULT_GAS,
1414
};
1515

1616
#[async_trait::async_trait]

0 commit comments

Comments
 (0)