Skip to content

Bridge/2.1.x #2612

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

Merged
merged 4 commits into from
Mar 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "witnet"
version = "2.0.4"
version = "2.1.0"
authors = ["Witnet Foundation <[email protected]>"]
publish = false
repository = "witnet/witnet-rust"
Expand Down
2 changes: 1 addition & 1 deletion bridges/centralized-ethereum/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "witnet-centralized-ethereum-bridge"
version = "2.0.4"
version = "2.1.0"
authors = ["Witnet Foundation <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion bridges/centralized-ethereum/src/actors/eth_poller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ impl EthPoller {
let dr_bytecodes: Result<Vec<Bytes>, web3::contract::Error> =
wrb_contract
.query(
"extractWitnetDataRequests",
"extractRadonRequests",
posted_ids.clone(),
None,
contract::Options::default(),
Expand Down
63 changes: 25 additions & 38 deletions bridges/wrb_abi.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"inputs": [
{
"indexed": false,
"internalType": "uint256",
"internalType": "uint64",
"name": "queryId",
"type": "uint256"
"type": "uint64"
},
{
"indexed": false,
Expand Down Expand Up @@ -47,9 +47,9 @@
{
"inputs": [
{
"internalType": "uint256[]",
"internalType": "uint64[]",
"name": "witnetQueryIds",
"type": "uint256[]"
"type": "uint64[]"
},
{
"internalType": "bytes",
Expand Down Expand Up @@ -86,12 +86,12 @@
{
"inputs": [
{
"internalType": "uint256[]",
"internalType": "uint64[]",
"name": "queryIds",
"type": "uint256[]"
"type": "uint64[]"
}
],
"name": "extractWitnetDataRequests",
"name": "extractRadonRequests",
"outputs": [
{
"internalType": "bytes[]",
Expand All @@ -102,27 +102,14 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "factory",
"outputs": [
{
"internalType": "contract WitnetRequestFactory",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "getNextQueryId",
"outputs": [
{
"internalType": "uint256",
"internalType": "uint64",
"name": "",
"type": "uint256"
"type": "uint64"
}
],
"stateMutability": "view",
Expand All @@ -131,15 +118,15 @@
{
"inputs": [
{
"internalType": "uint256[]",
"internalType": "uint64[]",
"name": "queryIds",
"type": "uint256[]"
"type": "uint64[]"
}
],
"name": "getQueryStatusBatch",
"outputs": [
{
"internalType": "enum WitnetV2.QueryStatus[]",
"internalType": "enum Witnet.QueryStatus[]",
"name": "",
"type": "uint8[]"
}
Expand All @@ -152,7 +139,7 @@
"name": "registry",
"outputs": [
{
"internalType": "contract WitnetRequestBytecodes",
"internalType": "interface IWitOracleRadonRegistry",
"name": "",
"type": "address"
}
Expand All @@ -163,9 +150,9 @@
{
"inputs": [
{
"internalType": "uint256",
"internalType": "uint64",
"name": "witnetQueryId",
"type": "uint256"
"type": "uint64"
},
{
"internalType": "bytes32",
Expand All @@ -192,14 +179,14 @@
{
"inputs": [
{
"internalType": "uint256",
"internalType": "uint64",
"name": "witnetQueryId",
"type": "uint256"
"type": "uint64"
},
{
"internalType": "uint32",
"internalType": "uint64",
"name": "witnetQueryResultTimestamp",
"type": "uint32"
"type": "uint64"
},
{
"internalType": "bytes32",
Expand Down Expand Up @@ -228,14 +215,14 @@
{
"components": [
{
"internalType": "uint256",
"internalType": "uint64",
"name": "queryId",
"type": "uint256"
"type": "uint64"
},
{
"internalType": "uint32",
"internalType": "uint64",
"name": "queryResultTimestamp",
"type": "uint32"
"type": "uint64"
},
{
"internalType": "bytes32",
Expand Down Expand Up @@ -280,9 +267,9 @@
{
"inputs": [
{
"internalType": "uint256",
"internalType": "uint64",
"name": "queryId",
"type": "uint256"
"type": "uint64"
}
],
"name": "upgradeQueryEvmReward",
Expand Down
2 changes: 1 addition & 1 deletion data_structures/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ authors = ["Witnet Foundation <[email protected]>"]
description = "data structures component"
edition = "2021"
name = "witnet_data_structures"
version = "2.0.4"
version = "2.1.0"
workspace = ".."

[features]
Expand Down
2 changes: 1 addition & 1 deletion node/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "witnet_node"
version = "2.0.4"
version = "2.1.0"
authors = ["Witnet Foundation <[email protected]>"]
workspace = ".."
description = "node component"
Expand Down
13 changes: 2 additions & 11 deletions node/src/actors/json_rpc/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,7 @@ use crate::{
inventory_manager::{InventoryManager, InventoryManagerError},
json_rpc::Subscriptions,
messages::{
AddCandidates, AddPeers, AddTransaction, AuthorizeStake, BuildDrt, BuildStake,
BuildStakeParams, BuildStakeResponse, BuildUnstake, BuildUnstakeParams, BuildVtt,
ClearPeers, DropAllPeers, EstimatePriority, GetBalance, GetBalance2, GetBalance2Limits,
GetBalanceTarget, GetBlocksEpochRange, GetConsolidatedPeers, GetDataRequestInfo,
GetEpoch, GetHighestCheckpointBeacon, GetItemBlock, GetItemSuperblock,
GetItemTransaction, GetKnownPeers, GetMemoryTransaction, GetMempool, GetNodeStats,
GetProtocolInfo, GetReputation, GetSignalingInfo, GetState, GetSupplyInfo,
GetSupplyInfo2, GetUtxoInfo, InitializePeers, IsConfirmedBlock, MagicEither,
QueryStakes, QueryStakingPowers, Rewind, SnapshotExport, SnapshotImport,
StakeAuthorization,
AddCandidates, AddPeers, AddTransaction, AuthorizeStake, BuildDrt, BuildStake, BuildStakeParams, BuildStakeResponse, BuildUnstake, BuildUnstakeParams, BuildVtt, ClearPeers, DropAllPeers, EstimatePriority, GetBalance, GetBalance2, GetBalance2Limits, GetBalanceTarget, GetBlocksEpochRange, GetConsolidatedPeers, GetDataRequestInfo, GetEpoch, GetHighestCheckpointBeacon, GetItemBlock, GetItemSuperblock, GetItemTransaction, GetKnownPeers, GetMemoryTransaction, GetMempool, GetNodeStats, GetProtocolInfo, GetReputation, GetSignalingInfo, GetState, GetSupplyInfo, GetSupplyInfo2, GetUtxoInfo, InitializePeers, IsConfirmedBlock, MagicEither, QueryStakes, QueryStakingPowers, Rewind, SnapshotExport, SnapshotImport, StakeAuthorization
},
peers_manager::PeersManager,
sessions_manager::SessionsManager,
Expand Down Expand Up @@ -1456,7 +1447,7 @@ pub async fn get_balance(params: Params, sensitive_methods_enabled: bool) -> Jso
// Handle parameters as an array with a first obligatory PublicKeyHash field plus an optional bool field
if let Params::Array(params) = params {
if let Some(Value::String(target_param)) = params.first() {
target = GetBalanceTarget::from_str(target_param).map_err(internal_error)?;
target = GetBalanceTarget::from_str(&target_param).map_err(internal_error)?;
} else {
return Err(Error::invalid_params(
"First argument of `get_balance` must have type `PublicKeyHash`",
Expand Down
2 changes: 1 addition & 1 deletion toolkit/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "witnet_toolkit"
version = "2.0.4"
version = "2.1.0"
authors = ["Adán SDPC <[email protected]>"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion wallet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["Witnet Foundation <[email protected]>"]
edition = "2021"
name = "witnet_wallet"
version = "2.0.4"
version = "2.1.0"
workspace = ".."

[dependencies]
Expand Down
Loading