Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • nodes/rust/duniter-v2s
  • llaq/lc-core-substrate
  • pini-gh/duniter-v2s
  • vincentux/duniter-v2s
  • mildred/duniter-v2s
  • d0p1/duniter-v2s
  • bgallois/duniter-v2s
  • Nicolas80/duniter-v2s
8 results
Show changes
Commits on Source (11)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 4251 additions and 3817 deletions
Cargo.lock
View file @ ce9ccfa5
This diff is collapsed.
Cargo.toml
View file @ ce9ccfa5
This diff is collapsed.
client/distance/Cargo.toml
View file @ ce9ccfa5
......@@ -11,14 +11,14 @@ version = '1.0.0'
[dependencies]
pallet-distance = { path = "../../pallets/distance" }
sp-distance = { path = "../../primitives/distance" }
log = "0.4"
thiserror = "1.0.30"
pallet-distance = { path = "../../pallets/distance" }
# substrate
scale-info = { version = "2.1.1", features = ["derive"] }
sp-distance = { path = "../../primitives/distance" }
thiserror = "1.0.30"
[dependencies.codec]
features = ['derive']
......@@ -26,26 +26,25 @@ package = 'parity-scale-codec'
version = '3.1.5'
[dependencies.frame-support]
git = 'https://github.com/duniter/substrate'
branch = 'duniter-substrate-v0.9.42'
git = 'https://github.com/duniter/duniter-polkadot-sdk'
branch = 'duniter-substrate-v1.6.0'
[dependencies.sc-client-api]
git = 'https://github.com/duniter/substrate'
branch = 'duniter-substrate-v0.9.42'
git = 'https://github.com/duniter/duniter-polkadot-sdk'
branch = 'duniter-substrate-v1.6.0'
[dependencies.sp-core]
git = 'https://github.com/duniter/substrate'
branch = 'duniter-substrate-v0.9.42'
git = 'https://github.com/duniter/duniter-polkadot-sdk'
branch = 'duniter-substrate-v1.6.0'
[dependencies.sp-keystore]
git = 'https://github.com/duniter/substrate'
branch = 'duniter-substrate-v0.9.42'
[dependencies.sp-runtime]
git = 'https://github.com/duniter/substrate'
branch = 'duniter-substrate-v0.9.42'
git = 'https://github.com/duniter/duniter-polkadot-sdk'
branch = 'duniter-substrate-v1.6.0'
### DOC ###
[package.metadata.docs.rs]
targets = ['x86_64-unknown-linux-gnu']
[dependencies.sp-runtime]
git = 'https://github.com/duniter/duniter-polkadot-sdk'
branch = 'duniter-substrate-v1.6.0'
distance-oracle/Cargo.toml
View file @ ce9ccfa5
......@@ -7,23 +7,25 @@ license = "AGPL-3.0-only"
edition = "2021"
[dependencies]
sp-distance = { path = "../primitives/distance" }
codec = { package = "parity-scale-codec", version = "3.6.5" }
# standalone only
clap = { version = "4.4.18", features = ["derive"], optional = true }
codec = { package = "parity-scale-codec", version = "3.6.9" }
fnv = "1.0.7"
log = "0.4.17"
num-traits = "0.2.15"
rayon = "1.7.0"
simple_logger = "4.2.0"
sp-core = { git = "https://github.com/duniter/substrate.git", branch = "duniter-substrate-v0.9.42" }
sp-runtime = { git = "https://github.com/duniter/substrate.git", branch = "duniter-substrate-v0.9.42" }
subxt = { git = 'https://github.com/duniter/subxt.git', branch = "duniter-substrate-v0.9.42" }
time = "<=0.3.23"# required for MSRV
time-macros = "=0.2.10"
log = "0.4.20"
num-traits = "0.2.17"
rayon = "1.8.1"
simple_logger = "4.3.3"
hex = "0.4.3"
# standalone only
clap = { version = "4.0", features = ["derive"], optional = true }
tokio = { version = "1.15.0", features = [
sp-core = { git = "https://github.com/duniter/duniter-polkadot-sdk.git", branch = "duniter-substrate-v1.6.0" }
sp-distance = { path = "../primitives/distance" }
sp-runtime = { git = "https://github.com/duniter/duniter-polkadot-sdk.git", branch = "duniter-substrate-v1.6.0" }
subxt = { git = 'https://github.com/duniter/subxt', branch = 'subxt-v0.34.0-duniter-substrate-v1.6.0', default-features = false, features = ["substrate-compat", "native", "jsonrpsee"] }
time = "0.3.31"
time-macros = "0.2.16"
tokio = { version = "1.35.1", features = [
"rt-multi-thread",
"macros",
], optional = true }
......@@ -31,7 +33,7 @@ tokio = { version = "1.15.0", features = [
[dev-dependencies]
bincode = "1.3.3"
dubp-wot = "0.11.1"
flate2 = { version = "1.0", features = [
flate2 = { version = "1.0.28", features = [
"zlib-ng-compat",
], default-features = false }
......
distance-oracle/src/api.rs
View file @ ce9ccfa5
......@@ -14,11 +14,12 @@
// You should have received a copy of the GNU Affero General Public License
// along with Duniter-v2S. If not, see <https://www.gnu.org/licenses/>.
#![allow(clippy::type_complexity)]
use crate::runtime;
use log::debug;
use sp_core::H256;
use subxt::storage::StorageKey;
pub type Client = subxt::OnlineClient<crate::RuntimeConfig>;
pub type AccountId = subxt::utils::AccountId32;
......@@ -31,7 +32,12 @@ pub async fn client(rpc_url: String) -> Client {
}
pub async fn parent_hash(client: &Client) -> H256 {
client.rpc().block_hash(None).await.unwrap().unwrap()
client
.blocks()
.at_latest()
.await
.expect("Cannot fetch latest block hash")
.hash()
}
pub async fn current_session(client: &Client, parent_hash: H256) -> u32 {
......@@ -93,27 +99,24 @@ pub async fn member_iter(client: &Client, evaluation_block: H256) -> MemberIter
client
.storage()
.at(evaluation_block)
.iter(runtime::storage().membership().membership(0), 100)
.iter(runtime::storage().membership().membership_iter())
.await
.expect("Cannot fetch memberships"),
)
}
pub struct MemberIter(
subxt::storage::KeyIter<
crate::RuntimeConfig,
Client,
subxt::backend::StreamOfResults<(
Vec<u8>,
runtime::runtime_types::sp_membership::MembershipData<u32>,
>,
)>,
);
impl MemberIter {
pub async fn next(&mut self) -> Result<Option<IdtyIndex>, subxt::error::Error> {
Ok(self
.0
.next()
.await?
.map(|(storage_key, _membership_data)| idty_id_from_storage_key(&storage_key)))
self.0.next().await.transpose().map(|i| {
i.map(|(storage_key, _membership_data)| idty_id_from_storage_key(&storage_key))
})
}
}
......@@ -122,26 +125,28 @@ pub async fn cert_iter(client: &Client, evaluation_block: H256) -> CertIter {
client
.storage()
.at(evaluation_block)
.iter(runtime::storage().certification().certs_by_receiver(0), 100)
.iter(runtime::storage().certification().certs_by_receiver_iter())
.await
.expect("Cannot fetch certifications"),
)
}
pub struct CertIter(subxt::storage::KeyIter<crate::RuntimeConfig, Client, Vec<(IdtyIndex, u32)>>);
pub struct CertIter(subxt::backend::StreamOfResults<(Vec<u8>, Vec<(IdtyIndex, u32)>)>);
impl CertIter {
pub async fn next(
&mut self,
) -> Result<Option<(IdtyIndex, Vec<(IdtyIndex, u32)>)>, subxt::error::Error> {
Ok(self
.0
.next()
.await?
.map(|(storage_key, issuers)| (idty_id_from_storage_key(&storage_key), issuers)))
self.0.next().await.transpose().map(|i| {
i.map(|(storage_key, issuers)| (idty_id_from_storage_key(&storage_key), issuers))
})
}
}
fn idty_id_from_storage_key(storage_key: &StorageKey) -> IdtyIndex {
u32::from_le_bytes(storage_key.as_ref()[40..44].try_into().unwrap())
fn idty_id_from_storage_key(storage_key: &[u8]) -> IdtyIndex {
u32::from_le_bytes(
storage_key[40..44]
.try_into()
.expect("Cannot convert StorageKey to IdtyIndex"),
)
}
distance-oracle/src/lib.rs
View file @ ce9ccfa5
......@@ -40,16 +40,15 @@ pub mod runtime {}
pub enum RuntimeConfig {}
impl subxt::config::Config for RuntimeConfig {
type Index = u32;
// type BlockNumber = u32;
type Hash = sp_core::H256;
type Hasher = subxt::config::substrate::BlakeTwo256;
type AccountId = AccountId;
type Address = subxt::ext::sp_runtime::MultiAddress<Self::AccountId, u32>;
type AssetId = ();
type ExtrinsicParams = subxt::config::substrate::SubstrateExtrinsicParams<Self>;
type Hash = sp_core::H256;
type Hasher = subxt::config::substrate::BlakeTwo256;
type Header =
subxt::config::substrate::SubstrateHeader<u32, subxt::config::substrate::BlakeTwo256>;
type Signature = subxt::ext::sp_runtime::MultiSignature;
type ExtrinsicParams = subxt::config::extrinsic_params::BaseExtrinsicParams<Self, Tip>;
}
#[derive(Copy, Clone, Debug, Default, Encode)]
......@@ -172,7 +171,10 @@ pub async fn run(
if handle_fs {
// Stop if already evaluated
if evaluation_result_path.try_exists().unwrap() {
if evaluation_result_path
.try_exists()
.expect("Result path unavailable")
{
info!("Nothing to do: File already exists");
return None;
}
......@@ -192,7 +194,11 @@ pub async fn run(
let mut members = FnvHashMap::<IdtyIndex, u32>::default();
let mut members_iter = api::member_iter(client, evaluation_block).await;
while let Some(member_idty) = members_iter.next().await.unwrap() {
while let Some(member_idty) = members_iter
.next()
.await
.expect("Cannot fetch next members")
{
members.insert(member_idty, 0);
}
......
docs/api/runtime-calls.md
View file @ ce9ccfa5
This diff is collapsed.
docs/api/runtime-errors.md
View file @ ce9ccfa5
# Runtime errors
There are **176** errors from **35** pallets.
There are **174** errors from **35** pallets.
<ul>
<li>System - 0
......@@ -28,6 +28,7 @@ and the new runtime.
Failed to extract the runtime version from the new runtime.
Either calling `Core_version` or decoding `RuntimeVersion` failed.
</details>
</li>
<li>
......@@ -51,6 +52,20 @@ There is a non-zero reference count preventing the account from being purged.
The origin filter prevent the call to be dispatched.
</details>
</li>
<li>
<details>
<summary>
<code>NothingAuthorized</code> - 6</summary>
No upgrade authorized.
</details>
</li>
<li>
<details>
<summary>
<code>Unauthorized</code> - 7</summary>
The submitted code is not authorized.
</details>
</li>
</ul>
</li>
<li>Account - 1
......@@ -210,11 +225,11 @@ Number of freezes exceed `MaxFreezes`.
</li>
</ul>
</li>
<li>TransactionPayment - 32
<li>TransactionPayment - 7
<ul>
</ul>
</li>
<li>OneshotAccount - 7
<li>OneshotAccount - 8
<ul>
<li>
<details>
......@@ -267,7 +282,7 @@ Source oneshot account does not exist.
</li>
</ul>
</li>
<li>Quota - 66
<li>Quota - 9
<ul>
</ul>
</li>
......@@ -589,22 +604,22 @@ Duplicated heartbeat.
<ul>
</ul>
</li>
<li>Sudo - 20
<li>Sudo - 19
<ul>
<li>
<details>
<summary>
<code>RequireSudo</code> - 0</summary>
Sender must be the Sudo account
Sender must be the Sudo account.
</details>
</li>
</ul>
</li>
<li>UpgradeOrigin - 21
<li>UpgradeOrigin - 20
<ul>
</ul>
</li>
<li>Preimage - 22
<li>Preimage - 21
<ul>
<li>
<details>
......@@ -648,9 +663,23 @@ A preimage may not be removed when there are outstanding requests.
The preimage request cannot be removed since no outstanding requests exist.
</details>
</li>
<li>
<details>
<summary>
<code>TooMany</code> - 6</summary>
More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
</details>
</li>
<li>
<details>
<summary>
<code>TooFew</code> - 7</summary>
Too few hashes were requested to be upgraded (i.e. zero).
</details>
</li>
</ul>
</li>
<li>TechnicalCommittee - 23
<li>TechnicalCommittee - 22
<ul>
<li>
<details>
......@@ -722,9 +751,16 @@ The given weight bound for the proposal was too low.
The given length bound for the proposal was too low.
</details>
</li>
<li>
<details>
<summary>
<code>PrimeAccountNotMember</code> - 10</summary>
Prime account is not a member
</details>
</li>
</ul>
</li>
<li>UniversalDividend - 30
<li>UniversalDividend - 23
<ul>
<li>
<details>
......@@ -735,7 +771,7 @@ This account is not allowed to claim UDs.
</li>
</ul>
</li>
<li>Wot - 40
<li>Wot - 24
<ul>
<li>
<details>
......@@ -795,7 +831,7 @@ Membership can only be renewed after an antispam delay.
</li>
</ul>
</li>
<li>Identity - 41
<li>Identity - 25
<ul>
<li>
<details>
......@@ -814,196 +850,182 @@ Identity already created.
<li>
<details>
<summary>
<code>IdtyAlreadyValidated</code> - 2</summary>
Identity already validated.
</details>
</li>
<li>
<details>
<summary>
<code>IdtyIndexNotFound</code> - 3</summary>
<code>IdtyIndexNotFound</code> - 2</summary>
Identity index not found.
</details>
</li>
<li>
<details>
<summary>
<code>IdtyNameAlreadyExist</code> - 4</summary>
<code>IdtyNameAlreadyExist</code> - 3</summary>
Identity name already exists.
</details>
</li>
<li>
<details>
<summary>
<code>IdtyNameInvalid</code> - 5</summary>
<code>IdtyNameInvalid</code> - 4</summary>
Invalid identity name.
</details>
</li>
<li>
<details>
<summary>
<code>IdtyNotConfirmed</code> - 6</summary>
Identity not confirmed by its owner.
</details>
</li>
<li>
<details>
<summary>
<code>IdtyNotFound</code> - 7</summary>
<code>IdtyNotFound</code> - 5</summary>
Identity not found.
</details>
</li>
<li>
<details>
<summary>
<code>InvalidSignature</code> - 8</summary>
<code>InvalidSignature</code> - 6</summary>
Invalid payload signature.
</details>
</li>
<li>
<details>
<summary>
<code>InvalidRevocationKey</code> - 9</summary>
<code>InvalidRevocationKey</code> - 7</summary>
Invalid revocation key.
</details>
</li>
<li>
<details>
<summary>
<code>IssuerNotMember</code> - 10</summary>
<code>IssuerNotMember</code> - 8</summary>
Issuer is not member and can not perform this action.
</details>
</li>
<li>
<details>
<summary>
<code>NotRespectIdtyCreationPeriod</code> - 11</summary>
<code>NotRespectIdtyCreationPeriod</code> - 9</summary>
Identity creation period is not respected.
</details>
</li>
<li>
<details>
<summary>
<code>OwnerKeyAlreadyRecentlyChanged</code> - 12</summary>
<code>OwnerKeyAlreadyRecentlyChanged</code> - 10</summary>
Owner key already changed recently.
</details>
</li>
<li>
<details>
<summary>
<code>OwnerKeyAlreadyUsed</code> - 13</summary>
<code>OwnerKeyAlreadyUsed</code> - 11</summary>
Owner key already used.
</details>
</li>
<li>
<details>
<summary>
<code>ProhibitedToRevertToAnOldKey</code> - 14</summary>
<code>ProhibitedToRevertToAnOldKey</code> - 12</summary>
Reverting to an old key is prohibited.
</details>
</li>
<li>
<details>
<summary>
<code>AlreadyRevoked</code> - 15</summary>
<code>AlreadyRevoked</code> - 13</summary>
Already revoked.
</details>
</li>
<li>
<details>
<summary>
<code>CanNotRevokeUnconfirmed</code> - 16</summary>
<code>CanNotRevokeUnconfirmed</code> - 14</summary>
Can not revoke identity that never was member.
</details>
</li>
<li>
<details>
<summary>
<code>CanNotRevokeUnvalidated</code> - 17</summary>
<code>CanNotRevokeUnvalidated</code> - 15</summary>
Can not revoke identity that never was member.
</details>
</li>
<li>
<details>
<summary>
<code>AccountNotExist</code> - 18</summary>
<code>AccountNotExist</code> - 16</summary>
Cannot link to an inexisting account.
</details>
</li>
</ul>
</li>
<li>Membership - 42
<li>Membership - 26
<ul>
<li>
<details>
<summary>
<code>IdtyIdNotFound</code> - 0</summary>
Identity ID not found.
<code>MembershipNotFound</code> - 0</summary>
Membership not found, can not renew.
</details>
</li>
<li>
<details>
<summary>
<code>MembershipAlreadyAcquired</code> - 1</summary>
Membership already acquired.
<code>AlreadyMember</code> - 1</summary>
Already member, can not add membership.
</details>
</li>
</ul>
</li>
<li>Certification - 27
<ul>
<li>
<details>
<summary>
<code>MembershipNotFound</code> - 2</summary>
Membership not found.
<code>OriginMustHaveAnIdentity</code> - 0</summary>
Issuer of a certification must have an identity
</details>
</li>
<li>
<details>
<summary>
<code>AlreadyMember</code> - 3</summary>
Already member, can not claim membership.
<code>CannotCertifySelf</code> - 1</summary>
Identity cannot certify itself.
</details>
</li>
</ul>
</li>
<li>Certification - 43
<ul>
<li>
<details>
<summary>
<code>CannotCertifySelf</code> - 0</summary>
Identity cannot certify itself.
<code>IssuedTooManyCert</code> - 2</summary>
Identity has already issued the maximum number of certifications.
</details>
</li>
<li>
<details>
<summary>
<code>IssuedTooManyCert</code> - 1</summary>
Identity has already issued the maximum number of certifications.
<code>NotEnoughCertReceived</code> - 3</summary>
Insufficient certifications received.
</details>
</li>
<li>
<details>
<summary>
<code>IssuerNotFound</code> - 2</summary>
Issuer not found.
<code>NotRespectCertPeriod</code> - 4</summary>
Identity has issued a certification too recently.
</details>
</li>
<li>
<details>
<summary>
<code>NotEnoughCertReceived</code> - 3</summary>
Insufficient certifications received.
<code>CertAlreadyExists</code> - 5</summary>
Can not add an already-existing cert
</details>
</li>
<li>
<details>
<summary>
<code>NotRespectCertPeriod</code> - 4</summary>
Identity has issued a certification too recently.
<code>CertDoesNotExist</code> - 6</summary>
Can not renew a non-existing cert
</details>
</li>
</ul>
</li>
<li>Distance - 44
<li>Distance - 28
<ul>
<li>
<details>
......@@ -1098,7 +1120,7 @@ Targeted distance evaluation request is only possible for an unvalidated identit
</li>
</ul>
</li>
<li>AtomicSwap - 50
<li>AtomicSwap - 29
<ul>
<li>
<details>
......@@ -1158,7 +1180,7 @@ Duration has not yet passed for the swap to be cancelled.
</li>
</ul>
</li>
<li>Multisig - 51
<li>Multisig - 30
<ul>
<li>
<details>
......@@ -1260,7 +1282,7 @@ The data to be stored is already stored.
</li>
</ul>
</li>
<li>ProvideRandomness - 52
<li>ProvideRandomness - 31
<ul>
<li>
<details>
......@@ -1271,7 +1293,7 @@ Request randomness queue is full.
</li>
</ul>
</li>
<li>Proxy - 53
<li>Proxy - 32
<ul>
<li>
<details>
......@@ -1331,7 +1353,7 @@ Cannot add self as proxy.
</li>
</ul>
</li>
<li>Utility - 54
<li>Utility - 33
<ul>
<li>
<details>
......@@ -1342,7 +1364,7 @@ Too many calls batched.
</li>
</ul>
</li>
<li>Treasury - 55
<li>Treasury - 34
<ul>
<li>
<details>
......@@ -1355,7 +1377,7 @@ Proposer's balance is too low.
<details>
<summary>
<code>InvalidIndex</code> - 1</summary>
No proposal or bounty at that index.
No proposal, bounty or spend at that index.
</details>
</li>
<li>
......@@ -1380,6 +1402,55 @@ amount to be spent.
Proposal has not been approved.
</details>
</li>
<li>
<details>
<summary>
<code>FailedToConvertBalance</code> - 5</summary>
The balance of the asset kind is not convertible to the balance of the native asset.
</details>
</li>
<li>
<details>
<summary>
<code>SpendExpired</code> - 6</summary>
The spend has expired and cannot be claimed.
</details>
</li>
<li>
<details>
<summary>
<code>EarlyPayout</code> - 7</summary>
The spend is not yet eligible for payout.
</details>
</li>
<li>
<details>
<summary>
<code>AlreadyAttempted</code> - 8</summary>
The payment has already been attempted.
</details>
</li>
<li>
<details>
<summary>
<code>PayoutError</code> - 9</summary>
There was some issue with the mechanism of payment.
</details>
</li>
<li>
<details>
<summary>
<code>NotAttempted</code> - 10</summary>
The payout was not yet attempted/claimed.
</details>
</li>
<li>
<details>
<summary>
<code>Inconclusive</code> - 11</summary>
The payment has neither failed nor succeeded yet.
</details>
</li>
</ul>
</li>
</ul>
\ No newline at end of file
</ul>
docs/api/runtime-events.md
View file @ ce9ccfa5
# Runtime events
There are **128** events from **35** pallets.
There are **129** events from **35** pallets.
<ul>
<li>System - 0
......@@ -77,6 +77,19 @@ sender: T::AccountId
hash: T::Hash
```
</details>
</li>
<li>
<details>
<summary>
<code>UpgradeAuthorized(code_hash, check_version)</code> - 6</summary>
An upgrade was authorized.
```rust
code_hash: T::Hash
check_version: bool
```
</details>
</li>
</ul>
......@@ -145,7 +158,7 @@ The account was unlinked from its identity.
Scheduled some task.
```rust
when: T::BlockNumber
when: BlockNumberFor<T>
index: u32
```
......@@ -158,7 +171,7 @@ index: u32
Canceled some task.
```rust
when: T::BlockNumber
when: BlockNumberFor<T>
index: u32
```
......@@ -171,7 +184,7 @@ index: u32
Dispatched some task.
```rust
task: TaskAddress<T::BlockNumber>
task: TaskAddress<BlockNumberFor<T>>
id: Option<TaskName>
result: DispatchResult
```
......@@ -185,7 +198,7 @@ result: DispatchResult
The call for the provided hash was not found so the task has been aborted.
```rust
task: TaskAddress<T::BlockNumber>
task: TaskAddress<BlockNumberFor<T>>
id: Option<TaskName>
```
......@@ -198,7 +211,7 @@ id: Option<TaskName>
The given task was unable to be renewed since the agenda is full at that block.
```rust
task: TaskAddress<T::BlockNumber>
task: TaskAddress<BlockNumberFor<T>>
id: Option<TaskName>
```
......@@ -211,7 +224,7 @@ id: Option<TaskName>
The given task can never be executed since it is overweight.
```rust
task: TaskAddress<T::BlockNumber>
task: TaskAddress<BlockNumberFor<T>>
id: Option<TaskName>
```
......@@ -510,7 +523,7 @@ amount: T::Balance
</li>
</ul>
</li>
<li>TransactionPayment - 32
<li>TransactionPayment - 7
<ul>
<li>
<details>
......@@ -529,7 +542,7 @@ tip: BalanceOf<T>
</li>
</ul>
</li>
<li>OneshotAccount - 7
<li>OneshotAccount - 8
<ul>
<li>
<details>
......@@ -576,7 +589,7 @@ balance: <T::Currency as Currency<T::AccountId>>::Balance
</li>
</ul>
</li>
<li>Quota - 66
<li>Quota - 9
<ul>
<li>
<details>
......@@ -649,12 +662,12 @@ no args
<li>
<details>
<summary>
<code>InvitationSent(idty_index, invited_by)</code> - 0</summary>
<code>InvitationSent(receiver, issuer)</code> - 0</summary>
An identity is being inivited to become a smith.
```rust
idty_index: T::IdtyIndex
invited_by: T::IdtyIndex
receiver: T::IdtyIndex
issuer: T::IdtyIndex
```
</details>
......@@ -674,12 +687,25 @@ idty_index: T::IdtyIndex
<li>
<details>
<summary>
<code>CertificationReceived(idty_index, issued_by)</code> - 2</summary>
<code>SmithCertAdded(receiver, issuer)</code> - 2</summary>
Certification received
```rust
idty_index: T::IdtyIndex
issued_by: T::IdtyIndex
receiver: T::IdtyIndex
issuer: T::IdtyIndex
```
</details>
</li>
<li>
<details>
<summary>
<code>SmithCertRemoved(receiver, issuer)</code> - 3</summary>
Certification lost
```rust
receiver: T::IdtyIndex
issuer: T::IdtyIndex
```
</details>
......@@ -687,7 +713,7 @@ issued_by: T::IdtyIndex
<li>
<details>
<summary>
<code>PromotedToSmith(idty_index)</code> - 3</summary>
<code>SmithMembershipAdded(idty_index)</code> - 4</summary>
A smith gathered enough certifications to become an authority (can call `go_online()`).
```rust
......@@ -699,7 +725,7 @@ idty_index: T::IdtyIndex
<li>
<details>
<summary>
<code>SmithExcluded(idty_index)</code> - 4</summary>
<code>SmithMembershipRemoved(idty_index)</code> - 5</summary>
A smith has been removed from the smiths set.
```rust
......@@ -924,13 +950,13 @@ offline: Vec<IdentificationTuple<T>>
<ul>
</ul>
</li>
<li>Sudo - 20
<li>Sudo - 19
<ul>
<li>
<details>
<summary>
<code>Sudid(sudo_result)</code> - 0</summary>
A sudo just took place. \[result\]
A sudo call just took place.
```rust
sudo_result: DispatchResult
......@@ -941,11 +967,12 @@ sudo_result: DispatchResult
<li>
<details>
<summary>
<code>KeyChanged(old_sudoer)</code> - 1</summary>
The \[sudoer\] just switched identity; the old key is supplied if one existed.
<code>KeyChanged(old, new)</code> - 1</summary>
The sudo key has been updated.
```rust
old_sudoer: Option<T::AccountId>
old: Option<T::AccountId>
new: T::AccountId
```
</details>
......@@ -953,8 +980,20 @@ old_sudoer: Option<T::AccountId>
<li>
<details>
<summary>
<code>SudoAsDone(sudo_result)</code> - 2</summary>
A sudo just took place. \[result\]
<code>KeyRemoved()</code> - 2</summary>
The key was permanently removed.
```rust
no args
```
</details>
</li>
<li>
<details>
<summary>
<code>SudoAsDone(sudo_result)</code> - 3</summary>
A [sudo_as](Pallet::sudo_as) call just took place.
```rust
sudo_result: DispatchResult
......@@ -964,7 +1003,7 @@ sudo_result: DispatchResult
</li>
</ul>
</li>
<li>UpgradeOrigin - 21
<li>UpgradeOrigin - 20
<ul>
<li>
<details>
......@@ -980,7 +1019,7 @@ result: DispatchResult
</li>
</ul>
</li>
<li>Preimage - 22
<li>Preimage - 21
<ul>
<li>
<details>
......@@ -1020,7 +1059,7 @@ hash: T::Hash
</li>
</ul>
</li>
<li>TechnicalCommittee - 23
<li>TechnicalCommittee - 22
<ul>
<li>
<details>
......@@ -1121,7 +1160,7 @@ no: MemberCount
</li>
</ul>
</li>
<li>UniversalDividend - 30
<li>UniversalDividend - 23
<ul>
<li>
<details>
......@@ -1182,11 +1221,11 @@ who: T::AccountId
</li>
</ul>
</li>
<li>Wot - 40
<li>Wot - 24
<ul>
</ul>
</li>
<li>Identity - 41
<li>Identity - 25
<ul>
<li>
<details>
......@@ -1232,7 +1271,6 @@ idty_index: T::IdtyIndex
<summary>
<code>IdtyChangedOwnerKey(idty_index, new_owner_key)</code> - 3</summary>
```rust
idty_index: T::IdtyIndex
new_owner_key: T::AccountId
......@@ -1268,7 +1306,7 @@ reason: RemovalReason
</li>
</ul>
</li>
<li>Membership - 42
<li>Membership - 26
<ul>
<li>
<details>
......@@ -1311,7 +1349,7 @@ reason: MembershipRemovalReason
</li>
</ul>
</li>
<li>Certification - 43
<li>Certification - 27
<ul>
<li>
<details>
......@@ -1355,7 +1393,7 @@ receiver: T::IdtyIndex
</li>
</ul>
</li>
<li>Distance - 44
<li>Distance - 28
<ul>
<li>
<details>
......@@ -1396,7 +1434,7 @@ idty_index: T::IdtyIndex
</li>
</ul>
</li>
<li>AtomicSwap - 50
<li>AtomicSwap - 29
<ul>
<li>
<details>
......@@ -1441,7 +1479,7 @@ proof: HashedProof
</li>
</ul>
</li>
<li>Multisig - 51
<li>Multisig - 30
<ul>
<li>
<details>
......@@ -1465,7 +1503,7 @@ A multisig operation has been approved by someone.
```rust
approving: T::AccountId
timepoint: Timepoint<T::BlockNumber>
timepoint: Timepoint<BlockNumberFor<T>>
multisig: T::AccountId
call_hash: CallHash
```
......@@ -1480,7 +1518,7 @@ A multisig operation has been executed.
```rust
approving: T::AccountId
timepoint: Timepoint<T::BlockNumber>
timepoint: Timepoint<BlockNumberFor<T>>
multisig: T::AccountId
call_hash: CallHash
result: DispatchResult
......@@ -1496,7 +1534,7 @@ A multisig operation has been cancelled.
```rust
cancelling: T::AccountId
timepoint: Timepoint<T::BlockNumber>
timepoint: Timepoint<BlockNumberFor<T>>
multisig: T::AccountId
call_hash: CallHash
```
......@@ -1505,7 +1543,7 @@ call_hash: CallHash
</li>
</ul>
</li>
<li>ProvideRandomness - 52
<li>ProvideRandomness - 31
<ul>
<li>
<details>
......@@ -1536,7 +1574,7 @@ r#type: RandomnessType
</li>
</ul>
</li>
<li>Proxy - 53
<li>Proxy - 32
<ul>
<li>
<details>
......@@ -1590,7 +1628,7 @@ A proxy was added.
delegator: T::AccountId
delegatee: T::AccountId
proxy_type: T::ProxyType
delay: T::BlockNumber
delay: BlockNumberFor<T>
```
</details>
......@@ -1605,14 +1643,14 @@ A proxy was removed.
delegator: T::AccountId
delegatee: T::AccountId
proxy_type: T::ProxyType
delay: T::BlockNumber
delay: BlockNumberFor<T>
```
</details>
</li>
</ul>
</li>
<li>Utility - 54
<li>Utility - 33
<ul>
<li>
<details>
......@@ -1690,7 +1728,7 @@ result: DispatchResult
</li>
</ul>
</li>
<li>Treasury - 55
<li>Treasury - 34
<ul>
<li>
<details>
......@@ -1804,8 +1842,76 @@ reactivated: BalanceOf<T, I>
deactivated: BalanceOf<T, I>
```
</details>
</li>
<li>
<details>
<summary>
<code>AssetSpendApproved(index, asset_kind, amount, beneficiary, valid_from, expire_at)</code> - 9</summary>
A new asset spend proposal has been approved.
```rust
index: SpendIndex
asset_kind: T::AssetKind
amount: AssetBalanceOf<T, I>
beneficiary: T::Beneficiary
valid_from: BlockNumberFor<T>
expire_at: BlockNumberFor<T>
```
</details>
</li>
<li>
<details>
<summary>
<code>AssetSpendVoided(index)</code> - 10</summary>
An approved spend was voided.
```rust
index: SpendIndex
```
</details>
</li>
<li>
<details>
<summary>
<code>Paid(index, payment_id)</code> - 11</summary>
A payment happened.
```rust
index: SpendIndex
payment_id: <T::Paymaster as Pay>::Id
```
</details>
</li>
<li>
<details>
<summary>
<code>PaymentFailed(index, payment_id)</code> - 12</summary>
A payment failed and can be retried.
```rust
index: SpendIndex
payment_id: <T::Paymaster as Pay>::Id
```
</details>
</li>
<li>
<details>
<summary>
<code>SpendProcessed(index)</code> - 13</summary>
A spend was processed and removed from the storage. It might have been successfully
paid or it may have expired.
```rust
index: SpendIndex
```
</details>
</li>
</ul>
</li>
</ul>
\ No newline at end of file
</ul>
end2end-tests/Cargo.toml
View file @ ce9ccfa5
......@@ -10,21 +10,23 @@ version = '3.0.0'
[dev-dependencies]
anyhow = "1.0"
async-trait = "0.1"
clap = { version = "3.2.23", features = ["derive"] }
async-trait = "0.1.74"
clap = { version = "3.2.23", features = ["derive", "cargo"] } # end2end cli refactoring need to upgrade to 4
ctrlc = "3.2.2"
cucumber = "0.11"
distance-oracle = { path = "../distance-oracle", default_features = false }
env_logger = "0.9.0"
hex = "0.4"
hex = "0.4.3"
notify = "4.0"
parity-scale-codec = "3.4.0"
portpicker = "0.1.1"
serde_json = "1.0.96"
sp-keyring = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false }
subxt = { git = 'https://github.com/duniter/subxt.git', branch = 'duniter-substrate-v0.9.42', default-features = false, features = ["substrate-compat", "jsonrpsee-ws"] }
sp-core = { git = "https://github.com/duniter/duniter-polkadot-sdk", branch = "duniter-substrate-v1.6.0", default-features = false }
sp-core-hashing = { git = "https://github.com/duniter/duniter-polkadot-sdk", branch = "duniter-substrate-v1.6.0", default-features = false }
sp-runtime = { git = "https://github.com/duniter/duniter-polkadot-sdk", branch = "duniter-substrate-v1.6.0" }
sp-keyring = { git = "https://github.com/duniter/duniter-polkadot-sdk", branch = "duniter-substrate-v1.6.0" }
subxt = { git = 'https://github.com/duniter/subxt', branch = 'subxt-v0.34.0-duniter-substrate-v1.6.0', default-features = false, features = ["substrate-compat", "native", "jsonrpsee"] }
tokio = { version = "1.28", features = ["macros", "time", "rt-multi-thread"], default-features = false }
sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false , features = ["std"] }
[[test]]
name = "cucumber_tests"
......
end2end-tests/cucumber-features/oneshot_account.feature
View file @ ce9ccfa5
Feature: Oneshot account
Scenario: Simple oneshot consumption
When charlie sends 7 ĞD to dave
# Cover the oneshot calls fees
When alice sends 7 ĞD to oneshot dave
# Alice is treasury funder for 1 ĞD and pays fees TODO
Then alice should have 199 cĞD
# Alice is treasury funder for 1 ĞD, and member so fees are refunded
Then alice should have 2 ĞD
Then dave should have oneshot 7 ĞD
When oneshot dave consumes into account bob
Then dave should have oneshot 0 ĞD
......@@ -11,13 +13,16 @@ Feature: Oneshot account
Then bob should have oneshot 0 ĞD
Scenario: Double oneshot consumption
When charlie sends 7 ĞD to dave
Then charlie should have 299 cĞD
# Cover the oneshot calls fees
When alice sends 7 ĞD to oneshot dave
# Alice is treasury funder for 1 ĞD and pays fees TODO
Then alice should have 199 cĞD
# Alice is treasury funder for 1 ĞD, and member so fees are refunded
Then alice should have 2 ĞD
Then dave should have oneshot 7 ĞD
When oneshot dave consumes 4 ĞD into account bob and the rest into oneshot charlie
Then dave should have oneshot 0 ĞD
Then bob should have 14 ĞD
Then bob should have oneshot 0 ĞD
Then charlie should have 10 ĞD
Then charlie should have 299 cĞD
Then charlie should have oneshot 298 cĞD
end2end-tests/cucumber-genesis/default.json
View file @ ce9ccfa5
......@@ -19,6 +19,8 @@
},
"owner_address": "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY",
"membership_expire_on": 2700000000,
"membership_revokes_on": 2700000001,
"revoked": false,
"next_cert_issuable_on": 0
},
"Bob": {
......@@ -30,6 +32,8 @@
},
"owner_address": "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty",
"membership_expire_on": 2700000000,
"membership_revokes_on": 2700000001,
"revoked": false,
"next_cert_issuable_on": 0
},
"Charlie": {
......@@ -41,6 +45,8 @@
},
"owner_address": "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y",
"membership_expire_on": 2700000000,
"membership_revokes_on": 2700000001,
"revoked": false,
"next_cert_issuable_on": 0
}
},
......@@ -87,4 +93,4 @@
"number": 0,
"medianTime": 1700000000
}
}
\ No newline at end of file
}
end2end-tests/cucumber-genesis/wot.json
View file @ ce9ccfa5
......@@ -17,6 +17,8 @@
},
"owner_address": "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY",
"membership_expire_on": 2700000000,
"membership_revokes_on": 2700000001,
"revoked": false,
"next_cert_issuable_on": 0
},
"Bob": {
......@@ -28,6 +30,8 @@
},
"owner_address": "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty",
"membership_expire_on": 2700000000,
"membership_revokes_on": 2700000001,
"revoked": false,
"next_cert_issuable_on": 0
},
"Charlie": {
......@@ -39,6 +43,8 @@
},
"owner_address": "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y",
"membership_expire_on": 2700000000,
"membership_revokes_on": 2700000001,
"revoked": false,
"next_cert_issuable_on": 0
},
"Dave": {
......@@ -50,6 +56,8 @@
},
"owner_address": "5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy",
"membership_expire_on": 2700000000,
"membership_revokes_on": 2700000001,
"revoked": false,
"next_cert_issuable_on": 0
}
},
......
end2end-tests/tests/common/balances.rs
View file @ ce9ccfa5
......@@ -20,10 +20,11 @@ use super::*;
use sp_keyring::AccountKeyring;
use subxt::{tx::PairSigner, utils::MultiAddress};
pub async fn set_balance(client: &Client, who: AccountKeyring, amount: u64) -> Result<()> {
pub async fn set_balance(client: &FullClient, who: AccountKeyring, amount: u64) -> Result<()> {
let _events = create_block_with_extrinsic(
client,
&client.rpc,
client
.client
.tx()
.create_signed(
&gdev::tx()
......@@ -35,7 +36,7 @@ pub async fn set_balance(client: &Client, who: AccountKeyring, amount: u64) -> R
},
)),
&PairSigner::new(SUDO_ACCOUNT.pair()),
BaseExtrinsicParamsBuilder::new(),
SubstrateExtrinsicParamsBuilder::new().build(),
)
.await?,
)
......@@ -45,7 +46,7 @@ pub async fn set_balance(client: &Client, who: AccountKeyring, amount: u64) -> R
}
pub async fn transfer(
client: &Client,
client: &FullClient,
from: AccountKeyring,
amount: u64,
to: AccountKeyring,
......@@ -54,15 +55,16 @@ pub async fn transfer(
let to = to.to_account_id();
let _events = create_block_with_extrinsic(
client,
&client.rpc,
client
.client
.tx()
.create_signed(
&gdev::tx()
.universal_dividend()
.transfer_ud(to.clone().into(), amount),
&from,
BaseExtrinsicParamsBuilder::new(),
SubstrateExtrinsicParamsBuilder::new().build(),
)
.await?,
)
......@@ -71,18 +73,23 @@ pub async fn transfer(
Ok(())
}
pub async fn transfer_all(client: &Client, from: AccountKeyring, to: AccountKeyring) -> Result<()> {
pub async fn transfer_all(
client: &FullClient,
from: AccountKeyring,
to: AccountKeyring,
) -> Result<()> {
let from = PairSigner::new(from.pair());
let to = to.to_account_id();
let _events = create_block_with_extrinsic(
client,
&client.rpc,
client
.client
.tx()
.create_signed(
&gdev::tx().balances().transfer_all(to.into(), false),
&from,
BaseExtrinsicParamsBuilder::new(),
SubstrateExtrinsicParamsBuilder::new().build(),
)
.await?,
)
......@@ -92,7 +99,7 @@ pub async fn transfer_all(client: &Client, from: AccountKeyring, to: AccountKeyr
}
pub async fn transfer_ud(
client: &Client,
client: &FullClient,
from: AccountKeyring,
amount: u64,
to: AccountKeyring,
......@@ -101,15 +108,16 @@ pub async fn transfer_ud(
let to = to.to_account_id();
let _events = create_block_with_extrinsic(
client,
&client.rpc,
client
.client
.tx()
.create_signed(
&gdev::tx()
.universal_dividend()
.transfer_ud(to.clone().into(), amount),
&from,
BaseExtrinsicParamsBuilder::new(),
SubstrateExtrinsicParamsBuilder::new().build(),
)
.await?,
)
......
end2end-tests/tests/common/cert.rs
View file @ ce9ccfa5
......@@ -20,12 +20,13 @@ use super::*;
use sp_keyring::AccountKeyring;
use subxt::{tx::PairSigner, utils::MultiAddress};
pub async fn certify(client: &Client, from: AccountKeyring, to: AccountKeyring) -> Result<()> {
pub async fn certify(client: &FullClient, from: AccountKeyring, to: AccountKeyring) -> Result<()> {
let signer = PairSigner::new(from.pair());
let from = from.to_account_id();
let to = to.to_account_id();
let issuer_index = client
let _issuer_index = client
.client
.storage()
.at_latest()
.await
......@@ -38,6 +39,7 @@ pub async fn certify(client: &Client, from: AccountKeyring, to: AccountKeyring)
.await?
.unwrap_or_else(|| panic!("{} issuer must exist", from));
let receiver_index = client
.client
.storage()
.at_latest()
.await
......@@ -47,15 +49,14 @@ pub async fn certify(client: &Client, from: AccountKeyring, to: AccountKeyring)
.unwrap_or_else(|| panic!("{} issuer must exist", from));
let _events = create_block_with_extrinsic(
client,
&client.rpc,
client
.client
.tx()
.create_signed(
&gdev::tx()
.certification()
.add_cert(issuer_index, receiver_index),
&gdev::tx().certification().add_cert(receiver_index),
&signer,
BaseExtrinsicParamsBuilder::new(),
SubstrateExtrinsicParamsBuilder::new().build(),
)
.await?,
)
......
end2end-tests/tests/common/distance.rs
View file @ ce9ccfa5
......@@ -19,20 +19,22 @@ use super::gdev::runtime_types::pallet_identity;
use super::*;
use crate::DuniterWorld;
use sp_keyring::AccountKeyring;
use subxt::backend::rpc::RpcClient;
use subxt::tx::{PairSigner, Signer};
use subxt::utils::AccountId32;
pub async fn request_evaluation(client: &Client, origin: AccountKeyring) -> Result<()> {
pub async fn request_evaluation(client: &FullClient, origin: AccountKeyring) -> Result<()> {
let origin = PairSigner::new(origin.pair());
let _events = create_block_with_extrinsic(
client,
&client.rpc,
client
.client
.tx()
.create_signed(
&gdev::tx().distance().request_distance_evaluation(),
&origin,
BaseExtrinsicParamsBuilder::new(),
SubstrateExtrinsicParamsBuilder::new().build(),
)
.await?,
)
......@@ -41,7 +43,11 @@ pub async fn request_evaluation(client: &Client, origin: AccountKeyring) -> Resu
Ok(())
}
pub async fn run_oracle(client: &Client, origin: AccountKeyring, rpc_url: String) -> Result<()> {
pub async fn run_oracle(
client: &FullClient,
origin: AccountKeyring,
rpc_url: String,
) -> Result<()> {
let origin = PairSigner::new(origin.pair());
let account_id: &AccountId32 = origin.account_id();
......@@ -56,12 +62,12 @@ pub async fn run_oracle(client: &Client, origin: AccountKeyring, rpc_url: String
.await
{
for _ in 0..30 {
super::create_empty_block(client).await?;
super::create_empty_block(&client.rpc).await?;
}
let _events = create_block_with_extrinsic(
client,
client
&client.rpc,
client.client
.tx()
.create_signed(
&gdev::tx().sudo().sudo(gdev::runtime_types::gdev_runtime::RuntimeCall::Distance(
......@@ -75,7 +81,7 @@ pub async fn run_oracle(client: &Client, origin: AccountKeyring, rpc_url: String
)
),
&origin,
BaseExtrinsicParamsBuilder::new(),
SubstrateExtrinsicParamsBuilder::new().build(),
)
.await?,
)
......
end2end-tests/tests/common/identity.rs
View file @ ce9ccfa5
......@@ -17,6 +17,7 @@
use super::gdev;
use super::gdev::runtime_types::pallet_identity;
use super::*;
use crate::gdev::runtime_types::pallet_identity::types::IdtyName;
use crate::DuniterWorld;
use sp_keyring::AccountKeyring;
use subxt::tx::PairSigner;
......@@ -30,7 +31,7 @@ type IdtyValue =
// submit extrinsics
pub async fn create_identity(
client: &Client,
client: &FullClient,
from: AccountKeyring,
to: AccountKeyring,
) -> Result<()> {
......@@ -38,13 +39,14 @@ pub async fn create_identity(
let to = to.to_account_id();
let _events = create_block_with_extrinsic(
client,
&client.rpc,
client
.client
.tx()
.create_signed(
&gdev::tx().identity().create_identity(to.into()),
&from,
BaseExtrinsicParamsBuilder::new(),
SubstrateExtrinsicParamsBuilder::new().build(),
)
.await?,
)
......@@ -53,17 +55,23 @@ pub async fn create_identity(
Ok(())
}
pub async fn confirm_identity(client: &Client, from: AccountKeyring, pseudo: String) -> Result<()> {
pub async fn confirm_identity(
client: &FullClient,
from: AccountKeyring,
pseudo: String,
) -> Result<()> {
let from = PairSigner::new(from.pair());
let pseudo: IdtyName = IdtyName(pseudo.as_bytes().to_vec());
let _events = create_block_with_extrinsic(
client,
&client.rpc,
client
.client
.tx()
.create_signed(
&gdev::tx().identity().confirm_identity(pseudo),
&from,
BaseExtrinsicParamsBuilder::new(),
SubstrateExtrinsicParamsBuilder::new().build(),
)
.await?,
)
......
end2end-tests/tests/common/mod.rs
View file @ ce9ccfa5
......@@ -37,9 +37,12 @@ use std::path::{Path, PathBuf};
use std::process::Command;
use std::str::FromStr;
use std::time::{Duration, Instant};
use subxt::config::extrinsic_params::BaseExtrinsicParamsBuilder;
use subxt::backend::rpc::RpcClient;
use subxt::backend::rpc::RpcParams;
use subxt::config::substrate::SubstrateExtrinsicParamsBuilder;
use subxt::config::SubstrateExtrinsicParams;
use subxt::ext::{sp_core, sp_runtime};
use subxt::rpc::rpc_params;
use subxt::rpc_params;
pub type Client = subxt::OnlineClient<GdevConfig>;
pub type Event = gdev::Event;
......@@ -49,15 +52,15 @@ pub type TxProgress = subxt::tx::TxProgress<GdevConfig, Client>;
pub enum GdevConfig {}
impl subxt::config::Config for GdevConfig {
type Index = u32;
type Hash = sp_core::H256;
type AccountId = subxt::utils::AccountId32;
type Address = sp_runtime::MultiAddress<Self::AccountId, u32>;
type AssetId = ();
type ExtrinsicParams = SubstrateExtrinsicParams<Self>;
type Hash = sp_core::H256;
type Hasher = subxt::config::substrate::BlakeTwo256;
type Header =
subxt::config::substrate::SubstrateHeader<u32, subxt::config::substrate::BlakeTwo256>;
type Hasher = subxt::config::substrate::BlakeTwo256;
type Signature = sp_runtime::MultiSignature;
type ExtrinsicParams = subxt::config::extrinsic_params::BaseExtrinsicParams<Self, Tip>;
}
#[derive(Copy, Clone, Debug, Default, Encode)]
......@@ -66,6 +69,11 @@ pub struct Tip {
tip: u64,
}
pub struct FullClient {
pub rpc: RpcClient,
pub client: Client,
}
impl Tip {
pub fn new(amount: u64) -> Self {
Tip { tip: amount }
......@@ -101,13 +109,13 @@ const DUNITER_LOCAL_PATH: &str = "../target/debug/duniter";
struct FullNode {
process: Process,
p2p_port: u16,
ws_port: u16,
rpc_port: u16,
}
pub async fn spawn_node(
maybe_genesis_conf_file: Option<PathBuf>,
no_spawn: bool,
) -> (Client, Option<Process>, u16) {
) -> (FullClient, Option<Process>, u16) {
println!("maybe_genesis_conf_file={:?}", maybe_genesis_conf_file);
let duniter_binary_path = std::env::var("DUNITER_BINARY_PATH").unwrap_or_else(|_| {
if std::path::Path::new(DUNITER_DOCKER_PATH).exists() {
......@@ -117,14 +125,14 @@ pub async fn spawn_node(
}
});
let mut the_ws_port = 9944;
let mut the_rpc_port = 9944;
let mut opt_process = None;
// Eventually spawn a node (we most likely will - unless --no-spawn option is used)
if !no_spawn {
let FullNode {
process,
p2p_port: _,
ws_port,
rpc_port,
} = spawn_full_node(
&[
"--chain=gdev_dev",
......@@ -144,27 +152,27 @@ pub async fn spawn_node(
maybe_genesis_conf_file,
);
opt_process = Some(process);
the_ws_port = ws_port;
the_rpc_port = rpc_port;
}
let client = Client::from_url(format!("ws://127.0.0.1:{}", the_ws_port))
let rpc = RpcClient::from_url(format!("ws://127.0.0.1:{}", the_rpc_port))
.await
.expect("fail to connect to node");
.expect("Failed to create the rpc backend");
let client = Client::from_rpc_client(rpc.clone()).await.unwrap();
(client, opt_process, the_ws_port)
(FullClient { rpc, client }, opt_process, the_rpc_port)
}
pub async fn create_empty_block(client: &Client) -> Result<()> {
pub async fn create_empty_block(client: &RpcClient) -> Result<()> {
// Create an empty block
let _: Value = client
.rpc()
.request("engine_createBlock", rpc_params![true, false, Value::Null])
.request("engine_createBlock", rpc_params![true, true, Value::Null])
.await?;
Ok(())
}
pub async fn create_block_with_extrinsic(
client: &Client,
client: &RpcClient,
extrinsic: SubmittableExtrinsic,
) -> Result<subxt::blocks::ExtrinsicEvents<GdevConfig>> {
//println!("extrinsic encoded: {}", hex::encode(extrinsic.encoded()));
......@@ -173,13 +181,12 @@ pub async fn create_block_with_extrinsic(
// Create a non-empty block
let _: Value = client
.rpc()
.request("engine_createBlock", rpc_params![false, false, Value::Null])
.request("engine_createBlock", rpc_params![false, true, Value::Null])
.await?;
// Get extrinsic events
watcher
.wait_for_in_block()
.wait_for_finalized()
.await?
.fetch_events()
.await
......@@ -194,7 +201,6 @@ fn spawn_full_node(
// Ports
let p2p_port = portpicker::pick_unused_port().expect("No ports free");
let rpc_port = portpicker::pick_unused_port().expect("No ports free");
let ws_port = portpicker::pick_unused_port().expect("No ports free");
// Env vars
let mut envs = Vec::new();
......@@ -204,7 +210,7 @@ fn spawn_full_node(
}
// Logs
let log_file_path = format!("duniter-v2s-{}.log", ws_port);
let log_file_path = format!("duniter-v2s-{}.log", rpc_port);
let log_file = std::fs::File::create(&log_file_path).expect("fail to create log file");
// Command
......@@ -218,8 +224,6 @@ fn spawn_full_node(
&p2p_port.to_string(),
"--rpc-port",
&rpc_port.to_string(),
"--ws-port",
&ws_port.to_string(),
]
.iter()
.chain(args),
......@@ -247,7 +251,7 @@ fn spawn_full_node(
FullNode {
process,
p2p_port,
ws_port,
rpc_port,
}
}
......
end2end-tests/tests/common/oneshot.rs
View file @ ce9ccfa5
......@@ -43,7 +43,7 @@ impl Account {
}
pub async fn create_oneshot_account(
client: &Client,
client: &FullClient,
from: AccountKeyring,
amount: u64,
to: AccountKeyring,
......@@ -52,15 +52,16 @@ pub async fn create_oneshot_account(
let to = to.to_account_id();
let _events = create_block_with_extrinsic(
client,
&client.rpc,
client
.client
.tx()
.create_signed(
&gdev::tx()
.oneshot_account()
.create_oneshot_account(to.into(), amount),
&from,
BaseExtrinsicParamsBuilder::new(),
SubstrateExtrinsicParamsBuilder::new().build(),
)
.await?,
)
......@@ -70,7 +71,7 @@ pub async fn create_oneshot_account(
}
pub async fn consume_oneshot_account(
client: &Client,
client: &FullClient,
from: AccountKeyring,
to: Account,
) -> Result<()> {
......@@ -78,13 +79,14 @@ pub async fn consume_oneshot_account(
let to = to.to_account_id();
let _events = create_block_with_extrinsic(
client,
&client.rpc,
client
.client
.tx()
.create_signed(
&gdev::tx().oneshot_account().consume_oneshot_account(0, to),
&from,
BaseExtrinsicParamsBuilder::new(),
SubstrateExtrinsicParamsBuilder::new().build(),
)
.await?,
)
......@@ -95,7 +97,7 @@ pub async fn consume_oneshot_account(
#[allow(clippy::too_many_arguments)]
pub async fn consume_oneshot_account_with_remaining(
client: &Client,
client: &FullClient,
from: AccountKeyring,
amount: u64,
to: Account,
......@@ -106,15 +108,16 @@ pub async fn consume_oneshot_account_with_remaining(
let remaining_to = remaining_to.to_account_id();
let _events = create_block_with_extrinsic(
client,
&client.rpc,
client
.client
.tx()
.create_signed(
&gdev::tx()
.oneshot_account()
.consume_oneshot_account_with_remaining(0, to, remaining_to, amount),
&from,
BaseExtrinsicParamsBuilder::new(),
SubstrateExtrinsicParamsBuilder::new().build(),
)
.await?,
)
......
end2end-tests/tests/cucumber_tests.rs
View file @ ce9ccfa5
......@@ -27,6 +27,7 @@ use std::sync::{
atomic::{AtomicBool, Ordering},
Arc,
};
use subxt::backend::rpc::RpcClient;
// ===== world =====
......@@ -44,25 +45,47 @@ impl DuniterWorld {
}
self.inner = Some(DuniterWorldInner::new(maybe_genesis_conf_file, no_spawn).await);
}
fn kill(&mut self) {
if let Some(ref mut inner) = self.inner {
inner.kill();
}
}
fn set_ignore_errors(&mut self, ignore_errors: bool) {
self.ignore_errors = ignore_errors;
}
// Read methods
fn rpc_client(&self) -> &RpcClient {
if let Some(ref inner) = self.inner {
&inner.client.rpc
} else {
panic!("uninit")
}
}
fn client(&self) -> &Client {
if let Some(ref inner) = self.inner {
&inner.client.client
} else {
panic!("uninit")
}
}
fn full_client(&self) -> &FullClient {
if let Some(ref inner) = self.inner {
&inner.client
} else {
panic!("uninit")
}
}
// Read methods
fn ignore_errors(&self) -> bool {
self.ignore_errors
}
// Read storage entry on last block
async fn read<'a, Address>(
&self,
......@@ -80,6 +103,7 @@ impl DuniterWorld {
.unwrap()
.fetch(address)
}
// Read storage entry with default value (on last block)
async fn read_or_default<'a, Address>(
&self,
......@@ -120,7 +144,7 @@ impl World for DuniterWorld {
}
struct DuniterWorldInner {
client: Client,
client: FullClient,
process: Option<Process>,
ws_port: u16,
}
......@@ -134,6 +158,7 @@ impl DuniterWorldInner {
ws_port,
}
}
fn kill(&mut self) {
if let Some(p) = &mut self.process {
p.kill();
......@@ -170,7 +195,7 @@ async fn who_have(world: &mut DuniterWorld, who: String, amount: u64, unit: Stri
}
// Create {amount} ĞD for {who}
common::balances::set_balance(world.client(), who, amount).await?;
common::balances::set_balance(world.full_client(), who, amount).await?;
Ok(())
}
......@@ -181,7 +206,7 @@ async fn who_have(world: &mut DuniterWorld, who: String, amount: u64, unit: Stri
#[when(regex = r"(\d+) blocks? later")]
async fn n_blocks_later(world: &mut DuniterWorld, n: usize) -> Result<()> {
for _ in 0..n {
common::create_empty_block(world.client()).await?;
common::create_empty_block(world.rpc_client()).await?;
}
Ok(())
}
......@@ -201,9 +226,9 @@ async fn transfer(
let (amount, is_ud) = parse_amount(amount, &unit);
let res = if is_ud {
common::balances::transfer_ud(world.client(), from, amount, to).await
common::balances::transfer_ud(world.full_client(), from, amount, to).await
} else {
common::balances::transfer(world.client(), from, amount, to).await
common::balances::transfer(world.full_client(), from, amount, to).await
};
if world.ignore_errors() {
......@@ -229,7 +254,7 @@ async fn create_oneshot_account(
assert!(!is_ud);
common::oneshot::create_oneshot_account(world.client(), from, amount, to).await
common::oneshot::create_oneshot_account(world.full_client(), from, amount, to).await
}
#[allow(clippy::needless_pass_by_ref_mut)]
......@@ -249,7 +274,7 @@ async fn consume_oneshot_account(
_ => unreachable!(),
};
common::oneshot::consume_oneshot_account(world.client(), from, to).await
common::oneshot::consume_oneshot_account(world.full_client(), from, to).await
}
#[when(
......@@ -286,7 +311,7 @@ async fn consume_oneshot_account_with_remaining(
assert!(!is_ud);
common::oneshot::consume_oneshot_account_with_remaining(
world.client(),
world.full_client(),
from,
amount,
to,
......@@ -302,7 +327,7 @@ async fn send_all_to(world: &mut DuniterWorld, from: String, to: String) -> Resu
let from = AccountKeyring::from_str(&from).expect("unknown from");
let to = AccountKeyring::from_str(&to).expect("unknown to");
common::balances::transfer_all(world.client(), from, to).await
common::balances::transfer_all(world.full_client(), from, to).await
}
#[allow(clippy::needless_pass_by_ref_mut)]
......@@ -312,7 +337,7 @@ async fn certifies(world: &mut DuniterWorld, from: String, to: String) -> Result
let from = AccountKeyring::from_str(&from).expect("unknown from");
let to = AccountKeyring::from_str(&to).expect("unknown to");
common::cert::certify(world.client(), from, to).await
common::cert::certify(world.full_client(), from, to).await
}
#[allow(clippy::needless_pass_by_ref_mut)]
......@@ -322,7 +347,7 @@ async fn creates_identity(world: &mut DuniterWorld, from: String, to: String) ->
let from = AccountKeyring::from_str(&from).expect("unknown from");
let to = AccountKeyring::from_str(&to).expect("unknown to");
common::identity::create_identity(world.client(), from, to).await
common::identity::create_identity(world.full_client(), from, to).await
}
#[allow(clippy::needless_pass_by_ref_mut)]
......@@ -330,7 +355,7 @@ async fn creates_identity(world: &mut DuniterWorld, from: String, to: String) ->
async fn confirm_identity(world: &mut DuniterWorld, from: String, pseudo: String) -> Result<()> {
let from = AccountKeyring::from_str(&from).expect("unknown from");
common::identity::confirm_identity(world.client(), from, pseudo).await
common::identity::confirm_identity(world.full_client(), from, pseudo).await
}
#[allow(clippy::needless_pass_by_ref_mut)]
......@@ -338,7 +363,7 @@ async fn confirm_identity(world: &mut DuniterWorld, from: String, pseudo: String
async fn request_distance_evaluation(world: &mut DuniterWorld, who: String) -> Result<()> {
let who = AccountKeyring::from_str(&who).expect("unknown origin");
common::distance::request_evaluation(world.client(), who).await
common::distance::request_evaluation(world.full_client(), who).await
}
#[allow(clippy::needless_pass_by_ref_mut)]
......@@ -347,7 +372,7 @@ async fn run_distance_oracle(world: &mut DuniterWorld, who: String) -> Result<()
let who = AccountKeyring::from_str(&who).expect("unknown origin");
common::distance::run_oracle(
world.client(),
world.full_client(),
who,
format!("ws://127.0.0.1:{}", world.inner.as_ref().unwrap().ws_port),
)
......