Skip to content

Commit 7eb5edc

Browse files
greenhatgreenhat
authored
Merge pull request #231 from ergoplatform/ergo-lib-v023
update ergo-lib to v0.23;
2 parents 807a6cc + cae9534 commit 7eb5edc

File tree

7 files changed

+39
-38
lines changed

7 files changed

+39
-38
lines changed

‎Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ members = [
55
]
66

77
[workspace.dependencies]
8-
# ergo-lib = { version = "0.21" }
9-
ergo-lib = { git = "https://github.com/ergoplatform/sigma-rust", rev = "26ca5c4dddc96186f767e09ea1885b675c70e0f3" }
8+
ergo-lib = { version = "0.23" }
9+
# ergo-lib = { git = "https://github.com/ergoplatform/sigma-rust", rev = "26ca5c4dddc96186f767e09ea1885b675c70e0f3" }

‎core/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ tokio = { version = "1", features = ["full"] }
2626
tower-http = { version = "0.3.0", features = ["cors"] }
2727
axum = "0.6"
2828
ergo-lib = { workspace = true }
29-
ergo-node-interface = { git = "https://github.com/ergoplatform/ergo-node-interface-rust", rev = "ffc93d869e79b9461fd1d4c9f4ea0f5d34ff9569" }
29+
# ergo-node-interface = { git = "https://github.com/ergoplatform/ergo-node-interface-rust", rev = "ffc93d869e79b9461fd1d4c9f4ea0f5d34ff9569" }
30+
ergo-node-interface = { version = "0.3" }
3031
derive_more = "0.99"
3132
clap = {version = "=3.1.18", features = ["derive"]}
3233
exitcode = "1.1.2"

‎core/src/contracts/ballot.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use ergo_lib::ergotree_ir::chain::ergo_box::box_value::BoxValue;
66
use ergo_lib::ergotree_ir::chain::ergo_box::box_value::BoxValueError;
77
use ergo_lib::ergotree_ir::chain::token::TokenId;
88
use ergo_lib::ergotree_ir::ergo_tree::ErgoTree;
9-
use ergo_lib::ergotree_ir::ergo_tree::ErgoTreeConstantError;
9+
use ergo_lib::ergotree_ir::ergo_tree::ErgoTreeError;
1010
use ergo_lib::ergotree_ir::mir::constant::TryExtractFromError;
1111
use ergo_lib::ergotree_ir::mir::constant::TryExtractInto;
1212
use ergo_lib::ergotree_ir::serialization::SigmaParsingError;
@@ -32,8 +32,8 @@ pub enum BallotContractError {
3232
UnknownUpdateNftId,
3333
#[error("ballot contract: sigma parsing error {0}")]
3434
SigmaParsing(SigmaParsingError),
35-
#[error("ballot contract: ergo tree constant error {0:?}")]
36-
ErgoTreeConstant(ErgoTreeConstantError),
35+
#[error("ballot contract: ergo tree error {0:?}")]
36+
ErgoTreeError(ErgoTreeError),
3737
#[error("ballot contract: TryExtractFrom error {0:?}")]
3838
TryExtractFrom(TryExtractFromError),
3939
#[error("contract error: {1:?}, expected P2S: {0}")]
@@ -224,8 +224,8 @@ pub enum BallotContractParametersError {
224224
SigmaSerialization(SigmaSerializationError),
225225
#[error("ballot contract parameters: TryExtractFrom error {0:?}")]
226226
TryExtractFrom(TryExtractFromError),
227-
#[error("ballot contract parameters: ergo tree constant error {0:?}")]
228-
ErgoTreeConstant(ErgoTreeConstantError),
227+
#[error("ballot contract parameters: ergo tree error {0:?}")]
228+
ErgoTreeError(ErgoTreeError),
229229
#[error("ballot contract parameters: base16 decoding error {0}")]
230230
Decode(DecodeError),
231231
}

‎core/src/contracts/oracle.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use ergo_lib::ergotree_ir::chain::ergo_box::box_value::BoxValue;
55
use ergo_lib::ergotree_ir::chain::ergo_box::box_value::BoxValueError;
66
use ergo_lib::ergotree_ir::chain::token::TokenId;
77
use ergo_lib::ergotree_ir::ergo_tree::ErgoTree;
8-
use ergo_lib::ergotree_ir::ergo_tree::ErgoTreeConstantError;
8+
use ergo_lib::ergotree_ir::ergo_tree::ErgoTreeError;
99
use ergo_lib::ergotree_ir::mir::constant::TryExtractFromError;
1010
use ergo_lib::ergotree_ir::mir::constant::TryExtractInto;
1111
use ergo_lib::ergotree_ir::serialization::SigmaParsingError;
@@ -31,8 +31,8 @@ pub enum OracleContractError {
3131
UnknownPoolNftId { expected: PoolTokenId, got: TokenId },
3232
#[error("oracle contract: sigma parsing error {0}")]
3333
SigmaParsing(#[from] SigmaParsingError),
34-
#[error("oracle contract: ergo tree constant error {0:?}")]
35-
ErgoTreeConstant(ErgoTreeConstantError),
34+
#[error("oracle contract: ergo tree error {0:?}")]
35+
ErgoTreeError(ErgoTreeError),
3636
#[error("oracle contract: TryExtractFrom error {0:?}")]
3737
TryExtractFrom(#[from] TryExtractFromError),
3838
#[error("contract error: {1:?}, expected P2S: {0}")]
@@ -114,7 +114,7 @@ impl OracleContract {
114114
inputs.contract_parameters.pool_nft_index,
115115
inputs.pool_nft_token_id.token_id().into(),
116116
)
117-
.map_err(OracleContractError::ErgoTreeConstant)?;
117+
.map_err(OracleContractError::ErgoTreeError)?;
118118
let contract = Self::from_ergo_tree(ergo_tree, inputs)?;
119119
Ok(contract)
120120
}
@@ -197,8 +197,8 @@ pub enum OracleContractParametersError {
197197
TryExtractFrom(TryExtractFromError),
198198
#[error("oracle contract parameters: BoxValue error {0:?}")]
199199
BoxValue(BoxValueError),
200-
#[error("oracle contract parameters: ergo tree constant error{0:?}")]
201-
ErgoTreeConstantError(ErgoTreeConstantError),
200+
#[error("oracle contract parameters: ergo tree error {0:?}")]
201+
ErgoTreeError(ErgoTreeError),
202202
#[error("oracle contract parameters: sigma serialization error {0}")]
203203
SigmaSerialization(SigmaSerializationError),
204204
}

‎core/src/contracts/pool.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use derive_more::From;
22
use ergo_lib::ergotree_ir::chain::token::TokenId;
33
use ergo_lib::ergotree_ir::ergo_tree::ErgoTree;
4-
use ergo_lib::ergotree_ir::ergo_tree::ErgoTreeConstantError;
4+
use ergo_lib::ergotree_ir::ergo_tree::ErgoTreeError;
55
use ergo_lib::ergotree_ir::mir::constant::TryExtractFromError;
66
use ergo_lib::ergotree_ir::mir::constant::TryExtractInto;
77

@@ -30,8 +30,8 @@ pub enum PoolContractError {
3030
UnknownUpdateNftId,
3131
#[error("pool contract: sigma parsing error {0}")]
3232
SigmaParsing(SigmaParsingError),
33-
#[error("pool contract: ergo tree constant error {0:?}")]
34-
ErgoTreeConstant(ErgoTreeConstantError),
33+
#[error("pool contract: ergo tree error {0:?}")]
34+
ErgoTreeError(ErgoTreeError),
3535
#[error("pool contract: TryExtractFrom error {0:?}")]
3636
TryExtractFrom(TryExtractFromError),
3737
#[error("contract error: {1:?}, expected P2S: {0}")]

‎core/src/contracts/refresh.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use base16::DecodeError;
22
use ergo_lib::ergotree_ir::chain::token::TokenId;
33
use ergo_lib::ergotree_ir::ergo_tree::ErgoTree;
4-
use ergo_lib::ergotree_ir::ergo_tree::ErgoTreeConstantError;
4+
use ergo_lib::ergotree_ir::ergo_tree::ErgoTreeError;
55
use ergo_lib::ergotree_ir::mir::constant::TryExtractFromError;
66
use ergo_lib::ergotree_ir::mir::constant::TryExtractInto;
77
use ergo_lib::ergotree_ir::serialization::SigmaParsingError;
@@ -47,8 +47,8 @@ pub enum RefreshContractError {
4747
},
4848
#[error("refresh contract: sigma parsing error {0}")]
4949
SigmaParsing(#[from] SigmaParsingError),
50-
#[error("refresh contract: ergo tree constant error {0:?}")]
51-
ErgoTreeConstant(ErgoTreeConstantError),
50+
#[error("refresh contract: ergo tree error {0:?}")]
51+
ErgoTreeError(ErgoTreeError),
5252
#[error("refresh contract: TryExtractFrom error {0:?}")]
5353
TryExtractFrom(#[from] TryExtractFromError),
5454
#[error("contract error: {1:?}, expected P2S: {0}")]
@@ -203,32 +203,32 @@ impl RefreshContract {
203203
inputs.contract_parameters.pool_nft_index,
204204
inputs.pool_nft_token_id.clone().token_id().into(),
205205
)
206-
.map_err(RefreshContractError::ErgoTreeConstant)?
206+
.map_err(RefreshContractError::ErgoTreeError)?
207207
.with_constant(
208208
inputs.contract_parameters.oracle_token_id_index,
209209
inputs.oracle_token_id.clone().token_id().into(),
210210
)
211-
.map_err(RefreshContractError::ErgoTreeConstant)?
211+
.map_err(RefreshContractError::ErgoTreeError)?
212212
.with_constant(
213213
inputs.contract_parameters.min_data_points_index,
214214
(inputs.contract_parameters.min_data_points.0).into(),
215215
)
216-
.map_err(RefreshContractError::ErgoTreeConstant)?
216+
.map_err(RefreshContractError::ErgoTreeError)?
217217
.with_constant(
218218
inputs.contract_parameters.buffer_length_index,
219219
(inputs.contract_parameters.buffer_length).into(),
220220
)
221-
.map_err(RefreshContractError::ErgoTreeConstant)?
221+
.map_err(RefreshContractError::ErgoTreeError)?
222222
.with_constant(
223223
inputs.contract_parameters.max_deviation_percent_index,
224224
(inputs.contract_parameters.max_deviation_percent).into(),
225225
)
226-
.map_err(RefreshContractError::ErgoTreeConstant)?
226+
.map_err(RefreshContractError::ErgoTreeError)?
227227
.with_constant(
228228
inputs.contract_parameters.epoch_length_index,
229229
(inputs.contract_parameters.epoch_length.0).into(),
230230
)
231-
.map_err(RefreshContractError::ErgoTreeConstant)?;
231+
.map_err(RefreshContractError::ErgoTreeError)?;
232232
Ok(Self {
233233
ergo_tree,
234234
pool_nft_index: inputs.contract_parameters.pool_nft_index,
@@ -435,8 +435,8 @@ pub enum RefreshContractParametersError {
435435
Decode(#[from] DecodeError),
436436
#[error("refresh contract parameters: TryExtractFrom error {0:?}")]
437437
TryExtractFrom(#[from] TryExtractFromError),
438-
#[error("refresh contract parameters: ergo tree constant error {0:?}")]
439-
ErgoTreeConstant(ErgoTreeConstantError),
438+
#[error("refresh contract parameters: ergo tree error {0:?}")]
439+
ErgoTreeError(ErgoTreeError),
440440
}
441441

442442
impl RefreshContractParameters {
@@ -450,16 +450,16 @@ impl RefreshContractParameters {
450450
inputs.min_data_points_index,
451451
inputs.min_data_points.0.into(),
452452
)
453-
.map_err(RefreshContractParametersError::ErgoTreeConstant)?
453+
.map_err(RefreshContractParametersError::ErgoTreeError)?
454454
.with_constant(inputs.buffer_length_index, inputs.buffer_length.into())
455-
.map_err(RefreshContractParametersError::ErgoTreeConstant)?
455+
.map_err(RefreshContractParametersError::ErgoTreeError)?
456456
.with_constant(
457457
inputs.max_deviation_percent_index,
458458
inputs.max_deviation_percent.into(),
459459
)
460-
.map_err(RefreshContractParametersError::ErgoTreeConstant)?
460+
.map_err(RefreshContractParametersError::ErgoTreeError)?
461461
.with_constant(inputs.epoch_length_index, inputs.epoch_length.0.into())
462-
.map_err(RefreshContractParametersError::ErgoTreeConstant)?;
462+
.map_err(RefreshContractParametersError::ErgoTreeError)?;
463463
let _pool_nft = ergo_tree
464464
.get_constant(inputs.pool_nft_index)
465465
.map_err(|_| RefreshContractParametersError::NoPoolNftId)?

‎core/src/contracts/update.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use base16::DecodeError;
22
use derive_more::From;
33
use ergo_lib::ergotree_ir::chain::token::TokenId;
44
use ergo_lib::ergotree_ir::ergo_tree::ErgoTree;
5-
use ergo_lib::ergotree_ir::ergo_tree::ErgoTreeConstantError;
5+
use ergo_lib::ergotree_ir::ergo_tree::ErgoTreeError;
66
use ergo_lib::ergotree_ir::mir::constant::TryExtractFromError;
77
use ergo_lib::ergotree_ir::mir::constant::{Literal, TryExtractInto};
88
use ergo_lib::ergotree_ir::serialization::SigmaParsingError;
@@ -41,8 +41,8 @@ pub enum UpdateContractError {
4141
MinVotesDiffers { expected: u64, actual: u64 },
4242
#[error("update contract: sigma parsing error {0}")]
4343
SigmaParsing(SigmaParsingError),
44-
#[error("update contract: ergo tree constant error {0:?}")]
45-
ErgoTreeConstant(ErgoTreeConstantError),
44+
#[error("update contract: ergo tree error {0:?}")]
45+
ErgoTreeError(ErgoTreeError),
4646
#[error("update contract: TryExtractFrom error {0:?}")]
4747
TryExtractFrom(TryExtractFromError),
4848
#[error("contract error: {1:?}, expected P2S: {0}")]
@@ -244,8 +244,8 @@ pub enum UpdateContractParametersError {
244244
MinVotesDiffers { expected: u64, actual: u64 },
245245
#[error("update contract parameters: TryExtractFrom error {0:?}")]
246246
TryExtractFrom(TryExtractFromError),
247-
#[error("update contract parameters: ergo tree constant error {0:?}")]
248-
ErgoTreeConstant(ErgoTreeConstantError),
247+
#[error("update contract parameters: ergo tree error {0:?}")]
248+
ErgoTreeError(ErgoTreeError),
249249
#[error("update contract parameters: sigma serialization error {0}")]
250250
SigmaSerialization(SigmaSerializationError),
251251
#[error("update contract parameters: base16 decoding error {0}")]
@@ -264,7 +264,7 @@ impl UpdateContractParameters {
264264
log::debug!("update contract ergo_tree_orig: {:#?}", ergo_tree_orig);
265265
let ergo_tree = ergo_tree_orig
266266
.with_constant(min_votes_index, (min_votes as i32).into())
267-
.map_err(UpdateContractParametersError::ErgoTreeConstant)?;
267+
.map_err(UpdateContractParametersError::ErgoTreeError)?;
268268
let _pool_nft = ergo_tree
269269
.get_constant(pool_nft_index)
270270
.map_err(|_| UpdateContractParametersError::NoPoolNftId)?

0 commit comments

Comments
 (0)